Merge staging-next into staging
This commit is contained in:
commit
679a57d577
|
@ -2595,6 +2595,12 @@
|
|||
githubId = 91113;
|
||||
name = "David Kleuker";
|
||||
};
|
||||
davidarmstronglewis = {
|
||||
email = "davidlewis@mac.com";
|
||||
github = "davidarmstronglewis";
|
||||
githubId = 6754950;
|
||||
name = "David Armstrong Lewis";
|
||||
};
|
||||
davidrusu = {
|
||||
email = "davidrusu.me@gmail.com";
|
||||
github = "davidrusu";
|
||||
|
|
|
@ -36,7 +36,7 @@ let
|
|||
machine = create_machine(${machineConfig})
|
||||
machine.start()
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
machine.succeed("nix verify -r --no-trust /run/current-system")
|
||||
machine.succeed("nix store verify --no-trust -r --option experimental-features nix-command /run/current-system")
|
||||
|
||||
with subtest("Check whether the channel got installed correctly"):
|
||||
machine.succeed("nix-instantiate --dry-run '<nixpkgs>' -A hello")
|
||||
|
|
|
@ -184,11 +184,12 @@ let
|
|||
with subtest("Check whether nixos-rebuild works"):
|
||||
machine.succeed("nixos-rebuild switch >&2")
|
||||
|
||||
with subtest("Test nixos-option"):
|
||||
kernel_modules = machine.succeed("nixos-option boot.initrd.kernelModules")
|
||||
assert "virtio_console" in kernel_modules
|
||||
assert "List of modules" in kernel_modules
|
||||
assert "qemu-guest.nix" in kernel_modules
|
||||
# FIXME: Nix 2.4 broke nixos-option, someone has to fix it.
|
||||
# with subtest("Test nixos-option"):
|
||||
# kernel_modules = machine.succeed("nixos-option boot.initrd.kernelModules")
|
||||
# assert "virtio_console" in kernel_modules
|
||||
# assert "List of modules" in kernel_modules
|
||||
# assert "qemu-guest.nix" in kernel_modules
|
||||
|
||||
machine.shutdown()
|
||||
|
||||
|
|
|
@ -1,5 +1,16 @@
|
|||
{ lib, stdenv, fetchurl, jre, writeScript, common-updater-scripts
|
||||
, git, nixfmt, nix, coreutils, gnused, disableRemoteLogging ? true }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, jre
|
||||
, writeScript
|
||||
, common-updater-scripts
|
||||
, git
|
||||
, nixfmt
|
||||
, nix
|
||||
, coreutils
|
||||
, gnused
|
||||
, disableRemoteLogging ? true
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
|
@ -61,7 +72,7 @@ let
|
|||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
|
||||
$out/bin/amm -c 'val foo = 21; println(foo * 2)' | grep 42
|
||||
$out/bin/amm -h "$PWD" -c 'val foo = 21; println(foo * 2)' | grep 42
|
||||
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
@ -80,7 +91,8 @@ let
|
|||
maintainers = [ maintainers.nequissimus ];
|
||||
};
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
ammonite_2_12 = common {
|
||||
scalaVersion = "2.12";
|
||||
sha256 = "K8JII6SAmnBjMWQ9a3NqSLLuP1OLcbwobj3G+OCiLdA=";
|
||||
|
|
|
@ -2385,6 +2385,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/junegunn/gv.vim/";
|
||||
};
|
||||
|
||||
harpoon = buildVimPluginFrom2Nix {
|
||||
pname = "harpoon";
|
||||
version = "2021-11-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ThePrimeagen";
|
||||
repo = "harpoon";
|
||||
rev = "57819752e62251f9488a95fea1690bb62547bd2a";
|
||||
sha256 = "0x5x6jmz31aclai0l2dplr0y16f97jb40cgvnrx8mr5gb0s5i7sc";
|
||||
};
|
||||
meta.homepage = "https://github.com/ThePrimeagen/harpoon/";
|
||||
};
|
||||
|
||||
haskell-vim = buildVimPluginFrom2Nix {
|
||||
pname = "haskell-vim";
|
||||
version = "2021-01-19";
|
||||
|
|
|
@ -744,6 +744,7 @@ tex/vimpreviewpandoc
|
|||
Th3Whit3Wolf/one-nvim@main
|
||||
theHamsta/nvim-dap-virtual-text
|
||||
ThePrimeagen/git-worktree.nvim
|
||||
ThePrimeagen/harpoon
|
||||
theprimeagen/refactoring.nvim
|
||||
ThePrimeagen/vim-apm
|
||||
thinca/vim-ft-diff_fold
|
||||
|
|
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1rdvsqrjpily74y8vwch711401585xckb4p41cfwrmj6vf44jhif";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
makeFlags = [ "PREFIX=$(out)" "CC=cc" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/j0hax/beats";
|
||||
|
|
|
@ -1,8 +1,10 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, pkg-config
|
||||
, openssl
|
||||
, Security
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
|
@ -19,7 +21,8 @@ rustPlatform.buildRustPackage rec {
|
|||
cargoSha256 = "sha256:1ddyzbpsiy54r13nb9yrm64cbbifixnhkskwg5fvhhzj4ri4ks4a";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ];
|
||||
buildInputs = lib.optionals stdenv.isLinux [ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Github user information on terminal";
|
||||
|
|
|
@ -8049,7 +8049,9 @@ with pkgs;
|
|||
|
||||
ocserv = callPackage ../tools/networking/ocserv { };
|
||||
|
||||
octofetch = callPackage ../tools/misc/octofetch { };
|
||||
octofetch = callPackage ../tools/misc/octofetch {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
oha = callPackage ../tools/networking/oha {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
|
|
Loading…
Reference in a new issue