b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2021-01-22 18:52:00 +00:00 committed by GitHub
parent a5bbeb4fb1 ff7c2d7009
commit 08c4f9056e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
58 changed files with 649 additions and 257 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

269
nixos/modules/programs/fish.nix
View file

@ -13,6 +13,27 @@ let
(filterAttrs (k: v: v != null) cfg.shellAliases)
);
envShellInit = pkgs.writeText "shellInit" cfge.shellInit;
envLoginShellInit = pkgs.writeText "loginShellInit" cfge.loginShellInit;
envInteractiveShellInit = pkgs.writeText "interactiveShellInit" cfge.interactiveShellInit;
sourceEnv = file:
if cfg.useBabelfish then
"source /etc/fish/${file}.fish"
else
''
set fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish-foreign-env/functions $fish_function_path
fenv source /etc/fish/foreign-env/${file} > /dev/null
set -e fish_function_path[1]
'';
babelfishTranslate = path: name:
pkgs.runCommand "${name}.fish" {
nativeBuildInputs = [ pkgs.babelfish ];
} "${pkgs.babelfish}/bin/babelfish < ${path} > $out;";
in
{
@ -29,6 +50,15 @@ in
type = types.bool;
};
useBabelfish = mkOption {
type = types.bool;
default = false;
description = ''
If enabled, the configured environment will be translated to native fish using <link xlink:href="https://github.com/bouk/babelfish">babelfish</link>.
Otherwise, <link xlink:href="https://github.com/oh-my-fish/plugin-foreign-env">foreign-env</link> will be used.
'';
};
vendor.config.enable = mkOption {
type = types.bool;
default = true;
@ -105,72 +135,152 @@ in
# Required for man completions
documentation.man.generateCaches = lib.mkDefault true;
environment.etc."fish/foreign-env/shellInit".text = cfge.shellInit;
environment.etc."fish/foreign-env/loginShellInit".text = cfge.loginShellInit;
environment.etc."fish/foreign-env/interactiveShellInit".text = cfge.interactiveShellInit;
environment = mkMerge [
(mkIf cfg.useBabelfish
{
etc."fish/setEnvironment.fish".source = babelfishTranslate config.system.build.setEnvironment "setEnvironment";
etc."fish/shellInit.fish".source = babelfishTranslate envShellInit "shellInit";
etc."fish/loginShellInit.fish".source = babelfishTranslate envLoginShellInit "loginShellInit";
etc."fish/interactiveShellInit.fish".source = babelfishTranslate envInteractiveShellInit "interactiveShellInit";
})
environment.etc."fish/nixos-env-preinit.fish".text = ''
# This happens before $__fish_datadir/config.fish sets fish_function_path, so it is currently
# unset. We set it and then completely erase it, leaving its configuration to $__fish_datadir/config.fish
set fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d $__fish_datadir/functions
(mkIf (!cfg.useBabelfish)
{
etc."fish/foreign-env/shellInit".source = envShellInit;
etc."fish/foreign-env/loginShellInit".source = envLoginShellInit;
etc."fish/foreign-env/interactiveShellInit".source = envInteractiveShellInit;
})
# source the NixOS environment config
if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]
fenv source ${config.system.build.setEnvironment}
end
{
etc."fish/nixos-env-preinit.fish".text =
if cfg.useBabelfish
then ''
# source the NixOS environment config
if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]
source /etc/fish/setEnvironment.fish
end
''
else ''
# This happens before $__fish_datadir/config.fish sets fish_function_path, so it is currently
# unset. We set it and then completely erase it, leaving its configuration to $__fish_datadir/config.fish
set fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d $__fish_datadir/functions
# clear fish_function_path so that it will be correctly set when we return to $__fish_datadir/config.fish
set -e fish_function_path
'';
# source the NixOS environment config
if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]
fenv source ${config.system.build.setEnvironment}
end
environment.etc."fish/config.fish".text = ''
# /etc/fish/config.fish: DO NOT EDIT -- this file has been generated automatically.
# clear fish_function_path so that it will be correctly set when we return to $__fish_datadir/config.fish
set -e fish_function_path
'';
}
# if we haven't sourced the general config, do it
if not set -q __fish_nixos_general_config_sourced
set --prepend fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d
fenv source /etc/fish/foreign-env/shellInit > /dev/null
set -e fish_function_path[1]
{
etc."fish/config.fish".text = ''
# /etc/fish/config.fish: DO NOT EDIT -- this file has been generated automatically.
${cfg.shellInit}
# if we haven't sourced the general config, do it
if not set -q __fish_nixos_general_config_sourced
${sourceEnv "shellInit"}
# and leave a note so we don't source this config section again from
# this very shell (children will source the general config anew)
set -g __fish_nixos_general_config_sourced 1
end
${cfg.shellInit}
# if we haven't sourced the login config, do it
status --is-login; and not set -q __fish_nixos_login_config_sourced
and begin
set --prepend fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d
fenv source /etc/fish/foreign-env/loginShellInit > /dev/null
set -e fish_function_path[1]
# and leave a note so we don't source this config section again from
# this very shell (children will source the general config anew)
set -g __fish_nixos_general_config_sourced 1
end
${cfg.loginShellInit}
# if we haven't sourced the login config, do it
status --is-login; and not set -q __fish_nixos_login_config_sourced
and begin
${sourceEnv "loginShellInit"}
# and leave a note so we don't source this config section again from
# this very shell (children will source the general config anew)
set -g __fish_nixos_login_config_sourced 1
end
${cfg.loginShellInit}
# if we haven't sourced the interactive config, do it
status --is-interactive; and not set -q __fish_nixos_interactive_config_sourced
and begin
${fishAliases}
# and leave a note so we don't source this config section again from
# this very shell (children will source the general config anew)
set -g __fish_nixos_login_config_sourced 1
end
set --prepend fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d
fenv source /etc/fish/foreign-env/interactiveShellInit > /dev/null
set -e fish_function_path[1]
# if we haven't sourced the interactive config, do it
status --is-interactive; and not set -q __fish_nixos_interactive_config_sourced
and begin
${fishAliases}
${cfg.promptInit}
${cfg.interactiveShellInit}
${sourceEnv "interactiveShellInit"}
# and leave a note so we don't source this config section again from
# this very shell (children will source the general config anew,
# allowing configuration changes in, e.g, aliases, to propagate)
set -g __fish_nixos_interactive_config_sourced 1
end
'';
${cfg.promptInit}
${cfg.interactiveShellInit}
# and leave a note so we don't source this config section again from
# this very shell (children will source the general config anew,
# allowing configuration changes in, e.g, aliases, to propagate)
set -g __fish_nixos_interactive_config_sourced 1
end
'';
}
{
etc."fish/generated_completions".source =
let
patchedGenerator = pkgs.stdenv.mkDerivation {
name = "fish_patched-completion-generator";
srcs = [
"${pkgs.fish}/share/fish/tools/create_manpage_completions.py"
"${pkgs.fish}/share/fish/tools/deroff.py"
];
unpackCmd = "cp $curSrc $(basename $curSrc)";
sourceRoot = ".";
patches = [ ./fish_completion-generator.patch ]; # to prevent collisions of identical completion files
dontBuild = true;
installPhase = ''
mkdir -p $out
cp * $out/
'';
preferLocalBuild = true;
allowSubstitutes = false;
};
generateCompletions = package: pkgs.runCommand
"${package.name}_fish-completions"
(
{
inherit package;
preferLocalBuild = true;
allowSubstitutes = false;
}
// optionalAttrs (package ? meta.priority) { meta.priority = package.meta.priority; }
)
''
mkdir -p $out
if [ -d $package/share/man ]; then
find $package/share/man -type f | xargs ${pkgs.python3.interpreter} ${patchedGenerator}/create_manpage_completions.py --directory $out >/dev/null
fi
'';
in
pkgs.buildEnv {
name = "system_fish-completions";
ignoreCollisions = true;
paths = map generateCompletions config.environment.systemPackages;
};
}
# include programs that bring their own completions
{
pathsToLink = []
++ optional cfg.vendor.config.enable "/share/fish/vendor_conf.d"
++ optional cfg.vendor.completions.enable "/share/fish/vendor_completions.d"
++ optional cfg.vendor.functions.enable "/share/fish/vendor_functions.d";
}
{ systemPackages = [ pkgs.fish ]; }
{
shells = [
"/run/current-system/sw/bin/fish"
"${pkgs.fish}/bin/fish"
];
}
];
programs.fish.interactiveShellInit = ''
# add completions generated by NixOS to $fish_complete_path
@ -187,61 +297,6 @@ in
end
'';
environment.etc."fish/generated_completions".source =
let
patchedGenerator = pkgs.stdenv.mkDerivation {
name = "fish_patched-completion-generator";
srcs = [
"${pkgs.fish}/share/fish/tools/create_manpage_completions.py"
"${pkgs.fish}/share/fish/tools/deroff.py"
];
unpackCmd = "cp $curSrc $(basename $curSrc)";
sourceRoot = ".";
patches = [ ./fish_completion-generator.patch ]; # to prevent collisions of identical completion files
dontBuild = true;
installPhase = ''
mkdir -p $out
cp * $out/
'';
preferLocalBuild = true;
allowSubstitutes = false;
};
generateCompletions = package: pkgs.runCommand
"${package.name}_fish-completions"
(
{
inherit package;
preferLocalBuild = true;
allowSubstitutes = false;
}
// optionalAttrs (package ? meta.priority) { meta.priority = package.meta.priority; }
)
''
mkdir -p $out
if [ -d $package/share/man ]; then
find $package/share/man -type f | xargs ${pkgs.python3.interpreter} ${patchedGenerator}/create_manpage_completions.py --directory $out >/dev/null
fi
'';
in
pkgs.buildEnv {
name = "system_fish-completions";
ignoreCollisions = true;
paths = map generateCompletions config.environment.systemPackages;
};
# include programs that bring their own completions
environment.pathsToLink = []
++ optional cfg.vendor.config.enable "/share/fish/vendor_conf.d"
++ optional cfg.vendor.completions.enable "/share/fish/vendor_completions.d"
++ optional cfg.vendor.functions.enable "/share/fish/vendor_functions.d";
environment.systemPackages = [ pkgs.fish ];
environment.shells = [
"/run/current-system/sw/bin/fish"
"${pkgs.fish}/bin/fish"
];
};
}

