mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
5ea376a152
|
|
@ -19424,6 +19424,12 @@
|
|||
githubId = 3413119;
|
||||
name = "Vonfry";
|
||||
};
|
||||
vonixxx = {
|
||||
email = "vonixxx@tuta.io";
|
||||
github = "vonixxx";
|
||||
githubId = 144771550;
|
||||
name = "Luca Uricariu";
|
||||
};
|
||||
votava = {
|
||||
email = "votava@gmail.com";
|
||||
github = "janvotava";
|
||||
|
|
|
|||
|
|
@ -12,5 +12,6 @@ in
|
|||
|
||||
config = mkIf cfg.enable {
|
||||
services.udev.packages = [ pkgs.qmk-udev-rules ];
|
||||
users.groups.plugdev = {};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ in
|
|||
config = mkOption {
|
||||
type = attrsOf str;
|
||||
default = { };
|
||||
example = literalExample ''
|
||||
example = literalExpression ''
|
||||
{
|
||||
"org.jitsi.jigasi.auth.URL" = "XMPP:jitsi-meet.example.com";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "camunda-modeler";
|
||||
version = "5.17.0";
|
||||
version = "5.18.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz";
|
||||
hash = "sha256-yxph3Aor5nZOhu2PY4MGcfScaz9w24JXqXbhT+QKlNI=";
|
||||
hash = "sha256-f7XYcFleEe1f6Uh6mOqfakzfWzOiQtBPhowTJUZU1MU=";
|
||||
};
|
||||
sourceRoot = "camunda-modeler-${version}-linux-x64";
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
|
||||
let
|
||||
inherit (callPackage ./sources.nix { }) supportedVersions unsupportedVersions;
|
||||
mkCitrix = callPackage ./generic.nix { };
|
||||
|
||||
toAttrName = x: "citrix_workspace_${builtins.replaceStrings [ "." ] [ "_" ] x}";
|
||||
|
||||
|
|
|
|||
|
|
@ -44,6 +44,17 @@ let
|
|||
x86hash = "95436fb289602cf31c65b7df89da145fc170233cb2e758a2f11116f15b57d382";
|
||||
x64suffix = "24";
|
||||
x86suffix = "24";
|
||||
homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest9.html";
|
||||
};
|
||||
|
||||
"23.11.0" = {
|
||||
major = "23";
|
||||
minor = "11";
|
||||
patch = "0";
|
||||
x64hash = "d3dde64baa6db7675a025eff546d552544d3523f4f3047621884f7830a9e2822";
|
||||
x86hash = "65b8c144e51b5bd78b98ae69e0fa76d6c020a857d74fd5254be49492527072b6";
|
||||
x64suffix = "82";
|
||||
x86suffix = "82";
|
||||
homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "abracadabra";
|
||||
version = "2.3.1";
|
||||
version = "2.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KejPi";
|
||||
repo = "AbracaDABra";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HRwgtNCrEzo6uXNJHG3PwpBAXVTppYUTmiwKWi3reho=";
|
||||
hash = "sha256-giQJ6lOD5TaOa98e7nXf6/HHxP6/TxD9Pgr7xAxvZzs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
, extraInstallCommands ? ""
|
||||
, meta ? {}
|
||||
, passthru ? {}
|
||||
, extraPreBwrapCmds ? ""
|
||||
, extraBwrapArgs ? []
|
||||
, unshareUser ? false
|
||||
, unshareIpc ? false
|
||||
|
|
@ -23,6 +24,7 @@
|
|||
, unshareNet ? false
|
||||
, unshareUts ? false
|
||||
, unshareCgroup ? false
|
||||
, privateTmp ? false
|
||||
, dieWithParent ? true
|
||||
, ...
|
||||
} @ args:
|
||||
|
|
@ -38,8 +40,8 @@ let
|
|||
buildFHSEnv = callPackage ./buildFHSEnv.nix { };
|
||||
|
||||
fhsenv = buildFHSEnv (removeAttrs (args // { inherit name; }) [
|
||||
"runScript" "extraInstallCommands" "meta" "passthru" "extraBwrapArgs" "dieWithParent"
|
||||
"unshareUser" "unshareCgroup" "unshareUts" "unshareNet" "unsharePid" "unshareIpc"
|
||||
"runScript" "extraInstallCommands" "meta" "passthru" "extraPreBwrapCmds" "extraBwrapArgs" "dieWithParent"
|
||||
"unshareUser" "unshareCgroup" "unshareUts" "unshareNet" "unsharePid" "unshareIpc" "privateTmp"
|
||||
"pname" "version"
|
||||
]);
|
||||
|
||||
|
|
@ -116,7 +118,8 @@ let
|
|||
|
||||
indentLines = str: lib.concatLines (map (s: " " + s) (filter (s: s != "") (lib.splitString "\n" str)));
|
||||
bwrapCmd = { initArgs ? "" }: ''
|
||||
ignored=(/nix /dev /proc /etc)
|
||||
${extraPreBwrapCmds}
|
||||
ignored=(/nix /dev /proc /etc ${lib.optionalString privateTmp "/tmp"})
|
||||
ro_mounts=()
|
||||
symlinks=()
|
||||
etc_ignored=()
|
||||
|
|
@ -150,10 +153,8 @@ let
|
|||
if [[ "''${etc_ignored[@]}" =~ "$i" ]]; then
|
||||
continue
|
||||
fi
|
||||
if [[ -L $i ]]; then
|
||||
symlinks+=(--symlink "$(${coreutils}/bin/readlink "$i")" "$i")
|
||||
else
|
||||
ro_mounts+=(--ro-bind-try "$i" "$i")
|
||||
if [[ -e $i ]]; then
|
||||
symlinks+=(--symlink "/.host-etc/''${i#/etc/}" "$i")
|
||||
fi
|
||||
done
|
||||
|
||||
|
|
@ -192,6 +193,8 @@ let
|
|||
${lib.optionalString unshareCgroup "--unshare-cgroup"}
|
||||
${lib.optionalString dieWithParent "--die-with-parent"}
|
||||
--ro-bind /nix /nix
|
||||
--ro-bind /etc /.host-etc
|
||||
${lib.optionalString privateTmp "--tmpfs /tmp"}
|
||||
# Our glibc will look for the cache in its own path in `/nix/store`.
|
||||
# As such, we need a cache to exist there, because pressure-vessel
|
||||
# depends on the existence of an ld cache. However, adding one
|
||||
|
|
|
|||
|
|
@ -16,13 +16,10 @@
|
|||
, pcbnew-transition
|
||||
, pybars3
|
||||
, versioneer
|
||||
, shapely_1_8
|
||||
}:
|
||||
let
|
||||
solidpython = callPackage ./solidpython { };
|
||||
|
||||
# https://github.com/yaqwsx/KiKit/issues/574
|
||||
# copy-pasted from nixpkgs#8d8e62e74f511160a599471549a98bc9e4f4818d
|
||||
shapely = callPackage ./shapely { };
|
||||
in
|
||||
buildPythonApplication rec {
|
||||
pname = "kikit";
|
||||
|
|
@ -48,7 +45,8 @@ buildPythonApplication rec {
|
|||
wxPython_4_2
|
||||
pcbnew-transition
|
||||
pybars3
|
||||
shapely
|
||||
# https://github.com/yaqwsx/KiKit/issues/574
|
||||
shapely_1_8
|
||||
# https://github.com/yaqwsx/KiKit/issues/576
|
||||
solidpython
|
||||
];
|
||||
|
|
|
|||
42
pkgs/by-name/ko/koodousfinder/package.nix
Normal file
42
pkgs/by-name/ko/koodousfinder/package.nix
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "koodousfinder";
|
||||
version = "0.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "teixeira0xfffff";
|
||||
repo = "KoodousFinder";
|
||||
# Not properly tagged, https://github.com/teixeira0xfffff/KoodousFinder/issues/7
|
||||
#rev = "refs/tags/v${version}";
|
||||
rev = "d9dab5572f44e5cd45c04e6fcda38956897855d1";
|
||||
hash = "sha256-skCbt2lDKgSyZdHY3WImbr6CF0icrDPTIXNV1736gKk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
keyring
|
||||
requests
|
||||
];
|
||||
|
||||
# Project has no tests, re-check with next release
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"koodousfinder"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to allows users to search for and analyze Android apps";
|
||||
homepage = "https://github.com/teixeira0xfffff/KoodousFinder";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
44
pkgs/by-name/wh/when/package.nix
Normal file
44
pkgs/by-name/wh/when/package.nix
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
{ lib
|
||||
, stdenvNoCC
|
||||
, perl
|
||||
, installShellFiles
|
||||
, fetchFromBitbucket
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "when";
|
||||
version = "1.1.45";
|
||||
|
||||
src = fetchFromBitbucket {
|
||||
repo = "when";
|
||||
owner = "ben-crowell";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-+ggYjY6/aTUrdvREn0TTQ4Pu/VR4QTjflDaicRXuOMs=";
|
||||
};
|
||||
|
||||
buildInputs = [ perl ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postBuild = ''
|
||||
pod2man $src/when when.1
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 when $out/bin/when
|
||||
installManPage when.1
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "An extremely simple personal calendar program";
|
||||
homepage = "https://www.lightandmatter.com/when/when.html";
|
||||
license = licenses.gpl2Only;
|
||||
mainProgram = "when";
|
||||
maintainers = with maintainers; [ vonixxx ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
})
|
||||
|
|
@ -22,5 +22,6 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
|
|||
homepage = "https://wavm.github.io";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ereslibre ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cpp-utilities";
|
||||
version = "5.24.2";
|
||||
version = "5.24.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Martchus";
|
||||
repo = "cpp-utilities";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-boV0OO8GzgH0HpNh00nYLM2+wCmvuDxwKHvCMCdmiJs=";
|
||||
sha256 = "sha256-YQNnf/DAtc58OwOWa2SBijIDpuhqWxFZHZCXLJ8PstI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
47
pkgs/development/libraries/geos/3.11.nix
Normal file
47
pkgs/development/libraries/geos/3.11.nix
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, callPackage
|
||||
, fetchpatch
|
||||
, fetchurl
|
||||
, testers
|
||||
|
||||
, cmake
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "geos";
|
||||
version = "3.11.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.osgeo.org/geos/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2";
|
||||
hash = "sha256-sfB3ZpSBxaPmKv/EnpbrBvKBmHpdNv2rIlIX5bgl5Mw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull upstream fix of `gcc-13` build failure:
|
||||
# https://github.com/libgeos/geos/pull/805
|
||||
(fetchpatch {
|
||||
name = "gcc-13.patch";
|
||||
url = "https://github.com/libgeos/geos/commit/bea3188be44075034fd349f5bb117c943bdb7fb1.patch";
|
||||
hash = "sha256-dQT3Hf9YJchgjon/r46TLIXXbE6C0ZnewyvfYJea4jM=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru.tests = {
|
||||
pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
geos = callPackage ./tests.nix { geos = finalAttrs.finalPackage; };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "C/C++ library for computational geometry with a focus on algorithms used in geographic information systems (GIS) software";
|
||||
homepage = "https://libgeos.org";
|
||||
license = licenses.lgpl21Only;
|
||||
maintainers = teams.geospatial.members;
|
||||
pkgConfigModules = [ "geos" ];
|
||||
mainProgram = "geosop";
|
||||
};
|
||||
})
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, callPackage
|
||||
, fetchpatch
|
||||
, fetchurl
|
||||
, testers
|
||||
|
||||
|
|
@ -10,23 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "geos";
|
||||
version = "3.11.2";
|
||||
version = "3.12.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.osgeo.org/geos/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2";
|
||||
hash = "sha256-sfB3ZpSBxaPmKv/EnpbrBvKBmHpdNv2rIlIX5bgl5Mw=";
|
||||
hash = "sha256-1up+SSIktRGT6CRP4+wXxNRNB3fzwyyk+xcRQFSaDQM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull upstream fix of `gcc-13` build failure:
|
||||
# https://github.com/libgeos/geos/pull/805
|
||||
(fetchpatch {
|
||||
name = "gcc-13.patch";
|
||||
url = "https://github.com/libgeos/geos/commit/bea3188be44075034fd349f5bb117c943bdb7fb1.patch";
|
||||
hash = "sha256-dQT3Hf9YJchgjon/r46TLIXXbE6C0ZnewyvfYJea4jM=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
doCheck = true;
|
||||
|
|
@ -40,8 +29,9 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
description = "C/C++ library for computational geometry with a focus on algorithms used in geographic information systems (GIS) software";
|
||||
homepage = "https://libgeos.org";
|
||||
license = licenses.lgpl21Only;
|
||||
mainProgram = "geosop";
|
||||
maintainers = teams.geospatial.members;
|
||||
pkgConfigModules = [ "geos" ];
|
||||
mainProgram = "geosop";
|
||||
changelog = "https://github.com/libgeos/geos/releases/tag/${finalAttrs.finalPackage.version}";
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,21 +1,19 @@
|
|||
{ lib, fetchurl, buildDunePackage, cmdliner
|
||||
{ lib, buildDunePackage, cmdliner
|
||||
, functoria-runtime
|
||||
, rresult, astring, fmt, logs, bos, fpath, emile, uri
|
||||
, alcotest
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
buildDunePackage {
|
||||
pname = "functoria";
|
||||
version = "4.3.6";
|
||||
inherit (functoria-runtime) version src;
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-${version}.tbz";
|
||||
hash = "sha256-i/5sZHfxECoKYMdGje+U21GWxJ6dDZreVcQGtbuo4SE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ cmdliner rresult astring fmt logs bos fpath emile uri ];
|
||||
|
||||
doCheck = false;
|
||||
doCheck = true;
|
||||
checkInputs = [ alcotest functoria-runtime ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A DSL to organize functor applications";
|
||||
|
|
|
|||
|
|
@ -1,14 +1,21 @@
|
|||
{ lib, buildDunePackage, functoria, cmdliner, fmt }:
|
||||
{ lib, buildDunePackage, fetchurl, cmdliner }:
|
||||
|
||||
buildDunePackage {
|
||||
buildDunePackage rec {
|
||||
pname = "functoria-runtime";
|
||||
version = "4.4.1";
|
||||
|
||||
inherit (functoria) version src;
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-${version}.tbz";
|
||||
hash = "sha256-FKCdzrRJVpUrCWqrTiE8l00ZKJOYsvI9mNzJ0ZxDBwg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ cmdliner fmt ];
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
propagatedBuildInputs = [ cmdliner ];
|
||||
|
||||
meta = with lib; {
|
||||
inherit (functoria.meta) homepage license;
|
||||
homepage = "https://github.com/mirage/functoria";
|
||||
license = licenses.isc;
|
||||
description = "Runtime support library for functoria-generated code";
|
||||
maintainers = [ maintainers.sternenseemann ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ buildDunePackage rec {
|
|||
inherit (mirage-runtime) version src;
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
duneVersion = "3";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, buildDunePackage, fetchurl, ipaddr, functoria-runtime
|
||||
, fmt, logs, lwt
|
||||
, logs, lwt
|
||||
, alcotest
|
||||
}:
|
||||
|
||||
|
|
@ -8,9 +8,8 @@ buildDunePackage rec {
|
|||
inherit (functoria-runtime) src version;
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [ ipaddr functoria-runtime fmt logs lwt ];
|
||||
propagatedBuildInputs = [ ipaddr functoria-runtime logs lwt ];
|
||||
checkInputs = [ alcotest ];
|
||||
doCheck = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aemet-opendata";
|
||||
version = "0.4.6";
|
||||
version = "0.4.7";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "Noltari";
|
||||
repo = "AEMET-OpenData";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-eAHj37d0akxSz4rnf9f0tDknJQe//cMg0Korp1rtxfQ=";
|
||||
hash = "sha256-kmU2HtNyYhfwWQv6asOtDpLZ6+O+eEICzBNLxUhAwaY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,28 +1,23 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
|
||||
# build-system
|
||||
, cython_3
|
||||
, setuptools
|
||||
|
||||
# dependencies
|
||||
, aiohappyeyeballs
|
||||
, async-timeout
|
||||
, buildPythonPackage
|
||||
, chacha20poly1305-reuseable
|
||||
, cython_3
|
||||
, fetchFromGitHub
|
||||
, mock
|
||||
, noiseprotocol
|
||||
, protobuf
|
||||
, zeroconf
|
||||
|
||||
# tests
|
||||
, mock
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, zeroconf
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioesphomeapi";
|
||||
version = "19.2.1";
|
||||
version = "21.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -31,7 +26,7 @@ buildPythonPackage rec {
|
|||
owner = "esphome";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-WSWGO0kI1m6oaImUYZ6m5WKJ+xPs/rtn5wVq1bDr+bE=";
|
||||
hash = "sha256-KT38NY1BZM6Qr1EeC05vM9IcVKO7GaEx0102TUzkyRE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -40,6 +35,7 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohappyeyeballs
|
||||
chacha20poly1305-reuseable
|
||||
noiseprotocol
|
||||
protobuf
|
||||
|
|
@ -48,19 +44,20 @@ buildPythonPackage rec {
|
|||
async-timeout
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"aioesphomeapi"
|
||||
];
|
||||
nativeCheckInputs = [
|
||||
mock
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"aioesphomeapi"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/esphome/aioesphomeapi/releases/tag/v${version}";
|
||||
description = "Python Client for ESPHome native API";
|
||||
homepage = "https://github.com/esphome/aioesphomeapi";
|
||||
changelog = "https://github.com/esphome/aioesphomeapi/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab hexa ];
|
||||
};
|
||||
|
|
|
|||
54
pkgs/development/python-modules/aiohappyeyeballs/default.nix
Normal file
54
pkgs/development/python-modules/aiohappyeyeballs/default.nix
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohappyeyeballs";
|
||||
version = "2.3.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bdraco";
|
||||
repo = "aiohappyeyeballs";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-LMvELnN6Sy6DssXfH6fQ84N2rhdjqB8AlikTMidrjT4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace " --cov=aiohappyeyeballs --cov-report=term-missing:skip-covered" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"aiohappyeyeballs"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Test has typos
|
||||
"tests/test_impl.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Modul for connecting with Happy Eyeballs";
|
||||
homepage = "https://github.com/bdraco/aiohappyeyeballs";
|
||||
changelog = "https://github.com/bdraco/aiohappyeyeballs/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.psfl;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, aiocoap
|
||||
, aiohappyeyeballs
|
||||
, async-interrupt
|
||||
, bleak
|
||||
, bleak-retry-connector
|
||||
|
|
@ -19,16 +20,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohomekit";
|
||||
version = "3.0.9";
|
||||
format = "pyproject";
|
||||
version = "3.1.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Jc2k";
|
||||
repo = pname;
|
||||
repo = "aiohomekit";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-YaLSpWSaiEP7X+IujrQgXgWl3aPc1WDMq2yaMUTu328=";
|
||||
hash = "sha256-yaPliPKa/mS9amUkEx/iM398HGoiKrR6miCtK7fThNw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -37,6 +38,7 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
aiocoap
|
||||
aiohappyeyeballs
|
||||
async-interrupt
|
||||
bleak
|
||||
bleak-retry-connector
|
||||
|
|
|
|||
60
pkgs/development/python-modules/bleak-esphome/default.nix
Normal file
60
pkgs/development/python-modules/bleak-esphome/default.nix
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
{ lib
|
||||
, aioesphomeapi
|
||||
, bleak
|
||||
, bluetooth-data-tools
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, habluetooth
|
||||
, poetry-core
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bleak-esphome";
|
||||
version = "0.2.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bluetooth-devices";
|
||||
repo = "bleak-esphome";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-QtSkrX7xGaV/13FonQhYR4MpZxVwR8dAFCRvID0zSGo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace " --cov=bleak_esphome --cov-report=term-missing:skip-covered" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aioesphomeapi
|
||||
bleak
|
||||
bluetooth-data-tools
|
||||
habluetooth
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"bleak_esphome"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Bleak backend of ESPHome";
|
||||
homepage = "https://github.com/bluetooth-devices/bleak-esphome";
|
||||
changelog = "https://github.com/bluetooth-devices/bleak-esphome/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bluetooth-data-tools";
|
||||
version = "1.17.0";
|
||||
version = "1.18.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-CJyTWNBtBk3YpoaiL1/P+aUE4ttthQDTdDuKBYEXrBg=";
|
||||
hash = "sha256-AN0zalYQ4JQCaBDrE4tq2WwVEXz0LBlfvrxNiPL4oOs=";
|
||||
};
|
||||
|
||||
# The project can build both an optimized cython version and an unoptimized
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
let
|
||||
pname = "chacha20poly1305-reuseable";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0";
|
||||
in
|
||||
|
||||
buildPythonPackage {
|
||||
|
|
@ -30,7 +30,7 @@ buildPythonPackage {
|
|||
owner = "bdraco";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-uRndA0NnSQtJTftALzBF3FWZtavRyMwBlnCBqoIXE5Q=";
|
||||
hash = "sha256-g1sLmYy5SClkdBSjFFYtikh2nuxfTIoaCyktqoFl+Ho=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, substituteAll
|
||||
, geos39
|
||||
, geos_3_9
|
||||
, gdal
|
||||
, asgiref
|
||||
, pytz
|
||||
|
|
@ -33,7 +33,7 @@ buildPythonPackage rec {
|
|||
] ++ lib.optional withGdal
|
||||
(substituteAll {
|
||||
src = ./django_3_set_geos_gdal_lib.patch;
|
||||
inherit geos39;
|
||||
inherit geos_3_9;
|
||||
inherit gdal;
|
||||
extension = stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
});
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ diff -Nur a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos
|
|||
lib_path = settings.GEOS_LIBRARY_PATH
|
||||
except (AttributeError, ImportError, ImproperlyConfigured, OSError):
|
||||
- lib_path = None
|
||||
+ lib_path = "@geos39@/lib/libgeos_c@extension@"
|
||||
+ lib_path = "@geos_3_9@/lib/libgeos_c@extension@"
|
||||
|
||||
# Setting the appropriate names for the GEOS-C library.
|
||||
if lib_path:
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-data";
|
||||
version = "2.23.1";
|
||||
version = "2.24.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "iterative";
|
||||
repo = "dvc-data";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-UsWMlwG1g59I+TIn1uwp6vyzVIBtj1lfchp+3SYognc=";
|
||||
hash = "sha256-CDy7Ye/DPg7GQY5cg/wR4OH4C9wIlsz3Cxc4ntoNYFw=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -1,48 +1,45 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, flatten-dict
|
||||
, fsspec
|
||||
, funcy
|
||||
, pygtrie
|
||||
, pytest-mock
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, reflink
|
||||
, setuptools-scm
|
||||
, shortuuid
|
||||
, tqdm
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-objects";
|
||||
version = "1.4.9";
|
||||
format = "pyproject";
|
||||
version = "2.0.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iterative";
|
||||
repo = pname;
|
||||
repo = "dvc-objects";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-9fuxlZDy83nl+rnVEFdAza1NHun8PdewgowMl3G5wZU=";
|
||||
hash = "sha256-nxZN0Q9mRAZJUOoxfE58lXZVOrY0r05iROcuo+nV99A=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace " --benchmark-skip" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
flatten-dict
|
||||
fsspec
|
||||
funcy
|
||||
pygtrie
|
||||
shortuuid
|
||||
tqdm
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
|
|||
|
|
@ -55,14 +55,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc";
|
||||
version = "3.33.3";
|
||||
version = "3.33.4";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-S6RHRY0G6YYcLa7CBFNxi1fVSJH7ZdgyqAo3wmLUNbE=";
|
||||
hash = "sha256-NWu12FVJDSSuxYGVWFNlbAEUINg05s64EJ6gIaErQ9E=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, python
|
||||
, geos
|
||||
, geos_3_11
|
||||
, pytestCheckHook
|
||||
, cython
|
||||
, numpy
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
geos # for geos-config
|
||||
geos_3_11 # for geos-config
|
||||
cython
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -15,8 +15,7 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "pyhiveapi";
|
||||
version = "0.5.16";
|
||||
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
|
@ -59,6 +58,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python library to interface with the Hive API";
|
||||
homepage = "https://github.com/Pyhass/Pyhiveapi";
|
||||
changelog = "https://github.com/Pyhass/Pyhiveapi/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,39 +2,32 @@
|
|||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, substituteAll
|
||||
, pythonOlder
|
||||
, geos
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, substituteAll
|
||||
|
||||
, cython
|
||||
, geos_3_11
|
||||
, numpy
|
||||
, oldest-supported-numpy
|
||||
, setuptools
|
||||
, wheel
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Shapely";
|
||||
version = "1.8.4";
|
||||
disabled = pythonOlder "3.6";
|
||||
version = "1.8.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-oZXlHKr6IYKR8suqP+9p/TNTyT7EtlsqRyLEz0DDGYw=";
|
||||
hash = "sha256-6CttYOz7EkEgyI/hBqR4WWu+qxQhFtfn9ko2TayQKpI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
geos # for geos-config
|
||||
cython
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# Environment variable used in shapely/_buildcfg.py
|
||||
GEOS_LIBRARY_PATH = "${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
GEOS_LIBRARY_PATH = "${geos_3_11}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
|
||||
patches = [
|
||||
# Patch to search form GOES .so/.dylib files in a Nix-aware way
|
||||
|
|
@ -45,6 +38,30 @@ buildPythonPackage rec {
|
|||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml --replace "setuptools<64" "setuptools"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cython
|
||||
geos_3_11 # for geos-config
|
||||
oldest-supported-numpy
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
geos_3_11
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
rm -r shapely # prevent import of local shapely
|
||||
'';
|
||||
|
|
@ -63,9 +80,10 @@ buildPythonPackage rec {
|
|||
pythonImportsCheck = [ "shapely" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Geometric objects, predicates, and operations";
|
||||
homepage = "https://pypi.python.org/pypi/Shapely/";
|
||||
license = with licenses; [ bsd3 ];
|
||||
maintainers = with maintainers; [ knedlsepp ];
|
||||
changelog = "https://github.com/shapely/shapely/blob/${version}/CHANGES.txt";
|
||||
description = "Manipulation and analysis of geometric objects";
|
||||
homepage = "https://github.com/shapely/shapely";
|
||||
license = licenses.bsd3;
|
||||
maintainers = teams.geospatial.members;
|
||||
};
|
||||
}
|
||||
|
|
@ -3,11 +3,11 @@
|
|||
stdenv.mkDerivation rec {
|
||||
pname = "include-what-you-use";
|
||||
# Also bump llvmPackages in all-packages.nix to the supported version!
|
||||
version = "0.19";
|
||||
version = "0.21";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/downloads/${pname}-${version}.src.tar.gz";
|
||||
hash = "sha256-KxAVe2DqCK3AjjiWtJIcc/yt1exOtlKymjQSnVAeXuA=";
|
||||
hash = "sha256-ajUZGf+JvafJXIlUcmAYaNs9qrlqlYs44DYokNWHYLY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -17,11 +17,21 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = with llvmPackages; [ cmake llvm.dev llvm python3 ];
|
||||
buildInputs = with llvmPackages; [ libclang clang-unwrapped python3 ];
|
||||
|
||||
clang = llvmPackages.clang;
|
||||
|
||||
cmakeFlags = [ "-DCMAKE_PREFIX_PATH=${llvmPackages.llvm.dev}" ];
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace $out/bin/iwyu_tool.py \
|
||||
--replace "'include-what-you-use'" "'$out/bin/include-what-you-use'"
|
||||
|
||||
|
||||
mv $out/bin/include-what-you-use $out/bin/.include-what-you-use-unwrapped
|
||||
mv $out/bin/iwyu_tool.py $out/bin/.iwyu_tool.py-unwrapped
|
||||
substituteAll ${./wrapper} $out/bin/include-what-you-use
|
||||
ln -s $out/bin/include-what-you-use $out/bin/iwyu_tool.py
|
||||
chmod +x $out/bin/include-what-you-use
|
||||
patchShebangs $out/bin/include-what-you-use
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
26
pkgs/development/tools/analysis/include-what-you-use/wrapper
Executable file
26
pkgs/development/tools/analysis/include-what-you-use/wrapper
Executable file
|
|
@ -0,0 +1,26 @@
|
|||
#!/bin/sh
|
||||
|
||||
buildcpath() {
|
||||
local path after
|
||||
while (( $# )); do
|
||||
case $1 in
|
||||
-isystem)
|
||||
shift
|
||||
path=$path${path:+':'}$1
|
||||
;;
|
||||
-idirafter)
|
||||
shift
|
||||
after=$after${after:+':'}$1
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
echo $path${after:+':'}$after
|
||||
}
|
||||
|
||||
export CPATH=${CPATH}${CPATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE} \
|
||||
$(<@clang@/nix-support/libc-cflags)):@clang@/resource-root/include
|
||||
export CPLUS_INCLUDE_PATH=${CPLUS_INCLUDE_PATH}${CPLUS_INCLUDE_PATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE} \
|
||||
$(<@clang@/nix-support/libcxx-cxxflags) \
|
||||
$(<@clang@/nix-support/libc-cflags)):@clang@/resource-root/include
|
||||
exec -a "$0" @out@/bin/.$(basename $0)-unwrapped "$@"
|
||||
|
|
@ -3,11 +3,12 @@
|
|||
, extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs
|
||||
, extraLibraries ? pkgs: [ ] # extra packages to add to multiPkgs
|
||||
, extraProfile ? "" # string to append to profile
|
||||
, extraBwrapArgs ? [ ] # extra arguments to pass to bubblewrap
|
||||
, extraPreBwrapCmds ? "" # extra commands to run before calling bubblewrap (real default is at usage site)
|
||||
, extraBwrapArgs ? [ ] # extra arguments to pass to bubblewrap (real default is at usage site)
|
||||
, extraArgs ? "" # arguments to always pass to steam
|
||||
, extraEnv ? { } # Environment variables to pass to Steam
|
||||
, withGameSpecificLibraries ? true # include game specific libraries
|
||||
}:
|
||||
}@args:
|
||||
|
||||
let
|
||||
commonTargetPkgs = pkgs: with pkgs; [
|
||||
|
|
@ -16,6 +17,8 @@ let
|
|||
lsb-release
|
||||
# Errors in output without those
|
||||
pciutils
|
||||
# run.sh wants ldconfig
|
||||
glibc.bin
|
||||
# Games' dependencies
|
||||
xorg.xrandr
|
||||
which
|
||||
|
|
@ -57,7 +60,10 @@ let
|
|||
fi
|
||||
'';
|
||||
|
||||
envScript = lib.toShellVars extraEnv;
|
||||
envScript = ''
|
||||
# prevents various error messages
|
||||
unset GIO_EXTRA_MODULES
|
||||
'' + lib.toShellVars extraEnv;
|
||||
|
||||
in buildFHSEnv rec {
|
||||
name = "steam";
|
||||
|
|
@ -279,7 +285,17 @@ in buildFHSEnv rec {
|
|||
exec steam ${extraArgs} "$@"
|
||||
'';
|
||||
|
||||
inherit extraBwrapArgs;
|
||||
# steamwebhelper deletes unrelated electron programs' singleton cookies from /tmp on startup:
|
||||
# https://github.com/ValveSoftware/steam-for-linux/issues/9121
|
||||
privateTmp = true;
|
||||
|
||||
extraPreBwrapCmds = ''
|
||||
install -m 1777 -d /tmp/dumps
|
||||
'' + args.extraPreBwrapCmds or "";
|
||||
|
||||
extraBwrapArgs = [
|
||||
"--bind-try /tmp/dumps /tmp/dumps"
|
||||
] ++ args.extraBwrapArgs or [];
|
||||
|
||||
meta =
|
||||
if steam != null
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/libbpf/bpftool";
|
||||
description = "Debugging/program analysis tools for the eBPF subsystem";
|
||||
license = [ licenses.gpl2 licenses.bsd2 ];
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute2, procps, shadow, getent }:
|
||||
|
||||
let
|
||||
version = "1.54.1";
|
||||
version = "1.56.0";
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "tailscale";
|
||||
|
|
@ -11,9 +11,9 @@ buildGoModule {
|
|||
owner = "tailscale";
|
||||
repo = "tailscale";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dYYmqz1o3+FhdHmQ3KzUkAoSfEHNQhQt6neV3rFI+QE=";
|
||||
hash = "sha256-st+s4fJMq1tad6IfPewGnM3LC7JDRoSt0LDV7392Kp4=";
|
||||
};
|
||||
vendorHash = "sha256-/kuu7DKPklMZOvYqJpsOp3TeDG9KDEET4U0G+sq+4qY=";
|
||||
vendorHash = "sha256-bG/ydsJf2UncOcDo8/BXdvQJO3Mk0tl8JGje1b6kto4=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];
|
||||
|
||||
|
|
|
|||
|
|
@ -91,6 +91,32 @@ stdenv.mkDerivation rec {
|
|||
revert = true;
|
||||
hash = "sha256-p8Kcv9d7ri4eJU6Fgqyzdj0hV5MHSe50AF02FPDJx2Y=";
|
||||
})
|
||||
|
||||
# Fixes for NTFS bugs (CVE-2023-4692 and CVE-2023-4693)
|
||||
(fetchpatch {
|
||||
url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=43651027d24e62a7a463254165e1e46e42aecdea";
|
||||
hash = "sha256-/oudbfL8Ph7ZsgsFUI0YIddji+7okFRG12E/rDsgvNM=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=0ed2458cc4eff6d9a9199527e2a0b6d445802f94";
|
||||
hash = "sha256-6EhLzVapN2n62Lgo+PnB4SRvDkYWFkrKNinCvArRUXk=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=7e5f031a6a6a3decc2360a7b0c71abbe598e7354";
|
||||
hash = "sha256-R2vmVGidm1ZFxopt/71y2816z2i/vvPrthZE52oc4CI=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=7a5a116739fa6d8a625da7d6b9272c9a2462f967";
|
||||
hash = "sha256-T1LglEcUl9GXQjJ6Y4fKuFyFAujNRbcAb9KoNkl6jXs=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=1fe82c41e070385e273d7bb1cfb482627a3c28e8";
|
||||
hash = "sha256-x/V7bmRaNxo8NNOUwVti59n9ST/2yTJ/blWjk3omdqE=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=e58b870ff926415e23fc386af41ff81b2f588763";
|
||||
hash = "sha256-a0faNQafL+uRIglnILkLj64ROWxqmczQTQSu3VdklSk=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = if kbdcompSupport then ''
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
diff --git a/include/bitcoin/bitcoin/wallet/dictionary.hpp b/include/bitcoin/bitcoin/wallet/dictionary.hpp
|
||||
index 632f1afc..63a51764 100644
|
||||
--- a/include/bitcoin/bitcoin/wallet/dictionary.hpp
|
||||
+++ b/include/bitcoin/bitcoin/wallet/dictionary.hpp
|
||||
@@ -19,6 +19,7 @@
|
||||
#ifndef LIBBITCOIN_WALLET_DICTIONARY_HPP
|
||||
#define LIBBITCOIN_WALLET_DICTIONARY_HPP
|
||||
|
||||
+#include <cstddef>
|
||||
#include <array>
|
||||
#include <vector>
|
||||
#include <bitcoin/bitcoin/compat.hpp>
|
||||
|
|
@ -1,18 +1,15 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook
|
||||
, boost, libbitcoin, libbitcoin-protocol }:
|
||||
|
||||
let
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libbitcoin-client";
|
||||
version = "3.5.0";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
name = "${pname}-${version}";
|
||||
version = "3.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libbitcoin";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0a9c00f1pfi8wczbfd1djkvr7di3iw1ynak6if910w01dkhbm6v4";
|
||||
hash = "sha256-5qbxixaozHFsOcBxnuGEfNJyGL8UaYCOPwPakfc0bAg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,18 +1,15 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook
|
||||
, boost, libbitcoin-client, libbitcoin-network }:
|
||||
|
||||
let
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libbitcoin-explorer";
|
||||
version = "3.5.0";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
name = "${pname}-${version}";
|
||||
version = "3.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libbitcoin";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "033nrdzrha4kypxk4biixjsbjd16r4m2mjvpid4gdj5hzbbj1p93";
|
||||
hash = "sha256-NUAtjrfRbZg5ewQo4PZ1HEoG8GRrsPcNb78UYMHqdyo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,18 +1,15 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook
|
||||
, boost, libbitcoin, zeromq }:
|
||||
|
||||
let
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libbitcoin-network";
|
||||
version = "3.5.0";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
name = "${pname}-${version}";
|
||||
version = "3.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libbitcoin";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0vqg3i40kwmbys4lyp82xvg2nx3ik4qhc66gcm8k66a86wpj9ji6";
|
||||
hash = "sha256-zDT92bvA779mzTodpKugCoxapB6vY2jCMSGZEkJLTXQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,18 +1,15 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook
|
||||
, boost, libbitcoin, secp256k1, zeromq }:
|
||||
|
||||
let
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libbitcoin-protocol";
|
||||
version = "3.5.0";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
name = "${pname}-${version}";
|
||||
version = "3.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libbitcoin";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1ln9r04hlnc7qmv17rakyhrnzw1a541pg5jc1sw3ccn90a5x6cfv";
|
||||
hash = "sha256-xf0qQQnZ8h6ent1sgkVTo55+9drZM8Zbx0deYZnLBho=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libbitcoin";
|
||||
version = "3.6.0";
|
||||
version = "3.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1rppyp3zpb6ymwangjpblwf6qh4y3d1hczrjx8aavmrq7hznnrhq";
|
||||
hash = "sha256-7fxj2hnuGRUS4QSQ1w0s3looe9pMvE2U50/yhNyBMf0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
|
@ -18,8 +18,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
patches = [ ./fix-gcc11-compilation.patch ];
|
||||
|
||||
configureFlags = [
|
||||
"--with-tests=no"
|
||||
"--with-boost=${boost.dev}"
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "terrascan";
|
||||
version = "1.18.5";
|
||||
version = "1.18.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "accurics";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-RDKy588qUvs0SGysz4DnQMliKiTJn4GA53kDyMZhzQE=";
|
||||
hash = "sha256-i621Qi0wlDYMpK/srFAiwALJ0cwMGh5jNlCqj8fM96w=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-9zD81p/UjH43B0aeqlItP9vrGMaT/zhVYv60ot153Gc=";
|
||||
|
|
|
|||
|
|
@ -6893,8 +6893,9 @@ with pkgs;
|
|||
citrix_workspace_23_02_0
|
||||
citrix_workspace_23_07_0
|
||||
citrix_workspace_23_09_0
|
||||
citrix_workspace_23_11_0
|
||||
;
|
||||
citrix_workspace = citrix_workspace_23_09_0;
|
||||
citrix_workspace = citrix_workspace_23_11_0;
|
||||
|
||||
clima = callPackage ../tools/text/clima { };
|
||||
|
||||
|
|
@ -19404,7 +19405,7 @@ with pkgs;
|
|||
img = callPackage ../development/tools/img { };
|
||||
|
||||
include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use {
|
||||
llvmPackages = llvmPackages_15;
|
||||
llvmPackages = llvmPackages_17;
|
||||
};
|
||||
|
||||
indent = callPackage ../development/tools/misc/indent { };
|
||||
|
|
@ -21473,7 +21474,9 @@ with pkgs;
|
|||
stdenv = if stdenv.cc.isClang then overrideLibcxx llvmPackages_14.stdenv else stdenv;
|
||||
};
|
||||
|
||||
geos39 = callPackage ../development/libraries/geos/3.9.nix { };
|
||||
geos_3_9 = callPackage ../development/libraries/geos/3.9.nix { };
|
||||
|
||||
geos_3_11 = callPackage ../development/libraries/geos/3.11.nix { };
|
||||
|
||||
getdata = callPackage ../development/libraries/getdata { };
|
||||
|
||||
|
|
@ -41413,7 +41416,9 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk.frameworks) CoreFoundation SystemConfiguration Security;
|
||||
};
|
||||
|
||||
wavm = callPackage ../development/interpreters/wavm { };
|
||||
wavm = callPackage ../development/interpreters/wavm {
|
||||
llvmPackages = llvmPackages_12;
|
||||
};
|
||||
|
||||
yabasic = callPackage ../development/interpreters/yabasic { };
|
||||
|
||||
|
|
|
|||
|
|
@ -218,6 +218,8 @@ self: super: with self; {
|
|||
|
||||
aiogram = callPackage ../development/python-modules/aiogram { };
|
||||
|
||||
aiohappyeyeballs = callPackage ../development/python-modules/aiohappyeyeballs { };
|
||||
|
||||
aioharmony = callPackage ../development/python-modules/aioharmony { };
|
||||
|
||||
aiohomekit = callPackage ../development/python-modules/aiohomekit { };
|
||||
|
|
@ -1514,6 +1516,8 @@ self: super: with self; {
|
|||
|
||||
bleak = callPackage ../development/python-modules/bleak { };
|
||||
|
||||
bleak-esphome = callPackage ../development/python-modules/bleak-esphome { };
|
||||
|
||||
bleak-retry-connector = callPackage ../development/python-modules/bleak-retry-connector { };
|
||||
|
||||
blebox-uniapi = callPackage ../development/python-modules/blebox-uniapi { };
|
||||
|
|
@ -13018,6 +13022,8 @@ self: super: with self; {
|
|||
|
||||
shapely = callPackage ../development/python-modules/shapely { };
|
||||
|
||||
shapely_1_8 = callPackage ../development/python-modules/shapely/1.8.nix { };
|
||||
|
||||
shaperglot = callPackage ../development/python-modules/shaperglot { };
|
||||
|
||||
sharedmem = callPackage ../development/python-modules/sharedmem { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue