Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
8e6a0d953b
@ -13287,7 +13287,7 @@
|
||||
};
|
||||
yana = {
|
||||
email = "yana@riseup.net";
|
||||
github = "alpakido";
|
||||
github = "sowelisuwi";
|
||||
githubId = 1643293;
|
||||
name = "Yana Timoshenko";
|
||||
};
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gremlin-console";
|
||||
version = "3.5.1";
|
||||
version = "3.5.2";
|
||||
src = fetchzip {
|
||||
url = "https://downloads.apache.org/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip";
|
||||
sha256 = "sha256-66krBK5mSMT0scCgMmiaigT/9nmYfItxe1OTzSbX+kE=";
|
||||
sha256 = "sha256-PCr8lDQzypgozKCzD8FV4X4ls5lYZRMey1vfcFzo+Uc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -23,9 +23,9 @@ buildGoModule rec {
|
||||
mkdir -p $out/bin
|
||||
install -Dm755 "$GOPATH/bin/cli" -T $out/bin/tctl
|
||||
install -Dm755 "$GOPATH/bin/authorization" -T $out/bin/tctl-authorization-plugin
|
||||
install -Dm755 "$GOPATH/bin/cassandra" -T $out/bin/temporal-cassandra
|
||||
install -Dm755 "$GOPATH/bin/server" -T $out/bin/temporal-server
|
||||
install -Dm755 "$GOPATH/bin/sql" -T $out/bin/temporal-sql
|
||||
install -Dm755 "$GOPATH/bin/cassandra" -T $out/bin/temporal-cassandra-tool
|
||||
install -Dm755 "$GOPATH/bin/sql" -T $out/bin/temporal-sql-tool
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
@ -12,13 +12,13 @@ assert trackerSearch -> (python3 != null);
|
||||
with lib;
|
||||
mkDerivation rec {
|
||||
pname = "qbittorrent";
|
||||
version = "4.4.0";
|
||||
version = "4.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qbittorrent";
|
||||
repo = "qBittorrent";
|
||||
rev = "release-${version}";
|
||||
sha256 = "sha256-xxQ6NGRSwRP+7kTxUsDB00VItHRHuaFopEroETtnGSs=";
|
||||
sha256 = "sha256-HNgegPL7M0zwkn7+lcNcsgWgrCbY9/d0nuIlIC5hkAM=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -10,38 +10,103 @@
|
||||
# commit.
|
||||
{ url ? null # The git url, if empty it will be set to src.url
|
||||
, branch ? null
|
||||
, stableVersion ? false # Use version format according to RFC 107 (i.e. LAST_TAG+date=YYYY-MM-DD)
|
||||
, tagPrefix ? "" # strip this prefix from a tag name when using stable version
|
||||
}:
|
||||
|
||||
let
|
||||
updateScript = writeShellScript "unstable-update-script.sh" ''
|
||||
set -ex
|
||||
|
||||
url="$1"
|
||||
url=""
|
||||
branch=""
|
||||
use_stable_version=""
|
||||
tag_prefix=""
|
||||
|
||||
while (( $# > 0 )); do
|
||||
flag="$1"
|
||||
shift 1
|
||||
case "$flag" in
|
||||
--url=*)
|
||||
url="''${flag#*=}"
|
||||
;;
|
||||
--branch=*)
|
||||
branch="''${flag#*=}"
|
||||
;;
|
||||
--use-stable-version)
|
||||
use_stable_version=1
|
||||
;;
|
||||
--tag-prefix=*)
|
||||
tag_prefix="''${flag#*=}"
|
||||
;;
|
||||
*)
|
||||
echo "$0: unknown option ‘''${flag}’"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
# By default we set url to src.url
|
||||
if [[ -z "$url" ]]; then
|
||||
url="$(${nix}/bin/nix-instantiate $systemArg --eval -E \
|
||||
"with import ./. {}; $UPDATE_NIX_ATTR_PATH.src.url" \
|
||||
"with import ./. {}; $UPDATE_NIX_ATTR_PATH.src.url or $UPDATE_NIX_ATTR_PATH.src.meta.homepage" \
|
||||
| tr -d '"')"
|
||||
fi
|
||||
|
||||
# Get info about HEAD from a shallow git clone
|
||||
tmpdir="$(${coreutils}/bin/mktemp -d)"
|
||||
${git}/bin/git clone --bare --depth=1 \
|
||||
${lib.optionalString (branch != null) "--branch ${branch}"} \
|
||||
"$url" "$tmpdir"
|
||||
|
||||
cloneArgs=(
|
||||
--bare
|
||||
--depth=1
|
||||
)
|
||||
|
||||
if [[ -n "$branch" ]]; then
|
||||
cloneArgs+=(--branch="$branch")
|
||||
fi
|
||||
|
||||
${git}/bin/git clone "''${cloneArgs[@]}" "$url" "$tmpdir"
|
||||
|
||||
pushd "$tmpdir"
|
||||
commit_date="$(${git}/bin/git show -s --pretty='format:%cs')"
|
||||
commit_sha="$(${git}/bin/git show -s --pretty='format:%H')"
|
||||
if [[ -z "$use_stable_version" ]]; then
|
||||
new_version="unstable-$commit_date"
|
||||
else
|
||||
depth=100
|
||||
while (( $depth < 10000 )); do
|
||||
last_tag="$(${git}/bin/git describe --tags --abbrev=0 2> /dev/null || true)"
|
||||
if [[ -n "$last_tag" ]]; then
|
||||
break
|
||||
fi
|
||||
${git}/bin/git fetch --depth="$depth" --tags
|
||||
depth=$(( $depth * 2 ))
|
||||
done
|
||||
if [[ -z "$last_tag" ]]; then
|
||||
echo "Cound not found a tag within last 10000 commits" > /dev/stderr
|
||||
exit 1
|
||||
fi
|
||||
if [[ -n "$tag_prefix" ]]; then
|
||||
last_tag="''${last_tag#$tag_prefix}"
|
||||
fi
|
||||
new_version="$last_tag+date=$commit_date"
|
||||
fi
|
||||
popd
|
||||
${coreutils}/bin/rm -rf "$tmpdir"
|
||||
# ${coreutils}/bin/rm -rf "$tmpdir"
|
||||
|
||||
# update the nix expression
|
||||
${common-updater-scripts}/bin/update-source-version \
|
||||
"$UPDATE_NIX_ATTR_PATH" \
|
||||
"unstable-$commit_date" \
|
||||
"$new_version" \
|
||||
--rev="$commit_sha"
|
||||
'';
|
||||
|
||||
in [ updateScript url ]
|
||||
|
||||
in [
|
||||
updateScript
|
||||
"--url=${builtins.toString url}"
|
||||
] ++ lib.optionals (branch != null) [
|
||||
"--branch=${branch}"
|
||||
] ++ lib.optionals stableVersion [
|
||||
"--use-stable-version"
|
||||
"--tag-prefix=${tagPrefix}"
|
||||
]
|
||||
|
||||
@ -9,11 +9,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-user-docs";
|
||||
version = "41.1";
|
||||
version = "41.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "Ve499XfRcX/BUvwq64nQr3qeyoZsiXTGdfYL1jCIjEg=";
|
||||
sha256 = "0xcIld06i7EXyfFIoLs/tJDRr3ExxEFod7G7/sWROVo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ddccontrol-db";
|
||||
version = "20220119";
|
||||
version = "20220216";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ddccontrol";
|
||||
repo = "ddccontrol-db";
|
||||
rev = version;
|
||||
sha256 = "sha256-8JJ6RG7yA1ssoYsvgDYp3/r+h1+rKnOwwoDhRx2brY8=";
|
||||
sha256 = "sha256-Nr8OvxbJRf9t2BUtEX3qBAH2BSs6KWLMzSpykiwYsHQ=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "v2ray-geoip";
|
||||
version = "202202100032";
|
||||
version = "202202170030";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "geoip";
|
||||
rev = "0a16dba825e420425786ff74f51a6bb881a62624";
|
||||
sha256 = "sha256-M3DitRNhvPh4AOocnG6omiQAPKgWziAcN4uO42/7BNE=";
|
||||
rev = "ebc49c1ccbe7f267778ab42dbfa01d7ff8a5241c";
|
||||
sha256 = "sha256-CxV7jKNeaSW7lVBKKr7Ih2XAehnFcapkyDogd5V32Zk=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -46,13 +46,13 @@
|
||||
|
||||
let self = stdenv.mkDerivation rec {
|
||||
pname = "mutter";
|
||||
version = "41.3";
|
||||
version = "41.4";
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "cZxdEGDrYFwbpkO0hvtXsaPHGX59+DvWwzZvxLaEd+U=";
|
||||
sha256 = "VYgmlQZKpvA4XNH39/qywqLtLJrsePV4+qB/UgnKUpw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
48
pkgs/desktops/gnome/extensions/dash-to-dock/default.nix
Normal file
48
pkgs/desktops/gnome/extensions/dash-to-dock/default.nix
Normal file
@ -0,0 +1,48 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, glib
|
||||
, gettext
|
||||
, sassc
|
||||
, unstableGitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-dash-to-dock";
|
||||
version = "71+date=2022-01-24";
|
||||
|
||||
# Temporarily switched to commit hash because stable version is buggy.
|
||||
src = fetchFromGitHub {
|
||||
owner = "micheleg";
|
||||
repo = "dash-to-dock";
|
||||
rev = "53114b4e000482a753e8b42dfa10d6057c08d1c6";
|
||||
sha256 = "Gv78I/dxhc6FpjZWk10uHBfD24tHE4KdkpaAo8UZpwU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
glib
|
||||
gettext
|
||||
sassc
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
extensionUuid = "dash-to-dock@micxgx.gmail.com";
|
||||
extensionPortalSlug = "dash-to-dock";
|
||||
|
||||
updateScript = unstableGitUpdater {
|
||||
stableVersion = true;
|
||||
tagPrefix = "extensions.gnome.org-v";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A dock for the Gnome Shell";
|
||||
homepage = "https://micheleg.github.io/dash-to-dock/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ eperuffo jtojnar rhoriguchi ];
|
||||
};
|
||||
}
|
||||
@ -28,10 +28,6 @@ super: lib.trivial.pipe super [
|
||||
meta.maintainers = with lib.maintainers; [ eperuffo ];
|
||||
}))
|
||||
|
||||
(patchExtension "dash-to-dock@micxgx.gmail.com" (old: {
|
||||
meta.maintainers = with lib.maintainers; [ eperuffo jtojnar rhoriguchi ];
|
||||
}))
|
||||
|
||||
(patchExtension "ddterm@amezin.github.com" (old: {
|
||||
# Requires gjs, zenity & vte via the typelib
|
||||
nativeBuildInputs = [ gobject-introspection wrapGAppsHook ];
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
{
|
||||
"arcmenu@arcmenu.com" = callPackage ./arcmenu { };
|
||||
"clock-override@gnomeshell.kryogenix.org" = callPackage ./clock-override { };
|
||||
"dash-to-dock@micxgx.gmail.com" = callPackage ./dash-to-dock { };
|
||||
"drop-down-terminal@gs-extensions.zzrough.org" = callPackage ./drop-down-terminal { };
|
||||
"EasyScreenCast@iacopodeenosee.gmail.com" = callPackage ./EasyScreenCast { };
|
||||
"emoji-selector@maestroschan.fr" = callPackage ./emoji-selector { };
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libjcat";
|
||||
version = "0.1.7";
|
||||
version = "0.1.10";
|
||||
|
||||
outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ];
|
||||
|
||||
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "hughsie";
|
||||
repo = "libjcat";
|
||||
rev = version;
|
||||
sha256 = "sha256-WYCYRFjjy9nr1p1SqzBGCBZ5vkhFybddXpHUcwdEDIQ=";
|
||||
sha256 = "sha256-6fqcP8LWvRoDf5gJz+kW0w5+3PP/luuoPMak1QLKzzM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -43,9 +43,7 @@ stdenv.mkDerivation rec {
|
||||
gobject-introspection
|
||||
vala
|
||||
gtk-doc
|
||||
(python3.withPackages (pkgs: with pkgs; [
|
||||
setuptools
|
||||
]))
|
||||
python3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@ -60,10 +58,6 @@ stdenv.mkDerivation rec {
|
||||
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs contrib/generate-version-script.py
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libscrypt";
|
||||
version = "1.21";
|
||||
version = "1.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "technion";
|
||||
repo = "libscrypt";
|
||||
rev = "v${version}";
|
||||
sha256 = "1d76ys6cp7fi4ng1w3mz2l0p9dbr7ljbk33dcywyimzjz8bahdng";
|
||||
sha256 = "sha256-QWWqC10bENemG5FYEog87tT7IxDaBJUDqu6j/sO3sYE=";
|
||||
};
|
||||
|
||||
buildFlags = lib.optional stdenv.isDarwin "LDFLAGS= CFLAGS_EXTRA=";
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mm-common";
|
||||
version = "1.0.3";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "6BWWYliZqs8dC/J8zC/Mfzc0BexIc1yhxyc8D7zcHvU=";
|
||||
sha256 = "6VTAm0MJp++T4TtpJgrNxXOMkHR36zgbeLseQU7m29g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
27
pkgs/development/python-modules/asterisk-mbox/default.nix
Normal file
27
pkgs/development/python-modules/asterisk-mbox/default.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asterisk-mbox";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "asterisk_mbox";
|
||||
inherit version;
|
||||
sha256 = "0624f9ab85ce9c4d43655f8653e8539fa10c81b60fd7b94b1a15dce306c20888";
|
||||
};
|
||||
|
||||
# no tests implemented
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "asterisk_mbox" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "The client side of a client/server to interact with Asterisk voicemail mailboxes";
|
||||
homepage = "https://github.com/PhracturedBlue/asterisk_mbox";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
32
pkgs/development/python-modules/bme280spi/default.nix
Normal file
32
pkgs/development/python-modules/bme280spi/default.nix
Normal file
@ -0,0 +1,32 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchPypi
|
||||
, spidev
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bme280spi";
|
||||
version = "0.2.0";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "51682acefda6f29eaaf9f37815edbfdd48ef0e9f1509419eceafe7b440eddc6e";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
spidev
|
||||
];
|
||||
|
||||
# no tests implemented
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for BME280 sensor through spidev";
|
||||
homepage = "https://github.com/Kuzj/bme280spi";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
@ -9,12 +9,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "croniter";
|
||||
version = "1.3.1";
|
||||
version = "1.3.4";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-2/AgcJiKvH6JVVg5FZMbNvhlw4KJOQvhGgxBErVcqsY=";
|
||||
hash = "sha256-MWk2WRaDS+ZUwsrFfqFNcQ50L464pfzoBPbOVI2oC/I=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dash";
|
||||
version = "2.1.0";
|
||||
version = "2.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "plotly";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qEHB90xzettkX/9ojCQ8AZYnTJaL+8n87SmlBOBSDWQ=";
|
||||
sha256 = "sha256-Ul3j1BJd3lKzGCEhPFYxZG0CcAqAZqmOEDi8vGPFItw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
38
pkgs/development/python-modules/dynalite-devices/default.nix
Normal file
38
pkgs/development/python-modules/dynalite-devices/default.nix
Normal file
@ -0,0 +1,38 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, asynctest
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dynalite-devices";
|
||||
version = "0.1.46";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ziv1234";
|
||||
repo = "python-dynalite-devices";
|
||||
rev = "v0.46"; # https://github.com/ziv1234/python-dynalite-devices/issues/2
|
||||
hash = "sha256-Fju2JpFkQBCbOln7r3L+crv82TI2SkdPJ1oaK7PEifo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/^addopts/d' setup.cfg
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
asynctest
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "dynalite_devices_lib" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An unofficial Dynalite DyNET interface creating devices";
|
||||
homepage = "https://github.com/ziv1234/python-dynalite-devices";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
31
pkgs/development/python-modules/geniushub-client/default.nix
Normal file
31
pkgs/development/python-modules/geniushub-client/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, aiohttp
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "geniushub-client";
|
||||
version = "0.6.30";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "390932b6e5051e221d104b2683d9deb6e352172c4ec4eeede0954bf2f9680211";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
];
|
||||
|
||||
# tests only implemented after 0.6.30
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "geniushubclient" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Aiohttp-based client for Genius Hub systems";
|
||||
homepage = "https://github.com/zxdavb/geniushub-client";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
35
pkgs/development/python-modules/i2csense/default.nix
Normal file
35
pkgs/development/python-modules/i2csense/default.nix
Normal file
@ -0,0 +1,35 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, smbus-cffi
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "i2csense";
|
||||
version = "0.0.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "6f9c0a37d971e5b8a60c54982bd580cff84bf94fedc08c097e603a8e5609c33f";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
smbus-cffi
|
||||
];
|
||||
|
||||
# no tests implemented
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"i2csense.bme280"
|
||||
"i2csense.bh1750"
|
||||
"i2csense.htu21d"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A library to handle i2c sensors with the Raspberry Pi";
|
||||
homepage = "https://github.com/azogue/i2csense";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
@ -57,8 +57,8 @@
|
||||
"aruba" = ps: with ps; [ pexpect ];
|
||||
"arwn" = ps: with ps; [ aiohttp-cors paho-mqtt ];
|
||||
"aseko_pool_live" = ps: with ps; [ aioaseko ];
|
||||
"asterisk_cdr" = ps: with ps; [ ]; # missing inputs: asterisk_mbox
|
||||
"asterisk_mbox" = ps: with ps; [ ]; # missing inputs: asterisk_mbox
|
||||
"asterisk_cdr" = ps: with ps; [ asterisk-mbox ];
|
||||
"asterisk_mbox" = ps: with ps; [ asterisk-mbox ];
|
||||
"asuswrt" = ps: with ps; [ aioasuswrt ];
|
||||
"atag" = ps: with ps; [ pyatag ];
|
||||
"aten_pe" = ps: with ps; [ atenpdu ];
|
||||
@ -83,7 +83,7 @@
|
||||
"bbb_gpio" = ps: with ps; [ ]; # missing inputs: Adafruit_BBIO
|
||||
"bbox" = ps: with ps; [ ]; # missing inputs: pybbox
|
||||
"beewi_smartclim" = ps: with ps; [ ]; # missing inputs: beewi_smartclim
|
||||
"bh1750" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense
|
||||
"bh1750" = ps: with ps; [ i2csense smbus-cffi ];
|
||||
"binary_sensor" = ps: with ps; [ ];
|
||||
"bitcoin" = ps: with ps; [ blockchain ];
|
||||
"bizkaibus" = ps: with ps; [ bizkaibus ];
|
||||
@ -98,7 +98,7 @@
|
||||
"bluesound" = ps: with ps; [ xmltodict ];
|
||||
"bluetooth_le_tracker" = ps: with ps; [ pygatt ];
|
||||
"bluetooth_tracker" = ps: with ps; [ bt-proximity pybluez ];
|
||||
"bme280" = ps: with ps; [ smbus-cffi ]; # missing inputs: bme280spi i2csense
|
||||
"bme280" = ps: with ps; [ bme280spi i2csense smbus-cffi ];
|
||||
"bme680" = ps: with ps; [ bme680 smbus-cffi ];
|
||||
"bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280
|
||||
"bmw_connected_drive" = ps: with ps; [ bimmer-connected ];
|
||||
@ -208,7 +208,7 @@
|
||||
"dunehd" = ps: with ps; [ pdunehd ];
|
||||
"dwd_weather_warnings" = ps: with ps; [ dwdwfsapi ];
|
||||
"dweet" = ps: with ps; [ ]; # missing inputs: dweepy
|
||||
"dynalite" = ps: with ps; [ ]; # missing inputs: dynalite_devices
|
||||
"dynalite" = ps: with ps; [ dynalite-devices ];
|
||||
"eafm" = ps: with ps; [ aioeafm ];
|
||||
"ebox" = ps: with ps; [ ]; # missing inputs: pyebox
|
||||
"ebusd" = ps: with ps; [ ]; # missing inputs: ebusdpy
|
||||
@ -312,7 +312,7 @@
|
||||
"generic" = ps: with ps; [ ];
|
||||
"generic_hygrostat" = ps: with ps; [ ];
|
||||
"generic_thermostat" = ps: with ps; [ sqlalchemy ];
|
||||
"geniushub" = ps: with ps; [ ]; # missing inputs: geniushub-client
|
||||
"geniushub" = ps: with ps; [ geniushub-client ];
|
||||
"geo_json_events" = ps: with ps; [ geojson-client ];
|
||||
"geo_location" = ps: with ps; [ ];
|
||||
"geo_rss_events" = ps: with ps; [ georss-generic-client ];
|
||||
@ -382,7 +382,7 @@
|
||||
"hp_ilo" = ps: with ps; [ python-hpilo ];
|
||||
"html5" = ps: with ps; [ aiohttp-cors pywebpush ];
|
||||
"http" = ps: with ps; [ aiohttp-cors ];
|
||||
"htu21d" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense
|
||||
"htu21d" = ps: with ps; [ i2csense smbus-cffi ];
|
||||
"huawei_lte" = ps: with ps; [ huawei-lte-api stringcase url-normalize ];
|
||||
"hue" = ps: with ps; [ aiohue ];
|
||||
"huisbaasje" = ps: with ps; [ huisbaasje-client ];
|
||||
@ -1149,6 +1149,7 @@
|
||||
"dte_energy_bridge"
|
||||
"duckdns"
|
||||
"dunehd"
|
||||
"dynalite"
|
||||
"eafm"
|
||||
"ecobee"
|
||||
"econet"
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
{ lib, mkYarnPackage, fetchFromGitHub, nodejs, runtimeShell }:
|
||||
{ lib, mkYarnPackage, fetchFromGitHub, nodejs, runtimeShell
|
||||
, nodePackages, python3, vips, glib, pkg-config
|
||||
}:
|
||||
|
||||
# Notes for the upgrade:
|
||||
# * Download the tarball of the new version to use.
|
||||
@ -10,13 +12,13 @@
|
||||
|
||||
mkYarnPackage rec {
|
||||
pname = "grafana-image-renderer";
|
||||
version = "3.3.0";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "grafana-image-renderer";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-q4w40Do3e4vMluwAb1YwSGMVHO6QRZr8Fa5I+05uzLI=";
|
||||
sha256 = "sha256-6yw+zp83T6VVa4A9KYX6rzMKG5GoyJ7M8Z+cEHE4uts=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
@ -35,6 +37,14 @@ mkYarnPackage rec {
|
||||
yarnNix = ./yarn.nix;
|
||||
yarnLock = ./yarn.lock;
|
||||
|
||||
pkgConfig.sharp = {
|
||||
nativeBuildInputs = [ nodePackages.node-gyp python3 pkg-config ];
|
||||
buildInputs = [ glib vips ];
|
||||
postInstall = ''
|
||||
node-gyp rebuild
|
||||
'';
|
||||
};
|
||||
|
||||
distPhase = ''
|
||||
runHook preDist
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
"license": "Apache-2.0",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/grafana/grafana-image-renderer.git"
|
||||
"url": "http://github.com/grafana/grafana-image-renderer.git"
|
||||
},
|
||||
"scripts": {
|
||||
"eslint": "eslint . --ext .ts",
|
||||
@ -14,6 +14,7 @@
|
||||
"prettier:write": "prettier --list-different \"**/*.ts\" --write",
|
||||
"precommit": "npm run eslint & npm run typecheck",
|
||||
"watch": "tsc-watch --onSuccess \"node build/app.js server --config=dev.json\"",
|
||||
"watch:debug": "tsc-watch --onSuccess \"cross-env DEBUG=puppeteer-cluster:* node build/app.js server --config=dev.json\"",
|
||||
"build": "tsc",
|
||||
"start": "node build/app.js --config=dev.json"
|
||||
},
|
||||
@ -30,8 +31,10 @@
|
||||
"morgan": "^1.9.0",
|
||||
"on-finished": "^2.3.0",
|
||||
"prom-client": "^11.5.3",
|
||||
"puppeteer": "^10.0.0",
|
||||
"puppeteer": "^13.1.3",
|
||||
"puppeteer-cluster": "^0.22.0",
|
||||
"poolpeteer": "^0.22.0",
|
||||
"sharp": "0.29.3",
|
||||
"unique-filename": "^1.1.0",
|
||||
"winston": "^3.2.1"
|
||||
},
|
||||
@ -39,6 +42,7 @@
|
||||
"@grafana/eslint-config": "^2.5.0",
|
||||
"@types/express": "^4.11.1",
|
||||
"@types/node": "^14.14.41",
|
||||
"cross-env": "7.0.3",
|
||||
"@typescript-eslint/eslint-plugin": "^4.32.0",
|
||||
"@typescript-eslint/parser": "^4.32.0",
|
||||
"eslint": "^7.32.0",
|
||||
@ -49,7 +53,7 @@
|
||||
"eslint-plugin-react-hooks": "^4.2.0",
|
||||
"husky": "^4.3.8",
|
||||
"lint-staged": "^11.2.0",
|
||||
"pkg": "^5.4.1",
|
||||
"pkg": "5.5.2",
|
||||
"prettier": "2.2.1",
|
||||
"tsc-watch": "^4.2.3",
|
||||
"typescript": "^4.3.2"
|
||||
@ -69,7 +73,7 @@
|
||||
},
|
||||
"bin": "build/app.js",
|
||||
"engines": {
|
||||
"node": ">=14 <15"
|
||||
"node": ">=14 <=16"
|
||||
},
|
||||
"volta": {
|
||||
"node": "14.16.1"
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,31 +1,30 @@
|
||||
{ lib, stdenv, fetchFromGitHub, xorg, boost, cmake, gtest }:
|
||||
{ lib, stdenv, fetchFromGitHub, xorg, boost, gtest }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xlayoutdisplay";
|
||||
version = "1.1.2";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alex-courtis";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0n3vg25gzwn1pcg6caxyyd1xf2w6n98m6jpxc70kqpxfqldxwl0m";
|
||||
sha256 = "sha256-8K9SoZToJTk/sL4PC4Fcsu9XzGLYfNIZlbIyxc9jf84=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = with xorg; [ libX11 libXrandr libXcursor boost ];
|
||||
checkInputs = [ gtest ];
|
||||
|
||||
doCheck = true;
|
||||
checkTarget = "gtest";
|
||||
|
||||
# format security fixup
|
||||
# Fixup reference to hardcoded boost path, dynamically link as seems fine and we don't have static for this
|
||||
postPatch = ''
|
||||
substituteInPlace test/test-Monitors.cpp \
|
||||
--replace 'fprintf(lidStateFile, contents);' \
|
||||
'fputs(contents, lidStateFile);'
|
||||
|
||||
substituteInPlace CMakeLists.txt --replace "set(Boost_USE_STATIC_LIBS ON)" ""
|
||||
substituteInPlace config.mk --replace '/usr/lib/libboost_program_options.a' '-lboost_program_options'
|
||||
'';
|
||||
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Detects and arranges linux display outputs, using XRandR for detection and xrandr for arrangement";
|
||||
homepage = "https://github.com/alex-courtis/xlayoutdisplay";
|
||||
|
||||
@ -1,14 +1,16 @@
|
||||
{ lib, stdenv, fetchurl }:
|
||||
{ lib, stdenv, fetchurl, cmake, halibut }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xtruss";
|
||||
version = "20181001.82973f5";
|
||||
version = "20211025.c25bf48";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.chiark.greenend.org.uk/~sgtatham/xtruss/${pname}-${version}.tar.gz";
|
||||
sha256 = "1mm8k92zc318jk71wlf2r4rb723nd9lalhjl0pf48raiajb5ifgd";
|
||||
sha256 = "sha256-ikuKHtXEn2UVLE62l7qD9qc9ZUk6jiAqj5ru36vgdHk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake halibut ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "easy-to-use X protocol tracing program";
|
||||
homepage = "https://www.chiark.greenend.org.uk/~sgtatham/xtruss";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "bashplotlib";
|
||||
version = "2019-01-02";
|
||||
version = "2021-03-31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "glamp";
|
||||
repo = "bashplotlib";
|
||||
rev = "f7533172c4dc912b5accae42edd5c0f655d7468f";
|
||||
sha256 = "1sifqslvvz2c05spwrl81kcdg792l6jwvfd3ih9q5wjkvkm0plz8";
|
||||
rev = "db4065cfe65c0bf7c530e0e8b9328daf9593ad74";
|
||||
sha256 = "sha256-0S6mgy6k7CcqsDR1kE5xcXGidF1t061e+M+ZuP2Gk3c=";
|
||||
};
|
||||
|
||||
# No tests
|
||||
|
||||
@ -2,31 +2,31 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "infracost";
|
||||
version = "0.9.8";
|
||||
version = "0.9.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "infracost";
|
||||
rev = "v${version}";
|
||||
repo = "infracost";
|
||||
sha256 = "sha256-8XS30fRxHPady/snr3gfo8Ryiw9O7EeDezcYYZjod1w=";
|
||||
sha256 = "sha256-ukFY6Iy7RaUjECbMCMdOkulMdzUlsoBnyRiuzldXVc8=";
|
||||
};
|
||||
vendorSha256 = "sha256-8r7v3526kY+rFHkl1+KEwNbFrSnXPlpZD6kiK4ea+Zg=";
|
||||
vendorSha256 = "sha256-D4tXBXtD3FlWvp4GPIuo/2p3MKg81DVPT5pKVOGe/5c=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ];
|
||||
|
||||
# Install completions post-install
|
||||
subPackages = [ "cmd/infracost" ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
checkInputs = [ terraform ];
|
||||
# Short only runs the unit-tests tagged short
|
||||
checkFlags = [ "-v" "-short" ];
|
||||
# -short only runs the unit-tests tagged short
|
||||
checkFlags = [ "-short" ];
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
# Remove tests that require networking
|
||||
rm cmd/infracost/{breakdown_test,diff_test}.go
|
||||
# ldflags are required for some of the version testing
|
||||
go test ./... $checkFlags ''${ldflags:+-ldflags="$ldflags"}
|
||||
rm cmd/infracost/{breakdown_test,diff_test,run_test}.go
|
||||
|
||||
go test $checkFlags ''${ldflags:+-ldflags="$ldflags"} -v -p $NIX_BUILD_CORES ./...
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
22
pkgs/tools/wayland/swaytools/default.nix
Normal file
22
pkgs/tools/wayland/swaytools/default.nix
Normal file
@ -0,0 +1,22 @@
|
||||
{ lib, python3Packages, slurp }:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "swaytools";
|
||||
version = "0.1.0";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1eb89259cbe027a0fa6bfc06ecf94e89b15e6f7b4965104e5b661c916ce7408c";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ slurp ];
|
||||
|
||||
passthru.updateScript = ./update.py;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/tmccombs/swaytools";
|
||||
description = "Collection of simple tools for sway (and i3)";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ atila ];
|
||||
};
|
||||
}
|
||||
58
pkgs/tools/wayland/swaytools/update.py
Executable file
58
pkgs/tools/wayland/swaytools/update.py
Executable file
@ -0,0 +1,58 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i python -p python39Packages.requests python39Packages.pip python39Packages.packaging
|
||||
|
||||
import requests
|
||||
import json
|
||||
import subprocess
|
||||
try:
|
||||
from packaging.version import parse
|
||||
except ImportError:
|
||||
from pip._vendor.packaging.version import parse
|
||||
|
||||
|
||||
URL_PATTERN = 'https://pypi.python.org/pypi/{package}/json'
|
||||
|
||||
def findLine(key,derivation):
|
||||
count = 0
|
||||
lines = []
|
||||
for line in derivation:
|
||||
if key in line:
|
||||
lines.append(count)
|
||||
count += 1
|
||||
return lines
|
||||
|
||||
def get_version(package, url_pattern=URL_PATTERN):
|
||||
"""Return version of package on pypi.python.org using json."""
|
||||
req = requests.get(url_pattern.format(package=package))
|
||||
version = parse('0')
|
||||
if req.status_code == requests.codes.ok:
|
||||
j = json.loads(req.text.encode(req.encoding))
|
||||
releases = j.get('releases', [])
|
||||
for release in releases:
|
||||
ver = parse(release)
|
||||
if not ver.is_prerelease:
|
||||
if ver > version:
|
||||
version = ver
|
||||
sha256 = j["releases"][release][-1]["digests"]["sha256"]
|
||||
return version, sha256
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
||||
nixpkgs = subprocess.check_output(["git", "rev-parse", "--show-toplevel"]).decode("utf-8").strip('\n')
|
||||
swaytoolsFolder = "/pkgs/tools/wayland/swaytools/"
|
||||
with open(nixpkgs + swaytoolsFolder + "default.nix", 'r') as arq:
|
||||
derivation = arq.readlines()
|
||||
|
||||
version, sha256 = get_version('swaytools')
|
||||
|
||||
key = "version = "
|
||||
line = findLine(key,derivation)[0]
|
||||
derivation[line] = f' version = "{version}";\n'
|
||||
|
||||
key = "sha256 = "
|
||||
line = findLine(key,derivation)[0]
|
||||
derivation[line] = f' sha256 = "{sha256}";\n'
|
||||
|
||||
with open(nixpkgs + swaytoolsFolder + "default.nix", 'w') as arq:
|
||||
arq.writelines(derivation)
|
||||
@ -2655,6 +2655,8 @@ with pkgs;
|
||||
|
||||
swayr = callPackage ../tools/wayland/swayr { };
|
||||
|
||||
swaytools = callPackage ../tools/wayland/swaytools { };
|
||||
|
||||
wayland-utils = callPackage ../tools/wayland/wayland-utils { };
|
||||
|
||||
wayland-proxy-virtwl = callPackage ../tools/wayland/wayland-proxy-virtwl { };
|
||||
|
||||
@ -24876,14 +24876,14 @@ let
|
||||
|
||||
XMLLibXML = buildPerlPackage {
|
||||
pname = "XML-LibXML";
|
||||
version = "2.0206";
|
||||
version = "2.0207";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0206.tar.gz";
|
||||
sha256 = "068nhmld1031grgi4qm7k5niwxlbn6qd08zf6g1gj4c7qfas62q1";
|
||||
url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0207.tar.gz";
|
||||
sha256 = "sha256-kDQ2yYWYdb71WTJDquhc7TKa0PtLV7v0WXXjJUfFDBU=";
|
||||
};
|
||||
SKIP_SAX_INSTALL = 1;
|
||||
buildInputs = [ AlienBuild AlienLibxml2 ]
|
||||
++ lib.optional stdenv.isDarwin pkgs.libiconv;
|
||||
++ lib.optionals stdenv.isDarwin (with pkgs; [ libiconv zlib ]);
|
||||
propagatedBuildInputs = [ XMLSAX ];
|
||||
};
|
||||
|
||||
|
||||
@ -654,6 +654,8 @@ in {
|
||||
|
||||
assertpy = callPackage ../development/python-modules/assertpy { };
|
||||
|
||||
asterisk-mbox = callPackage ../development/python-modules/asterisk-mbox { };
|
||||
|
||||
asteval = callPackage ../development/python-modules/asteval { };
|
||||
|
||||
astor = callPackage ../development/python-modules/astor { };
|
||||
@ -1268,6 +1270,8 @@ in {
|
||||
|
||||
blurhash = callPackage ../development/python-modules/blurhash { };
|
||||
|
||||
bme280spi = callPackage ../development/python-modules/bme280spi { };
|
||||
|
||||
bme680 = callPackage ../development/python-modules/bme680 { };
|
||||
|
||||
bokeh = callPackage ../development/python-modules/bokeh { };
|
||||
@ -2478,6 +2482,8 @@ in {
|
||||
|
||||
dyn = callPackage ../development/python-modules/dyn { };
|
||||
|
||||
dynalite-devices = callPackage ../development/python-modules/dynalite-devices { };
|
||||
|
||||
dynd = callPackage ../development/python-modules/dynd { };
|
||||
|
||||
easydict = callPackage ../development/python-modules/easydict { };
|
||||
@ -3184,6 +3190,8 @@ in {
|
||||
|
||||
generic = callPackage ../development/python-modules/generic { };
|
||||
|
||||
geniushub-client = callPackage ../development/python-modules/geniushub-client { };
|
||||
|
||||
genome-collector = callPackage ../development/python-modules/genome-collector { };
|
||||
|
||||
genpy = callPackage ../development/python-modules/genpy { };
|
||||
@ -3864,6 +3872,8 @@ in {
|
||||
inherit (pkgs) i2c-tools;
|
||||
};
|
||||
|
||||
i2csense = callPackage ../development/python-modules/i2csense { };
|
||||
|
||||
i3ipc = callPackage ../development/python-modules/i3ipc { };
|
||||
|
||||
i3-py = callPackage ../development/python-modules/i3-py { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user