1
nixos/modules/services/web-servers/tomcat.nix
View file

@ -74,6 +74,7 @@ in
extraGroups = mkOption {
default = [];
type = types.listOf types.str;
example = [ "users" ];
description = "Defines extra groups to which the tomcat user belongs.";
};

4
pkgs/applications/audio/new-session-manager/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "new-session-manager";
version = "1.4.0";
version = "1.5.0";
src = fetchFromGitHub {
owner = "linuxaudio";
repo = "new-session-manager";
rev = "v${version}";
sha256 = "PqOv4tx3NLxL2+GWIUVgL72EQYMyDPIMrAkyby3TZ+0=";
sha256 = "sha256-YP5AHoFP8P1o0Y2jAipRcNPxPRuM7COs5tBMm6Eojoc=";
};
nativeBuildInputs = [ meson pkg-config ninja ];

4
pkgs/applications/misc/googler/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "googler";
version = "4.3.1";
version = "4.3.2";
src = fetchFromGitHub {
owner = "jarun";
repo = pname;
rev = "v${version}";
sha256 = "04wa0mlbfjnzwham2dpd9lch7800js4vp3ikgjl4qnwilvr1lw74";
sha256 = "sha256-PgWg396AQ15CAnfTXGDpSg1UXx7mNCtknEjJd/KV4MU=";
};
buildInputs = [ python ];

8
pkgs/applications/networking/instant-messengers/slack/default.nix
View file

