mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-30 17:49:58 +03:00
Merge master into staging-next
This commit is contained in:
commit
ce1d6621cd
2
.github/workflows/periodic-merge-24h.yml
vendored
2
.github/workflows/periodic-merge-24h.yml
vendored
@ -33,7 +33,7 @@ jobs:
|
||||
- uses: actions/checkout@v2
|
||||
|
||||
- name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }}
|
||||
uses: devmasx/merge-branch@v1.3.1
|
||||
uses: devmasx/merge-branch@1.4.0
|
||||
with:
|
||||
type: now
|
||||
from_branch: ${{ matrix.pairs.from }}
|
||||
|
2
.github/workflows/periodic-merge-6h.yml
vendored
2
.github/workflows/periodic-merge-6h.yml
vendored
@ -39,7 +39,7 @@ jobs:
|
||||
- uses: actions/checkout@v2
|
||||
|
||||
- name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }}
|
||||
uses: devmasx/merge-branch@v1.3.1
|
||||
uses: devmasx/merge-branch@1.4.0
|
||||
with:
|
||||
type: now
|
||||
from_branch: ${{ matrix.pairs.from }}
|
||||
|
@ -8,17 +8,27 @@ in
|
||||
|
||||
{
|
||||
options = {
|
||||
services.xserver.windowManager.clfswm.enable = mkEnableOption "clfswm";
|
||||
services.xserver.windowManager.clfswm = {
|
||||
enable = mkEnableOption "clfswm";
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.lispPackages.clfswm;
|
||||
defaultText = "pkgs.lispPackages.clfswm";
|
||||
description = ''
|
||||
clfswm package to use.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.xserver.windowManager.session = singleton {
|
||||
name = "clfswm";
|
||||
start = ''
|
||||
${pkgs.lispPackages.clfswm}/bin/clfswm &
|
||||
${cfg.package}/bin/clfswm &
|
||||
waitPID=$!
|
||||
'';
|
||||
};
|
||||
environment.systemPackages = [ pkgs.lispPackages.clfswm ];
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
};
|
||||
}
|
||||
|
@ -50,6 +50,8 @@ in
|
||||
|
||||
dontFixCmake = true;
|
||||
|
||||
inherit lua;
|
||||
|
||||
buildInputs = [
|
||||
gperf
|
||||
libtermkey
|
||||
|
@ -132,4 +132,15 @@ rec {
|
||||
extraName = "-pathogen";
|
||||
configure.pathogen.pluginNames = [ "vim-nix" ];
|
||||
};
|
||||
|
||||
nvimWithLuaPackages = wrapNeovim2 "with-lua-packages" (makeNeovimConfig {
|
||||
extraLuaPackages = ps: [ps.mpack];
|
||||
customRC = ''
|
||||
lua require("mpack")
|
||||
'';
|
||||
});
|
||||
|
||||
nvim_with_lua_packages = runTest nvimWithLuaPackages ''
|
||||
${nvimWithLuaPackages}/bin/nvim -i NONE --noplugin -es
|
||||
'';
|
||||
})
|
||||
|
@ -28,6 +28,8 @@ let
|
||||
, extraPython3Packages ? (_: [ ])
|
||||
, withNodeJs ? false
|
||||
, withRuby ? true
|
||||
/* the function you would have passed to lua.withPackages */
|
||||
, extraLuaPackages ? (_: [ ])
|
||||
|
||||
# expects a list of plugin configuration
|
||||
# expects { plugin=far-vim; config = "let g:far#source='rg'"; optional = false; }
|
||||
@ -76,6 +78,8 @@ let
|
||||
++ (extraPython3Packages ps)
|
||||
++ (lib.concatMap (f: f ps) pluginPython3Packages));
|
||||
|
||||
lua = neovim-unwrapped.lua;
|
||||
luaEnv = lua.withPackages(ps: extraLuaPackages ps);
|
||||
|
||||
# Mapping a boolean argument to a key that tells us whether to add or not to
|
||||
# add to nvim's 'embedded rc' this:
|
||||
@ -110,6 +114,9 @@ let
|
||||
"--set" "GEM_HOME" "${rubyEnv}/${rubyEnv.ruby.gemPath}"
|
||||
] ++ lib.optionals (binPath != "") [
|
||||
"--suffix" "PATH" ":" binPath
|
||||
] ++ lib.optionals (luaEnv != null) [
|
||||
"--prefix" "LUA_PATH" ";" "${luaEnv}/share/lua/${lua.luaversion}/?.lua"
|
||||
"--prefix" "LUA_CPATH" ";" "${luaEnv}/lib/lua/${lua.luaversion}/?.so"
|
||||
];
|
||||
|
||||
|
||||
@ -123,6 +130,7 @@ let
|
||||
inherit neovimRcContent;
|
||||
inherit manifestRc;
|
||||
inherit python3Env;
|
||||
inherit luaEnv;
|
||||
inherit withNodeJs;
|
||||
} // lib.optionalAttrs withRuby {
|
||||
inherit rubyEnv;
|
||||
@ -143,6 +151,8 @@ let
|
||||
, extraPythonPackages ? (_: [])
|
||||
/* the function you would have passed to python.withPackages */
|
||||
, withPython3 ? true, extraPython3Packages ? (_: [])
|
||||
/* the function you would have passed to lua.withPackages */
|
||||
, extraLuaPackages ? (_: [])
|
||||
, withNodeJs ? false
|
||||
, withRuby ? true
|
||||
, vimAlias ? false
|
||||
@ -159,6 +169,7 @@ let
|
||||
res = makeNeovimConfig {
|
||||
inherit withPython3;
|
||||
extraPython3Packages = compatFun extraPython3Packages;
|
||||
inherit extraLuaPackages;
|
||||
inherit withNodeJs withRuby viAlias vimAlias;
|
||||
inherit configure;
|
||||
inherit extraName;
|
||||
|
@ -52,14 +52,14 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "palemoon";
|
||||
version = "29.4.0.1";
|
||||
version = "29.4.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
githubBase = "repo.palemoon.org";
|
||||
owner = "MoonchildProductions";
|
||||
repo = "Pale-Moon";
|
||||
rev = "${version}_Release";
|
||||
sha256 = "1qzsryhlxvh9xx9j7s4dmxv575z13wdx8iigj8r0pdmg5kx6rpkb";
|
||||
sha256 = "086f517xkk4smx57klyyvx4m3g6r5f1667w990zhpapbh997hfri";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -0,0 +1,79 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, python3
|
||||
, wrapGAppsHook
|
||||
, evolution-data-server
|
||||
, feedbackd
|
||||
, gtk3
|
||||
, json-glib
|
||||
, libgcrypt
|
||||
, libhandy
|
||||
, libphonenumber
|
||||
, olm
|
||||
, pidgin
|
||||
, protobuf
|
||||
, sqlite
|
||||
, plugins ? [ ]
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "chatty";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "source.puri.sm";
|
||||
owner = "Librem5";
|
||||
repo = "chatty";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/l8hysfBmXLbs2COIVjdr2JC1qX/c66DqOm2Gyqb9s8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs build-aux/meson
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream-glib
|
||||
desktop-file-utils
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
evolution-data-server
|
||||
feedbackd
|
||||
gtk3
|
||||
json-glib
|
||||
libgcrypt
|
||||
libhandy
|
||||
libphonenumber
|
||||
olm
|
||||
pidgin
|
||||
protobuf
|
||||
sqlite
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix PURPLE_PLUGIN_PATH : ${pidgin.makePluginPath plugins}
|
||||
${lib.concatMapStringsSep " " (p: p.wrapArgs or "") plugins}
|
||||
)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "XMPP and SMS messaging via libpurple and ModemManager";
|
||||
homepage = "https://source.puri.sm/Librem5/chatty";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ dotlambda tomfitzhenry ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
@ -87,6 +87,10 @@ let unwrapped = stdenv.mkDerivation rec {
|
||||
done
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
makePluginPath = lib.makeSearchPathOutput "lib" "lib/purple-${majorVersion}";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Multi-protocol instant messaging client";
|
||||
homepage = "http://pidgin.im";
|
||||
|
@ -6,6 +6,8 @@
|
||||
, joblib
|
||||
, astropy
|
||||
, radio_beam
|
||||
, six
|
||||
, dask
|
||||
, pytestCheckHook
|
||||
, pytest-astropy
|
||||
, astropy-helpers
|
||||
@ -31,7 +33,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ astropy-helpers ];
|
||||
propagatedBuildInputs = [ astropy radio_beam joblib ];
|
||||
propagatedBuildInputs = [ astropy radio_beam joblib six dask ];
|
||||
checkInputs = [ pytestCheckHook aplpy pytest-astropy ];
|
||||
|
||||
meta = {
|
||||
|
@ -47,6 +47,11 @@ let
|
||||
|
||||
postPatch = optionalString buildKernel ''
|
||||
patchShebangs scripts
|
||||
|
||||
# https://github.com/openzfs/zfs/issues/10107
|
||||
substituteInPlace ./config/kernel.m4 \
|
||||
--replace "make modules" "make CC=$CC modules"
|
||||
|
||||
# The arrays must remain the same length, so we repeat a flag that is
|
||||
# already part of the command and therefore has no effect.
|
||||
substituteInPlace ./module/os/linux/zfs/zfs_ctldir.c \
|
||||
|
@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mosquitto";
|
||||
version = "2.0.11";
|
||||
version = "2.0.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eclipse";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1i0kkqhjxqahkhsl60s46zlywa87jakv7h4sr3fhi1v53vwpb9mg";
|
||||
sha256 = "0bn6vpk6gdxrnm3aw3j2g0ny6cx2arv8pmv4x8302pr6qcrz57s6";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.isDarwin [
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wordpress";
|
||||
version = "5.7.2";
|
||||
version = "5.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://wordpress.org/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-640FIIFZRp0L48szn3tqFQo59QP69nnCVQKEM/UTEhk=";
|
||||
sha256 = "sha256-0pgTq1U2Exj1GfKo+mYxEmoKj5GsMPYstgAsEIV36H8=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
34
pkgs/shells/bash/yarn-completion/default.nix
Normal file
34
pkgs/shells/bash/yarn-completion/default.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yarn-bash-completion";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dsifford";
|
||||
repo = "yarn-completion";
|
||||
rev = "v${version}";
|
||||
sha256 = "0xflbrbwskjqv3knvc8jqygpvfxh5ak66q7w22d1ng8gwrfqzcng";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
installShellCompletion --cmd yarn ./yarn-completion.bash
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/dsifford/yarn-completion/";
|
||||
description = "Bash completion for Yarn";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ DamienCassou ];
|
||||
};
|
||||
}
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2021-08-28";
|
||||
version = "2021-09-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "offensive-security";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-eLbRtsZYRCPh0FDecxjAt4P0mUZJaZKg6kg5/SSYP1A=";
|
||||
sha256 = "sha256-uWKZTtBp1HF7WbQVoZMxNQ2osvw3+RARLAJTwxqRErA=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
@ -10611,6 +10611,8 @@ with pkgs;
|
||||
|
||||
nix-bash-completions = callPackage ../shells/bash/nix-bash-completions { };
|
||||
|
||||
yarn-bash-completion = callPackage ../shells/bash/yarn-completion { };
|
||||
|
||||
undistract-me = callPackage ../shells/bash/undistract-me { };
|
||||
|
||||
dash = callPackage ../shells/dash { };
|
||||
@ -23283,6 +23285,8 @@ with pkgs;
|
||||
inherit (python3Packages) python wrapPython pygments markdown;
|
||||
};
|
||||
|
||||
chatty = callPackage ../applications/networking/instant-messengers/chatty { };
|
||||
|
||||
chirp = callPackage ../applications/radio/chirp { };
|
||||
|
||||
browsh = callPackage ../applications/networking/browsers/browsh { };
|
||||
|
Loading…
Reference in New Issue
Block a user