Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
0fde33f69b
@ -177,17 +177,17 @@ OK
|
||||
the boot partition.
|
||||
</para>
|
||||
<programlisting>
|
||||
# parted /dev/sda -- mkpart primary 512MiB -8GiB
|
||||
# parted /dev/sda -- mkpart primary 512MB -8GB
|
||||
</programlisting>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
Next, add a <emphasis>swap</emphasis> partition. The size
|
||||
required will vary according to needs, here a 8GiB one is
|
||||
required will vary according to needs, here a 8GB one is
|
||||
created.
|
||||
</para>
|
||||
<programlisting>
|
||||
# parted /dev/sda -- mkpart primary linux-swap -8GiB 100%
|
||||
# parted /dev/sda -- mkpart primary linux-swap -8GB 100%
|
||||
</programlisting>
|
||||
<note>
|
||||
<para>
|
||||
@ -204,7 +204,7 @@ OK
|
||||
reserved 512MiB at the start of the disk.
|
||||
</para>
|
||||
<programlisting>
|
||||
# parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB
|
||||
# parted /dev/sda -- mkpart ESP fat32 1MB 512MB
|
||||
# parted /dev/sda -- set 3 esp on
|
||||
</programlisting>
|
||||
</listitem>
|
||||
@ -242,7 +242,7 @@ OK
|
||||
live.
|
||||
</para>
|
||||
<programlisting>
|
||||
# parted /dev/sda -- mkpart primary 1MiB -8GiB
|
||||
# parted /dev/sda -- mkpart primary 1MB -8GB
|
||||
</programlisting>
|
||||
</listitem>
|
||||
<listitem>
|
||||
@ -252,7 +252,7 @@ OK
|
||||
created.
|
||||
</para>
|
||||
<programlisting>
|
||||
# parted /dev/sda -- mkpart primary linux-swap -8GiB 100%
|
||||
# parted /dev/sda -- mkpart primary linux-swap -8GB 100%
|
||||
</programlisting>
|
||||
<note>
|
||||
<para>
|
||||
|
||||
@ -133,14 +133,14 @@ update /etc/fstab.
|
||||
which will be used by the boot partition.
|
||||
|
||||
```ShellSession
|
||||
# parted /dev/sda -- mkpart primary 512MiB -8GiB
|
||||
# parted /dev/sda -- mkpart primary 512MB -8GB
|
||||
```
|
||||
|
||||
3. Next, add a *swap* partition. The size required will vary according
|
||||
to needs, here a 8GiB one is created.
|
||||
to needs, here a 8GB one is created.
|
||||
|
||||
```ShellSession
|
||||
# parted /dev/sda -- mkpart primary linux-swap -8GiB 100%
|
||||
# parted /dev/sda -- mkpart primary linux-swap -8GB 100%
|
||||
```
|
||||
|
||||
::: {.note}
|
||||
@ -153,7 +153,7 @@ update /etc/fstab.
|
||||
reserved 512MiB at the start of the disk.
|
||||
|
||||
```ShellSession
|
||||
# parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB
|
||||
# parted /dev/sda -- mkpart ESP fat32 1MB 512MB
|
||||
# parted /dev/sda -- set 3 esp on
|
||||
```
|
||||
|
||||
@ -180,14 +180,14 @@ update /etc/fstab.
|
||||
end part, where the swap will live.
|
||||
|
||||
```ShellSession
|
||||
# parted /dev/sda -- mkpart primary 1MiB -8GiB
|
||||
# parted /dev/sda -- mkpart primary 1MB -8GB
|
||||
```
|
||||
|
||||
3. Finally, add a *swap* partition. The size required will vary
|
||||
according to needs, here a 8GiB one is created.
|
||||
|
||||
```ShellSession
|
||||
# parted /dev/sda -- mkpart primary linux-swap -8GiB 100%
|
||||
# parted /dev/sda -- mkpart primary linux-swap -8GB 100%
|
||||
```
|
||||
|
||||
::: {.note}
|
||||
|
||||
@ -16,11 +16,11 @@ let
|
||||
lib.concatMapStrings (s: if lib.isList s then "-" else s)
|
||||
(builtins.split "[^a-zA-Z0-9_.\\-]+" name);
|
||||
|
||||
# Function to build "zfs allow" commands for the filesystems we've
|
||||
# delegated permissions to. It also checks if the target dataset
|
||||
# exists before delegating permissions, if it doesn't exist we
|
||||
# delegate it to the parent dataset. This should solve the case of
|
||||
# provisoning new datasets.
|
||||
# Function to build "zfs allow" commands for the filesystems we've delegated
|
||||
# permissions to. It also checks if the target dataset exists before
|
||||
# delegating permissions, if it doesn't exist we delegate it to the parent
|
||||
# dataset (if it exists). This should solve the case of provisoning new
|
||||
# datasets.
|
||||
buildAllowCommand = permissions: dataset: (
|
||||
"-+${pkgs.writeShellScript "zfs-allow-${dataset}" ''
|
||||
# Here we explicitly use the booted system to guarantee the stable API needed by ZFS
|
||||
@ -38,15 +38,17 @@ let
|
||||
(concatStringsSep "," permissions)
|
||||
dataset
|
||||
]}
|
||||
else
|
||||
${lib.escapeShellArgs [
|
||||
"/run/booted-system/sw/bin/zfs"
|
||||
"allow"
|
||||
cfg.user
|
||||
(concatStringsSep "," permissions)
|
||||
# Remove the last part of the path
|
||||
(builtins.dirOf dataset)
|
||||
]}
|
||||
${lib.optionalString ((builtins.dirOf dataset) != ".") ''
|
||||
else
|
||||
${lib.escapeShellArgs [
|
||||
"/run/booted-system/sw/bin/zfs"
|
||||
"allow"
|
||||
cfg.user
|
||||
(concatStringsSep "," permissions)
|
||||
# Remove the last part of the path
|
||||
(builtins.dirOf dataset)
|
||||
]}
|
||||
''}
|
||||
fi
|
||||
''}"
|
||||
);
|
||||
@ -67,14 +69,14 @@ let
|
||||
(concatStringsSep "," permissions)
|
||||
dataset
|
||||
]}
|
||||
${lib.escapeShellArgs [
|
||||
${lib.optionalString ((builtins.dirOf dataset) != ".") (lib.escapeShellArgs [
|
||||
"/run/booted-system/sw/bin/zfs"
|
||||
"unallow"
|
||||
cfg.user
|
||||
(concatStringsSep "," permissions)
|
||||
# Remove the last part of the path
|
||||
(builtins.dirOf dataset)
|
||||
]}
|
||||
])}
|
||||
''}"
|
||||
);
|
||||
in
|
||||
|
||||
@ -104,9 +104,9 @@ in
|
||||
|
||||
storagePath = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = if cfg.storageBackend == "file" then "/var/lib/vault" else null;
|
||||
default = if cfg.storageBackend == "file" || cfg.storageBackend == "raft" then "/var/lib/vault" else null;
|
||||
defaultText = literalExpression ''
|
||||
if config.${opt.storageBackend} == "file"
|
||||
if config.${opt.storageBackend} == "file" || cfg.storageBackend == "raft"
|
||||
then "/var/lib/vault"
|
||||
else null
|
||||
'';
|
||||
@ -172,11 +172,16 @@ in
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
assertions = [
|
||||
{ assertion = cfg.storageBackend == "inmem" -> (cfg.storagePath == null && cfg.storageConfig == null);
|
||||
{
|
||||
assertion = cfg.storageBackend == "inmem" -> (cfg.storagePath == null && cfg.storageConfig == null);
|
||||
message = ''The "inmem" storage expects no services.vault.storagePath nor services.vault.storageConfig'';
|
||||
}
|
||||
{ assertion = (cfg.storageBackend == "file" -> (cfg.storagePath != null && cfg.storageConfig == null)) && (cfg.storagePath != null -> cfg.storageBackend == "file");
|
||||
message = ''You must set services.vault.storagePath only when using the "file" backend'';
|
||||
{
|
||||
assertion = (
|
||||
(cfg.storageBackend == "file" -> (cfg.storagePath != null && cfg.storageConfig == null)) &&
|
||||
(cfg.storagePath != null -> (cfg.storageBackend == "file" || cfg.storageBackend == "raft"))
|
||||
);
|
||||
message = ''You must set services.vault.storagePath only when using the "file" or "raft" backend'';
|
||||
}
|
||||
];
|
||||
|
||||
|
||||
@ -48,6 +48,9 @@ in {
|
||||
};
|
||||
# Take snapshot and sync
|
||||
"pool/syncoid".target = "root@target:pool/syncoid";
|
||||
|
||||
# Test pool without parent (regression test for https://github.com/NixOS/nixpkgs/pull/180111)
|
||||
"pool".target = "root@target:pool/full-pool";
|
||||
};
|
||||
};
|
||||
};
|
||||
@ -105,6 +108,9 @@ in {
|
||||
source.systemctl("start --wait syncoid-pool-syncoid.service")
|
||||
target.succeed("cat /mnt/pool/syncoid/test.txt")
|
||||
|
||||
source.systemctl("start --wait syncoid-pool.service")
|
||||
target.succeed("[[ -d /mnt/pool/full-pool/syncoid ]]")
|
||||
|
||||
assert len(source.succeed("zfs allow pool")) == 0, "Pool shouldn't have delegated permissions set after syncing snapshots"
|
||||
assert len(source.succeed("zfs allow pool/sanoid")) == 0, "Sanoid dataset shouldn't have delegated permissions set after syncing snapshots"
|
||||
assert len(source.succeed("zfs allow pool/syncoid")) == 0, "Syncoid dataset shouldn't have delegated permissions set after syncing snapshots"
|
||||
|
||||
@ -24,6 +24,10 @@ buildGoModule rec {
|
||||
"-X ${t}/util.CommitHash=${src.rev}"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
go generate ./runtime
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
installManPage assets/packaging/micro.1
|
||||
install -Dt $out/share/applications assets/packaging/micro.desktop
|
||||
|
||||
@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
|
||||
owner = "vv9k";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-JSKenJEM+FUk/2BtAstIhJ26kFBRDvvFAlBsb0ltUsY=";
|
||||
sha256 = "sha256-BrJkG1OYpkAfBYUfLn/CNDBc0n1tW5OLnpobkPABQow=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-hFay+XL2oqA7SC+I3wlrzhUmUitO2vbeqfoArU9Jsp4=";
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nali";
|
||||
version = "0.5.0";
|
||||
version = "0.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zu1k";
|
||||
repo = "nali";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rK+UKECwG+2WcltV4zhODSFZ1EGkmLTBggLgKGMCAGI=";
|
||||
sha256 = "sha256-mKZQe+VuhXm5N2SAOfHUlPK6wJPa8Cd+wgDjqSGbR7I=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-pIJsCBevCVMg6NXc96f6hAbFK5VKwjFwCe34A+54NW8=";
|
||||
vendorSha256 = "sha256-iNgYU/OgdbKscIA9dIVKqV5tiyLaC3Q4D3W1QsW7CWg=";
|
||||
subPackages = [ "." ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ fetchFromGitHub, lib, python3, stdenvNoCC }:
|
||||
{ lib, stdenvNoCC, fetchFromGitHub, python3 }:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "mpv_thumbnail_script";
|
||||
version = "unstable-2020-01-16";
|
||||
version = "0.4.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "theamm";
|
||||
owner = "marzzzello";
|
||||
repo = pname;
|
||||
rev = "682becf5b5115c2a206b4f0bdee413d4be8b5bef";
|
||||
rev = version;
|
||||
sha256 = "0dgfrb8ypc5vlq35kzn423fm6l6348ivl85vb6j3ccc9a51xprw3";
|
||||
};
|
||||
|
||||
@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "A lua script to show preview thumbnails in mpv's OSC seekbar";
|
||||
homepage = "https://github.com/theamm/mpv_thumbnail_script";
|
||||
homepage = "https://github.com/marzzzello/mpv_thumbnail_script";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchgit, mpfr, m4, binutils, emacs, zlib, which
|
||||
, texinfo, libX11, xorgproto, libXi, gmp, readline, strace
|
||||
, texinfo, libX11, xorgproto, libXi, gmp, readline
|
||||
, libXext, libXt, libXaw, libXmu } :
|
||||
|
||||
assert stdenv ? cc ;
|
||||
@ -7,34 +7,32 @@ assert stdenv.cc.isGNU ;
|
||||
assert stdenv.cc ? libc ;
|
||||
assert stdenv.cc.libc != null ;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gcl";
|
||||
version = "2.6.13pre50";
|
||||
version = "2.6.13pre124";
|
||||
|
||||
src = fetchgit {
|
||||
sha256 = "0vpxb6z5g9fjavrgx8gz8fsjvskfz64f63qibh5s00fvvndlwi88";
|
||||
sha256 = "sha256-e4cUQlNSfdz+B3urlZ82pf7fTc6aoloUyDDorAUi5kc=";
|
||||
url = "https://git.savannah.gnu.org/r/gcl.git";
|
||||
rev = "refs/tags/Version_2_6_13pre50";
|
||||
rev = "refs/tags/Version_${builtins.replaceStrings ["."] ["_"] version}";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -e 's/<= obj-date/<= (if (= 0 obj-date) 1 obj-date)/' -i lsp/make.lisp
|
||||
''
|
||||
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=902475
|
||||
+ ''
|
||||
substituteInPlace h/elf64_i386_reloc.h \
|
||||
--replace 'case R_X86_64_PC32:' 'case R_X86_64_PC32: case R_X86_64_PLT32:'
|
||||
'';
|
||||
|
||||
sourceRoot = "gcl/gcl";
|
||||
|
||||
# breaks when compiling in parallel
|
||||
enableParallelBuilding = false;
|
||||
|
||||
patches = [];
|
||||
|
||||
buildInputs = [
|
||||
mpfr m4 binutils emacs gmp
|
||||
libX11 xorgproto libXi
|
||||
libXext libXt libXaw libXmu
|
||||
zlib which texinfo readline strace
|
||||
zlib which texinfo readline
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@ -22,13 +22,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "folly";
|
||||
version = "2022.08.08.00";
|
||||
version = "2022.08.15.00";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "folly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-shgqM7hUz0uHOtaXSSdnsQW0eUvCUAo3mtq0EISeQgU=";
|
||||
sha256 = "sha256-GJYjilN2nwKEpuWj2NJQ25hT9lI2pdkWzgfLBph5mmU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, withJitSealloc ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -17,9 +18,9 @@ stdenv.mkDerivation rec {
|
||||
"--enable-pcre2-32"
|
||||
# only enable jit on supported platforms which excludes Apple Silicon, see https://github.com/zherczeg/sljit/issues/51
|
||||
"--enable-jit=auto"
|
||||
# fix pcre jit in systemd units that set MemoryDenyWriteExecute=true like gitea
|
||||
"--enable-jit-sealloc"
|
||||
];
|
||||
]
|
||||
# fix pcre jit in systemd units that set MemoryDenyWriteExecute=true like gitea
|
||||
++ lib.optional withJitSealloc "--enable-jit-sealloc";
|
||||
|
||||
outputs = [ "bin" "dev" "out" "doc" "man" "devdoc" ];
|
||||
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
, qtwebchannel
|
||||
, qtpositioning
|
||||
, qtwebsockets
|
||||
, buildPackages
|
||||
, bison
|
||||
, coreutils
|
||||
, flex
|
||||
@ -105,6 +106,9 @@ qtModule rec {
|
||||
patchShebangs .
|
||||
)
|
||||
|
||||
substituteInPlace cmake/Functions.cmake \
|
||||
--replace "/bin/bash" "${buildPackages.bash}/bin/bash"
|
||||
|
||||
sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \
|
||||
src/3rdparty/chromium/device/udev_linux/udev?_loader.cc
|
||||
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Wand";
|
||||
version = "0.6.9";
|
||||
version = "0.6.10";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-QCdOiCmo21P9vjKPWAV6Wrfi664Hx3uJ8V44B2mLtbw=";
|
||||
sha256 = "sha256-Nz9KfyhmyGjDHOkQ4fmzapLRMmQKIAaOwXzqMoT+3Fc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bleak-retry-connector";
|
||||
version = "1.7.2";
|
||||
version = "1.8.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qRUS+JJWd2MPXa5Bs2WzZIHk6VcPe75yBoArFGk2yHQ=";
|
||||
hash = "sha256-wtzZ94nHfVtX8YakMLGxhqvn95v93qL2Qz9OeBRB520=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-access-context-manager";
|
||||
version = "0.1.13";
|
||||
version = "0.1.14";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-AnWAJyvLU4vurVv9uJvi2fkl0Sk1nCK5iNxSplxflHs=";
|
||||
hash = "sha256-GFS9VvdXHxP1KvJzQkgjmYXO3qpMXl8yICGZEr18O8M=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -3,8 +3,11 @@
|
||||
, buildPythonPackage
|
||||
, numpy
|
||||
, scipy
|
||||
, pytorch
|
||||
, autograd
|
||||
, nose2
|
||||
, matplotlib
|
||||
, tensorflow
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -18,14 +21,22 @@ buildPythonPackage rec {
|
||||
sha256 = "sha256-dqyduExNgXIbEFlgkckaPfhLFSVLqPgwAOyBUdowwiQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy scipy ];
|
||||
checkInputs = [ nose2 autograd ];
|
||||
propagatedBuildInputs = [ numpy scipy pytorch ];
|
||||
checkInputs = [ nose2 autograd matplotlib tensorflow ];
|
||||
|
||||
checkPhase = ''
|
||||
# nose2 doesn't properly support excludes
|
||||
rm tests/test_{problem,tensorflow,theano}.py
|
||||
runHook preCheck
|
||||
# FIXME: Some numpy regression?
|
||||
# Traceback (most recent call last):
|
||||
# File "/build/source/tests/manifolds/test_hyperbolic.py", line 270, in test_second_order_function_approximation
|
||||
# self.run_hessian_approximation_test()
|
||||
# File "/build/source/tests/manifolds/_manifold_tests.py", line 29, in run_hessian_approximation_test
|
||||
# assert np.allclose(np.linalg.norm(error), 0) or (2.95 <= slope <= 3.05)
|
||||
# AssertionError
|
||||
rm tests/manifolds/test_hyperbolic.py
|
||||
|
||||
nose2 tests -v
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "pymanopt" ];
|
||||
|
||||
@ -2,17 +2,17 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "backblaze-b2";
|
||||
version = "3.2.0";
|
||||
version = "3.5.0";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit version;
|
||||
pname = "b2";
|
||||
sha256 = "sha256-dE4eLTNU6O0DscwN8+m1UaG46dbI0DiWzeJK49GUvKA=";
|
||||
sha256 = "sha256-vyqExulsV0wDijLotPO3RAOk9o4ne0Vq74KJKhSBrvo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace requirements.txt \
|
||||
--replace 'docutils==0.16' 'docutils'
|
||||
--replace 'tabulate==0.8.10' 'tabulate'
|
||||
substituteInPlace setup.py \
|
||||
--replace 'setuptools_scm<6.0' 'setuptools_scm'
|
||||
'';
|
||||
@ -27,18 +27,27 @@ python3Packages.buildPythonApplication rec {
|
||||
setuptools
|
||||
docutils
|
||||
rst2ansi
|
||||
tabulate
|
||||
];
|
||||
|
||||
checkInputs = with python3Packages; [
|
||||
backoff
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# require network
|
||||
"test_files_headers"
|
||||
"test_copy_file_by_id"
|
||||
"test_integration"
|
||||
"test_get_account_info"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# requires network
|
||||
"test/integration/test_b2_command_line.py"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
@ -54,6 +63,6 @@ python3Packages.buildPythonApplication rec {
|
||||
description = "Command-line tool for accessing the Backblaze B2 storage service";
|
||||
homepage = "https://github.com/Backblaze/B2_Command_Line_Tool";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ hrdinka kevincox ];
|
||||
maintainers = with maintainers; [ hrdinka kevincox tomhoule ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "esbuild";
|
||||
version = "0.15.2";
|
||||
version = "0.15.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanw";
|
||||
repo = "esbuild";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-VYW3XQvwxeUnfNMXFcqB6xhh45YgTv4Iu6ce6MEclpw=";
|
||||
sha256 = "sha256-UjvVaBeKrZ9T/pFQVdIYFHCsmAO+332Q8Gz0bPEfzgw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "universal-ctags";
|
||||
version = "5.9.20220710.0";
|
||||
version = "5.9.20220814.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "universal-ctags";
|
||||
repo = "ctags";
|
||||
rev = "p${version}";
|
||||
sha256 = "sha256-/7g1AGLbl49s8hbwy3IGwshKAGKRJrdbECau2acMtjE=";
|
||||
sha256 = "sha256-U1PjmBb99v7N+Dd7n2r1Xx09yflf0OxRlb4f1Sg0UvI=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
@ -2,15 +2,15 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "refinery-cli";
|
||||
version = "0.8.5";
|
||||
version = "0.8.6";
|
||||
|
||||
src = fetchCrate {
|
||||
pname = "refinery_cli";
|
||||
inherit version;
|
||||
sha256 = "sha256-I9YjMsl70eiws4ea0P9oqOsNzN+gfO5Jwr7VlFCltq8=";
|
||||
sha256 = "sha256-vT/iM+o9ZrotiBz6mq9IVVJAkK97QUlOiZp6tg3O8pI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-Ehofdr6UNtOwRT0QVFaXDrWFRPqdF9eA8eL/hRwIJUM=";
|
||||
cargoSha256 = "sha256-DMQr0Qtr2c3BHWqTb+IW2cV1fwWIFMY5koR2GPceYHQ=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
37
pkgs/servers/snappymail/default.nix
Normal file
37
pkgs/servers/snappymail/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ lib, stdenv, fetchurl, writeText
|
||||
, dataPath ? "/var/lib/snappymail" }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "snappymail";
|
||||
version = "2.17.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz";
|
||||
sha256 = "sha256-Z8By/X4IheOyCT7F4KArBN+CFUTcSn0VZchcYhAJsCU=";
|
||||
};
|
||||
|
||||
sourceRoot = "snappymail";
|
||||
|
||||
includeScript = writeText "include.php" ''
|
||||
<?php
|
||||
|
||||
# the trailing `/` is important here
|
||||
define('APP_DATA_FOLDER_PATH', '${dataPath}/');
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir $out
|
||||
cp -r ../* $out
|
||||
rm -rf $out/{data,env-vars,_include.php}
|
||||
cp ${includeScript} $out/include.php
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple, modern & fast web-based email client";
|
||||
|
||||
homepage = "https://snappymail.eu";
|
||||
downloadPage = "https://github.com/the-djmaze/snappymail/releases";
|
||||
license = licenses.agpl3;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ mic92 ];
|
||||
};
|
||||
}
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xprintidle";
|
||||
version = "0.2.4";
|
||||
version = "0.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "g0hl1n";
|
||||
repo = "xprintidle";
|
||||
rev = version;
|
||||
sha256 = "sha256-CgjHTvwQKR/TPQyEWKxN5j97Sh2iec0BQPhC96sfyoI=";
|
||||
sha256 = "sha256-bafDUZoSFsJ3g6mtLCRechGizfrWg2qW2vnlfIzj7mQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,32 +2,54 @@
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, pkg-config
|
||||
, libxcb
|
||||
# Darwin dependencies
|
||||
, openssl
|
||||
# Darwin dependencies
|
||||
, AppKit
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "didyoumean";
|
||||
version = "1.1.0";
|
||||
version = "1.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hisbaan";
|
||||
repo = "didyoumean";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-t2bmvz05vWIxQhC474q/9uky1kAQoFN8Z+qflw5Vj68=";
|
||||
sha256 = "sha256-hHl9PGNDFN7Dad2JOlAy99dz0pC9OmphwYMJHBBwx7Y=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-4DbziI9enib4pm9/P4WEu15glIxtejaV2GCqbzuxxyw=";
|
||||
cargoSha256 = "sha256-rjkj9MO6fXVOk3fA87olGt/iIaJ8Zv/cy/Cqy/pg6yI=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isLinux [ libxcb ]
|
||||
++ lib.optionals stdenv.isDarwin [ AppKit ];
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isLinux [
|
||||
libxcb
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
AppKit
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
installManPage man/dym.1
|
||||
installShellCompletion completions/dym.{bash,fish}
|
||||
installShellCompletion --zsh completions/_dym
|
||||
'';
|
||||
|
||||
# Clipboard doesn't exist in test environment
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A CLI spelling corrector for when you're unsure";
|
||||
homepage = "https://github.com/hisbaan/didyoumean";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ evanjs ];
|
||||
maintainers = with maintainers; [ evanjs wegank ];
|
||||
mainProgram = "dym";
|
||||
};
|
||||
}
|
||||
|
||||
@ -4,10 +4,8 @@
|
||||
, rustPlatform
|
||||
, installShellFiles
|
||||
, libiconv
|
||||
, libgit2
|
||||
, cmake
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, nixosTests
|
||||
, Security
|
||||
, Foundation
|
||||
@ -16,19 +14,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "starship";
|
||||
version = "1.10.0";
|
||||
version = "1.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "starship";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mumlnY9KGKdS3x4U84J4I8m5uMJI7SZR52aT6DPi/MM=";
|
||||
sha256 = "sha256-ujv2lqhzsug9Qpco+4doMGH+0yG5cZZzLmSLr0MBmZk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles cmake ]
|
||||
++ lib.optionals stdenv.isLinux [ pkg-config ];
|
||||
nativeBuildInputs = [ installShellFiles cmake ];
|
||||
|
||||
buildInputs = [ libgit2 ] ++ lib.optionals stdenv.isDarwin [ libiconv Security Foundation Cocoa ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security Foundation Cocoa ];
|
||||
|
||||
buildNoDefaultFeatures = true;
|
||||
# the "notify" feature is currently broken on darwin
|
||||
@ -41,15 +38,7 @@ rustPlatform.buildRustPackage rec {
|
||||
--zsh <($out/bin/starship completions zsh)
|
||||
'';
|
||||
|
||||
cargoPatches = [
|
||||
# Bump chrono dependency to fix panic when no timezone
|
||||
(fetchpatch {
|
||||
url = "https://github.com/starship/starship/commit/e652e8643310c3b41ce19ad05b8168abc29bb683.patch";
|
||||
sha256 = "sha256-iGYLJuptPMc45E7o+GXjIx7y2PxuO1mGM7xSopDBve0=";
|
||||
})
|
||||
];
|
||||
|
||||
cargoSha256 = "sha256-w7UCExSkgEY52D98SSe2EkuiwtjM6t0/uTiafrtEBaU=";
|
||||
cargoSha256 = "sha256-iZvjU/GzC/ssXcd+UeV57IA0hKT45cQ09VBB4BNYw50=";
|
||||
|
||||
preCheck = ''
|
||||
HOME=$TMPDIR
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rustcat";
|
||||
version = "2.0.0";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "robiot";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-aoeinz1XVJ+MNt8ndV/HnKLdwa7rXwxIZucCkZCnNaM=";
|
||||
sha256 = "sha256-/6vNFh7n6WvYerrL8m9sgUKsO2KKj7/f8xc4rzHy9Io=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-cQxBM8m0sy9WKvKqyY/sNE3p4l2v9zdx80mReQEAoc8=";
|
||||
cargoSha256 = "sha256-wqoU9UfXDmf7KIHgFif5rZfZY8Zu0SsaMVfwTtXLzHg=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
|
||||
@ -19,14 +19,14 @@ with lib;
|
||||
let
|
||||
go-d-plugin = callPackage ./go.d.plugin.nix {};
|
||||
in stdenv.mkDerivation rec {
|
||||
version = "1.36.0";
|
||||
version = "1.36.1";
|
||||
pname = "netdata";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netdata";
|
||||
repo = "netdata";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ir8NO150PgDEaWjTvXuSZMIK3qwZrGyPuGHxLIBfCfU=";
|
||||
sha256 = "sha256-Msbzfcxq9hqerA9eXuMle+pAhDAAWWE/v0DKXgnhEnM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -4,16 +4,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "guest-agent";
|
||||
version = "20220104.00";
|
||||
version = "20220713.00";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleCloudPlatform";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-BC2qpnGJU/D0z8jlmAEwvmFwBk1n0ZvqPBB6Zon9N/U=";
|
||||
sha256 = "sha256-6N6ikAIpqbtNgD6TTASbMzCJcBc7D3ziE4YvQmTb1Go=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-YcWKSiN715Z9lmNAQx+sHEgxWnhFhenCNXBS7gdMV4M=";
|
||||
vendorSha256 = "sha256-JZfplQGwe+UCzdMLMD+9JJ2ksK9dZ6scz2jl0XoZ9rI=";
|
||||
|
||||
patches = [ ./disable-etc-mutation.patch ];
|
||||
|
||||
|
||||
@ -14912,6 +14912,9 @@ with pkgs;
|
||||
# Import PHP81 interpreter, extensions and packages
|
||||
php81 = callPackage ../development/interpreters/php/8.1.nix {
|
||||
stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
|
||||
pcre2 = pcre2.override {
|
||||
withJitSealloc = false; # Needed to avoid crashes, see https://bugs.php.net/bug.php?id=78630
|
||||
};
|
||||
};
|
||||
php81Extensions = recurseIntoAttrs php81.extensions;
|
||||
php81Packages = recurseIntoAttrs php81.packages;
|
||||
@ -14919,6 +14922,9 @@ with pkgs;
|
||||
# Import PHP80 interpreter, extensions and packages
|
||||
php80 = callPackage ../development/interpreters/php/8.0.nix {
|
||||
stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
|
||||
pcre2 = pcre2.override {
|
||||
withJitSealloc = false; # Needed to avoid crashes, see https://bugs.php.net/bug.php?id=78630
|
||||
};
|
||||
};
|
||||
php80Extensions = recurseIntoAttrs php80.extensions;
|
||||
php80Packages = recurseIntoAttrs php80.packages;
|
||||
@ -21256,6 +21262,8 @@ with pkgs;
|
||||
|
||||
snappy = callPackage ../development/libraries/snappy { };
|
||||
|
||||
snappymail = callPackage ../servers/snappymail { };
|
||||
|
||||
snow = callPackage ../tools/security/snow { };
|
||||
|
||||
snowcrash = callPackage ../tools/security/snowcrash { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user