Merge staging-next into staging
This commit is contained in:
commit
9a2405d657
|
@ -1,5 +1,8 @@
|
|||
{ pkgs ? (import ../.. {}), nixpkgs ? { }}:
|
||||
let
|
||||
inherit (pkgs) lib;
|
||||
inherit (lib) hasPrefix removePrefix;
|
||||
|
||||
locationsXml = import ./lib-function-locations.nix { inherit pkgs nixpkgs; };
|
||||
functionDocs = import ./lib-function-docs.nix { inherit locationsXml pkgs; };
|
||||
version = pkgs.lib.version;
|
||||
|
@ -29,6 +32,18 @@ let
|
|||
optionsDoc = pkgs.nixosOptionsDoc {
|
||||
inherit (pkgs.lib.evalModules { modules = [ ../../pkgs/top-level/config.nix ]; }) options;
|
||||
documentType = "none";
|
||||
transformOptions = opt:
|
||||
opt // {
|
||||
declarations =
|
||||
map
|
||||
(decl:
|
||||
if hasPrefix (toString ../..) (toString decl)
|
||||
then
|
||||
let subpath = removePrefix "/" (removePrefix (toString ../..) (toString decl));
|
||||
in { url = "https://github.com/NixOS/nixpkgs/blob/master/${subpath}"; name = subpath; }
|
||||
else decl)
|
||||
opt.declarations;
|
||||
};
|
||||
};
|
||||
|
||||
in pkgs.runCommand "doc-support" {}
|
||||
|
|
|
@ -78,6 +78,15 @@ pkgs.stdenv.mkDerivation {
|
|||
# get rid of the unnecessary slack here--but see
|
||||
# https://github.com/NixOS/nixpkgs/issues/125121 for caveats.
|
||||
|
||||
# shrink to fit
|
||||
resize2fs -M $img
|
||||
|
||||
# Add 16 MebiByte to the current_size
|
||||
new_size=$(dumpe2fs -h $img | awk -F: \
|
||||
'/Block count/{count=$2} /Block size/{size=$2} END{print (count*size+16*2**20)/size}')
|
||||
|
||||
resize2fs $img $new_size
|
||||
|
||||
if [ ${builtins.toString compressImage} ]; then
|
||||
echo "Compressing image"
|
||||
zstd -v --no-progress ./$img -o $out
|
||||
|
|
|
@ -213,6 +213,23 @@
|
|||
|
||||
<xsl:template match="attr[@name = 'declarations' or @name = 'definitions']">
|
||||
<simplelist>
|
||||
<!--
|
||||
Example:
|
||||
opt.declarations = [ { name = "foo/bar.nix"; url = "https://github.com/....."; } ];
|
||||
-->
|
||||
<xsl:for-each select="list/attrs[attr[@name = 'name']]">
|
||||
<member><filename>
|
||||
<xsl:if test="attr[@name = 'url']">
|
||||
<xsl:attribute name="xlink:href"><xsl:value-of select="attr[@name = 'url']/string/@value"/></xsl:attribute>
|
||||
</xsl:if>
|
||||
<xsl:value-of select="attr[@name = 'name']/string/@value"/>
|
||||
</filename></member>
|
||||
</xsl:for-each>
|
||||
|
||||
<!--
|
||||
When the declarations/definitions are raw strings,
|
||||
fall back to hardcoded location logic, specific to Nixpkgs.
|
||||
-->
|
||||
<xsl:for-each select="list/string">
|
||||
<member><filename>
|
||||
<!-- Hyperlink the filename either to the NixOS Subversion
|
||||
|
|
|
@ -18,7 +18,7 @@ with lib;
|
|||
let
|
||||
rootfsImage = pkgs.callPackage ../../../lib/make-ext4-fs.nix ({
|
||||
inherit (config.sdImage) storePaths;
|
||||
compressImage = true;
|
||||
compressImage = config.sdImage.compressImage;
|
||||
populateImageCommands = config.sdImage.populateRootCommands;
|
||||
volumeLabel = "NIXOS_SD";
|
||||
} // optionalAttrs (config.sdImage.rootPartitionUUID != null) {
|
||||
|
@ -174,7 +174,8 @@ in
|
|||
mtools, libfaketime, util-linux, zstd }: stdenv.mkDerivation {
|
||||
name = config.sdImage.imageName;
|
||||
|
||||
nativeBuildInputs = [ dosfstools e2fsprogs mtools libfaketime util-linux zstd ];
|
||||
nativeBuildInputs = [ dosfstools e2fsprogs libfaketime mtools util-linux ]
|
||||
++ lib.optional config.sdImage.compressImage zstd;
|
||||
|
||||
inherit (config.sdImage) imageName compressImage;
|
||||
|
||||
|
@ -189,14 +190,18 @@ in
|
|||
echo "file sd-image $img" >> $out/nix-support/hydra-build-products
|
||||
fi
|
||||
|
||||
root_fs=${rootfsImage}
|
||||
${lib.optionalString config.sdImage.compressImage ''
|
||||
root_fs=./root-fs.img
|
||||
echo "Decompressing rootfs image"
|
||||
zstd -d --no-progress "${rootfsImage}" -o ./root-fs.img
|
||||
zstd -d --no-progress "${rootfsImage}" -o $root_fs
|
||||
''}
|
||||
|
||||
# Gap in front of the first partition, in MiB
|
||||
gap=${toString config.sdImage.firmwarePartitionOffset}
|
||||
|
||||
# Create the image file sized to fit /boot/firmware and /, plus slack for the gap.
|
||||
rootSizeBlocks=$(du -B 512 --apparent-size ./root-fs.img | awk '{ print $1 }')
|
||||
rootSizeBlocks=$(du -B 512 --apparent-size $root_fs | awk '{ print $1 }')
|
||||
firmwareSizeBlocks=$((${toString config.sdImage.firmwareSize} * 1024 * 1024 / 512))
|
||||
imageSize=$((rootSizeBlocks * 512 + firmwareSizeBlocks * 512 + gap * 1024 * 1024))
|
||||
truncate -s $imageSize $img
|
||||
|
@ -214,7 +219,7 @@ in
|
|||
|
||||
# Copy the rootfs into the SD image
|
||||
eval $(partx $img -o START,SECTORS --nr 2 --pairs)
|
||||
dd conv=notrunc if=./root-fs.img of=$img seek=$START count=$SECTORS
|
||||
dd conv=notrunc if=$root_fs of=$img seek=$START count=$SECTORS
|
||||
|
||||
# Create a FAT32 /boot/firmware partition of suitable size into firmware_part.img
|
||||
eval $(partx $img -o START,SECTORS --nr 1 --pairs)
|
||||
|
|
|
@ -369,6 +369,17 @@ in {
|
|||
|
||||
networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.config.http.server_port ];
|
||||
|
||||
# symlink the configuration to /etc/home-assistant
|
||||
environment.etc = lib.mkMerge [
|
||||
(lib.mkIf (cfg.config != null && !cfg.configWritable) {
|
||||
"home-assistant/configuration.yaml".source = configFile;
|
||||
})
|
||||
|
||||
(lib.mkIf (cfg.lovelaceConfig != null && !cfg.lovelaceConfigWritable) {
|
||||
"home-assistant/ui-lovelace.yaml".source = lovelaceConfigFile;
|
||||
})
|
||||
];
|
||||
|
||||
systemd.services.home-assistant = {
|
||||
description = "Home Assistant";
|
||||
after = [
|
||||
|
@ -378,18 +389,22 @@ in {
|
|||
"mysql.service"
|
||||
"postgresql.service"
|
||||
];
|
||||
reloadTriggers = [
|
||||
configFile
|
||||
lovelaceConfigFile
|
||||
];
|
||||
preStart = let
|
||||
copyConfig = if cfg.configWritable then ''
|
||||
cp --no-preserve=mode ${configFile} "${cfg.configDir}/configuration.yaml"
|
||||
'' else ''
|
||||
rm -f "${cfg.configDir}/configuration.yaml"
|
||||
ln -s ${configFile} "${cfg.configDir}/configuration.yaml"
|
||||
ln -s /etc/home-assistant/configuration.yaml "${cfg.configDir}/configuration.yaml"
|
||||
'';
|
||||
copyLovelaceConfig = if cfg.lovelaceConfigWritable then ''
|
||||
cp --no-preserve=mode ${lovelaceConfigFile} "${cfg.configDir}/ui-lovelace.yaml"
|
||||
'' else ''
|
||||
rm -f "${cfg.configDir}/ui-lovelace.yaml"
|
||||
ln -s ${lovelaceConfigFile} "${cfg.configDir}/ui-lovelace.yaml"
|
||||
ln -s /etc/home-assistant/ui-lovelace.yaml "${cfg.configDir}/ui-lovelace.yaml"
|
||||
'';
|
||||
in
|
||||
(optionalString (cfg.config != null) copyConfig) +
|
||||
|
|
|
@ -174,6 +174,7 @@ in
|
|||
serviceConfig = {
|
||||
DynamicUser = true;
|
||||
StateDirectory = "bitlbee";
|
||||
ReadWritePaths = [ cfg.configDir ];
|
||||
ExecStart = "${bitlbeePkg}/sbin/bitlbee -F -n -c ${bitlbeeConfig}";
|
||||
};
|
||||
};
|
||||
|
|
|
@ -26,6 +26,13 @@ in
|
|||
description = "Bind xpra to TCP";
|
||||
};
|
||||
|
||||
desktop = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
example = "gnome-shell";
|
||||
description = "Start a desktop environment instead of seamless mode";
|
||||
};
|
||||
|
||||
auth = mkOption {
|
||||
type = types.str;
|
||||
default = "pam";
|
||||
|
@ -222,7 +229,7 @@ in
|
|||
services.xserver.displayManager.job.execCmd = ''
|
||||
${optionalString (cfg.pulseaudio)
|
||||
"export PULSE_COOKIE=/run/pulse/.config/pulse/cookie"}
|
||||
exec ${pkgs.xpra}/bin/xpra start \
|
||||
exec ${pkgs.xpra}/bin/xpra ${if cfg.desktop == null then "start" else "start-desktop --start=${cfg.desktop}"} \
|
||||
--daemon=off \
|
||||
--log-dir=/var/log \
|
||||
--log-file=xpra.log \
|
||||
|
|
|
@ -419,5 +419,10 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
|||
"docker rmi layered-image-with-path",
|
||||
)
|
||||
|
||||
with subtest("etc"):
|
||||
docker.succeed("${examples.etc} | docker load")
|
||||
docker.succeed("docker run --rm etc | grep localhost")
|
||||
docker.succeed("docker image rm etc:latest")
|
||||
|
||||
'';
|
||||
})
|
||||
|
|
|
@ -98,9 +98,26 @@ in {
|
|||
};
|
||||
lovelaceConfigWritable = true;
|
||||
};
|
||||
|
||||
# Cause a configuration change inside `configuration.yml` and verify that the process is being reloaded.
|
||||
specialisation.differentName = {
|
||||
inheritParentConfig = true;
|
||||
configuration.services.home-assistant.config.homeassistant.name = lib.mkForce "Test Home";
|
||||
};
|
||||
|
||||
# Cause a configuration change that requires a service restart as we added a new runtime dependency
|
||||
specialisation.newFeature = {
|
||||
inheritParentConfig = true;
|
||||
configuration.services.home-assistant.config.device_tracker = [
|
||||
{ platform = "bluetooth_tracker"; }
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
testScript = { nodes, ... }: let
|
||||
system = nodes.hass.config.system.build.toplevel;
|
||||
in
|
||||
''
|
||||
import re
|
||||
|
||||
start_all()
|
||||
|
@ -142,12 +159,21 @@ in {
|
|||
with subtest("Check extra components are considered in systemd unit hardening"):
|
||||
hass.succeed("systemctl show -p DeviceAllow home-assistant.service | grep -q char-ttyUSB")
|
||||
|
||||
with subtest("Print log to ease debugging"):
|
||||
output_log = hass.succeed("cat ${configDir}/home-assistant.log")
|
||||
print("\n### home-assistant.log ###\n")
|
||||
print(output_log + "\n")
|
||||
with subtest("Check service reloads when configuration changes"):
|
||||
# store the old pid of the process
|
||||
pid = hass.succeed("systemctl show --property=MainPID home-assistant.service")
|
||||
hass.succeed("${system}/specialisation/differentName/bin/switch-to-configuration test")
|
||||
new_pid = hass.succeed("systemctl show --property=MainPID home-assistant.service")
|
||||
assert pid == new_pid, "The PID of the process should not change between process reloads"
|
||||
|
||||
with subtest("check service restarts when package changes"):
|
||||
pid = new_pid
|
||||
hass.succeed("${system}/specialisation/newFeature/bin/switch-to-configuration test")
|
||||
new_pid = hass.succeed("systemctl show --property=MainPID home-assistant.service")
|
||||
assert pid != new_pid, "The PID of the process shoudl change when the HA binary changes"
|
||||
|
||||
with subtest("Check that no errors were logged"):
|
||||
output_log = hass.succeed("cat ${configDir}/home-assistant.log")
|
||||
assert "ERROR" not in output_log
|
||||
|
||||
with subtest("Check systemd unit hardening"):
|
||||
|
|
|
@ -1,15 +1,16 @@
|
|||
{ fetchurl, lib, stdenv, libjpeg, libpng, libtiff, perl }:
|
||||
{ fetchurl, lib, stdenv, libjpeg, libpng, libtiff, perl, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libpano13";
|
||||
version = "2.9.20";
|
||||
version = "2.9.21";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/panotools/${pname}-${version}.tar.gz";
|
||||
sha256 = "12cv4886l1czfjwy7k6ipgf3zjksgwhdjzr2s9fdg33vqcv2hlrv";
|
||||
sha256 = "sha256-eeWhRSGZMF4pYUYnIO9ZQRUnecEnxblvw0DSSS5jNZA=";
|
||||
};
|
||||
|
||||
buildInputs = [ perl libjpeg libpng libtiff ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
# one of the tests succeeds on my machine but fails on Hydra (no idea why)
|
||||
#doCheck = true;
|
||||
|
|
|
@ -46,12 +46,15 @@ in python.pkgs.buildPythonApplication rec {
|
|||
};
|
||||
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
appdirs
|
||||
etebase
|
||||
etesync
|
||||
flask
|
||||
flask-wtf
|
||||
msgpack
|
||||
(python.pkgs.toPythonModule (radicale3.override { python3 = python; }))
|
||||
];
|
||||
requests
|
||||
] ++ requests.optional-dependencies.socks;
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, stdenv, fetchFromGitHub, qmake, qttools, qttranslations, qtlocation, wrapQtAppsHook, substituteAll }:
|
||||
{ lib, stdenv, fetchFromGitHub, qmake, qttools, qttranslations, qtlocation, qtpbfimageplugin, wrapQtAppsHook, substituteAll }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gpxsee";
|
||||
version = "11.0";
|
||||
version = "11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tumic0";
|
||||
repo = "GPXSee";
|
||||
rev = version;
|
||||
sha256 = "sha256-UT3Q7pirEXvwQmqHHiSivX/VNZPVLwRJ/aiP7wpkhqQ=";
|
||||
sha256 = "sha256-0n1XPrJ+gssIP/7k9CI8AWXs9ddKOg3Lo3DfrXGUl84=";
|
||||
};
|
||||
|
||||
patches = (substituteAll {
|
||||
|
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||
inherit qttranslations;
|
||||
});
|
||||
|
||||
buildInputs = [ qtlocation ];
|
||||
buildInputs = [ qtlocation qtpbfimageplugin ];
|
||||
|
||||
nativeBuildInputs = [ qmake qttools wrapQtAppsHook ];
|
||||
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
, yajl
|
||||
, nixosTests
|
||||
, criu
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
let
|
||||
|
@ -48,6 +49,15 @@ stdenv.mkDerivation rec {
|
|||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Should dropped in next release after 1.4.5
|
||||
(fetchpatch {
|
||||
name = "usrbin-paths.patch";
|
||||
url = "https://github.com/containers/crun/commit/dd29f7f7f713c49784ac30f7cdca33b2ef94d5b8.patch";
|
||||
sha256 = "sha256-kHHix8CUL+c8HbOe5qx4PeF1P19113U4bRZyleMUjqk=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook go-md2man pkg-config python3 ];
|
||||
|
||||
buildInputs = [ libcap libseccomp systemd yajl ]
|
||||
|
|
|
@ -9,6 +9,16 @@
|
|||
|
||||
{ pkgs, buildImage, buildLayeredImage, fakeNss, pullImage, shadowSetup, buildImageWithNixDb, pkgsCross }:
|
||||
|
||||
let
|
||||
nixosLib = import ../../../nixos/lib {
|
||||
# Experimental features need testing too, but there's no point in warning
|
||||
# about it, so we enable the feature flag.
|
||||
featureFlags.minimalModules = {};
|
||||
};
|
||||
evalMinimalConfig = module: nixosLib.evalModules { modules = [ module ]; };
|
||||
|
||||
in
|
||||
|
||||
rec {
|
||||
# 1. basic example
|
||||
bash = buildImage {
|
||||
|
@ -582,6 +592,37 @@ rec {
|
|||
includeStorePaths = false;
|
||||
};
|
||||
|
||||
etc =
|
||||
let
|
||||
inherit (pkgs) lib;
|
||||
nixosCore = (evalMinimalConfig ({ config, ... }: {
|
||||
imports = [
|
||||
pkgs.pkgsModule
|
||||
../../../nixos/modules/system/etc/etc.nix
|
||||
];
|
||||
environment.etc."some-config-file" = {
|
||||
text = ''
|
||||
127.0.0.1 localhost
|
||||
::1 localhost
|
||||
'';
|
||||
# For executables:
|
||||
# mode = "0755";
|
||||
};
|
||||
}));
|
||||
in pkgs.dockerTools.streamLayeredImage {
|
||||
name = "etc";
|
||||
tag = "latest";
|
||||
enableFakechroot = true;
|
||||
fakeRootCommands = ''
|
||||
mkdir -p /etc
|
||||
${nixosCore.config.system.build.etcActivationCommands}
|
||||
'';
|
||||
config.Cmd = pkgs.writeScript "etc-cmd" ''
|
||||
#!${pkgs.busybox}/bin/sh
|
||||
${pkgs.busybox}/bin/cat /etc/some-config-file
|
||||
'';
|
||||
};
|
||||
|
||||
# Example export of the bash image
|
||||
exportBash = pkgs.dockerTools.exportImage { fromImage = bash; };
|
||||
|
||||
|
|
|
@ -69,5 +69,8 @@ buildPythonPackage rec {
|
|||
homepage = "https://github.com/vyperlang/vyper";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ siraben ];
|
||||
knownVulnerabilities = [
|
||||
"CVE-2022-29255"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -59,6 +59,7 @@ let
|
|||
outputHash = hash;
|
||||
name = baseNameOf url;
|
||||
nativeBuildInputs = [ cacert ];
|
||||
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
|
||||
}
|
||||
''
|
||||
echo "${url} ${dhallHash}" > in-dhall-file
|
||||
|
@ -76,7 +77,7 @@ let
|
|||
sourceFile = "source.dhall";
|
||||
|
||||
in
|
||||
runCommand name { impureEnvVars = lib.fetchers.proxyImpureEnvVars; }
|
||||
runCommand name { }
|
||||
(''
|
||||
set -eu
|
||||
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, ninja
|
||||
, openssl
|
||||
|
@ -16,16 +17,24 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "duckdb";
|
||||
version = "0.3.4";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2PBc5qe2md87u2nvMTx/XZVzLsr8QrvUkw46/6VTlGs=";
|
||||
sha256 = "sha256-pQ/t26dv9ZWLl0MHcAn0sgxryW2T2hM8XyOkXyfC5CY=";
|
||||
};
|
||||
|
||||
patches = [ ./version.patch ];
|
||||
patches = [
|
||||
./version.patch
|
||||
(fetchpatch {
|
||||
name = "fix-tpce-test.patch";
|
||||
url = "https://github.com/duckdb/duckdb/commit/82e13a4bb9f0683af6c52468af2fb903cce4286d.patch";
|
||||
sha256 = "sha256-m0Bs0DOJQtkadbKZKk88NHyBFJkjxXUsiWYciuRIJLU=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt --subst-var-by DUCKDB_VERSION "v${version}"
|
||||
'';
|
||||
|
@ -62,6 +71,7 @@ stdenv.mkDerivation rec {
|
|||
"test/common/test_cast_hugeint.test"
|
||||
"test/sql/copy/csv/test_csv_remote.test"
|
||||
"test/sql/copy/parquet/test_parquet_remote.test"
|
||||
"test/sql/copy/parquet/test_parquet_remote_foreign_files.test"
|
||||
] ++ lib.optionals stdenv.isAarch64 [
|
||||
"test/sql/aggregate/aggregates/test_kurtosis.test"
|
||||
"test/sql/aggregate/aggregates/test_skewness.test"
|
||||
|
|
|
@ -6,6 +6,8 @@
|
|||
, etuples
|
||||
, fetchFromGitHub
|
||||
, filelock
|
||||
, jax
|
||||
, jaxlib
|
||||
, logical-unification
|
||||
, minikanren
|
||||
, numba
|
||||
|
@ -19,7 +21,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aesara";
|
||||
version = "2.7.2";
|
||||
version = "2.7.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -28,7 +30,7 @@ buildPythonPackage rec {
|
|||
owner = "aesara-devs";
|
||||
repo = "aesara";
|
||||
rev = "refs/tags/rel-${version}";
|
||||
hash = "sha256-NJxklOpIbSbi/SB/rafBNllpnNb1yWLVpyB2f/U0i78=";
|
||||
hash = "sha256-LeZEWKSfVmU7k7qMjniUjwoDJ5xJUHoYux7Qy5/w4Cg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -47,6 +49,8 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
checkInputs = [
|
||||
jax
|
||||
jaxlib
|
||||
numba
|
||||
numba-scipy
|
||||
pytestCheckHook
|
||||
|
|
|
@ -5,18 +5,20 @@
|
|||
, msrestazure
|
||||
, azure-common
|
||||
, azure-mgmt-core
|
||||
, azure-mgmt-nspkg
|
||||
, isPy3k
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-eventhub";
|
||||
version = "10.0.0";
|
||||
version = "10.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "0856574ef4b73bbbc62834051061e2081400aba7e3715e10ef5181d639e86a0b";
|
||||
hash = "sha256-MZqhSBkwypvEefhoEWEPsBUFidWYD7qAX6edcBDDSSA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -24,8 +26,6 @@ buildPythonPackage rec {
|
|||
msrestazure
|
||||
azure-common
|
||||
azure-mgmt-core
|
||||
] ++ lib.optionals (!isPy3k) [
|
||||
azure-mgmt-nspkg
|
||||
];
|
||||
|
||||
# has no tests
|
||||
|
|
|
@ -70,6 +70,11 @@ buildPythonPackage rec {
|
|||
|
||||
meta = {
|
||||
description = "A Session and Caching library with WSGI Middleware";
|
||||
homepage = "https://github.com/bbangert/beaker";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ domenkozar ];
|
||||
knownVulnerabilities = [
|
||||
"CVE-2013-7489"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "casbin";
|
||||
version = "1.16.5";
|
||||
version = "1.16.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = pname;
|
||||
repo = "pycasbin";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-27j1iuqf0af4Cm3r32FJnWnjvvUcacuv2+1OL6z/mwM=";
|
||||
sha256 = "sha256-i7XwB1qV2WQD1dWxi4ncXsAwGUR5tWQhp+Z/jVvv1oo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cloudflare";
|
||||
version = "2.9.10";
|
||||
version = "2.9.11";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-LsUMB0zqlelHqWsgdmJ8v+Qn/reYuxCTKTODBT9K0bg=";
|
||||
hash = "sha256-kvCSazLBU2sBzobdZrVXcdlEpMoAe5wb7rBWxzhDuus=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -1,23 +1,31 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, isPyPy
|
||||
, pytest, pytest-cov, pytest-mock, freezegun
|
||||
, jinja2, future, binaryornot, click, whichcraft, poyo, jinja2_time, requests
|
||||
, python-slugify }:
|
||||
, jinja2, future, binaryornot, click, jinja2_time, requests
|
||||
, python-slugify
|
||||
, pyyaml
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cookiecutter";
|
||||
version = "1.7.3";
|
||||
version = "2.1.1";
|
||||
|
||||
# not sure why this is broken
|
||||
disabled = isPyPy;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-a5pNcoguJDvgd6c5fQ8fdv5mzz35HzEV27UzDiFPpFc=";
|
||||
sha256 = "sha256-85gr6NnFPawSYYZAE/3sf4Ov0uQu3m9t0GnF4UnFQNU=";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest pytest-cov pytest-mock freezegun ];
|
||||
propagatedBuildInputs = [
|
||||
jinja2 future binaryornot click whichcraft poyo jinja2_time requests python-slugify
|
||||
binaryornot
|
||||
jinja2
|
||||
click
|
||||
pyyaml
|
||||
jinja2_time
|
||||
python-slugify
|
||||
requests
|
||||
];
|
||||
|
||||
# requires network access for cloning git repos
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ducc0";
|
||||
version = "0.23.0";
|
||||
version = "0.24.0";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
@ -11,7 +11,7 @@ buildPythonPackage rec {
|
|||
owner = "mtr";
|
||||
repo = "ducc";
|
||||
rev = "ducc0_${lib.replaceStrings ["."] ["_"] version}";
|
||||
sha256 = "dOc3TihtoRuLfniC9zQ1MEbnvGJHzFZfZ8+J8Dnw6Lk=";
|
||||
sha256 = "sFgEO6f9D3AFV62yLEocgrPrj03H60e2NtdA/Ws6lQw=";
|
||||
};
|
||||
|
||||
buildInputs = [ pybind11 ];
|
||||
|
|
|
@ -1,9 +1,11 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, duckdb
|
||||
, google-cloud-storage
|
||||
, mypy
|
||||
, numpy
|
||||
, pandas
|
||||
, psutil
|
||||
, pybind11
|
||||
, setuptools-scm
|
||||
, pytestCheckHook
|
||||
|
@ -29,7 +31,9 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
checkInputs = [
|
||||
google-cloud-storage
|
||||
mypy
|
||||
psutil
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
|
|
|
@ -1,18 +1,34 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, isPy27, flask, pytestCheckHook, pytest-cov, pytest-xprocess, pytestcache }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchPypi
|
||||
, cachelib
|
||||
, flask
|
||||
, pytest-asyncio
|
||||
, pytest-xprocess
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Flask-Caching";
|
||||
version = "1.10.1";
|
||||
disabled = isPy27; # invalid python2 syntax
|
||||
version = "1.11.1";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "cf19b722fcebc2ba03e4ae7c55b532ed53f0cbf683ce36fafe5e881789a01c00";
|
||||
sha256 = "28af189e97defb9e39b43ebe197b54a58aaee81bdeb759f46d969c26d7aa7810";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ flask ];
|
||||
propagatedBuildInputs = [
|
||||
cachelib
|
||||
flask
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook pytest-cov pytest-xprocess pytestcache ];
|
||||
checkInputs = [
|
||||
pytest-asyncio
|
||||
pytest-xprocess
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# backend_cache relies on pytest-cache, which is a stale package from 2013
|
||||
|
|
|
@ -54,5 +54,8 @@ buildPythonPackage rec {
|
|||
homepage = "https://github.com/mher/flower";
|
||||
license = licenses.bsdOriginal;
|
||||
maintainers = with maintainers; [ arnoldfarkas ];
|
||||
knownVulnerabilities = [
|
||||
"CVE-2022-30034"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -4,11 +4,12 @@
|
|||
, fetchPypi
|
||||
, sphinx
|
||||
, beautifulsoup4
|
||||
, sphinx-basic-ng
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "furo";
|
||||
version = "2022.4.7";
|
||||
version = "2022.6.21";
|
||||
format = "wheel";
|
||||
disable = pythonOlder "3.6";
|
||||
|
||||
|
@ -16,12 +17,13 @@ buildPythonPackage rec {
|
|||
inherit pname version format;
|
||||
dist = "py3";
|
||||
python = "py3";
|
||||
sha256 = "sha256-fz49L7l3SDWQ+Oyyws1RG9gmYbecGO+yTelVi8nN8tc=";
|
||||
sha256 = "sha256-Bhto4yM0Xif8ugJM8zoed/Pf2NmYdBC+gidJpwbirdY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
sphinx
|
||||
beautifulsoup4
|
||||
sphinx-basic-ng
|
||||
];
|
||||
|
||||
installCheckPhase = ''
|
||||
|
|
|
@ -1,10 +1,12 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchpatch
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, pandoc
|
||||
, pytestCheckHook
|
||||
, pytest-console-scripts
|
||||
, pytest-timeout
|
||||
, pytest-tornasync
|
||||
, argon2-cffi
|
||||
, jinja2
|
||||
|
@ -28,21 +30,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyter_server";
|
||||
version = "1.11.2";
|
||||
disabled = pythonOlder "3.6";
|
||||
version = "1.17.1";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c1f32e0c1807ab2de37bf70af97a36b4436db0bc8af3124632b1f4441038bf95";
|
||||
sha256 = "a36781656645ae17b12819a49ace377c045bf633823b3e4cd4b0c88c01e7711b";
|
||||
};
|
||||
|
||||
patches = [ (fetchpatch
|
||||
{ name = "Normalize-file-name-and-path.patch";
|
||||
url = "https://github.com/jupyter-server/jupyter_server/pull/608/commits/345e26cdfd78651954b68708fa44119c2ac0dbd5.patch";
|
||||
sha256 = "1kqz3dyh2w0h1g1fbvqa13q17hb6y32694rlaasyg213mq6g4k32";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
argon2-cffi
|
||||
jinja2
|
||||
|
@ -64,7 +59,10 @@ buildPythonPackage rec {
|
|||
|
||||
checkInputs = [
|
||||
ipykernel
|
||||
pandoc
|
||||
pytestCheckHook
|
||||
pytest-console-scripts
|
||||
pytest-timeout
|
||||
pytest-tornasync
|
||||
requests
|
||||
];
|
||||
|
@ -74,19 +72,18 @@ buildPythonPackage rec {
|
|||
export PATH=$out/bin:$PATH
|
||||
'';
|
||||
|
||||
pytestFlagsArray = [ "jupyter_server" ];
|
||||
|
||||
# disabled failing tests
|
||||
disabledTests = [
|
||||
"test_server_extension_list"
|
||||
"test_list_formats"
|
||||
"test_base_url"
|
||||
"test_culling"
|
||||
"test_cull_idle"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# attempts to use trashcan, build env doesn't allow this
|
||||
"test_delete"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
"tests/services/kernels/test_api.py"
|
||||
"tests/services/sessions/test_api.py"
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -61,12 +61,12 @@ in
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyterhub";
|
||||
version = "1.3.0";
|
||||
version = "1.5.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "13pf6qhimpaxj20871ff5rvwwan59320cdhhrn9cfh6314971zq5";
|
||||
sha256 = "sha256-3GGPZXwjukYoDjYlflCTGAZnS6Dp5kmK+wke/GIm1p0=";
|
||||
};
|
||||
|
||||
# Most of this only applies when building from source (e.g. js/css assets are
|
||||
|
@ -158,6 +158,7 @@ buildPythonPackage rec {
|
|||
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
|
||||
description = "Serves multiple Jupyter notebook instances";
|
||||
homepage = "https://jupyter.org/";
|
||||
changelog = "https://github.com/jupyterhub/jupyterhub/blob/${version}/docs/source/changelog.md";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ixxie cstrahan ];
|
||||
};
|
||||
|
|
|
@ -20,8 +20,10 @@ buildPythonPackage rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Kerberos high-level interface";
|
||||
homepage = "https://pypi.python.org/pypi/kerberos";
|
||||
homepage = "https://pypi.org/project/kerberos/";
|
||||
license = licenses.asl20;
|
||||
knownVulnerabilities = [
|
||||
"CVE-2015-3206"
|
||||
];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "nexia";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "bdraco";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-f1IUyeOmRmnr7zWoMKF895FKsNgiiCbw7inmXDGZrVw=";
|
||||
sha256 = "sha256-+3nWf9GjX7ovnumwSq3l1dcHrgWIPPzKsPmI8/tT7Lo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -27,12 +27,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "notebook";
|
||||
version = "6.4.10";
|
||||
version = "6.4.12";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-JAina8YokoOo7s/KZ+KY7IPGfbUaTC4bcT3RgLs56Q4=";
|
||||
sha256 = "sha256-YmjJ7JBIz/ekVAXJkMKaycpAsLw+wpJj0hjF4B8rToY=";
|
||||
};
|
||||
|
||||
LC_ALL = "en_US.utf8";
|
||||
|
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "PyPDF2";
|
||||
version = "1.26.0";
|
||||
version = "1.28.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "11a3aqljg4sawjijkvzhs3irpw0y67zivqpbjpm065ha5wpr13z2";
|
||||
sha256 = "sha256-BM5CzQVweIH+28oxZHRFEYBf6MMGGK5M+yuUDjNo1a0=";
|
||||
};
|
||||
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
|
|
|
@ -10,8 +10,8 @@
|
|||
, multi_key_dict
|
||||
, testscenarios
|
||||
, requests
|
||||
, unittest2
|
||||
, requests-mock
|
||||
, stestr
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
@ -33,16 +33,16 @@ buildPythonPackage rec {
|
|||
buildInputs = [ mock ];
|
||||
propagatedBuildInputs = [ pbr pyyaml setuptools six multi_key_dict requests ];
|
||||
|
||||
checkInputs = [ unittest2 testscenarios requests-mock ];
|
||||
checkPhase = ''
|
||||
unit2
|
||||
'';
|
||||
checkInputs = [ stestr testscenarios requests-mock ];
|
||||
checkPhase = ''
|
||||
stestr run
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python bindings for the remote Jenkins API";
|
||||
homepage = "https://pypi.python.org/pypi/python-jenkins";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ gador ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -2,25 +2,37 @@
|
|||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, cython
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rencode";
|
||||
version = "1.0.6";
|
||||
version = "unstable-2021-08-10";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aresch";
|
||||
repo = "rencode";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PGjjrZuoGYSPMNqXG1KXoZnOoWIe4g6s056jFhqrJ60=";
|
||||
rev = "572ff74586d9b1daab904c6f7f7009ce0143bb75";
|
||||
hash = "sha256-cL1hV3RMDuSdcjpPXXDYIEbzQrxiPeRs82PU8HTEQYk=";
|
||||
};
|
||||
|
||||
buildInputs = [ cython ];
|
||||
nativeBuildInputs = [ cython ];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
# import from $out
|
||||
rm -r rencode
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/aresch/rencode";
|
||||
description = "Fast (basic) object serialization similar to bencode";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
44
pkgs/development/python-modules/sphinx-basic-ng/default.nix
Normal file
44
pkgs/development/python-modules/sphinx-basic-ng/default.nix
Normal file
|
@ -0,0 +1,44 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, sphinx
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinx-basic-ng";
|
||||
version = "0.0.1.a11";
|
||||
disable = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pradyunsg";
|
||||
repo = "sphinx-basic-ng";
|
||||
rev = version;
|
||||
sha256 = "sha256-Eur3CadC2NTuBXosG4SN9t2L0qkqN+Q79bcvhvlG/f8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-import-error.patch";
|
||||
url = "https://github.com/pradyunsg/sphinx-basic-ng/pull/32/commits/323a0085721b908aa11bc3c36c51e16f517ee023.patch";
|
||||
sha256 = "sha256-/G1wLG/08u2s3YENSKSYekLrV1fUkxDAlxc3crTQNHk=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
sphinx
|
||||
];
|
||||
|
||||
# no tests implemented
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "sphinx_basic_ng" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A modernised skeleton for Sphinx themes";
|
||||
homepage = "https://sphinx-basic-ng.readthedocs.io/en/latest/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ Luflosi ];
|
||||
};
|
||||
}
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "tensorflow-metadata";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tensorflow";
|
||||
repo = "metadata";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-IaLr6XYEy1EcyWi5GWzDFa7TeVZ59v8Wj5qkNdVbOqw=";
|
||||
sha256 = "sha256-6BtKHyVrprtEb2Bi7g2YuctUykWSRXmKwADfHzGkYjc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "waitress";
|
||||
version = "2.1.1";
|
||||
version = "2.1.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-4uYFds8UoVOdp597fuHnmnHmTzZqC0fbVKFelx9XuxY=";
|
||||
sha256 = "780a4082c5fbc0fde6a2fcfe5e26e6efc1e8f425730863c04085769781f51eba";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, buildGoModule, fetchFromGitLab, fetchurl }:
|
||||
|
||||
let
|
||||
version = "15.0.0";
|
||||
version = "15.1.0";
|
||||
in
|
||||
buildGoModule rec {
|
||||
inherit version;
|
||||
|
@ -14,13 +14,13 @@ buildGoModule rec {
|
|||
"-X ${commonPackagePath}.REVISION=v${version}"
|
||||
];
|
||||
|
||||
vendorSha256 = "0ag3pmcrxksgikdcvl9rv2s3kn7l0dj41pf2m9dq0g2a1j45nydn";
|
||||
vendorSha256 = "sha256-5MzhDBCsgcACzImnfvetr3Z6SO+fHozChIhvZG0JwBc=";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-runner";
|
||||
rev = "v${version}";
|
||||
sha256 = "1s7jqhrwy5wl0db37d3pms499mmy7msx4ch46w5qa25nfbxcr07c";
|
||||
sha256 = "sha256-G6V0l9kzbpl9XEYiiVBYjY7xOHemtOrb1xyB1HjhhTc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -1,20 +1,25 @@
|
|||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "elfinfo";
|
||||
version = "1.1.0";
|
||||
|
||||
goPackagePath = "github.com/xyproto/elfinfo";
|
||||
src = fetchFromGitHub {
|
||||
rev = version;
|
||||
owner = "xyproto";
|
||||
repo = "elfinfo";
|
||||
rev = version;
|
||||
sha256 = "1n8bg0rcq9fqa6rdnk6x9ngvm59hcayblkpjv9j5myn2vmm6fv8m";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Small utility for showing information about ELF files";
|
||||
homepage = "https://elfinfo.roboticoverlords.org/";
|
||||
changelog = "https://github.com/xyproto/elfinfo/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dtzWill ];
|
||||
};
|
||||
|
|
29
pkgs/os-specific/linux/ax99100/default.nix
Normal file
29
pkgs/os-specific/linux/ax99100/default.nix
Normal file
|
@ -0,0 +1,29 @@
|
|||
{ kernel, stdenv, kmod, lib, fetchzip }:
|
||||
stdenv.mkDerivation
|
||||
{
|
||||
pname = "ax99100";
|
||||
version = "1.8.0";
|
||||
nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies;
|
||||
src = fetchzip {
|
||||
url = "https://www.asix.com.tw/en/support/download/file/1229";
|
||||
sha256 = "1rbp1m01qr6b3nbr72vpbw89pjh8mddc60im78z2yjd951xkbcjh";
|
||||
extension = "tar.bz2";
|
||||
};
|
||||
|
||||
makeFlags = [ "KDIR='${kernel.dev}/lib/modules/${kernel.modDirVersion}/build'" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/tty/serial
|
||||
cp ax99100.ko $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/tty/serial
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "ASIX AX99100 Serial and Parralel Port driver";
|
||||
homepage = "https://www.asix.com.tw/en/product/Interface/PCIe_Bridge/AX99100";
|
||||
# According to the source code in the tarball, the license is gpl2.
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = lib.platforms.linux;
|
||||
# currently, the build fails with kernels newer than 5.17
|
||||
broken = lib.versionAtLeast kernel.version "5.18.0";
|
||||
};
|
||||
}
|
|
@ -2,7 +2,7 @@
|
|||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2022.6.6";
|
||||
version = "2022.6.7";
|
||||
components = {
|
||||
"abode" = ps: with ps; [
|
||||
abodepy
|
||||
|
|
|
@ -176,7 +176,7 @@ let
|
|||
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2022.6.6";
|
||||
hassVersion = "2022.6.7";
|
||||
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
|
@ -194,7 +194,7 @@ in python.pkgs.buildPythonApplication rec {
|
|||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = version;
|
||||
hash = "sha256-scwj3VrSoFk/pSVzfwvGFM5fRci3+7iqr7TAwLantFQ=";
|
||||
hash = "sha256-RR0CsPOzOdWRPSgmKGl3egrPXS1CDI+ODWZeLkVCSGQ=";
|
||||
};
|
||||
|
||||
# leave this in, so users don't have to constantly update their downstream patch handling
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ergo";
|
||||
version = "2.9.1";
|
||||
version = "2.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ergochat";
|
||||
repo = "ergo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RxsmkTfHymferS/FRW0sLnstKfvGXkW6cEb/JbeS4lc=";
|
||||
sha256 = "sha256-SydseZSEuFhbaU4OMnT8zFLbRfmeKwXsZZeDh8mbZco=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "metabase";
|
||||
version = "0.42.1";
|
||||
version = "0.43.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.metabase.com/v${version}/metabase.jar";
|
||||
hash = "sha256-PmcVVAS/5mDhmOSoFvkZeYkbvFD/KOcgVYuScwD4Olg=";
|
||||
hash = "sha256-WGbIsmCWsSxgE7Ktr539qTt/o5cJrYi0yu3ZkfbxOV0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
@ -46,13 +46,13 @@ in {
|
|||
'';
|
||||
|
||||
nextcloud23 = generic {
|
||||
version = "23.0.5";
|
||||
sha256 = "3cf51a795f8439e5d34f0a521d939cefafbae38450cce64c6673016984195f29";
|
||||
version = "23.0.6";
|
||||
sha256 = "34fbc3a6c16a623f57971b8c4df7c5e62b3650728edec7d05ec116b295040548";
|
||||
};
|
||||
|
||||
nextcloud24 = generic {
|
||||
version = "24.0.1";
|
||||
sha256 = "d32a8f6c4722a45cb67de7018163cfafcfa22a871fbac0f623c3875fa4304e5a";
|
||||
version = "24.0.2";
|
||||
sha256 = "30d6cac1265dff221836bec46a937dcafd7e7d52ee59b939841750b514e5033d";
|
||||
};
|
||||
|
||||
# tip: get she sha with:
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rt";
|
||||
version = "5.0.1";
|
||||
version = "5.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
owner = "bestpractical";
|
||||
sha256 = "1qqh6w094x7dljz001va802v4s6mixs9lkhs2cs47lf5ph3vwq2q";
|
||||
sha256 = "1qdvbsmdynjw2v0clnmhdmrky7w4dsiysv92n7d7jdbawnicqahn";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -88,6 +88,7 @@ stdenv.mkDerivation rec {
|
|||
MozillaCA
|
||||
NetCIDR
|
||||
NetIP
|
||||
ParallelForkManager
|
||||
PathDispatcher
|
||||
PerlIOeol
|
||||
Plack
|
||||
|
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mpd-discord-rpc";
|
||||
version = "1.5.1";
|
||||
version = "1.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JakeStanger";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jwsfUepGJ7IB1H6Er1EszYkkYIOSyuFvTX7NF9UhhGo=";
|
||||
sha256 = "sha256-/QWIoP6KcrI8cYTh3x2lQz7nPSvzb1zRWg8TFoYY9vE=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-4MUfjXWDZmfsUzvWo8I2fgzm4jOfX1ZgHYqUmxXJ/BU=";
|
||||
cargoSha256 = "sha256-46PS1+ud7GYuMOJMp93Hf7+nlngvgL67zedaF44TcYY=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
@ -14,16 +14,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "prs";
|
||||
version = "0.3.2";
|
||||
version = "0.3.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "timvisee";
|
||||
repo = "prs";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-90Ed/mafACSJvH+DjCbdXs3eeyT+pGflRzDD9l3b0/s=";
|
||||
hash = "sha256-dfyTaWwV2hNZPZfvM+AqqR1zbChjT6Y/TEkQPEXRtGA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-5teiF8s11Ml8UtbVn6fXur2OQzE52JZnsgyDihbEFTQ=";
|
||||
cargoHash = "sha256-yf46le0jG4EXo60kGKc0GwSO5vl4Dw0gmYJ4yr+TFdE=";
|
||||
|
||||
postPatch = ''
|
||||
# The GPGME backend is recommended
|
||||
|
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "htmldoc";
|
||||
version = "1.9.15";
|
||||
version = "1.9.16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "michaelrsweet";
|
||||
repo = "htmldoc";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WNsYJacZBYoZ8Bxj+InQ9ePvelqhU5y9nY7aikUNxEk=";
|
||||
sha256 = "117cj5sfzl18gan53ld8lxb0wycizcp9jcakcs3nsvnss99rw3a6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
@ -21896,7 +21896,9 @@ with pkgs;
|
|||
gn = gn1924;
|
||||
};
|
||||
|
||||
ergochat = callPackage ../servers/irc/ergochat { };
|
||||
ergochat = callPackage ../servers/irc/ergochat {
|
||||
buildGoModule = buildGo118Module;
|
||||
};
|
||||
|
||||
etcd = etcd_3_3;
|
||||
etcd_3_3 = callPackage ../servers/etcd/3.3.nix { };
|
||||
|
|
|
@ -282,6 +282,8 @@ in {
|
|||
|
||||
apfs = callPackage ../os-specific/linux/apfs { };
|
||||
|
||||
ax99100 = callPackage ../os-specific/linux/ax99100 {};
|
||||
|
||||
batman_adv = callPackage ../os-specific/linux/batman-adv {};
|
||||
|
||||
bbswitch = callPackage ../os-specific/linux/bbswitch {};
|
||||
|
|
|
@ -9617,10 +9617,10 @@ let
|
|||
|
||||
GnuPGInterface = buildPerlPackage {
|
||||
pname = "GnuPG-Interface";
|
||||
version = "1.00";
|
||||
version = "1.02";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/J/JE/JESSE/GnuPG-Interface-1.00.tar.gz";
|
||||
sha256 = "97e9c809491a061b2e99fb4e50c7bf74eb42e1deb11c64b081b21b4dbe6aec2f";
|
||||
url = "mirror://cpan/authors/id/B/BP/BPS/GnuPG-Interface-1.02.tar.gz";
|
||||
sha256 = "c27a48c3d48e1a9205e362eeea66d46b032bd84637991fdf0b13828bcafdd3e6";
|
||||
};
|
||||
buildInputs = [ pkgs.which pkgs.gnupg1compat ];
|
||||
propagatedBuildInputs = [ MooXHandlesVia MooXlate ];
|
||||
|
|
|
@ -10014,6 +10014,8 @@ in {
|
|||
|
||||
sphinx-autobuild = callPackage ../development/python-modules/sphinx-autobuild { };
|
||||
|
||||
sphinx-basic-ng = callPackage ../development/python-modules/sphinx-basic-ng { };
|
||||
|
||||
sphinx-copybutton = callPackage ../development/python-modules/sphinx-copybutton { };
|
||||
|
||||
sphinx-inline-tabs = callPackage ../development/python-modules/sphinx-inline-tabs { };
|
||||
|
|
Loading…
Reference in a new issue