Merge master into staging-next
This commit is contained in:
commit
c86cbc2a8a
|
@ -449,16 +449,10 @@ in {
|
|||
imports = [
|
||||
(mkAliasOptionModule [ "users" "extraUsers" ] [ "users" "users" ])
|
||||
(mkAliasOptionModule [ "users" "extraGroups" ] [ "users" "groups" ])
|
||||
(mkChangedOptionModule
|
||||
[ "security" "initialRootPassword" ]
|
||||
[ "users" "users" "root" "initialHashedPassword" ]
|
||||
(cfg: if cfg.security.initialRootPassword == "!"
|
||||
then null
|
||||
else cfg.security.initialRootPassword))
|
||||
(mkRenamedOptionModule ["security" "initialRootPassword"] ["users" "users" "root" "initialHashedPassword"])
|
||||
];
|
||||
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
|
||||
users.mutableUsers = mkOption {
|
||||
|
@ -526,6 +520,17 @@ in {
|
|||
'';
|
||||
};
|
||||
|
||||
|
||||
users.allowNoPasswordLogin = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Disable checking that at least the <literal>root</literal> user or a user in the <literal>wheel</literal> group can log in using
|
||||
a password or an SSH key.
|
||||
|
||||
WARNING: enabling this can lock you out of your system. Enable this only if you know what are you doing.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
|
@ -540,6 +545,7 @@ in {
|
|||
home = "/root";
|
||||
shell = mkDefault cfg.defaultUserShell;
|
||||
group = "root";
|
||||
initialHashedPassword = mkDefault "!";
|
||||
};
|
||||
nobody = {
|
||||
uid = ids.uids.nobody;
|
||||
|
@ -616,9 +622,11 @@ in {
|
|||
# there is at least one "privileged" account that has a
|
||||
# password or an SSH authorized key. Privileged accounts are
|
||||
# root and users in the wheel group.
|
||||
assertion = !cfg.mutableUsers ->
|
||||
any id ((mapAttrsToList (_: cfg:
|
||||
(cfg.name == "root"
|
||||
# The check does not apply when users.disableLoginPossibilityAssertion
|
||||
# The check does not apply when users.mutableUsers
|
||||
assertion = !cfg.mutableUsers -> !cfg.allowNoPasswordLogin ->
|
||||
any id (mapAttrsToList (name: cfg:
|
||||
(name == "root"
|
||||
|| cfg.group == "wheel"
|
||||
|| elem "wheel" cfg.extraGroups)
|
||||
&&
|
||||
|
@ -629,10 +637,14 @@ in {
|
|||
|| cfg.openssh.authorizedKeys.keyFiles != [])
|
||||
) cfg.users) ++ [
|
||||
config.security.googleOsLogin.enable
|
||||
]);
|
||||
];
|
||||
message = ''
|
||||
Neither the root account nor any wheel user has a password or SSH authorized key.
|
||||
You must set one to prevent being locked out of your system.'';
|
||||
You must set one to prevent being locked out of your system.
|
||||
If you really want to be locked out of your system, set users.allowNoPasswordLogin = true;
|
||||
However you are most probably better off by setting users.mutableUsers = true; and
|
||||
manually running passwd root to set the root password.
|
||||
'';
|
||||
}
|
||||
] ++ flatten (flip mapAttrsToList cfg.users (name: user:
|
||||
[
|
||||
|
|
|
@ -127,7 +127,7 @@ in {
|
|||
description = "ConnMan VPN service";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "syslog.target" ];
|
||||
before = [ "connman" ];
|
||||
before = [ "connman.service" ];
|
||||
serviceConfig = {
|
||||
Type = "dbus";
|
||||
BusName = "net.connman.vpn";
|
||||
|
@ -140,7 +140,7 @@ in {
|
|||
description = "D-BUS Service";
|
||||
serviceConfig = {
|
||||
Name = "net.connman.vpn";
|
||||
before = [ "connman" ];
|
||||
before = [ "connman.service" ];
|
||||
ExecStart = "${cfg.package}/sbin/connman-vpnd -n";
|
||||
User = "root";
|
||||
SystemdService = "connman-vpn.service";
|
||||
|
|
|
@ -305,7 +305,7 @@ let
|
|||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Wether to enable wol on this interface.";
|
||||
description = "Whether to enable wol on this interface.";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Jonathan's Own Version or Emacs";
|
||||
description = "Jonathan's Own Version of Emacs";
|
||||
homepage = "https://github.com/jonmacs/jove";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
, makeWrapper
|
||||
, pkg-config
|
||||
, python2
|
||||
, python3
|
||||
, openssl
|
||||
, SDL2
|
||||
, fontconfig
|
||||
|
@ -24,16 +25,16 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "neovide";
|
||||
version = "unstable-2021-10-09";
|
||||
version = "unstable-2022-02-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kethku";
|
||||
repo = "neovide";
|
||||
rev = "7f76ad4764197ba75bb9263d25b265d801563ccf";
|
||||
sha256 = "sha256-kcP0WSk3quTaWCGQYN4zYlDQ9jhx/Vu6AamSLGFszwQ=";
|
||||
rev = "92bc1725f1733547eb0ae25b740425f03f358c2a";
|
||||
sha256 = "sha256-bKTteaj6gddp0NuV5Y0pfHotezU9Hmb136xOC9zkJ/M=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-TQEhz9FtvIb/6Qtyz018dPle0+nub1oMZMFtKAqYcoI=";
|
||||
cargoSha256 = "sha256-TaZN49ou6bf1vW0mEsmaItp1c73d0M826MMrSGXpnGE=";
|
||||
|
||||
SKIA_SOURCE_DIR =
|
||||
let
|
||||
|
@ -41,8 +42,8 @@ rustPlatform.buildRustPackage rec {
|
|||
owner = "rust-skia";
|
||||
repo = "skia";
|
||||
# see rust-skia:skia-bindings/Cargo.toml#package.metadata skia
|
||||
rev = "m91-0.39.4";
|
||||
sha256 = "sha256-ovlR1vEZaQqawwth/UYVUSjFu+kTsywRpRClBaE1CEA=";
|
||||
rev = "m93-0.42.0";
|
||||
sha256 = "sha256-F1DWLm7bdKnuCu5tMMekxSyaGq8gPRNtZwcRVXJxjZQ=";
|
||||
};
|
||||
# The externals for skia are taken from skia/DEPS
|
||||
externals = lib.mapAttrs (n: v: fetchgit v) (lib.importJSON ./skia-externals.json);
|
||||
|
@ -72,6 +73,7 @@ rustPlatform.buildRustPackage rec {
|
|||
pkg-config
|
||||
makeWrapper
|
||||
python2 # skia-bindings
|
||||
python3 # rust-xcb
|
||||
llvmPackages.clang # skia
|
||||
];
|
||||
|
||||
|
|
|
@ -1,18 +1,18 @@
|
|||
{
|
||||
"expat": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git",
|
||||
"rev": "e976867fb57a0cd87e3b0fe05d59e0ed63c6febb",
|
||||
"sha256": "sha256-akSh/Vo7s7m/7qePamGA7oiHEHT3D6JhCFMc27CgDFI="
|
||||
"rev": "a28238bdeebc087071777001245df1876a11f5ee",
|
||||
"sha256": "sha256-TSaVtKEk7J0fckDvpI6/U5Aq7d37nsixp0Ft7sMHi8w="
|
||||
},
|
||||
"libjpeg-turbo": {
|
||||
"url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git",
|
||||
"rev": "64fc43d52351ed52143208ce6a656c03db56462b",
|
||||
"sha256": "sha256-rk22wE83hxKbtZLhGwUIF4J816jHvWovgICdrKZi2Ig="
|
||||
"rev": "24e310554f07c0fdb8ee52e3e708e4f3e9eb6e20",
|
||||
"sha256": "sha256-bhbUnA36rKYLJSLpElmXJqccXQDjjbMcNMsVM4Eekrs="
|
||||
},
|
||||
"icu": {
|
||||
"url": "https://chromium.googlesource.com/chromium/deps/icu.git",
|
||||
"rev": "dbd3825b31041d782c5b504c59dcfb5ac7dda08c",
|
||||
"sha256": "sha256-voMH+TdNx3dBHeH5Oky5OYmmLGJ2u+WrMrmAkjXJRTE="
|
||||
"rev": "a0718d4f121727e30b8d52c7a189ebf5ab52421f",
|
||||
"sha256": "sha256-BI3f/gf9GNDvSfXWeRHKBvznSz4mjXY8rM24kK7QvOM="
|
||||
},
|
||||
"zlib": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src/third_party/zlib",
|
||||
|
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "hydrus";
|
||||
version = "471";
|
||||
version = "472";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hydrusnetwork";
|
||||
repo = "hydrus";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-KRAPnYjDWXZ56OctGvEticQs5wSMFS27kGdpxj0mk0g=";
|
||||
sha256 = "sha256-6BhicOKQez9gk73WHaPeN/FXcUetdklhh8jePSgvN6E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tev";
|
||||
version = "1.22";
|
||||
version = "1.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Tom94";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-WLDQaN6wHnadvp0JyUzlcZVNiSbFudmmBSNYRMaE6U4=";
|
||||
sha256 = "sha256-NtnnZV/+8aUm8BkUz8Xm3aeSbOI2gNUPNfvYlwUl01Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake wrapGAppsHook ];
|
||||
|
@ -21,11 +21,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
dontWrapGApps = true; # We also need zenity (see below)
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "/usr/" "''${out}/"
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DTEV_DEPLOY=1" # Only relevant not to append "dev" to the version
|
||||
];
|
||||
|
|
|
@ -1,57 +1,40 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, at-spi2-atk
|
||||
, atk
|
||||
, buildFHSUserEnv
|
||||
, cairo
|
||||
, dbus
|
||||
, fetchurl
|
||||
, fontconfig
|
||||
, freetype
|
||||
, gdk-pixbuf
|
||||
, glib
|
||||
, gsettings-desktop-schemas
|
||||
, gtk2
|
||||
, gtk3-x11
|
||||
, harfbuzz
|
||||
, liberation_ttf
|
||||
, libjpeg
|
||||
, libtiff
|
||||
, libudev0-shim
|
||||
, libuuid
|
||||
, libX11
|
||||
, libXcursor
|
||||
, libXext
|
||||
, libXi
|
||||
, libXinerama
|
||||
, libxkbfile
|
||||
, libxml2
|
||||
, libXrandr
|
||||
, libXrender
|
||||
, libXScrnSaver
|
||||
, libxslt
|
||||
, libXtst
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, pango
|
||||
, pcsclite
|
||||
, pixman
|
||||
, zlib
|
||||
, writeTextDir
|
||||
, configText ? ""
|
||||
}:
|
||||
let
|
||||
version = "2106.1";
|
||||
version = "2111";
|
||||
|
||||
sysArch =
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then "x64"
|
||||
else throw "Unsupported system: ${stdenv.hostPlatform.system}";
|
||||
# The downloaded archive also contains ARM binaries, but these have not been tested.
|
||||
|
||||
# For USB support, ensure that /var/run/vmware/<YOUR-UID>
|
||||
# exists and is owned by you. Then run vmware-usbarbitrator as root.
|
||||
bins = [ "vmware-view" "vmware-usbarbitrator" ];
|
||||
|
||||
# This forces the default GTK theme (Adwaita) because Horizon is prone to
|
||||
# UI usability issues when using non-default themes, such as Adwaita-dark.
|
||||
wrapBinCommands = name: ''
|
||||
makeWrapper "$out/bin/${name}" "$out/bin/${name}_wrapper" \
|
||||
--set GTK_THEME Adwaita \
|
||||
--suffix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" \
|
||||
--suffix LD_LIBRARY_PATH : "$out/lib/vmware/view/crtbora:$out/lib/vmware"
|
||||
'';
|
||||
|
||||
vmwareHorizonClientFiles = stdenv.mkDerivation {
|
||||
name = "vmwareHorizonClientFiles";
|
||||
inherit version;
|
||||
src = fetchurl {
|
||||
url = "https://download3.vmware.com/software/view/viewclients/CART22FQ2/VMware-Horizon-Client-Linux-2106.1-8.3.1-18435609.tar.gz";
|
||||
sha256 = "b42ddb9d7e9c8d0f8b86b69344fcfca45251c5a5f1e06a18a3334d5a04e18c39";
|
||||
url = "https://download3.vmware.com/software/view/viewclients/CART22FH2/VMware-Horizon-Client-Linux-2111-8.4.0-18957622.tar.gz";
|
||||
sha256 = "2f79d2d8d34e6f85a5d21a3350618c4763d60455e7d68647ea40715eaff486f7";
|
||||
};
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
installPhase = ''
|
||||
|
@ -65,27 +48,19 @@ let
|
|||
# Deleting the bundled library is the simplest way to force it to use our version.
|
||||
rm "$out/lib/vmware/gcc/libstdc++.so.6"
|
||||
|
||||
# This libjpeg library interferes with Chromium, so we will be using ours instead.
|
||||
rm $out/lib/vmware/libjpeg.*
|
||||
|
||||
# This library causes the program to core-dump occasionally. Use ours instead.
|
||||
rm $out/lib/vmware/view/crtbora/libcairo.*
|
||||
|
||||
# Force the default GTK theme (Adwaita) because Horizon is prone to
|
||||
# UI usability issues when using non-default themes, such as Adwaita-dark.
|
||||
makeWrapper "$out/bin/vmware-view" "$out/bin/vmware-view_wrapper" \
|
||||
--set GTK_THEME Adwaita \
|
||||
--suffix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" \
|
||||
--suffix LD_LIBRARY_PATH : "$out/lib/vmware/view/crtbora:$out/lib/vmware"
|
||||
${lib.concatMapStrings wrapBinCommands bins}
|
||||
'';
|
||||
};
|
||||
|
||||
vmwareFHSUserEnv = buildFHSUserEnv {
|
||||
name = "vmware-view";
|
||||
vmwareFHSUserEnv = name: buildFHSUserEnv {
|
||||
inherit name;
|
||||
|
||||
runScript = "${vmwareHorizonClientFiles}/bin/vmware-view_wrapper";
|
||||
runScript = "${vmwareHorizonClientFiles}/bin/${name}_wrapper";
|
||||
|
||||
targetPkgs = pkgs: [
|
||||
targetPkgs = pkgs: with pkgs; [
|
||||
at-spi2-atk
|
||||
atk
|
||||
cairo
|
||||
|
@ -99,25 +74,29 @@ let
|
|||
harfbuzz
|
||||
liberation_ttf
|
||||
libjpeg
|
||||
libpulseaudio
|
||||
libtiff
|
||||
libudev0-shim
|
||||
libuuid
|
||||
libX11
|
||||
libXcursor
|
||||
libXext
|
||||
libXi
|
||||
libXinerama
|
||||
libxkbfile
|
||||
libv4l
|
||||
libxml2
|
||||
libXrandr
|
||||
libXrender
|
||||
libXScrnSaver
|
||||
libXtst
|
||||
pango
|
||||
pcsclite
|
||||
pixman
|
||||
vmwareHorizonClientFiles
|
||||
xorg.libX11
|
||||
xorg.libXcursor
|
||||
xorg.libXext
|
||||
xorg.libXi
|
||||
xorg.libXinerama
|
||||
xorg.libxkbfile
|
||||
xorg.libXrandr
|
||||
xorg.libXrender
|
||||
xorg.libXScrnSaver
|
||||
xorg.libXtst
|
||||
zlib
|
||||
|
||||
(writeTextDir "etc/vmware/config" configText)
|
||||
];
|
||||
};
|
||||
|
||||
|
@ -125,20 +104,25 @@ let
|
|||
name = "vmware-view";
|
||||
desktopName = "VMware Horizon Client";
|
||||
icon = "${vmwareHorizonClientFiles}/share/icons/vmware-view.png";
|
||||
exec = "${vmwareFHSUserEnv}/bin/vmware-view %u";
|
||||
exec = "${vmwareFHSUserEnv "vmware-view"}/bin/vmware-view %u";
|
||||
mimeType = "x-scheme-handler/vmware-view";
|
||||
};
|
||||
|
||||
binLinkCommands = lib.concatMapStringsSep
|
||||
"\n"
|
||||
(bin: "ln -s ${vmwareFHSUserEnv bin}/bin/${bin} $out/bin/")
|
||||
bins;
|
||||
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "vmware-view";
|
||||
name = "vmware-horizon-client";
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/share/applications
|
||||
cp "${desktopItem}"/share/applications/* $out/share/applications/
|
||||
ln -s "${vmwareFHSUserEnv}/bin/vmware-view" "$out/bin/"
|
||||
cp ${desktopItem}/share/applications/* $out/share/applications/
|
||||
${binLinkCommands}
|
||||
'';
|
||||
|
||||
unwrapped = vmwareHorizonClientFiles;
|
||||
|
@ -146,10 +130,11 @@ stdenv.mkDerivation {
|
|||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with lib; {
|
||||
mainProgram = "vmware-view";
|
||||
description = "Allows you to connect to your VMware Horizon virtual desktop";
|
||||
homepage = "https://www.vmware.com/go/viewclients";
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.linux;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ buckley310 ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -21,11 +21,11 @@ let
|
|||
|
||||
self = python3Packages.buildPythonApplication rec {
|
||||
pname = "mercurial";
|
||||
version = "6.0.1";
|
||||
version = "6.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
|
||||
sha256 = "sha256-Bf0LSAOJyWVH9abHaekO4A8dE/esDUZeQKOBxs86VuI=";
|
||||
sha256 = "sha256-X7TDbThWKS6/WEBR1ZMG2WrYqjK1U3RSsdnEdvlasRo=";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
|
@ -35,7 +35,7 @@ let
|
|||
cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
sha256 = "sha256-leyLb6RqntiuEhmJSUkZRUuO8ah0BZI5OhKkGbWRjxs=";
|
||||
sha256 = "sha256-rIG57oPCTUz4HNJyuMBPlKTSh02ecF5052Q1P9wGq1s=";
|
||||
sourceRoot = "${pname}-${version}/rust";
|
||||
} else null;
|
||||
cargoRoot = if rustSupport then "rust" else null;
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, buildPackages, diffutils, ed }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch, buildPackages, diffutils, ed, lzip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rcs";
|
||||
version = "5.10.0";
|
||||
version = "5.10.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/rcs/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-Og2flYx60wPkdehjRlSXTtvm3rOkVEkfOFfcGIm6xcU";
|
||||
url = "mirror://gnu/rcs/${pname}-${version}.tar.lz";
|
||||
sha256 = "sha256-Q93+EHJKi4XiRo9kA7YABzcYbwHmDgvWL95p2EIjTMU=";
|
||||
};
|
||||
|
||||
ac_cv_path_ED = "${ed}/bin/ed";
|
||||
|
@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
hardeningDisable = lib.optional stdenv.cc.isClang "format";
|
||||
|
||||
nativeBuildInputs = [ lzip ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.gnu.org/software/rcs/";
|
||||
description = "Revision control system";
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "papirus-icon-theme";
|
||||
version = "20211201";
|
||||
version = "20220204";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PapirusDevelopmentTeam";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-lcwQALFQ4zkgDLCX1uthAP3QZwP7UcWcPSOU+UTDykE=";
|
||||
sha256 = "sha256-DYz2fnn1ZfX09NQcRXmGTYY95K5wOWhlmJeDjEvN1vY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 ];
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "v2ray-geoip";
|
||||
version = "202201270031";
|
||||
version = "202202030030";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "geoip";
|
||||
rev = "236a5edc951685cf11d5fcbd08d82d74bd425f92";
|
||||
sha256 = "sha256-y2hVSlfUwbbKpd2O8VBwTEL/djhXjd2XhBbDlmmqJCc=";
|
||||
rev = "ca550e313a264e05c1fb22f293bc64c7432049ef";
|
||||
sha256 = "sha256-gajlNfyaq8HwghBU6Gcq7lyqjVAmNcOgJKKsw5P+8Nc=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyncstdlib";
|
||||
version = "3.10.2";
|
||||
version = "3.10.3";
|
||||
disabled = pythonOlder "3.7";
|
||||
format = "flit";
|
||||
|
||||
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "maxfischer2781";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vjOhfEsAldTjROFUer1SgEX1KxnNM/WwtLsCB9ZV1WM=";
|
||||
sha256 = "sha256-Q547XKsn4/U7XbDhZADF4qPpFxAGPmv9bAXSQZnNUIo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "gdown";
|
||||
version = "4.2.0";
|
||||
version = "4.2.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "bd871c125242a9d3691aa74f360b6b5268a58c13991bb2405fdb3ec3028307dc";
|
||||
sha256 = "sha256-X3onSr8PN3D24lMtKG2Y/RiKbD1qSq2n0YVO8Y5H5K4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "tfsec";
|
||||
version = "0.63.1";
|
||||
version = "1.0.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-khAVb+uwr3qyAWjvMjPG//+FKQJ9qoVwmhsej++IQhs=";
|
||||
sha256 = "sha256-YdoEPU0qXBJ6kD9mWNFxdeQE9e4vkrtVdEOcuFVDpOk=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/aquasecurity/tfsec";
|
||||
|
|
|
@ -10,14 +10,14 @@ in
|
|||
buildGoModule rec {
|
||||
pname = "faas-cli";
|
||||
# When updating version change rev.
|
||||
version = "0.14.1";
|
||||
rev = "d94600d2d2be52a66e0a15c219634f3bcac27318";
|
||||
version = "0.14.2";
|
||||
rev = "b1c09c0243f69990b6c81a17d7337f0fd23e7542";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openfaas";
|
||||
repo = "faas-cli";
|
||||
rev = version;
|
||||
sha256 = "132m9kv7a4vv65n8y3sq1drks6n1pci9fhvq0s637imf2vxccxqr";
|
||||
sha256 = "sha256-OdFd4q5IHu4FjNArcqVt4dNyLWegR4GdAyyCzgNIU+Q=";
|
||||
};
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "heroku";
|
||||
version = "7.59.0";
|
||||
version = "7.59.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz";
|
||||
sha256 = "0whkm8xi918m4y0wjdbma42kl4cc6chakjn5chi75aqd5y3qanpp";
|
||||
sha256 = "dbb69d4b5df99ff47ed0f6f1f58d968b3b144b13deee1b33c82fef7ef4006903";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -180,6 +180,7 @@ folke/tokyonight.nvim
|
|||
folke/trouble.nvim
|
||||
folke/twilight.nvim
|
||||
folke/which-key.nvim
|
||||
folke/zen-mode.nvim
|
||||
FooSoft/vim-argwrap
|
||||
freitass/todo.txt-vim
|
||||
frigoeu/psc-ide-vim
|
||||
|
@ -454,6 +455,7 @@ MarcWeber/vim-addon-sql
|
|||
MarcWeber/vim-addon-syntax-checker
|
||||
MarcWeber/vim-addon-toggle-buffer
|
||||
MarcWeber/vim-addon-xdebug
|
||||
marko-cerovac/material.nvim
|
||||
markonm/traces.vim
|
||||
martinda/Jenkinsfile-vim-syntax
|
||||
MattesGroeger/vim-bookmarks
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGo117Module rec {
|
||||
pname = "kopia";
|
||||
version = "0.10.3";
|
||||
version = "0.10.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FdLQI+MbGaO0Kj6icUmcvPzo3rC7mbHYC1xoGv/FzPk=";
|
||||
sha256 = "sha256-L6aAcIGNNts4rsJNCmuKSFtBWe/VUzhwiNmlpKCZ+B4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-7QgD4kMiULE2G+/FIqe19kZGvJDEXBY27bEfxabD+ic=";
|
||||
vendorSha256 = "sha256-jswXHGjDnH3dVjpvdbr/sMYyWmGvTAZB77oKBMkBsnI=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -6,8 +6,24 @@ 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" ]
|
||||
REPOS = [
|
||||
"libime",
|
||||
"xcb-imdkit",
|
||||
|
||||
"fcitx5",
|
||||
"fcitx5-chewing",
|
||||
"fcitx5-chinese-addons",
|
||||
"fcitx5-configtool",
|
||||
"fcitx5-gtk",
|
||||
"fcitx5-hangul",
|
||||
"fcitx5-lua",
|
||||
"fcitx5-m17n",
|
||||
"fcitx5-qt",
|
||||
"fcitx5-rime",
|
||||
"fcitx5-table-extra",
|
||||
"fcitx5-table-other",
|
||||
"fcitx5-unikey"
|
||||
]
|
||||
|
||||
OWNER = "fcitx"
|
||||
|
||||
|
|
|
@ -13,15 +13,15 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "innernet";
|
||||
version = "1.5.2";
|
||||
version = "1.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tonarino";
|
||||
repo = "innernet";
|
||||
rev = "v${version}";
|
||||
sha256 = "141zjfl125m5lrimam1dbpk40dqfq4vnaz42sbiq1v1avyg684fq";
|
||||
sha256 = "sha256-dpoSjGtjGJTF/sQ8vbeAUCjnkYqz4zGnfO8br8gJbsQ=";
|
||||
};
|
||||
cargoSha256 = "0559d0ayysvqs4k46fhgd4r8wa89abgx6rvhlh0gnlnga8vacpw5";
|
||||
cargoSha256 = "sha256-EmAlm3W9r6pP1VIxeM2UP1ZG9TjopTarckMfLDonr1k=";
|
||||
|
||||
nativeBuildInputs = with llvmPackages; [
|
||||
llvm
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2022-02-03";
|
||||
version = "2022-02-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "offensive-security";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-s5neMvY77lNXcwgOt6FLEk/mfkrJU1v1GBzwIJ4oX/Y=";
|
||||
sha256 = "sha256-1wdIvJ7AeCNNbApS16ZFmytsPL8Oal+ivem8cHOD1iA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
Loading…
Reference in a new issue