@ -41,11 +41,11 @@ let
pname = "slack";
x86_64-darwin-version = "4.11.1";
x86_64-darwin-sha256 = "0a5rq8zhgdckwxnyjv6nrgpnj682j1rd9yc4nwvsbvpzv15kmd35";
x86_64-darwin-version = "4.12.2";
x86_64-darwin-sha256 = "0qflv2glfy7d77zjgqi7qcjr53c9dni26gmqkg9vk2xijmmd3xy7";
x86_64-linux-version = "4.11.1";
x86_64-linux-sha256 = "1r43g3xnla5aq38l3mpba8jb1gx9m2b6pr84prsclz27nr0rfm6g";
x86_64-linux-version = "4.12.2";
x86_64-linux-sha256 = "sha256-G5uQI078N7AbhEJs6a/17Hoi5DSdwvYLM1T/ttrEw4s=";
version = {
x86_64-darwin = x86_64-darwin-version;

13
pkgs/applications/version-management/git-and-tools/gh/default.nix
View file

@ -1,4 +1,9 @@
{ lib, fetchFromGitHub, buildGoModule, installShellFiles }:
{ lib
, fetchFromGitHub
, buildGoModule
, installShellFiles
, git
}:
buildGoModule rec {
pname = "gh";
@ -30,8 +35,10 @@ buildGoModule rec {
done
'';
# fails with `unable to find git executable in PATH`
doCheck = false;
checkInputs = [ git ];
checkPhase = ''
make test
'';
meta = with lib; {
description = "GitHub CLI tool";

4
pkgs/applications/window-managers/cagebreak/default.nix
View file

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "cagebreak";
version = "1.4.4";
version = "1.5.0";
src = fetchFromGitHub {
owner = "project-repo";
repo = "cagebreak";
rev = version;
hash = "sha256-YmUn5H0xNC/4MBGydrEk7dy5v+s2ja4VoA1neWrQ3VY=";
hash = "sha256-P6zBVQEv+fKdverNIXhoEavu51uGKbSHx3Sh5FWsc2E=";
};
nativeBuildInputs = [ meson ninja pkg-config wayland scdoc makeWrapper ];

18
pkgs/data/fonts/powerline-symbols/default.nix Normal file
View file

@ -0,0 +1,18 @@
{ lib, runCommandNoCC, powerline }:
let
inherit (powerline) version;
in runCommandNoCC "powerline-symbols-${version}" {
meta = {
inherit (powerline.meta) license;
priority = (powerline.meta.priority or 0) + 1;
maintainers = with lib.maintainers; [ midchildan ];
};
} ''
install -Dm644 \
${powerline.src}/font/PowerlineSymbols.otf \
$out/share/fonts/OTF/PowerlineSymbols.otf
install -Dm644 \
${powerline.src}/font/10-powerline-symbols.conf \
$out/etc/fonts/conf.d/10-powerline-symbols.conf
''

4
pkgs/development/interpreters/python/default.nix
View file

@ -181,9 +181,9 @@ in {
major = "3";
minor = "10";
patch = "0";
suffix = "a3";
suffix = "a4";
};
sha256 = "sha256-sJjJdAdxOUfX7W7VioSGdxlgp2lyMOPZjg42MCd/JYY=";
sha256 = "sha256-McHBl7IZuOH96je/izkxur0Edirn+igVkQU/pbek73M=";
inherit (darwin) configd;
inherit passthruFun;
};

15
pkgs/development/libraries/exosip/default.nix
View file

@ -1,24 +1,17 @@
{ lib, stdenv, fetchurl, libosip, openssl, pkg-config, fetchpatch }:
{ lib, stdenv, fetchurl, libosip, openssl, pkg-config }:
stdenv.mkDerivation rec {
pname = "libexosip2";
version = "4.1.0";
version = "5.2.0";
src = fetchurl {
url = "mirror://savannah/exosip/libeXosip2-${version}.tar.gz";
sha256 = "17cna8kpc8nk1si419vgr6r42k2lda0rdk50vlxrw8rzg0xp2xrw";
url = "mirror://savannah/exosip/${pname}-${version}.tar.gz";
sha256 = "09bj7cm6mk8yr68y5a09a625x10ql6an3zi4pj6y1jbkhpgqibp3";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libosip openssl ];
patches = [
(fetchpatch {
url = "https://sources.debian.net/data/main/libe/libexosip2/4.1.0-2.1/debian/patches/openssl110.patch";
sha256 = "01q2dax7pwh197mn18r22y38mrsky85mvs9vbkn9fpcilrdayal6";
})
];
meta = with lib; {
license = licenses.gpl2Plus;
description = "Library that hides the complexity of using the SIP protocol";

4
pkgs/development/libraries/libime/default.nix
View file

@ -26,13 +26,13 @@ let
in
stdenv.mkDerivation rec {
pname = "libime";
version = "1.0.2";
version = "1.0.3";
src = fetchFromGitHub {
owner = "fcitx";
repo = "libime";
rev = version;
sha256 = "hDfxuDIj9qx5d+UFwxDdP2PCboPnUV1n+VVoEIGsucM=";
sha256 = "sha256-Ykj4/3yKUqK0BRqW1E2zFYNgeUOXQ1DsotmKU6c8vEg=";
fetchSubmodules = true;
};

4
pkgs/development/libraries/libsmartcols/default.nix
View file

@ -1,10 +1,10 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python3 }:
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python3, gtk-doc}:
stdenv.mkDerivation rec {
name = "libsmartcols";
version = "v2.36.1";
nativeBuildInputs = [ autoreconfHook pkg-config python3 ];
nativeBuildInputs = [ autoreconfHook pkg-config python3 gtk-doc ];
src = fetchFromGitHub {
owner = "karelzak";

16
pkgs/development/libraries/vulkan-loader/default.nix
View file

@ -15,19 +15,23 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config cmake ];
buildInputs = [ python3 xlibsWrapper libxcb libXrandr libXext wayland ];
preConfigure = ''
substituteInPlace loader/vulkan.pc.in \
--replace 'includedir=''${prefix}/include' 'includedir=${vulkan-headers}/include' \
--replace 'libdir=''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@' 'libdir=@CMAKE_INSTALL_LIBDIR@'
'';
cmakeFlags = [
"-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share"
"-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}"
"-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include"
];
outputs = [ "out" "dev" ];
doInstallCheck = true;
installCheckPhase = ''
grep -q "${vulkan-headers}/include" $dev/lib/pkgconfig/vulkan.pc || {
echo vulkan-headers include directory not found in pkg-config file
exit 1
}
'';
meta = with lib; {
description = "LunarG Vulkan loader";
homepage = "https://www.lunarg.com";

4
pkgs/development/libraries/xcb-imdkit/default.nix
View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "xcb-imdkit";
version = "1.0.1";
version = "1.0.2";
src = fetchFromGitHub {
owner = "fcitx";
repo = "xcb-imdkit";
rev = version;
sha256 = "dvax+Wj8+tHdiL6txcuugrOlRnxdIW25DYO4iNAYK8M=";
sha256 = "sha256-ISaVsMtDsyfhbhsAwDSWkQ7ZcpNtvC7M9NFQsWA5ju8=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/APScheduler/default.nix
View file

@ -20,11 +20,11 @@
buildPythonPackage rec {
pname = "APScheduler";
version = "3.6.3";
version = "3.7.0";
src = fetchPypi {
inherit pname version;
sha256 = "3bb5229eed6fbbdafc13ce962712ae66e175aa214c69bed35a06bffcf0c5e244";
sha256 = "1cab7f2521e107d07127b042155b632b7a1cd5e02c34be5a28ff62f77c900c6a";
};
buildInputs = [

5
pkgs/development/python-modules/aioshelly/default.nix
View file

@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "aioshelly";
version = "0.5.3";
version = "0.5.4";
src = fetchFromGitHub {
owner = "home-assistant-libs";
repo = pname;
rev = version;
sha256 = "0177psqfib70vcvf3cg8plbwrilh770cqg8b547icdh5lnqv70b1";
sha256 = "sha256-EjzWx3wcmTfB3OmN0OB37K6wYKVO3HzGEIf+uihas8k=";
};
propagatedBuildInputs = [
@ -28,6 +28,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python library to control Shelly";
homepage = "https://github.com/home-assistant-libs/aioshelly";
changelog = "https://github.com/home-assistant-libs/aioshelly/releases/tag/${version}";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};

4
pkgs/development/python-modules/alerta-server/default.nix
View file

@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "alerta-server";
version = "8.2.0";
version = "8.3.3";
src = fetchPypi {
inherit pname version;
sha256 = "ee06d0f828b679402847989de9013a1271db282af377f5dce776347623dde345";
sha256 = "a2713a31c6e326c774a3ee0328f424f944b951935ff1b893a4a66598d61c5a97";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/amqp/default.nix
View file

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "amqp";
version = "5.0.2";
version = "5.0.3";
src = fetchPypi {
inherit pname version;
sha256 = "fcd5b3baeeb7fc19b3486ff6d10543099d40ae1f5c9196eae695d1cde1b2f784";
sha256 = "1733ebf713050504fd9d2ebc661f1fc95b3588f99ee87d2e39c84c27bfd815dc";
};
propagatedBuildInputs = [ vine ];

4
pkgs/development/python-modules/azure-storage-blob/default.nix
View file

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-storage-blob";
version = "12.7.0";
version = "12.7.1";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "8194a5007ec1bda903d58bc976c98131ffd4b2f9a3b718f558c730c28ac152c6";
sha256 = "c6249f211684929ea6c9d34b5151b06d039775344f0d48fcf479736ed4c11b9e";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/azure-storage-file-share/default.nix
View file

@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "azure-storage-file-share";
version = "12.4.0";
version = "12.4.1";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "fe420825ab87df7077ba2737d2889dddd702d595b88d6e0180f2e3b061602c55";
sha256 = "7503d05882970abc977529ff5a4b81e79f62fd51b238fe306f72e13f57a522ca";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/bitarray/default.nix
View file

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "bitarray";
version = "1.6.1";
version = "1.6.3";
src = fetchPypi {
inherit pname version;
sha256 = "ab85b38365dd9956264226b30dababa02161ed49bb36c7ee82cc6545e07b1599";
sha256 = "ae27ce4bef4f35b4cc2c0b0d9cf02ed49eee567c23d70cb5066ad215f9b62b3c";
};
meta = with lib; {

4
pkgs/development/python-modules/breathe/default.nix
View file

@ -1,13 +1,13 @@
{ lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }:
buildPythonPackage rec {
version = "4.26.0";
version = "4.26.1";
pname = "breathe";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "72543e3ef896b402eec4067c8be2f384570a27421b803ea6980455d7a9859cb1";
sha256 = "f59ecadebbb76e3b4710e8c9d2f8f98d51e54701930a38ddf732930653dcf6b5";
};
propagatedBuildInputs = [ docutils six sphinx ];

53
pkgs/development/python-modules/bsblan/default.nix Normal file
View file

@ -0,0 +1,53 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, aresponses
, coverage
, mypy
, pytest-asyncio
, pytest-cov
, pytest-mock
, aiohttp
, attrs
, cattrs
, yarl
}:
buildPythonPackage rec {
pname = "bsblan";
version = "0.4.1";
src = fetchFromGitHub {
owner = "liudger";
repo = "python-bsblan";
rev = "v.${version}";
sha256 = "0vyg9vsrs34jahlav83qp2djv81p3ks31qz4qh46zdij2nx7l1fv";
};
propagatedBuildInputs = [
aiohttp
attrs
cattrs
yarl
];
checkInputs = [
aresponses
coverage
mypy
pytest-asyncio
pytest-cov
pytest-mock
pytestCheckHook
];
pythonImportsCheck = [ "bsblan" ];
meta = with lib; {
description = "Python client for BSB-Lan";
homepage = "https://github.com/liudger/python-bsblan";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

35
pkgs/development/python-modules/cattrs/default.nix Normal file
View file

@ -0,0 +1,35 @@
{ lib
, attrs
, buildPythonPackage
, fetchFromGitHub
, hypothesis
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "cattrs";
version = "1.1.2";
src = fetchFromGitHub {
owner = "Tinche";
repo = pname;
rev = "v${version}";
sha256 = "083d5mi6x7qcl26wlvwwn7gsp5chxlxkh4rp3a41w8cfwwr3h6l8";
};
propagatedBuildInputs = [ attrs ];
checkInputs = [
hypothesis
pytestCheckHook
];
pythonImportsCheck = [ "cattr" ];
meta = with lib; {
description = "Python custom class converters for attrs";
homepage = "https://github.com/Tinche/cattrs";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/certbot/default.nix
View file

@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "certbot";
version = "1.10.1";
version = "1.11.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "035cdw2h3f511drc0q1j65j911m1pj6c5ghywavkhib0chim044c";
sha256 = "sha256-IGXiIOLP/Uq6HdXAschp1jFYq52ohRK4VLtkjF4Tb44=";
};
sourceRoot = "source/${pname}";

8
pkgs/development/python-modules/fuse-python/default.nix
View file

@ -2,19 +2,21 @@
buildPythonPackage rec {
pname = "fuse-python";
version = "1.0.0";
version = "1.0.1";
src = fetchPypi {
inherit pname version;
sha256 = "cbaa21c8f0a440302d1ba9fd57a80cf9ff227e5a3820708a8ba8450db883cc05";
sha256 = "da42d4f596a2e91602bcdf46cc51747df31c074a3ceb78bccc253c483a8a75fb";
};
buildInputs = [ fuse ];
nativeBuildInputs = [ pkg-config ];
# no tests in the Pypi archive
# no tests implemented
doCheck = false;
pythonImportsCheck = [ "fuse" ];
meta = with lib; {
description = "Python bindings for FUSE";
homepage = "https://github.com/libfuse/python-fuse";

41
pkgs/development/python-modules/hass-nabucasa/default.nix
View file

@ -1,33 +1,50 @@
{ lib, buildPythonPackage, fetchFromGitHub
, acme, aiohttp, snitun, attrs, pycognito, warrant
, pytest-aiohttp, asynctest, atomicwrites, pytest }:
{ lib
, acme
, aiohttp
, asynctest
, atomicwrites
, attrs
, buildPythonPackage
, fetchFromGitHub
, pycognito
, pytest-aiohttp
, pytestCheckHook
, snitun
, warrant
}:
buildPythonPackage rec {
pname = "hass-nabucasa";
version = "0.39.0";
version = "0.41.0";
src = fetchFromGitHub {
owner = "nabucasa";
repo = pname;
rev = version;
sha256 = "1bsvwxddpp4dsq3k2320qrx5x9lscqzffzz1zj6fbwgc4741f01w";
sha256 = "sha256-ewWw3PyJGRHP23J6WBBWs9YGl4vTb9/j/soZ6n5wbLM=";
};
postPatch = ''
sed -i 's/"acme.*"/"acme"/' setup.py
sed -i 's/"attrs.*"/"attrs"/' setup.py
sed -i 's/"cryptography.*"/"cryptography"/' setup.py
'';
propagatedBuildInputs = [
acme aiohttp atomicwrites snitun attrs warrant pycognito
acme
aiohttp
atomicwrites
attrs
pycognito
snitun
warrant
];
checkInputs = [ pytest pytest-aiohttp asynctest ];
checkInputs = [
asynctest
pytest-aiohttp
pytestCheckHook
];
checkPhase = ''
pytest tests/
'';
pythonImportsCheck = [ "hass_nabucasa" ];
meta = with lib; {
homepage = "https://github.com/NabuCasa/hass-nabucasa";

4
pkgs/development/python-modules/mautrix/default.nix
View file

@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "mautrix";
version = "0.8.6";
version = "0.8.9";
src = fetchPypi {
inherit pname version;
sha256 = "e28d89cb8297ec36d78ef79507613c45ab3ab0bc709f1944ca5be349797f8f6b";
sha256 = "13669a0150370c96cabcff859fb4d17f4a539dc7c707ff0c99c00612e24f5447";
};
propagatedBuildInputs = [

25
pkgs/development/python-modules/pycognito/default.nix
View file

@ -1,24 +1,25 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, cryptography
, boto3
, buildPythonPackage
, cryptography
, envs
, fetchFromGitHub
, isPy27
, mock
, pytestCheckHook
, python-jose
, requests
, mock
, isPy27
}:
buildPythonPackage rec {
pname = "pycognito";
version = "0.1.4";
version = "0.1.5";
src = fetchFromGitHub {
owner = "pvizeli";
repo = "pycognito";
repo = pname;
rev = version;
sha256 = "HLzPrRon+ipcUZlD1l4nYSwSbdDLwOALy4ejGunjK0w=";
sha256 = "sha256-RJeHPCTuaLN+zB0N0FGt4qrTI6++1ks5iBn64Cx0Psc=";
};
postPatch = ''
@ -35,7 +36,13 @@ buildPythonPackage rec {
disabled = isPy27;
checkInputs = [ mock ];
checkInputs = [
mock
pytestCheckHook
];
pytestFlagsArray = [ "tests.py" ];
pythonImportsCheck = [ "pycognito" ];
meta = with lib; {
description = "Python class to integrate Boto3's Cognito client so it is easy to login users. With SRP support";

34
pkgs/development/python-modules/python-http-client/default.nix Normal file
View file

@ -0,0 +1,34 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, mock
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "python_http_client";
version = "3.3.1";
src = fetchFromGitHub {
owner = "sendgrid";
repo = "python-http-client";
rev = version;
sha256 = "0mbcg0vb9v41v7hbvycrxx5wyrf3ysvfgxkix8hn8c4x5l2lmidc";
};
checkInputs = [
mock
pytestCheckHook
];
# Failure was fixed by https://github.com/sendgrid/python-http-client/commit/6d62911ab0d0645b499e14bb17c302b48f3c10e4
disabledTests = [ "test__daterange" ];
pythonImportsCheck = [ "python_http_client" ];
meta = with lib; {
description = "Python HTTP library to call APIs";
homepage = "https://github.com/sendgrid/python-http-client";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/scikitlearn/default.nix
View file

@ -13,13 +13,13 @@
buildPythonPackage rec {
pname = "scikit-learn";
version = "0.23.2";
version = "0.24.1";
# UnboundLocalError: local variable 'message' referenced before assignment
disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534
src = fetchPypi {
inherit pname version;
sha256 = "20766f515e6cd6f954554387dfae705d93c7b544ec0e6c6a5d8e006f6f7ef480";
sha256 = "oDNKGALmTWVgIsO/q1anP71r9LEpg0PzaIryFRgQu98=";
};
buildInputs = [

49
pkgs/development/python-modules/sendgrid/default.nix Normal file
View file

@ -0,0 +1,49 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, flask
, pytestCheckHook
, python-http-client
, pyyaml
, starkbank-ecdsa
, werkzeug
}:
buildPythonPackage rec {
pname = "sendgrid";
version = "6.5.0";
src = fetchFromGitHub {
owner = pname;
repo = "sendgrid-python";
rev = version;
sha256 = "14kqjdv49486ksc1s0m0hc4k5nf9vn1v1g489mpib01hiiqxjp1b";
};
propagatedBuildInputs = [
python-http-client
starkbank-ecdsa
];
checkInputs = [
flask
pytestCheckHook
pyyaml
werkzeug
];
# Exclude tests that require network access
pytestFlagsArray = [
"--ignore test/test_sendgrid.py"
"--ignore live_test.py"
];
pythonImportsCheck = [ "sendgrid" ];
meta = with lib; {
description = "Python client for SendGrid";
homepage = "https://github.com/sendgrid/sendgrid-python";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

28
pkgs/development/python-modules/starkbank-ecdsa/default.nix Normal file
View file

@ -0,0 +1,28 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "starkbank-ecdsa";
version = "1.1.0";
src = fetchFromGitHub {
owner = "starkbank";
repo = "ecdsa-python";
rev = "v${version}";
sha256 = "03smk33zhmv1j1svgjnykak0jnw8yl0yv03i1gsasx71f33zmfwi";
};
checkInputs = [ pytestCheckHook ];
pytestFlagsArray = [ "-v tests/*.py" ];
pythonImportsCheck = [ "ellipticcurve" ];
meta = with lib; {
description = "Python ECDSA library";
homepage = "https://github.com/starkbank/ecdsa-python";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/tools/repository-managers/nexus/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "nexus";
version = "3.29.0-02";
version = "3.29.2-02";
src = fetchurl {
url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-unix.tar.gz";
sha256 = "0yxk3yy9vllxc9v4dn3fs8hh389lrw2g8gg24rx1w8bg05rrrr8z";
sha256 = "sha256-vHy7V32xlYaPJdc8oi3j98weOdc4R5S64Dwo9YI8o6c=";
};
preferLocalBuild = true;

4
pkgs/development/web/postman/default.nix
View file

@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "postman";
version = "7.36.0";
version = "7.36.1";
src = fetchurl {
url = "https://dl.pstmn.io/download/version/${version}/linux64";
sha256 = "1wdbwlli9lzxxcwbc94fybfq6ipzvsv0waqcr1mjqzlfjqaqgrsb";
sha256 = "sha256-6brThKTAQI3cu3SSqvEIT1nwlQ/jPTP+d/Q/m/Ez5nQ=";
name = "${pname}.tar.gz";
};

24
pkgs/misc/vscode-extensions/default.nix
View file

@ -165,6 +165,18 @@ let
};
};
eamodio.gitlens = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "gitlens";
publisher = "eamodio";
version = "11.1.3";
sha256 = "sha256-hqJg3jP4bbXU4qSJOjeKfjkPx61yPDMsQdSUVZObK/U=";
};
meta = {
license = lib.licenses.mit;
};
};
esbenp.prettier-vscode = buildVscodeMarketplaceExtension {
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog";
@ -333,6 +345,18 @@ let
};
};
jpoissonnier.vscode-styled-components = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-styled-components";
publisher = "jpoissonnier";
version = "1.4.1";
sha256 = "sha256-ojbeuYBCS+DjF5R0aLuBImzoSOb8mXw1s0Uh0CzggzE=";
};
meta = {
license = lib.licenses.mit;
};
};
justusadam.language-haskell = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "language-haskell";

9
pkgs/os-specific/linux/kernel/linux-lqx.nix
View file

@ -1,19 +1,20 @@
{ lib, stdenv, fetchFromGitHub, buildLinux, linux_zen, ... } @ args:
let
version = "5.10.6";
version = "5.10.9";
suffix = "lqx1";
in
buildLinux (args // {
modDirVersion = "${version}-lqx1";
modDirVersion = "${version}-${suffix}";
inherit version;
isZen = true;
src = fetchFromGitHub {
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${version}-lqx1";
sha256 = "0vvb00311yhf08ib3yvkjwk2j45f8r268ywg5299yjgbyl6g95kg";
rev = "v${version}-${suffix}";
sha256 = "1j0rz4j1br7kzg9zb5l2xz60ccr4iwjndxq3f4gml8s3fb4cpp6f";
};
extraMeta = {

9
pkgs/os-specific/linux/kernel/linux-zen.nix
View file

@ -1,19 +1,20 @@
{ lib, stdenv, fetchFromGitHub, buildLinux, ... } @ args:
let
version = "5.10.6";
version = "5.10.9";
suffix = "zen1";
in
buildLinux (args // {
modDirVersion = "${version}-zen1";
modDirVersion = "${version}-${suffix}";
inherit version;
isZen = true;
src = fetchFromGitHub {
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${version}-zen1";
sha256 = "0asn4ysnzv845g35ca9sdi89sc7clcc88xmx64pcxmh033civ5fw";
rev = "v${version}-${suffix}";
sha256 = "0p7w2ib8aac0cx16fksr8870kmijw86hbzdkjsq1ww07ifnb4qir";
};
extraMeta = {

4
pkgs/servers/home-assistant/component-packages.nix
View file

@ -99,7 +99,7 @@
"brottsplatskartan" = ps: with ps; [ ]; # missing inputs: brottsplatskartan
"browser" = ps: with ps; [ ];
"brunt" = ps: with ps; [ ]; # missing inputs: brunt
"bsblan" = ps: with ps; [ ]; # missing inputs: bsblan
"bsblan" = ps: with ps; [ bsblan ];
"bt_home_hub_5" = ps: with ps; [ ]; # missing inputs: bthomehub5-devicelist
"bt_smarthub" = ps: with ps; [ ]; # missing inputs: btsmarthub_devicelist
"buienradar" = ps: with ps; [ ]; # missing inputs: buienradar
@ -709,7 +709,7 @@
"scsgate" = ps: with ps; [ ]; # missing inputs: scsgate
"search" = ps: with ps; [ aiohttp-cors ];
"season" = ps: with ps; [ ephem ];
"sendgrid" = ps: with ps; [ ]; # missing inputs: sendgrid
"sendgrid" = ps: with ps; [ sendgrid ];
"sense" = ps: with ps; [ ]; # missing inputs: sense_energy
"sensehat" = ps: with ps; [ ]; # missing inputs: sense-hat
"sensibo" = ps: with ps; [ ]; # missing inputs: pysensibo

6
pkgs/servers/monitoring/grafana-agent/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "grafana-agent";
version = "0.10.0";
version = "0.11.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "grafana";
repo = "agent";
sha256 = "1kliq6d3hg4bx9s5crdagirf2h3ljl0ikcyz0x0wb2ack6cgjsvm";
sha256 = "092ry9gq9fpkkgsdymfwzdxz982pp0ljf2gs6mp419ivvllzwhiv";
};
vendorSha256 = null;
@ -27,7 +27,7 @@ buildGoModule rec {
# Add to RUNPATH so it can be found.
postFixup = ''
patchelf \
--set-rpath "${lib.makeLibraryPath [ (lib.getDev systemd) ]}:$(patchelf --print-rpath $out/bin/agent)" \
--set-rpath "${lib.makeLibraryPath [ (lib.getLib systemd) ]}:$(patchelf --print-rpath $out/bin/agent)" \
$out/bin/agent
'';

1
pkgs/servers/sip/sipwitch/default.nix
View file

@ -23,5 +23,6 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ ];
platforms = with lib.platforms; linux;
broken = true; # Require libexosip2 < 5.0.0 which is vulnerable to CVE-2014-10375.
};
}

4
pkgs/tools/admin/exoscale-cli/default.nix
View file

@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "exoscale-cli";
version = "1.22.2";
version = "1.23.0";
src = fetchFromGitHub {
owner = "exoscale";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-HzKRZJcWgNPOQYx6JXmx8vomtOuWaaBfMzwxOqXjHI4=";
sha256 = "sha256-LVWUfaACdDp9xsuXHysPO/8QMdaDqS+yhP2U9cc4jh4=";
};
goPackagePath = "github.com/exoscale/cli";

4
pkgs/tools/filesystems/fuse-overlayfs/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "fuse-overlayfs";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = "v${version}";
sha256 = "00pzwxn5a7dwz9ngl98198lx1c3nlhalzajyqazw9ydjkxibfpay";
sha256 = "sha256-lus+1hkc4GxrTxtdfDJ0XqJp37dcjKp4/sI3CEh8cYA=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];

6
pkgs/tools/inputmethods/fcitx5/default.nix
View file

@ -41,13 +41,13 @@ let
in
stdenv.mkDerivation rec {
pname = "fcitx5";
version = "5.0.3";
version = "5.0.4";
src = fetchFromGitHub {
owner = "fcitx";
repo = "fcitx5";
rev = version;
sha256 = "QYMH0WbhHqDKUvpj1VOB8U5sbBD89H6moLFkQBJijZA=";
sha256 = "sha256-2KGdR1m70Qatidzf/DZuFK3lc1t8z7sxjyhaxuc0Tqg=";
};
prePatch = ''
@ -90,6 +90,8 @@ stdenv.mkDerivation rec {
libxkbfile
];
passthru.updateScript = ./update.py;
meta = with lib; {
description = "Next generation of fcitx";
homepage = "https://github.com/fcitx/fcitx5";

4
pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix
View file

@ -31,13 +31,13 @@ in
mkDerivation rec {
pname = "fcitx5-chinese-addons";
version = "5.0.2";
version = "5.0.3";
src = fetchFromGitHub {
owner = "fcitx";
repo = "fcitx5-chinese-addons";
rev = version;
sha256 = "11UIMrwzZqO8nrQx5oubeoQN8hspL1mvHw5Dc9sVOqQ=";
sha256 = "sha256-kCihpRUtUXrqqf7FPQp8ZRexiygOuDVOdQwVx7tSn+c=";
};
cmakeFlags = [

6
pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
View file

@ -6,6 +6,7 @@
, fcitx5
, fcitx5-qt
, qtx11extras
, qtquickcontrols2
, kwidgetsaddons
, kdeclarative
, kirigami2
@ -18,13 +19,13 @@
mkDerivation rec {
pname = "fcitx5-configtool";
version = "5.0.1";
version = "5.0.2";
src = fetchFromGitHub {
owner = "fcitx";
repo = "fcitx5-configtool";
rev = version;
sha256 = "npSqd0R6bqKc+JxYCGcfVzgNLpuLtnHq6zM58smZ8/I=";
sha256 = "sha256-kw0KIbS5SVMf6kR/9xsYiChHXQBM0enSVXyh0QfiiPY=";
};
cmakeFlags = [
@ -40,6 +41,7 @@ mkDerivation rec {
fcitx5
fcitx5-qt
qtx11extras
qtquickcontrols2
kirigami2
isocodes
xkeyboardconfig

6
pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix
View file

@ -24,18 +24,20 @@
stdenv.mkDerivation rec {
pname = "fcitx5-gtk";
version = "5.0.1";
version = "5.0.3";
src = fetchFromGitHub {
owner = "fcitx";
repo = "fcitx5-gtk";
rev = version;
sha256 = "rkusIqMRQMTjcpJR335as1xUQrzD9dLVB/wrLstPXPY=";
sha256 = "sha256-+BzXbZyzC3fvLqysufblk0zK9fAg5jslVdm/v3jz4B4=";
};
cmakeFlags = [
"-DGOBJECT_INTROSPECTION_GIRDIR=share/gir-1.0"
"-DGOBJECT_INTROSPECTION_TYPELIBDIR=lib/girepository-1.0"
# disabled since we currently don't have gtk4 in nixpkgs
"-DENABLE_GTK4_IM_MODULE=off"
] ++ lib.optional (! withGTK2) "-DENABLE_GTK2_IM_MODULE=off";
buildInputs = [

6
pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix
View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "fcitx5-lua";
version = "5.0.1";
version = "5.0.2";
src = fetchFromGitHub {
owner = "fcitx";
repo = "fcitx5-lua";
rev = "${version}";
sha256 = "OiTk9ldqBqF7WT1KY71hacLD6OQQNO05F7+cSXlli40=";
rev = version;
sha256 = "sha256-lFlHn2q/kpq1EIKKhYVdJofXqtOHnpLz7PoWuNAhmhE=";
};
nativeBuildInputs = [

4
pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
View file

@ -12,13 +12,13 @@
mkDerivation rec {
pname = "fcitx5-qt";
version = "5.0.1";
version = "5.0.2";
src = fetchFromGitHub {
owner = "fcitx";
repo = "fcitx5-qt";
rev = version;
sha256 = "BVOumk2xj3vmwmm4KwiktQhWyTuUA2OFwYXNR6HgwyM=";
sha256 = "sha256-QylvjhjiIujYGKFtL4bKVXpobkN5t6Q2MGf16dsL24A=";
};
preConfigure = ''

4
pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix
View file

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "fcitx5-rime";
version = "5.0.2";
version = "5.0.3";
src = fetchFromGitHub {
owner = "fcitx";
repo = "fcitx5-rime";
rev = version;
sha256 = "cVCTsD1Iw6OtyYFpxff3ix2CubRTnDaBevAYA4I9Ai8=";
sha256 = "sha256-mPNZ/B5bpxua+E1T+oz9v2QKAzGraA2cfT8oJacC35U=";
};
cmakeFlags = [

4
pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix
View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "fcitx5-table-extra";
version = "5.0.1";
version = "5.0.2";
src = fetchFromGitHub {
owner = "fcitx";
repo = "fcitx5-table-extra";
rev = version;
sha256 = "UHhiWm2Khh6JBB9jz0ZKFofkAJPlqn6SqHeK9etoaxs=";
sha256 = "sha256-Bqxdi/rjiTKqHLvVFVcQMjz/I0xxTiBgUIRkZjLuK+M=";
};
nativeBuildInputs = [

4
pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix
View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "fcitx5-table-other";
version = "5.0.1";
version = "5.0.2";
src = fetchFromGitHub {
owner = "fcitx";
repo = "fcitx5-table-other";
rev = version;
sha256 = "hQlrjDPImDof2+3/uOtTdJ27cInevbxH9B+lNwquKbs=";
sha256 = "sha256-P+KaUmjAHe1CZ5rNMQAxwKSW5ZMVgQcwkgdlungXTLM=";
};
nativeBuildInputs = [

29
pkgs/tools/inputmethods/fcitx5/update.py Executable file
View file

@ -0,0 +1,29 @@
#!/usr/bin/env nix-shell
#!nix-shell -i python3 -p nix-prefetch-github python3Packages.requests
from nix_prefetch_github import *
import json
import requests
import subprocess
REPOS = [ "libime", "xcb-imdkit", "fcitx5", "fcitx5-gtk", "fcitx5-qt", "fcitx5-configtool", "fcitx5-lua",
"fcitx5-rime", "fcitx5-chinese-addons", "fcitx5-table-extra", "fcitx5-table-other" ]
OWNER = "fcitx"
def get_latest_tag(repo, owner=OWNER):
r = requests.get( 'https://api.github.com/repos/{}/{}/tags'.format(owner,repo)
, auth=('poscat', 'db5e6fd16d0eb8c36385d3d944e058a1178b4265'))
return r.json()[0].get("name")
def main():
sources = dict()
for repo in REPOS:
rev = get_latest_tag(repo)
if repo == "fcitx5-qt":
subprocess.run(["nix-update", "--commit", "--version", rev, "libsForQt5.{}".format(repo)])
else:
subprocess.run(["nix-update", "--commit", "--version", rev, repo])
if __name__ == "__main__":
main ()

13
pkgs/tools/misc/rcm/default.nix
View file

@ -1,12 +1,15 @@
{ lib, stdenv, fetchurl }:
{ lib
, stdenv
, fetchurl
}:
stdenv.mkDerivation rec {
pname = "rcm";
version = "1.3.3";
version = "1.3.4";
src = fetchurl {
url = "https://thoughtbot.github.io/rcm/dist/rcm-${version}.tar.gz";
sha256 = "1bqk7rrp1ckzvsvl9wghsr77m8xl3a7yc5gqdsisz492dx2j8mck";
sha256 = "sha256-mxGuN0Sc9NI07G0TSEeb/tMlPauhH36ed0BZhltmwko=";
};
patches = [ ./fix-rcmlib-path.patch ];
@ -18,10 +21,10 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
description = "Management Suite for Dotfiles";
homepage = "https://github.com/thoughtbot/rcm";
description = "Management Suite for Dotfiles";
license = licenses.bsd3;
maintainers = with maintainers; [ malyn ];
maintainers = with maintainers; [ malyn AndersonTorres ];
platforms = with platforms; unix;
};
}

2
pkgs/tools/package-management/nix/default.nix
View file

@ -3,6 +3,7 @@
, stateDir ? "/nix/var"
, confDir ? "/etc"
, boehmgc
, Security
}:
let
@ -52,6 +53,7 @@ common =
[ curl openssl sqlite xz bzip2 nlohmann_json
brotli boost editline
]
++ lib.optionals stdenv.isDarwin [ Security ]
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
++ lib.optionals is24 [ libarchive gmock ]
++ lib.optional withLibseccomp libseccomp

3
pkgs/top-level/all-packages.nix
View file

@ -20499,6 +20499,8 @@ in
powerline-fonts = callPackage ../data/fonts/powerline-fonts { };
powerline-symbols = callPackage ../data/fonts/powerline-symbols { };
powerline-go = callPackage ../tools/misc/powerline-go { };
powerline-rs = callPackage ../tools/misc/powerline-rs {
@ -28573,6 +28575,7 @@ in
storeDir = config.nix.storeDir or "/nix/store";
stateDir = config.nix.stateDir or "/nix/var";
boehmgc = boehmgc.override { enableLargeConfig = true; };
inherit (darwin.apple_sdk.frameworks) Security;
})
nix
nixStable

50
pkgs/top-level/beam-packages.nix
View file

@ -1,17 +1,17 @@
{ callPackage, wxGTK30, openssl_1_0_2, buildPackages }:
rec {
lib = callPackage ../development/beam-modules/lib.nix {};
lib = callPackage ../development/beam-modules/lib.nix { };
# Each
interpreters = rec {
# R22 is the default version.
erlang = erlangR22; # The main switch to change default Erlang version.
erlang_odbc = erlangR22_odbc;
erlang_javac = erlangR22_javac;
erlang_odbc_javac = erlangR22_odbc_javac;
erlang_nox = erlangR22_nox;
# R23 is the default version.
erlang = erlangR23; # The main switch to change default Erlang version.
erlang_odbc = erlangR23_odbc;
erlang_javac = erlangR23_javac;
erlang_odbc_javac = erlangR23_odbc_javac;
erlang_nox = erlangR23_nox;
# Standard Erlang versions, using the generic builder.
@ -25,7 +25,8 @@ rec {
erlangR23_odbc = erlangR23.override { odbcSupport = true; };
erlangR23_javac = erlangR23.override { javacSupport = true; };
erlangR23_odbc_javac = erlangR23.override {
javacSupport = true; odbcSupport = true;
javacSupport = true;
odbcSupport = true;
};
erlangR23_nox = erlangR23.override { wxSupport = false; };
@ -39,7 +40,8 @@ rec {
erlangR22_odbc = erlangR22.override { odbcSupport = true; };
erlangR22_javac = erlangR22.override { javacSupport = true; };
erlangR22_odbc_javac = erlangR22.override {
javacSupport = true; odbcSupport = true;
javacSupport = true;
odbcSupport = true;
};
erlangR22_nox = erlangR22.override { wxSupport = false; };
@ -51,7 +53,8 @@ rec {
erlangR21_odbc = erlangR21.override { odbcSupport = true; };
erlangR21_javac = erlangR21.override { javacSupport = true; };
erlangR21_odbc_javac = erlangR21.override {
javacSupport = true; odbcSupport = true;
javacSupport = true;
odbcSupport = true;
};
erlangR21_nox = erlangR21.override { wxSupport = false; };
@ -63,7 +66,8 @@ rec {
erlangR20_odbc = erlangR20.override { odbcSupport = true; };
erlangR20_javac = erlangR20.override { javacSupport = true; };
erlangR20_odbc_javac = erlangR20.override {
javacSupport = true; odbcSupport = true;
javacSupport = true;
odbcSupport = true;
};
erlangR20_nox = erlangR20.override { wxSupport = false; };
@ -76,7 +80,8 @@ rec {
erlangR19_odbc = erlangR19.override { odbcSupport = true; };
erlangR19_javac = erlangR19.override { javacSupport = true; };
erlangR19_odbc_javac = erlangR19.override {
javacSupport = true; odbcSupport = true;
javacSupport = true;
odbcSupport = true;
};
erlangR19_nox = erlangR19.override { wxSupport = false; };
@ -89,28 +94,31 @@ rec {
erlangR18_odbc = erlangR18.override { odbcSupport = true; };
erlangR18_javac = erlangR18.override { javacSupport = true; };
erlangR18_odbc_javac = erlangR18.override {
javacSupport = true; odbcSupport = true;
javacSupport = true;
odbcSupport = true;
};
erlangR18_nox = erlangR18.override { wxSupport = false; };
# Basho fork, using custom builder.
erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-basho.nix {
autoconf = buildPackages.autoconf269;
};
erlang_basho_R16B02_odbc = erlang_basho_R16B02.override {
odbcSupport = true;
};
erlang_basho_R16B02 =
lib.callErlang ../development/interpreters/erlang/R16B02-basho.nix {
autoconf = buildPackages.autoconf269;
};
erlang_basho_R16B02_odbc =
erlang_basho_R16B02.override { odbcSupport = true; };
# Other Beam languages. These are built with `beam.interpreters.erlang`. To
# access for example elixir built with different version of Erlang, use
# `beam.packages.erlangR23.elixir`.
inherit (packages.erlang) elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7;
inherit (packages.erlang)
elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7;
inherit (packages.erlang) lfe lfe_1_2 lfe_1_3;
};
# Helper function to generate package set with a specific Erlang version.
packagesWith = erlang: callPackage ../development/beam-modules { inherit erlang; };
packagesWith = erlang:
callPackage ../development/beam-modules { inherit erlang; };
# Each field in this tuple represents all Beam packages in nixpkgs built with
# appropriate Erlang/OTP version.

10
pkgs/top-level/python-packages.nix
View file

@ -1048,6 +1048,8 @@ in {
bsdiff4 = callPackage ../development/python-modules/bsdiff4 { };
bsblan = callPackage ../development/python-modules/bsblan { };
btchip = callPackage ../development/python-modules/btchip { };
bt_proximity = callPackage ../development/python-modules/bt-proximity { };
@ -1163,6 +1165,8 @@ in {
catboost = callPackage ../development/python-modules/catboost { };
cattrs = callPackage ../development/python-modules/cattrs { };
cbeams = callPackage ../misc/cbeams { };
cbor2 = callPackage ../development/python-modules/cbor2 { };
@ -6199,6 +6203,8 @@ in {
python-hpilo = callPackage ../development/python-modules/python-hpilo { };
python-http-client = callPackage ../development/python-modules/python-http-client { };
python-igraph = callPackage ../development/python-modules/python-igraph {
pkg-config = pkgs.pkg-config;
igraph = pkgs.igraph;
@ -6981,6 +6987,8 @@ in {
send2trash = callPackage ../development/python-modules/send2trash { };
sendgrid = callPackage ../development/python-modules/sendgrid { };
sentencepiece = callPackage ../development/python-modules/sentencepiece { inherit (pkgs) sentencepiece pkg-config; };
sentinel = callPackage ../development/python-modules/sentinel { };
@ -7367,6 +7375,8 @@ in {
inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices;
};
starkbank-ecdsa = callPackage ../development/python-modules/starkbank-ecdsa { };
staticjinja = callPackage ../development/python-modules/staticjinja { };
statistics = callPackage ../development/python-modules/statistics { };