Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -1915,7 +1915,10 @@
|
||||
<para>
|
||||
<literal>services.xserver.desktopManager.xfce</literal> now
|
||||
includes Xfce’s screen locker,
|
||||
<literal>xfce4-screensaver</literal>.
|
||||
<literal>xfce4-screensaver</literal> that is enabled by
|
||||
default. You can disable it by setting
|
||||
<literal>false</literal> to
|
||||
<link linkend="opt-services.xserver.desktopManager.xfce.enableScreensaver">services.xserver.desktopManager.xfce.enableScreensaver</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
|
||||
@@ -650,7 +650,7 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
- xfsprogs was update to version 5.15, which enables inobtcount and bigtime by default on filesystem creation. Support for these features was added in kernel 5.10 and deemed stable in kernel 5.15.
|
||||
If you want to be able to mount XFS filesystems created with this release of xfsprogs on kernel releases older than 5.10, you need to format them with `mkfs.xfs -m bigtime=0 -m inobtcount=0`.
|
||||
|
||||
- `services.xserver.desktopManager.xfce` now includes Xfce's screen locker, `xfce4-screensaver`.
|
||||
- `services.xserver.desktopManager.xfce` now includes Xfce's screen locker, `xfce4-screensaver` that is enabled by default. You can disable it by setting `false` to [services.xserver.desktopManager.xfce.enableScreensaver](#opt-services.xserver.desktopManager.xfce.enableScreensaver).
|
||||
|
||||
- The `hadoop` package has added support for `aarch64-linux` and `aarch64-darwin` as of 3.3.1 ([#158613](https://github.com/NixOS/nixpkgs/pull/158613)).
|
||||
|
||||
|
||||
@@ -66,6 +66,12 @@ in
|
||||
default = true;
|
||||
description = "Enable the XFWM (default) window manager.";
|
||||
};
|
||||
|
||||
enableScreensaver = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = "Enable the XFCE screensaver.";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -99,7 +105,6 @@ in
|
||||
ristretto
|
||||
xfce4-appfinder
|
||||
xfce4-notifyd
|
||||
xfce4-screensaver
|
||||
xfce4-screenshooter
|
||||
xfce4-session
|
||||
xfce4-settings
|
||||
@@ -123,7 +128,7 @@ in
|
||||
] ++ optionals (!cfg.noDesktop) [
|
||||
xfce4-panel
|
||||
xfdesktop
|
||||
];
|
||||
] ++ optional cfg.enableScreensaver xfce4-screensaver;
|
||||
|
||||
environment.pathsToLink = [
|
||||
"/share/xfce4"
|
||||
@@ -169,6 +174,6 @@ in
|
||||
xfce4-notifyd
|
||||
];
|
||||
|
||||
security.pam.services.xfce4-screensaver.unixAuth = true;
|
||||
security.pam.services.xfce4-screensaver.unixAuth = cfg.enableScreensaver;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "lightning-loop";
|
||||
version = "0.17.0-beta";
|
||||
version = "0.18.0-beta";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lightninglabs";
|
||||
repo = "loop";
|
||||
rev = "v${version}";
|
||||
sha256 = "0hjawagn1dfgj67i52bvf3phvm9f9708z3jqs6cvyz0w7vp107py";
|
||||
sha256 = "1kg5nlvb4lb3cjn84wcylhq0l73d2n6rg4n1srnxmgs96v41y78f";
|
||||
};
|
||||
|
||||
vendorSha256 = "1fpc73hwdn3baz5ykrykvqdr5861gj9p6liy8qll5525kdv560f6";
|
||||
vendorSha256 = "0q3wbjfaqdj29sjlhx6fhc0p4d12aa31s6ia36jalcvf659ybb0l";
|
||||
|
||||
subPackages = [ "cmd/loop" "cmd/loopd" ];
|
||||
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "drawio";
|
||||
version = "17.2.4";
|
||||
version = "17.4.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm";
|
||||
sha256 = "sha256-dKl7DxNneoQEL+QhZmpfQCd15RoeDRnkZt3sv8t2KM4=";
|
||||
sha256 = "294f99d9060bc394490b20d2ddab75ed5c0166d7960850f065eb8897ef31a2e3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "geeqie";
|
||||
version = "1.7.2";
|
||||
version = "1.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BestImageViewer";
|
||||
repo = "geeqie";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Abr7trlms6bxOAqE6xNKRv51TBGNilNdBhUZUg7OTKY=";
|
||||
sha256 = "sha256-O+yz/uNxueR+naEJG8EZ+k/JutRjJ5wwbB9DYb8YNLw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
# Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs.
|
||||
let
|
||||
pname = "zettlr";
|
||||
version = "2.2.4";
|
||||
version = "2.2.5";
|
||||
name = "${pname}-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage";
|
||||
sha256 = "sha256-lzXciToyUsHl8WV0IvdP6R2pYegL7/G04YPLb6gbCgQ=";
|
||||
sha256 = "sha256-KP3lt0CweT1f/BR3IpnjwCqNvhFbrpz9KLg6K8OMs+I=";
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
inherit name src;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -46,12 +46,12 @@ assert with lib.strings; (
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "palemoon";
|
||||
version = "29.4.5.1";
|
||||
version = "29.4.6";
|
||||
|
||||
src = fetchzip {
|
||||
name = "${pname}-${version}";
|
||||
url = "http://archive.palemoon.org/source/${pname}-${version}.source.tar.xz";
|
||||
sha256 = "sha256-IC7E88dECAz2diVLEEdjMltpNMBhPTlPvbz05BniBMI=";
|
||||
sha256 = "sha256-6bI3AnIhp0x3BCgTvmbOXDBGrJXg3cN+AmwI8XCKD8g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -46,12 +46,12 @@ with lib;
|
||||
# Those pieces of software we entirely ignore upstream's handling of, and just
|
||||
# make sure they're in the path if desired.
|
||||
let
|
||||
k3sVersion = "1.23.4+k3s1"; # k3s git tag
|
||||
k3sCommit = "43b1cb48200d8f6af85c16ed944d68fcc96b6506"; # k3s git commit at the above version
|
||||
k3sRepoSha256 = "1sn7rd5hqfqvwj036blk0skmq6r8igbmiqk1dnpaqnkkddpzdgmc";
|
||||
k3sVendorSha256 = "sha256-1/kQvNqFUWwch1JH+twWzBdjNYseoZyVObB1+s9WPM4=";
|
||||
k3sVersion = "1.23.5+k3s1"; # k3s git tag
|
||||
k3sCommit = "313aaca547f030752788dce696fdf8c9568bc035"; # k3s git commit at the above version
|
||||
k3sRepoSha256 = "0vk72609cyyh64irp14jp2zspnxw34jm710cbwgklx0ch6kiz88d";
|
||||
k3sVendorSha256 = "sha256-d7kQsJi/eQbaTUDglp3gFpc5Im6CyD9coKeM3kMrbjI=";
|
||||
|
||||
k3sServerVendorSha256 = "sha256-2KIFff43jfqWdxX61aWofrjmc5mMkr5aEJRFdGpLyU8=";
|
||||
k3sServerVendorSha256 = "sha256-E3USXNuXY0lzZH+t3O7BOQ8rKNNQ6avOMItgOEi1cEg=";
|
||||
|
||||
# taken from ./manifests/traefik.yaml, extracted from '.spec.chart' https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/download#L9
|
||||
# The 'patch' and 'minor' versions are currently hardcoded as single digits only, so ignore the trailing two digits. Weird, I know.
|
||||
@@ -68,8 +68,8 @@ let
|
||||
|
||||
# taken from go.mod, the 'github.com/containerd/containerd' line
|
||||
# run `grep github.com/containerd/containerd go.mod | head -n1 | awk '{print $4}'`
|
||||
containerdVersion = "1.5.9-k3s1";
|
||||
containerdSha256 = "09wfy20z3c9fnla353pibpsb10xzl0f4xwp8qdjh3fwa1q2626gg";
|
||||
containerdVersion = "1.5.10-k3s1";
|
||||
containerdSha256 = "1ff2sfaqpjimq7w0lprci6ibyi6v65ap6b9sr6b0j12gqr2sqwa5";
|
||||
|
||||
# run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag
|
||||
criCtlVersion = "1.22.0-k3s1";
|
||||
@@ -228,9 +228,24 @@ buildGoModule rec {
|
||||
|
||||
patches = [
|
||||
./patches/0001-scrips-download-strip-downloading-just-package-CRD.patch
|
||||
./patches/0002-Don-t-build-a-static-binary-in-package-cli.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Nix prefers dynamically linked binaries over static binary.
|
||||
|
||||
substituteInPlace scripts/package-cli \
|
||||
--replace '"$LDFLAGS $STATIC" -o' \
|
||||
'"$LDFLAGS" -o' \
|
||||
--replace "STATIC=\"-extldflags \'-static\'\"" \
|
||||
""
|
||||
|
||||
# Upstream codegen fails with trimpath set. Removes "trimpath" for 'go generate':
|
||||
|
||||
substituteInPlace scripts/package-cli \
|
||||
--replace '"''${GO}" generate' \
|
||||
'GOFLAGS="" "''${GO}" generate'
|
||||
'';
|
||||
|
||||
# Important utilities used by the kubelet, see
|
||||
# https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-237202494
|
||||
# Note the list in that issue is stale and some aren't relevant for k3s.
|
||||
|
||||
-37
@@ -1,37 +0,0 @@
|
||||
From 49c000c7c5dd7a502a2be4c638d2c32b65673c00 Mon Sep 17 00:00:00 2001
|
||||
From: Euan Kemp <euank@euank.com>
|
||||
Date: Sun, 6 Feb 2022 23:13:00 -0800
|
||||
Subject: [PATCH] Don't build a static binary in package-cli
|
||||
|
||||
since nixpkgs prefers dynamically linked binaries.
|
||||
|
||||
Also remove "trimpath" for the 'go generate' step because the codegen
|
||||
they use doesn't work with trimpath set.
|
||||
---
|
||||
scripts/package-cli | 5 ++---
|
||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/scripts/package-cli b/scripts/package-cli
|
||||
index 28927327b7..95dbb469f1 100755
|
||||
--- a/scripts/package-cli
|
||||
+++ b/scripts/package-cli
|
||||
@@ -48,14 +48,13 @@ fi
|
||||
|
||||
CMD_NAME=dist/artifacts/k3s${BIN_SUFFIX}
|
||||
|
||||
-"${GO}" generate
|
||||
+GOFLAGS="" "${GO}" generate
|
||||
LDFLAGS="
|
||||
-X github.com/rancher/k3s/pkg/version.Version=$VERSION
|
||||
-X github.com/rancher/k3s/pkg/version.GitCommit=${COMMIT:0:8}
|
||||
-w -s
|
||||
"
|
||||
-STATIC="-extldflags '-static'"
|
||||
-CGO_ENABLED=0 "${GO}" build -ldflags "$LDFLAGS $STATIC" -o ${CMD_NAME} ./cmd/k3s/main.go
|
||||
+CGO_ENABLED=0 "${GO}" build -ldflags "$LDFLAGS" -o ${CMD_NAME} ./cmd/k3s/main.go
|
||||
|
||||
stat ${CMD_NAME}
|
||||
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
{ callPackage, fetchurl, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "2.5.0";
|
||||
# make sure you test also -A pythonPackages.protobuf
|
||||
src = fetchurl {
|
||||
url = "http://protobuf.googlecode.com/files/${version}.tar.bz2";
|
||||
sha256 = "0xxn9gxhvsgzz2sgmihzf6pf75clr05mqj6218camwrwajpcbgqk";
|
||||
};
|
||||
})
|
||||
@@ -1,61 +0,0 @@
|
||||
{ lib, stdenv, version, src
|
||||
, autoreconfHook, zlib, gtest
|
||||
, ...
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "protobuf";
|
||||
inherit version;
|
||||
|
||||
inherit src;
|
||||
|
||||
postPatch = ''
|
||||
rm -rf gtest
|
||||
cp -r ${gtest.src}/googletest gtest
|
||||
chmod -R a+w gtest
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace src/google/protobuf/testing/googletest.cc \
|
||||
--replace 'tmpnam(b)' '"'$TMPDIR'/foo"'
|
||||
'';
|
||||
|
||||
outputs = [ "out" "lib" ];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [ zlib ];
|
||||
|
||||
# The generated C++ code uses static initializers which mutate a global data
|
||||
# structure. This causes problems for an executable when:
|
||||
#
|
||||
# 1) it dynamically links to two libs, both of which contain generated C++ for
|
||||
# the same proto file, and
|
||||
# 2) the two aforementioned libs both dynamically link to libprotobuf.
|
||||
#
|
||||
# One solution is to statically link libprotobuf, that way the global
|
||||
# variables are not shared; in fact, this is necessary for the python Mesos
|
||||
# binding to not crash, as the python lib contains two C extensions which
|
||||
# both refer to the same proto schema.
|
||||
#
|
||||
# See: https://github.com/NixOS/nixpkgs/pull/19064#issuecomment-255082684
|
||||
# https://github.com/google/protobuf/issues/1489
|
||||
dontDisableStatic = true;
|
||||
configureFlags = [
|
||||
"CFLAGS=-fPIC"
|
||||
"CXXFLAGS=-fPIC"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Protocol Buffers - Google's data interchange format";
|
||||
longDescription =
|
||||
'' Protocol Buffers are a way of encoding structured data in an
|
||||
efficient yet extensible format. Google uses Protocol Buffers for
|
||||
almost all of its internal RPC protocols and file formats.
|
||||
'';
|
||||
license = "mBSD";
|
||||
homepage = "https://developers.google.com/protocol-buffers/";
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
||||
passthru.version = version;
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
{ lib, stdenv, fetchurl, cmake, openssl, pkg-config, qtbase }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qca-qt5";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.kde.org/stable/qca/${version}/qca-${version}.tar.xz";
|
||||
sha256 = "sha256-RpdgAjfEvDqXnofSzIBiTyewYoDmNfXZDsfdTSqfYG0=";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl qtbase ];
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
# tells CMake to use this CA bundle file if it is accessible
|
||||
preConfigure = "export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt";
|
||||
|
||||
# tricks CMake into using this CA bundle file if it is not accessible (in a sandbox)
|
||||
cmakeFlags = [ "-Dqca_CERTSTORE=/etc/ssl/certs/ca-certificates.crt" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Qt 5 Cryptographic Architecture";
|
||||
homepage = "http://delta.affinix.com/qca";
|
||||
maintainers = with maintainers; [ ttuegel ];
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = with platforms; unix;
|
||||
};
|
||||
}
|
||||
@@ -26,5 +26,8 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with maintainers; [ ttuegel ];
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = with platforms; unix;
|
||||
# until macOS SDK supports Qt 5.15, 2.3.2 is the highest version of qca-qt5
|
||||
# that works on darwin
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "apycula";
|
||||
version = "0.3";
|
||||
version = "0.3.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "Apycula";
|
||||
hash = "sha256-Ncecrn5fQW0iAgrE3P7GZTx8E1TiFqiDMhZQSPrDvdk=";
|
||||
hash = "sha256-RoWZt2Ox0XjJ6vmuCCcNCTMfwZnwJ6fSx71fmipmu2c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -12,16 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "chex";
|
||||
# As of 2021-12-29, the latest official version has broken tests with jax 0.2.26:
|
||||
# `AttributeError: module 'jax.interpreters.xla' has no attribute 'xb'`
|
||||
version = "unstable-2021-12-16";
|
||||
version = "0.1.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deepmind";
|
||||
repo = pname;
|
||||
rev = "5adc10e0b4218f8ec775567fca38b68bbad42a3a";
|
||||
sha256 = "00xib6zv9pwid2q7wcr109qj3fa3g3b852skz8444kw7r0qxy7z3";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-NtZYOHByKBcKmhRaNULwaQqxfoPRmgbtJ3cFHNfy4E8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "deepmind";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qvKMeGPiWXvvyV+GZdTWdsC6Wp08AmP8nDtWk7sZtqM=";
|
||||
hash = "sha256-qvKMeGPiWXvvyV+GZdTWdsC6Wp08AmP8nDtWk7sZtqM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@@ -32,6 +32,7 @@ buildPythonPackage rec {
|
||||
checkInputs = [
|
||||
chex
|
||||
cloudpickle
|
||||
dill
|
||||
dm-tree
|
||||
jaxlib
|
||||
pytest-xdist
|
||||
@@ -55,6 +56,11 @@ buildPythonPackage rec {
|
||||
"haiku/_src/integration/jax2tf_test.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# See https://github.com/deepmind/dm-haiku/issues/366.
|
||||
"test_jit_Recurrent"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Haiku is a simple neural network library for JAX developed by some of the authors of Sonnet.";
|
||||
homepage = "https://github.com/deepmind/dm-haiku";
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "luxtronik";
|
||||
version = "0.3.11";
|
||||
version = "0.3.12";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "Bouni";
|
||||
repo = "python-luxtronik";
|
||||
rev = version;
|
||||
sha256 = "sha256-pngtkEuWmOD1MG7/Bh+8iqCxU0l/fGHA8uZxYoxOE5Y=";
|
||||
sha256 = "sha256-qQwMahZ3EzXzI7FyTL71WzDpLqmIgVYxiJ0IGvlw8dY=";
|
||||
};
|
||||
|
||||
# Project has no tests
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pex";
|
||||
version = "2.1.78";
|
||||
version = "2.1.79";
|
||||
format = "flit";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-1bWAEMMBjmyLS1W+VWgD9BsZq5f0DmEOQryXH9vupCY=";
|
||||
hash = "sha256-XIqof/RZL1dmfPU6NVtkf18zrkG5RPOesGfsDDrPhQ8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "phonenumbers";
|
||||
version = "8.12.44";
|
||||
version = "8.12.46";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Js/QJX0XBP4viMr/LKq7cNFqh3seZbaq5R+fu+EKqM4=";
|
||||
sha256 = "sha256-HEQPYzbLSYk/8agybHC032k4Aq6YHyEPVFzUIVrEgTM=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@@ -9,6 +9,8 @@
|
||||
, future
|
||||
, imagemagick
|
||||
, importlib-resources
|
||||
, jax
|
||||
, jaxlib
|
||||
, jinja2
|
||||
, langdetect
|
||||
, lib
|
||||
@@ -78,6 +80,8 @@ buildPythonPackage rec {
|
||||
beautifulsoup4
|
||||
ffmpeg
|
||||
imagemagick
|
||||
jax
|
||||
jaxlib
|
||||
jinja2
|
||||
langdetect
|
||||
matplotlib
|
||||
@@ -119,6 +123,9 @@ buildPythonPackage rec {
|
||||
# Requires `tensorflow_io` which is not packaged in `nixpkgs`.
|
||||
"tensorflow_datasets/image/lsun_test.py"
|
||||
|
||||
# Requires `envlogger` which is not packaged in `nixpkgs`.
|
||||
"tensorflow_datasets/rlds/robosuite_panda_pick_place_can/robosuite_panda_pick_place_can_test.py"
|
||||
|
||||
# Fails with `TypeError: Constant constructor takes either 0 or 2 positional arguments`
|
||||
# deep in TF AutoGraph. Doesn't reproduce in Docker with Ubuntu 22.04 => might be related
|
||||
# to the differences in some of the dependencies?
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "appthreat-depscan";
|
||||
version = "2.1.2";
|
||||
version = "2.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AppThreat";
|
||||
repo = "dep-scan";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hRmTx0qs/QnDLl4KhGbKw5Mucq4wQCaCIkeObrZlJSI=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-6ifpPNBcqaNGVQjZQ3G48QuwTRRn4zL3awa06yOeveU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
||||
@@ -3,16 +3,16 @@
|
||||
nixosTests }:
|
||||
buildGoModule rec {
|
||||
pname = "buildkite-agent";
|
||||
version = "3.35.1";
|
||||
version = "3.35.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "buildkite";
|
||||
repo = "agent";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fa32tKOlRuKTONiMboX7CUxeknePsNRC7jlBvAtXmus=";
|
||||
sha256 = "sha256-BpfWeSEX4N77yXfWKpH7KWKsncdOYquxF+L+g13DdiA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-YnOOJDzdirikFbS9451A/TWOSWv04QsqO68/cSXK82k=";
|
||||
vendorSha256 = "sha256-E51LBpNN/N3wH1LMxv/+nnwpQAxHhyDW2jgVIDkNeQ4=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mpris-scrobbler";
|
||||
version = "0.4.0.1";
|
||||
version = "0.4.90";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mariusor";
|
||||
repo = "mpris-scrobbler";
|
||||
rev = "v${version}";
|
||||
sha256 = "0jzmgcb9a19hl8y7iwy8l3cc2vgzi0scw7r5q72kszfyxn0yk2gs";
|
||||
sha256 = "sha256-+Y5d7yFOnSk2gQS/m/01ofbNeDCLXb+cTTlHj4bgO0M=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -26,15 +26,10 @@ rustPlatform.buildRustPackage rec {
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security SystemConfiguration ];
|
||||
|
||||
postInstall = ''
|
||||
HOME=$(mktemp -d)
|
||||
for shell in bash fish zsh; do
|
||||
$out/bin/atuin gen-completions -s $shell -o .
|
||||
done
|
||||
|
||||
installShellCompletion --cmd atuin \
|
||||
--bash atuin.bash \
|
||||
--fish atuin.fish \
|
||||
--zsh _atuin
|
||||
--bash <($out/bin/atuin gen-completions -s bash) \
|
||||
--fish <($out/bin/atuin gen-completions -s fish) \
|
||||
--zsh <($out/bin/atuin gen-completions -s zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "broot";
|
||||
version = "1.9.1";
|
||||
version = "1.11.1";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-oIStnwbfp48QHkSlXgveH9AM2fmmrrSmwdvXxvbV/tg=";
|
||||
sha256 = "sha256-MbyfdzeBo12/7M1F/J7upBQGB/tv1M4sZ+90i/vcLjs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-DOPFVa2w+ldG7fnundBGb+jM0t2E2jS0nJIIzekD2QE=";
|
||||
cargoHash = "sha256-GDU7tL+NDKk46DYnZajcAoPMZxGCrg/IS4xhSZrB6Cs=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2022-04-08";
|
||||
version = "2022-04-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "offensive-security";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-yZ/4ULiNekedF0wUwowq5wcen52NbIsbSzINhKuStzo=";
|
||||
sha256 = "sha256-Ucbw09oFklulyXr8mGO5RskKNZx0rPTA6hPJgYByPAI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nuclei";
|
||||
version = "2.6.5";
|
||||
version = "2.6.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-g78sZDhV2+MgoFkJIrE2RbVLa/aPjbKFFRyKj594Hb0=";
|
||||
sha256 = "sha256-IZxLnJyfF4MF2aTFYDyZoWdhvrd1cUJkGsASqo9KAyk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-/umoSOQ0ehQplxU8OTGJVmTgO+8xPZxVwRBfM67zMh8=";
|
||||
vendorSha256 = "sha256-oiRpxCAdxDjlUUHqRmpAHypmESQJpziOmBtTwKig7nk=";
|
||||
|
||||
modRoot = "./v2";
|
||||
subPackages = [
|
||||
|
||||
@@ -19726,7 +19726,6 @@ with pkgs;
|
||||
protobuf3_7 = callPackage ../development/libraries/protobuf/3.7.nix { };
|
||||
protobuf3_6 = callPackage ../development/libraries/protobuf/3.6.nix { };
|
||||
protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix { };
|
||||
protobuf2_5 = callPackage ../development/libraries/protobuf/2.5.nix { };
|
||||
|
||||
protobufc = callPackage ../development/libraries/protobufc/1.3.nix { };
|
||||
|
||||
|
||||
@@ -176,6 +176,9 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea
|
||||
|
||||
qca-qt5 = callPackage ../development/libraries/qca-qt5 { };
|
||||
|
||||
# Until macOS SDK allows for Qt 5.15, darwin is limited to 2.3.2
|
||||
qca-qt5_2_3_2 = callPackage ../development/libraries/qca-qt5/2.3.2.nix { };
|
||||
|
||||
qcoro = callPackage ../development/libraries/qcoro { };
|
||||
|
||||
qcsxcad = callPackage ../development/libraries/science/electronics/qcsxcad { };
|
||||
|
||||
Reference in New Issue
Block a user