mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-04 03:27:38 +03:00
Merge staging-next into staging
This commit is contained in:
commit
516d7767c0
@ -57,6 +57,9 @@ in
|
||||
];
|
||||
};
|
||||
|
||||
# Yubikey-agent expects pcsd to be running in order to function.
|
||||
services.pcscd.enable = true;
|
||||
|
||||
environment.extraInit = ''
|
||||
if [ -z "$SSH_AUTH_SOCK" -a -n "$XDG_RUNTIME_DIR" ]; then
|
||||
export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/yubikey-agent/yubikey-agent.sock"
|
||||
|
@ -1,48 +0,0 @@
|
||||
{ lib, stdenv, fetchurl, rpmextract, wrapGAppsHook, nwjs }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gometer";
|
||||
version = "5.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gometer-prod-new-apps.s3-accelerate.amazonaws.com/${version}/goMeter-linux64.rpm";
|
||||
sha256 = "sha256-E53sVvneW2EMPz9HNCgbGuHnDlVihE+Lf+DkFIP+j28=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
rpmextract
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
dontConfigure = true;
|
||||
|
||||
unpackPhase = ''
|
||||
rpmextract ${src}
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mv usr $out
|
||||
mv opt $out
|
||||
|
||||
mkdir $out/share/applications
|
||||
mv $out/opt/goMeter/goMeter.desktop $out/share/applications/gometer.desktop
|
||||
substituteInPlace $out/share/applications/gometer.desktop \
|
||||
--replace '/opt/goMeter/' ""
|
||||
|
||||
makeWrapper ${nwjs}/bin/nw $out/bin/goMeter \
|
||||
--add-flags $out/opt/goMeter/package.nw
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Analytic-Tracking tool for GoLance";
|
||||
homepage = "https://golance.com/download-gometer";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ wolfangaukang ];
|
||||
};
|
||||
}
|
@ -1,37 +1,48 @@
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, vala, cmake, ninja, wrapGAppsHook, pkg-config, gettext
|
||||
, gobject-introspection, gnome, glib, gdk-pixbuf, gtk3, glib-networking
|
||||
, xorg, libXdmcp, libxkbcommon
|
||||
, gobject-introspection, glib, gdk-pixbuf, gtk4, glib-networking
|
||||
, libadwaita
|
||||
, libnotify, libsoup, libgee
|
||||
, librsvg, libsignal-protocol-c
|
||||
, libsignal-protocol-c
|
||||
, libgcrypt
|
||||
, libepoxy
|
||||
, at-spi2-core
|
||||
, sqlite
|
||||
, dbus
|
||||
, gpgme
|
||||
, pcre
|
||||
, pcre2
|
||||
, qrencode
|
||||
, icu
|
||||
, gspell
|
||||
, srtp, libnice, gnutls, gstreamer, gst-plugins-base, gst-plugins-good, webrtc-audio-processing
|
||||
}:
|
||||
, srtp
|
||||
, libnice
|
||||
, gnutls
|
||||
, gstreamer
|
||||
, gst-plugins-base
|
||||
, gst-plugins-good
|
||||
, gst-plugins-bad
|
||||
, gst-vaapi
|
||||
, webrtc-audio-processing
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dino";
|
||||
version = "0.3.1";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dino";
|
||||
repo = "dino";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wjSgs1mUMV7j/8ZeXqWs8aOeWvJHwKziUfbtOC1HS3s=";
|
||||
sha256 = "sha256-FZ7MVeVxIzxzSQi5G9y+nn487pKLcXEZV1JK9mCY2MQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# don't overwrite manually set version information
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "include(ComputeVersion)" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
vala
|
||||
cmake
|
||||
ninja
|
||||
ninja # https://github.com/dino/dino/issues/230
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
gettext
|
||||
@ -40,40 +51,42 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
qrencode
|
||||
gobject-introspection
|
||||
glib-networking
|
||||
glib
|
||||
glib-networking # required for TLS support
|
||||
libadwaita
|
||||
libgee
|
||||
gnome.adwaita-icon-theme
|
||||
sqlite
|
||||
gdk-pixbuf
|
||||
gtk3
|
||||
gtk4
|
||||
libnotify
|
||||
gpgme
|
||||
libgcrypt
|
||||
libsoup
|
||||
pcre
|
||||
libepoxy
|
||||
at-spi2-core
|
||||
dbus
|
||||
pcre2
|
||||
icu
|
||||
libsignal-protocol-c
|
||||
librsvg
|
||||
gspell
|
||||
srtp
|
||||
libnice
|
||||
gnutls
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
gst-plugins-good # contains rtpbin, required for VP9
|
||||
gst-plugins-bad # required for H264, MSDK
|
||||
gst-vaapi # required for VAAPI
|
||||
webrtc-audio-processing
|
||||
] ++ lib.optionals (!stdenv.isDarwin) [
|
||||
xorg.libxcb
|
||||
xorg.libpthreadstubs
|
||||
libXdmcp
|
||||
libxkbcommon
|
||||
];
|
||||
|
||||
cmakeFlags = ["-DBUILD_TESTS=yes"];
|
||||
cmakeFlags = [
|
||||
"-DBUILD_TESTS=true"
|
||||
"-DRTP_ENABLE_H264=true"
|
||||
"-DRTP_ENABLE_MSDK=true"
|
||||
"-DRTP_ENABLE_VAAPI=true"
|
||||
"-DRTP_ENABLE_VP9=true"
|
||||
"-DVERSION_FOUND=true"
|
||||
"-DVERSION_IS_RELEASE=true"
|
||||
"-DVERSION_FULL=${version}"
|
||||
];
|
||||
|
||||
# Undefined symbols for architecture arm64: "_gpg_strerror"
|
||||
NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lgpg-error";
|
||||
|
@ -4,8 +4,11 @@
|
||||
, fetchpatch
|
||||
, openssl
|
||||
, libsamplerate
|
||||
, swig
|
||||
, alsa-lib
|
||||
, AppKit
|
||||
, python3
|
||||
, pythonSupport ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -33,6 +36,9 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs =
|
||||
lib.optionals pythonSupport [ swig python3 ];
|
||||
|
||||
buildInputs = [ openssl libsamplerate ]
|
||||
++ lib.optional stdenv.isLinux alsa-lib
|
||||
++ lib.optional stdenv.isDarwin AppKit;
|
||||
@ -41,11 +47,24 @@ stdenv.mkDerivation rec {
|
||||
export LD=$CC
|
||||
'';
|
||||
|
||||
postBuild = lib.optionalString pythonSupport ''
|
||||
make -C pjsip-apps/src/swig/python
|
||||
'';
|
||||
|
||||
outputs = [ "out" ]
|
||||
++ lib.optional pythonSupport "py";
|
||||
|
||||
configureFlags = [ "--enable-shared" ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/bin
|
||||
cp pjsip-apps/bin/pjsua-* $out/bin/pjsua
|
||||
mkdir -p $out/share/${pname}-${version}/samples
|
||||
cp pjsip-apps/bin/samples/*/* $out/share/${pname}-${version}/samples
|
||||
'' + lib.optionalString pythonSupport ''
|
||||
(cd pjsip-apps/src/swig/python && \
|
||||
python setup.py install --prefix=$py
|
||||
)
|
||||
'';
|
||||
|
||||
# We need the libgcc_s.so.1 loadable (for pthread_cancel to work)
|
||||
|
@ -7,14 +7,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "cwltool";
|
||||
version = "3.1.20230201130431";
|
||||
version = "3.1.20230209161050";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "common-workflow-language";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-rx5rdB8OgJ7Mck3pm1GRrymZbQ3lHlXFecICb/pbnKg=";
|
||||
hash = "sha256-gc/KSJS3KcxXc3xDyJSXavaxtwhKBiihgdI7yc7d2I8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -86,8 +86,9 @@ stdenvNoCC.mkDerivation rec {
|
||||
yarn2nix;
|
||||
};
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
inherit (mirakurun.meta) description platforms;
|
||||
maintainers = with lib.maintainers; [ midchildan ];
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ midchildan ];
|
||||
};
|
||||
}
|
||||
|
@ -1,29 +1,35 @@
|
||||
{ lib, stdenv, fetchurl }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (self: {
|
||||
pname = "dev86";
|
||||
version = "0.16.21";
|
||||
version = "unstable-2022-07-19";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://v3.sk/~lkundrak/dev86/Dev86src-${version}.tar.gz";
|
||||
sha256 = "154dyr2ph4n0kwi8yx0n78j128kw29rk9r9f7s2gddzrdl712jr3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jbruchon";
|
||||
repo = "dev86";
|
||||
rev = "f5cd3e5c17a0d3cd8298bac8e30bed6e59c4e57a";
|
||||
hash = "sha256-CWeboFkJkpKHZ/wkuvMj5a+5qB2uzAtoYy8OdyYErMg=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
# Parallel builds are not supported due to build process structure:
|
||||
# tools are built sequentially in submakefiles and are reusing the
|
||||
# same targets as dependencies. Building dependencies in parallel
|
||||
# from different submakes is not synchronized and fails:
|
||||
# Parallel builds are not supported due to build process structure: tools are
|
||||
# built sequentially in submakefiles and are reusing the same targets as
|
||||
# dependencies. Building dependencies in parallel from different submakes is
|
||||
# not synchronized and fails:
|
||||
# make[3]: Entering directory '/build/dev86-0.16.21/libc'
|
||||
# Unable to execute as86.
|
||||
enableParallelBuilding = false;
|
||||
|
||||
meta = {
|
||||
description = "Linux 8086 development environment";
|
||||
homepage = "https://github.com/lkundrak/dev86";
|
||||
homepage = "https://github.com/jbruchon/dev86";
|
||||
description =
|
||||
"C compiler, assembler and linker environment for the production of 8086 executables";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ lib.maintainers.AndersonTorres ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ config, lib, pkgs }:
|
||||
|
||||
lib.makeScope pkgs.newScope (self: with self; {
|
||||
lib.makeScope pkgs.newScope (self: {
|
||||
|
||||
harec = callPackage ./harec { };
|
||||
hare = callPackage ./hare { };
|
||||
harec = pkgs.callPackage ./harec { };
|
||||
hare = pkgs.callPackage ./hare { };
|
||||
})
|
||||
|
@ -25,3 +25,20 @@ SCDOC = scdoc
|
||||
|
||||
# Where to store build artifacts
|
||||
# set HARECACHE externally
|
||||
|
||||
# Cross-compiler toolchains
|
||||
# # TODO: fixup this
|
||||
AARCH64_AS=aarch64-as
|
||||
AARCH64_AR=aarch64-ar
|
||||
AARCH64_CC=aarch64-cc
|
||||
AARCH64_LD=aarch64-ld
|
||||
|
||||
RISCV64_AS=riscv64-as
|
||||
RISCV64_AR=riscv64-ar
|
||||
RISCV64_CC=riscv64-cc
|
||||
RISCV64_LD=riscv64-ld
|
||||
|
||||
X86_64_AS=as
|
||||
X86_64_AR=ar
|
||||
X86_64_CC=cc
|
||||
X86_64_LD=ld
|
||||
|
@ -2,25 +2,30 @@
|
||||
, stdenv
|
||||
, fetchFromSourcehut
|
||||
, binutils-unwrapped
|
||||
, harec
|
||||
, harePackages
|
||||
, makeWrapper
|
||||
, qbe
|
||||
, scdoc
|
||||
, substituteAll
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
let
|
||||
inherit (harePackages) harec;
|
||||
in
|
||||
stdenv.mkDerivation (self: {
|
||||
pname = "hare";
|
||||
version = "unstable-2022-07-30";
|
||||
version = "unstable-2023-02-10";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~sircmpwn";
|
||||
repo = "hare";
|
||||
rev = "296925c91d79362d6b8ac94e0336a38e9af0f1c9";
|
||||
hash = "sha256-LeIUnpTMZ6vxgAy/LPm9/IMit41RgezdVESIv+gQFHc=";
|
||||
rev = "52b3f2d0c7a85e04a79666a954101e527b7f1272";
|
||||
hash = "sha256-/zP8LbZ113Ar06MZF1zP20LKMGko+4HcOXSntLVAQAU=";
|
||||
};
|
||||
|
||||
patches = [ ./disable-failing-test-cases.patch ];
|
||||
patches = [
|
||||
./000-disable-failing-test-cases.diff
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
binutils-unwrapped
|
||||
@ -86,12 +91,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "http://harelang.org/";
|
||||
description =
|
||||
"A systems programming language designed to be simple, stable, and robust";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = [ lib.maintainers.AndersonTorres ];
|
||||
inherit (harec.meta) platforms badPlatforms;
|
||||
broken = stdenv.isAarch64; # still figuring how to set cross-compiling stuff
|
||||
};
|
||||
})
|
||||
|
@ -4,15 +4,15 @@
|
||||
, qbe
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
stdenv.mkDerivation (self: {
|
||||
pname = "harec";
|
||||
version = "unstable-2022-07-02";
|
||||
version = "unstable-2023-02-08";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~sircmpwn";
|
||||
repo = "harec";
|
||||
rev = "56359312644f76941de1878d33a1a0b840be8056";
|
||||
hash = "sha256-8SFYRJSvX8hmsHBgaLUfhLUV7d54im22ETZds1eASc4=";
|
||||
rev = "4730fa6b835f08c44bd7991cc8b264fbc27d752b";
|
||||
hash = "sha256-XOhZWdmkMAuXbj7svILJI3wI7RF9OAb/OE1uGel4/vE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -30,15 +30,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "http://harelang.org/";
|
||||
description = "Bootstrapping Hare compiler written in C for POSIX systems";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = [ lib.maintainers.AndersonTorres ];
|
||||
# The upstream developers do not like proprietary operating systems; see
|
||||
# https://harelang.org/platforms/
|
||||
platforms = with platforms;
|
||||
platforms = with lib.platforms;
|
||||
lib.intersectLists (freebsd ++ linux) (aarch64 ++ x86_64 ++ riscv64);
|
||||
badPlatforms = with platforms; darwin;
|
||||
badPlatforms = lib.platforms.darwin;
|
||||
};
|
||||
})
|
||||
|
16
pkgs/development/compilers/ocaml/4.09.1-Werror.patch
Normal file
16
pkgs/development/compilers/ocaml/4.09.1-Werror.patch
Normal file
@ -0,0 +1,16 @@
|
||||
The 4.09.1 tarball appears to have been acidentally generated as a
|
||||
development tarball, which causes configure to enable -Werror. This
|
||||
means newer compilers will make the build fail.
|
||||
|
||||
diff a/configure b/configure
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -12360,7 +12360,7 @@ case $ocaml_cv_cc_vendor in #(
|
||||
msvc-*) :
|
||||
outputobj=-Fo; CPP="cl -nologo -EP"; gcc_warnings="" ;; #(
|
||||
*) :
|
||||
- outputobj='-o $(EMPTY)'; case 4.09.1+dev1-2020-03-13 in #(
|
||||
+ outputobj='-o $(EMPTY)'; case 4.09.1 in #(
|
||||
*+dev*) :
|
||||
gcc_warnings="-Wall -Werror" ;; #(
|
||||
*) :
|
@ -8,6 +8,7 @@ import ./generic.nix {
|
||||
hardeningDisable = [ "strictoverflow" ];
|
||||
|
||||
patches = [
|
||||
./4.09.1-Werror.patch
|
||||
# Compatibility with Glibc 2.34
|
||||
{ url = "https://github.com/ocaml/ocaml/commit/8eed2e441222588dc385a98ae8bd6f5820eb0223.patch";
|
||||
sha256 = "sha256:1b3jc6sj2k23yvfwrv6nc1f4x2n2biqbhbbp74aqb6iyqyjsq35n"; }
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "SDL2_ttf";
|
||||
version = "2.20.1";
|
||||
version = "2.20.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-eM2tUfPMOtppMrG7bpFLM3mKuXCh6Bd2PyLdv9l9DFc=";
|
||||
sha256 = "sha256-ncce2TSHUhsQeixKnKa/Q/ti9r3dXCawVea5FBiiIFM=";
|
||||
};
|
||||
|
||||
configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";
|
||||
|
@ -162,9 +162,11 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://v8.dev/";
|
||||
description = "Google's open source JavaScript engine";
|
||||
maintainers = with maintainers; [ cstrahan proglodyte matthewbauer ];
|
||||
platforms = platforms.unix;
|
||||
license = licenses.bsd3;
|
||||
broken = lib.versionAtLeast stdenv.cc.version "12";
|
||||
};
|
||||
}
|
||||
|
@ -172,6 +172,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://v8.dev/";
|
||||
description = "Google's open source JavaScript engine";
|
||||
maintainers = with maintainers; [ cstrahan proglodyte matthewbauer ];
|
||||
platforms = platforms.unix;
|
||||
|
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiolifx";
|
||||
version = "0.8.7";
|
||||
version = "0.8.9";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-pqneX4O3BnDH7vT7RgFiEIMpLcoXOpBvKOYuMla3Iq4=";
|
||||
hash = "sha256-Ih82dNDZd3sbGHhxDTtzJQXkjn6Pgefb0S24gttiOO8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "globus-sdk";
|
||||
version = "3.15.1";
|
||||
version = "3.16.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "globus";
|
||||
repo = "globus-sdk-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-qxqGfbrnMvmjbBD7l8OtGKx7WJr65Jbd9y5IyZDXwW4=";
|
||||
hash = "sha256-zl5+22r0KMqdBKIlBe+8xxgh6h9am34USc1dLy+VGyY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -87,7 +87,7 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/home-assistant-libs/chip-wheels";
|
||||
license = licenses.asl20;
|
||||
maintainers = teams.home-assistant.members;
|
||||
platforms = platforms.linux;
|
||||
platforms = [ "aarch64-linux" "x86_64-linux" ];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
|
@ -1,29 +1,43 @@
|
||||
{ lib
|
||||
, aiohttp
|
||||
, aioresponses
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "incomfort-client";
|
||||
version = "0.4.5";
|
||||
version = "0.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zxdavb";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0r9f15fcjwhrq6ldji1dzbb76wsvinpkmyyaj7n55rl6ibnsyrwp";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-kdPue3IfF85O+0dgvX+dN6S4WoQmjxdCfwfv83SnO8E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
];
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "incomfortclient" ];
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
aioresponses
|
||||
pytest-asyncio
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"incomfortclient"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module to poll Intergas boilers via a Lan2RF gateway";
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "md-toc";
|
||||
version = "8.1.8";
|
||||
version = "8.1.9";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "frnmst";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-2Q/NcsGupYV80byrKmuoxA0d6/z7Z+fmGB6bfzDRvqQ=";
|
||||
hash = "sha256-t3G8nQCVUUuDb+W+Gw+f2miXQ2i/hdVfT6yGxdNWKpw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "meshtastic";
|
||||
version = "2.0.11";
|
||||
version = "2.0.12";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "meshtastic";
|
||||
repo = "Meshtastic-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-XIYzlGtj+S28N7RLvA38WSLv7LNZqKs8aJUaEG1CslI=";
|
||||
hash = "sha256-Y3X5LW85e+OQ548H13fQ0s+R870Hzp0kVd+v+lbdqtg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "netutils";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "networktocode";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-RT6KAliRlH285sEx2fbIXJNwe1gcyH6CrQ8pXKgY/hQ=";
|
||||
hash = "sha256-hSSHCWi0L/ZfFz0JQ6Al5mjhb2g0DpykLF66uMKMIN8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -6,14 +6,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "peaqevcore";
|
||||
version = "11.2.0";
|
||||
version = "12.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-L4QUQsLdFwJPGq8ZdpTHRv5dNn1o6lc1q37LVNNCOOM=";
|
||||
hash = "sha256-nhipggmTd0BgYOPo4SoezrvPmw7wQL71K5y1EKoHRDw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -5,13 +5,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydanfossair";
|
||||
version = "0.1.0";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JonasPed";
|
||||
repo = "pydanfoss-air";
|
||||
rev = "v${version}";
|
||||
sha256 = "0950skga7x930whdn9f765x7fi8g6rr3zh99zpzaj8avjdwf096b";
|
||||
sha256 = "sha256-WTRiEQbd3wwNAz1gk0rS3khy6lg61rcGZQTMlBc0uO8=";
|
||||
};
|
||||
|
||||
# Project has no tests
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvisa-py";
|
||||
version = "0.6.1";
|
||||
version = "0.6.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "pyvisa";
|
||||
repo = "pyvisa-py";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-cXxiT/PWDf5WV+s8GbEA2u+1dPyfUKu19IQ2+Q4GTqM=";
|
||||
hash = "sha256-2jNf/jmqpAE4GoX7xGvQTr0MF/UalIWDMAQHUq+B4v4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -76,7 +76,7 @@ in buildPythonPackage {
|
||||
# https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html
|
||||
license = licenses.bsd3;
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ];
|
||||
hydraPlatforms = []; # output size 3.2G on 1.11.0
|
||||
maintainers = with maintainers; [ junjihashimoto ];
|
||||
};
|
||||
|
@ -51,7 +51,7 @@ buildPythonPackage rec {
|
||||
# https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html
|
||||
license = licenses.bsd3;
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
platforms = platforms.linux;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ junjihashimoto ];
|
||||
};
|
||||
}
|
||||
|
@ -61,7 +61,7 @@ in buildPythonPackage {
|
||||
# https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html
|
||||
license = licenses.bsd3;
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
platforms = platforms.linux;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ junjihashimoto ];
|
||||
};
|
||||
}
|
||||
|
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "vertica-python";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-zfeXJJL5pWzv9y39MWHYZggBRBAPGJItUKKaxp8MlRM=";
|
||||
hash = "sha256-UC8RkZCRodsK4DV0Pnn2jUohM7pNiqGWrbjWlDqn72I=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ lib, buildGoModule, fetchFromGitLab, fetchurl, bash }:
|
||||
|
||||
let
|
||||
version = "15.8.0";
|
||||
version = "15.8.2";
|
||||
in
|
||||
buildGoModule rec {
|
||||
inherit version;
|
||||
@ -23,7 +23,7 @@ buildGoModule rec {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-runner";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-U7yVlnEzwqcgTX8WjXe2i4SQ0KyW7PgSM3UyuGkjm9g=";
|
||||
sha256 = "sha256-kb1xDvU2aP6bI9oziAlUfxbmIq8CgFXPs04hRUmaPyE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -2,14 +2,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "license-generator";
|
||||
version = "0.8.1";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-ZVhsbaJJ9WBcQPx2yikIAQJeBXwC6ZAJkfCRmokNV3I=";
|
||||
hash = "sha256-ijA/AqLeQ9/XLeCriWNUA6R3iKyq+QPDH5twSvqFmEA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-Yh9q/aYHXUF2eIFpJ7ccgeyIO5mQMgRDCNr+ZyS166Y=";
|
||||
cargoHash = "sha256-FfkCV4anPHElGGIOYDSzHam5ohVGpOgtu/nM0aw9HzU=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command-line tool for generating license files";
|
||||
|
@ -1,24 +1,26 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, scdoc, util-linux }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, scdoc, util-linux, xorg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ydotool";
|
||||
version = "1.0.3";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ReimuNotMoe";
|
||||
repo = "ydotool";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RcPHQFXD3YgfF11OFpcnSowPlEjxy2c2RWhGYr30GhI=";
|
||||
hash = "sha256-MtanR+cxz6FsbNBngqLE+ITKPZFHmWGsD1mBDk0OVng=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Daemon/ydotoold.c \
|
||||
--replace "/usr/bin/xinput" "${xorg.xinput}/bin/xinput"
|
||||
substituteInPlace Daemon/ydotool.service.in \
|
||||
--replace "/usr/bin/kill" "${util-linux}/bin/kill"
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ cmake scdoc ];
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace ${placeholder "out"}/lib/systemd/user/ydotool.service \
|
||||
--replace /usr/bin/kill "${util-linux}/bin/kill"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/ReimuNotMoe/ydotool";
|
||||
description = "Generic Linux command-line automation tool";
|
||||
|
@ -582,6 +582,7 @@ mapAliases ({
|
||||
go-mk = throw "go-mk has been dropped due to the lack of maintanence from upstream since 2015"; # Added 2022-06-02
|
||||
go-pup = throw "'go-pup' has been renamed to/replaced by 'pup'"; # Converted to throw 2022-02-22
|
||||
go-repo-root = throw "go-repo-root has been dropped due to the lack of maintanence from upstream since 2014"; # Added 2022-06-02
|
||||
gometer = throw "gometer has been removed from nixpkgs because goLance stopped offering Linux support"; # Added 2023-02-10
|
||||
gpgstats = throw "gpgstats has been removed: upstream is gone"; # Added 2022-02-06
|
||||
gpshell = throw "gpshell has been removed, because it was unmaintained in nixpkgs"; # added 2021-12-17
|
||||
|
||||
|
@ -4409,7 +4409,7 @@ with pkgs;
|
||||
ditaa = callPackage ../tools/graphics/ditaa { };
|
||||
|
||||
dino = callPackage ../applications/networking/instant-messengers/dino {
|
||||
inherit (gst_all_1) gstreamer gst-plugins-base;
|
||||
inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad gst-vaapi;
|
||||
gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; };
|
||||
};
|
||||
|
||||
@ -25783,8 +25783,6 @@ with pkgs;
|
||||
|
||||
gmailctl = callPackage ../applications/networking/gmailctl { };
|
||||
|
||||
gometer = callPackage ../applications/misc/gometer { };
|
||||
|
||||
gomp = callPackage ../applications/version-management/gomp { };
|
||||
|
||||
gomplate = callPackage ../development/tools/gomplate { };
|
||||
|
@ -7186,6 +7186,11 @@ self: super: with self; {
|
||||
|
||||
pixelmatch = callPackage ../development/python-modules/pixelmatch { };
|
||||
|
||||
pjsua2 = (toPythonModule (pkgs.pjsip.override {
|
||||
pythonSupport = true;
|
||||
python3 = self.python;
|
||||
})).py;
|
||||
|
||||
pkce = callPackage ../development/python-modules/pkce { };
|
||||
|
||||
pkgconfig = callPackage ../development/python-modules/pkgconfig { };
|
||||
|
Loading…
Reference in New Issue
Block a user