Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
59d64381a5
|
|
@ -5341,6 +5341,16 @@
|
|||
githubId = 1031119;
|
||||
name = "Ian-Woo Kim";
|
||||
};
|
||||
ibizaman = {
|
||||
email = "ibizapeanut@gmail.com";
|
||||
github = "ibizaman";
|
||||
githubId = 1044950;
|
||||
name = "Pierre Penninckx";
|
||||
keys = [{
|
||||
longkeyid = "rsa2048/0xD4C5C37E6031A3FE";
|
||||
fingerprint = "A01F 10C6 7176 B2AE 2A34 1A56 D4C5 C37E 6031 A3FE";
|
||||
}];
|
||||
};
|
||||
iblech = {
|
||||
email = "iblech@speicherleck.de";
|
||||
github = "iblech";
|
||||
|
|
|
|||
|
|
@ -28,6 +28,12 @@ stdenv.mkDerivation rec {
|
|||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
# Workaround build failure on -fno-common toolchains like upstream
|
||||
# gcc-10. Otherwise build fails as:
|
||||
# ld: volume.o:/build/mpg321-0.3.2-orig/mpg321.h:119: multiple definition of
|
||||
# `loop_remaining'; mpg321.o:/build/mpg321-0.3.2-orig/mpg321.h:119: first defined here
|
||||
NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
|
||||
configureFlags =
|
||||
[ ("--enable-alsa=" + (if stdenv.isLinux then "yes" else "no")) ]
|
||||
++ (lib.optional (defaultAudio != null)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{lib, stdenv, fetchurl, boost, dash, freetype, libpng, pkg-config, SDL, which, zlib, nasm }:
|
||||
{lib, stdenv, fetchurl, fetchpatch, boost, dash, freetype, libpng, pkg-config, SDL, which, zlib, nasm }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mupen64plus";
|
||||
|
|
@ -9,6 +9,19 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1a21n4gqdvag6krwcjm5bnyw5phrlxw6m0mk73jy53iq03f3s96m";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull upstream fix for -fno-common toolchains:
|
||||
# https://github.com/mupen64plus/mupen64plus-core/pull/736
|
||||
(fetchpatch {
|
||||
name = "fno-common.patch";
|
||||
url = "https://github.com/mupen64plus/mupen64plus-core/commit/39975200ad4926cfc79c96609b64696289065502.patch";
|
||||
sha256 = "0kdshp9xdkharn3d1g1pvxhh761pa1v5w07iq0wf9l380r2m6gbv";
|
||||
# a/something -> a/source/mupen64plus-core/something
|
||||
stripLen = 1;
|
||||
extraPrefix = "source/mupen64plus-core/";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config nasm ];
|
||||
buildInputs = [ boost dash freetype libpng SDL which zlib ];
|
||||
|
||||
|
|
|
|||
|
|
@ -56,6 +56,12 @@ stdenv.mkDerivation rec {
|
|||
xorg.libXxf86vm
|
||||
];
|
||||
|
||||
# Workaround build failure on -fno-common toolchains like upstream
|
||||
# gcc-10. Otherwise build fails as:
|
||||
# ld: AboutDlg.o:/build/pcsxr/gui/Linux.h:42: multiple definition of `cfgfile';
|
||||
# LnxMain.o:/build/pcsxr/gui/Linux.h:42: first defined here
|
||||
NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
|
||||
dynarecTarget =
|
||||
if stdenv.isx86_64 then "x86_64"
|
||||
else if stdenv.isi686 then "x86"
|
||||
|
|
@ -81,7 +87,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Playstation 1 emulator";
|
||||
homepage = "https://pcsxr.codeplex.com/";
|
||||
homepage = "https://github.com/iCatButler/pcsxr";
|
||||
maintainers = with maintainers; [ rardiol ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.all;
|
||||
|
|
|
|||
|
|
@ -74,13 +74,13 @@ let
|
|||
self: super: {
|
||||
octoprint = self.buildPythonPackage rec {
|
||||
pname = "OctoPrint";
|
||||
version = "1.8.0";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OctoPrint";
|
||||
repo = "OctoPrint";
|
||||
rev = version;
|
||||
sha256 = "sha256-GDKXHLigMAork+KAFOs8znNhaTYVTWVB2Tb+4sAqF8o=";
|
||||
sha256 = "sha256-9phB9B8y3ay1Bsvf/m/E9xdl7vmQur4qbWOw9v6KFak=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with super; [
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@
|
|||
}
|
||||
},
|
||||
"beta": {
|
||||
"version": "102.0.5005.49",
|
||||
"sha256": "16r9mrsagy8lspr4pcrzfpw0vw0ym9m7n41a9yipjhm2arlhw5b2",
|
||||
"sha256bin64": "0lyk6rd9c1gyvxsmq1bl7asr7carzyaan306ddvwxsy5rfh53jxa",
|
||||
"version": "102.0.5005.61",
|
||||
"sha256": "07vbi3gn9g4n04b2qi2hm34r122snrqaifa46yk3pyh1d79rfdqs",
|
||||
"sha256bin64": "1cwfpjh060sm56bkgmpmmck0y3vrndrv6cbn8y3p26p3j06f2i3h",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-04-14",
|
||||
|
|
@ -32,15 +32,15 @@
|
|||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "103.0.5056.0",
|
||||
"sha256": "1mvi7yc38cxn39wqm8ybrn862gaw293rb6lwcszc6rmzwd9jmd29",
|
||||
"sha256bin64": "06371adaz8llzfjykc72vjvpy3xrgvqzz9kdrr82jdx1pjdbv29d",
|
||||
"version": "103.0.5060.13",
|
||||
"sha256": "1y7nadfmw4yxc2za7ln3h7xywlzdiscmsa8kjar17gmqz6ic69id",
|
||||
"sha256bin64": "0crs07sjqhgpr22vxa7c52ai8xvxp6c4cs82kaqzc5cgg97076gq",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-05-09",
|
||||
"version": "2022-05-11",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "bf4e17dc67b2a2007475415e3f9e1d1cf32f6e35",
|
||||
"sha256": "0d2lb4alsx32zsdw3jxpxbzal350mim237p2y984h4r6fd1ddzyi"
|
||||
"rev": "578a7fe4c3c6b0bc2ae1fd2e37f14857d09895bf",
|
||||
"sha256": "03dqfrdpf5xxl64dby3qmbwpzdq2gsa8g7xl438py3a629rgxg63"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -103,6 +103,7 @@
|
|||
, crashreporterSupport ? !privacySupport
|
||||
, geolocationSupport ? !privacySupport
|
||||
, googleAPISupport ? geolocationSupport
|
||||
, mlsAPISupport ? geolocationSupport
|
||||
, webrtcSupport ? !privacySupport
|
||||
|
||||
# digital rights managemewnt
|
||||
|
|
@ -185,6 +186,18 @@ let
|
|||
};
|
||||
});
|
||||
|
||||
defaultPrefs = {
|
||||
"geo.provider.network.url" = {
|
||||
value = "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%";
|
||||
reason = "Use MLS by default for geolocation, since our Google API Keys are not working";
|
||||
};
|
||||
};
|
||||
|
||||
defaultPrefsFile = pkgs.writeText "nixos-default-prefs.js" (lib.concatStringsSep "\n" (lib.mapAttrsToList (key: value: ''
|
||||
// ${value.reason}
|
||||
pref("${key}", ${builtins.toJSON value.value});
|
||||
'') defaultPrefs));
|
||||
|
||||
in
|
||||
|
||||
buildStdenv.mkDerivation ({
|
||||
|
|
@ -304,11 +317,17 @@ buildStdenv.mkDerivation ({
|
|||
'' + lib.optionalString googleAPISupport ''
|
||||
# Google API key used by Chromium and Firefox.
|
||||
# Note: These are for NixOS/nixpkgs use ONLY. For your own distribution,
|
||||
# please get your own set of keys.
|
||||
echo "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI" > $TMPDIR/ga
|
||||
# please get your own set of keys at https://www.chromium.org/developers/how-tos/api-keys/.
|
||||
echo "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI" > $TMPDIR/google-api-key
|
||||
# 60.5+ & 66+ did split the google API key arguments: https://bugzilla.mozilla.org/show_bug.cgi?id=1531176
|
||||
configureFlagsArray+=("--with-google-location-service-api-keyfile=$TMPDIR/ga")
|
||||
configureFlagsArray+=("--with-google-safebrowsing-api-keyfile=$TMPDIR/ga")
|
||||
configureFlagsArray+=("--with-google-location-service-api-keyfile=$TMPDIR/google-api-key")
|
||||
configureFlagsArray+=("--with-google-safebrowsing-api-keyfile=$TMPDIR/google-api-key")
|
||||
'' + lib.optionalString mlsAPISupport ''
|
||||
# Mozilla Location services API key
|
||||
# Note: These are for NixOS/nixpkgs use ONLY. For your own distribution,
|
||||
# please get your own set of keys at https://location.services.mozilla.com/api.
|
||||
echo "dfd7836c-d458-4917-98bb-421c82d3c8a0" > $TMPDIR/mls-api-key
|
||||
configureFlagsArray+=("--with-mozilla-api-keyfile=$TMPDIR/mls-api-key")
|
||||
'' + lib.optionalString enableOfficialBranding ''
|
||||
export MOZILLA_OFFICIAL=1
|
||||
'';
|
||||
|
|
@ -467,6 +486,7 @@ buildStdenv.mkDerivation ({
|
|||
postInstall = ''
|
||||
# Install distribution customizations
|
||||
install -Dvm644 ${distributionIni} $out/lib/${binaryName}/distribution/distribution.ini
|
||||
install -Dvm644 ${defaultPrefsFile} $out/lib/${binaryName}/browser/defaults/preferences/nixos-default-prefs.js
|
||||
|
||||
'' + lib.optionalString buildStdenv.isLinux ''
|
||||
# Remove SDK cruft. FIXME: move to a separate output?
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ in mkDerivationWith python3Packages.buildPythonApplication rec {
|
|||
pyyaml backendPackage jinja2 pygments
|
||||
# scripts and userscripts libs
|
||||
tldextract beautifulsoup4
|
||||
pyreadability pykeepass stem
|
||||
readability-lxml pykeepass stem
|
||||
pynacl
|
||||
# extensive ad blocking
|
||||
adblock
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ let
|
|||
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
|
||||
|
||||
# Upstream source
|
||||
version = "11.0.11";
|
||||
version = "11.0.13";
|
||||
|
||||
lang = "en-US";
|
||||
|
||||
|
|
@ -98,7 +98,7 @@ let
|
|||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
|
||||
];
|
||||
sha256 = "1dx92jdnvs7w52mps4zhnnjym6jsl9vwfiav1jw8qq0g8hslgybd";
|
||||
sha256 = "03pzwzgikc43pm0lga61jdzg46fanmvd1wsnb2xkq0y1ny8gsqfz";
|
||||
};
|
||||
|
||||
i686-linux = fetchurl {
|
||||
|
|
@ -107,7 +107,7 @@ let
|
|||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
|
||||
];
|
||||
sha256 = "165mg9gwmlqwskbk3i8lhjjqp4lmpq5vzdvd9zalx69xqh9v85i5";
|
||||
sha256 = "0j8h2g404sagzjxnwf55n8hpvmwk52qhml98nyliajf1xg8v8k19";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
pillow
|
||||
pygments
|
||||
pygobject3
|
||||
pyreadability
|
||||
readability-lxml
|
||||
pytz
|
||||
requests
|
||||
];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
"name": "element-desktop",
|
||||
"productName": "Element",
|
||||
"main": "lib/electron-main.js",
|
||||
"version": "1.10.12",
|
||||
"version": "1.10.13",
|
||||
"description": "A feature-rich client for Matrix.org",
|
||||
"author": "Element",
|
||||
"repository": {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"version": "1.10.12",
|
||||
"desktopSrcHash": "K1p/+dZRtKb+AiU2EcikAsmiTIKPw0zaVzAfUDzsYZY=",
|
||||
"desktopYarnHash": "09ri87ynfgxrv22sykggiy6nlcf20qwj7zj9qq0rz3c2acr6g9mn",
|
||||
"webHash": "1m7pvliymyggg6qx8gj6l3j2f4rml0km1vmk1zdspxa4l6p0qxd8"
|
||||
"version": "1.10.13",
|
||||
"desktopSrcHash": "tTvpjSIipvmJIfZF1RiRtlDjsKJYHoPQ6XSqI8TGH14=",
|
||||
"desktopYarnHash": "105bphn4ga4f0n60cvrlppf8wim2c1qy09g8arraadcxymds98n6",
|
||||
"webHash": "1zxjlzlxh2gbswa1063zbw6ahwlcnvyqkvbwj92vk873c3g8ba72"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,8 +15,26 @@ let
|
|||
version = "1.16.0";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
extension = "zip";
|
||||
sha256 = "36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01";
|
||||
};
|
||||
# Needs networking for some tests
|
||||
doCheck = false;
|
||||
});
|
||||
|
||||
# The bravado-core dependency is incompatible with jschonschema 4.0:
|
||||
# https://github.com/Yelp/bravado-core/pull/385
|
||||
jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "3.2.0";
|
||||
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
hash = "sha256-yKhbKNN3zHc35G4tnytPRO48Dh3qxr9G3e/HGH0weXo=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
doCheck = false;
|
||||
});
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, perlPackages, libminc }:
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, makeWrapper, perlPackages, libminc }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mni_autoreg";
|
||||
|
|
@ -11,6 +11,16 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0axl069nv57vmb2wvqq7s9v3bfxwspzmk37bxm4973ai1irgppjq";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull upstream workaround for -fno-common toolchains:
|
||||
# https://github.com/BIC-MNI/mni_autoreg/pull/28
|
||||
(fetchpatch {
|
||||
name = "fno-common.patch";
|
||||
url = "https://github.com/BIC-MNI/mni_autoreg/commit/06adfacbd84369ea3bcc4376596ac1c0f2e49af9.patch";
|
||||
sha256 = "004sdrbx9kcj1qqwjly6p03svakl0x2sbv83salyg63fv67jynx8";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake makeWrapper ];
|
||||
buildInputs = [ libminc ];
|
||||
propagatedBuildInputs = with perlPackages; [ perl GetoptTabular MNI-Perllib ];
|
||||
|
|
|
|||
|
|
@ -8,6 +8,12 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0qflf3i27x6jwks3c6q560m1q8r043ja96syah145113iz5wdalp";
|
||||
};
|
||||
|
||||
# Workaround build failure on -fno-common toolchains like upstream
|
||||
# gcc-10. Otherwise build fails as:
|
||||
# ld: /build/ccKomtcd.o:(.bss+0x4544): multiple definition of `SeqTypes';
|
||||
# /build/ccx7EsgU.o:(.bss+0x2a0dfdc): first defined here
|
||||
NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
|
||||
preBuild = ''
|
||||
cd ./src/
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gh";
|
||||
version = "2.11.0";
|
||||
version = "2.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cli";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-VWbkthOaq34tAiBkPlCXmz32RrJfO6dfVS+LLls39jA=";
|
||||
sha256 = "sha256-bDPcU898ceARV06AADNj08D1eKD6yp39D6Ahs70d+kU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-soNQXtpQ217scP606UA05+r9WIrUAMOCDBsfLKrVD+Q=";
|
||||
|
|
|
|||
|
|
@ -38,8 +38,8 @@ import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({
|
|||
packageBuild = fetchFromGitHub {
|
||||
owner = "melpa";
|
||||
repo = "package-build";
|
||||
rev = "047801d301a73d4932f33f768d94a8ed26b8d524";
|
||||
sha256 = "0ygzkpg7xc3mjjbxg1kcyz6fwbkb0prvca499f0ffmhfaiv28h59";
|
||||
rev = "35017a2d87376c70c3239f48bdbac7efca85aa10";
|
||||
sha256 = "07hdmam85452v4r2vaabj1qfyami1hgbh0jgj9dcwbkpr0y1gvqj";
|
||||
};
|
||||
|
||||
elpa2nix = ./elpa2nix.el;
|
||||
|
|
|
|||
|
|
@ -11,12 +11,22 @@
|
|||
;; Allow installing package tarfiles larger than 10MB
|
||||
(setq large-file-warning-threshold nil)
|
||||
|
||||
(defun melpa2nix-build-package-1 (rcp version commit)
|
||||
(let ((source-dir (package-recipe--working-tree rcp)))
|
||||
(unwind-protect
|
||||
(let ((files (package-build-expand-files-spec rcp t)))
|
||||
(cond
|
||||
((= (length files) 1)
|
||||
(package-build--build-single-file-package
|
||||
rcp version commit files source-dir))
|
||||
((> (length files) 1)
|
||||
(package-build--build-multi-file-package
|
||||
rcp version commit files source-dir))
|
||||
(t (error "Unable to find files matching recipe patterns")))))))
|
||||
|
||||
(defun melpa2nix-build-package ()
|
||||
(if (not noninteractive)
|
||||
(error "`melpa2nix-build-package' is to be used only with -batch"))
|
||||
(pcase command-line-args-left
|
||||
(`(,package ,version ,commit)
|
||||
;; Monkey-patch package-build so it doesn't shell out to git/hg.
|
||||
(defun package-build--get-commit (&rest _)
|
||||
commit)
|
||||
(package-build--package (package-recipe-lookup package) version))))
|
||||
(melpa2nix-build-package-1 (package-recipe-lookup package) version commit))))
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -6,18 +6,18 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unison-code-manager";
|
||||
milestone_id = "M2j";
|
||||
milestone_id = "M2l";
|
||||
version = "1.0.${milestone_id}-alpha";
|
||||
|
||||
src = if (stdenv.isDarwin) then
|
||||
fetchurl {
|
||||
url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-macos.tar.gz";
|
||||
sha256 = "0lrj37mfqzwg9n757ymjb440jx51kj1s8g6qv9vis9pxckmy0m08";
|
||||
sha256 = "sha256-1jwDICm1tt//92S+ybHhRcNQjeCc5DaM6+RMInLWzFE=";
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-linux.tar.gz";
|
||||
sha256 = "0qvin1rlkjwijchsijq3vbnn4injawchh2w97kyq7i3idh8ccl59";
|
||||
sha256 = "sha256-ECpg6iNxSVkt/VuspFYTdVyUO/+XxGwB1NmgfMOhb5A=";
|
||||
};
|
||||
|
||||
# The tarball is just the prebuilt binary, in the archive root.
|
||||
|
|
|
|||
|
|
@ -6,25 +6,27 @@
|
|||
, ansible-core
|
||||
, enrich
|
||||
, flaky
|
||||
, jsonschema
|
||||
, pythonOlder
|
||||
, pytest
|
||||
, pytest-xdist
|
||||
, pytestCheckHook
|
||||
, pyyaml
|
||||
, rich
|
||||
, ruamel-yaml
|
||||
, wcmatch
|
||||
, yamllint
|
||||
, pythonOlder
|
||||
, pytest-xdist
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible-lint";
|
||||
version = "6.0.2";
|
||||
version = "6.2.1";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-tTm8ItE+beDMLiV1jh0osrwBVhpBSuN87aNwi1oqee0=";
|
||||
sha256 = "sha256-yg3u5YNcv6+buhgnWGiKiKC5xoUrMrFed+SwN2whvB8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -41,6 +43,8 @@ buildPythonPackage rec {
|
|||
ansible-compat
|
||||
ansible-core
|
||||
enrich
|
||||
jsonschema
|
||||
pytest # yes, this is an actual runtime dependency
|
||||
pyyaml
|
||||
rich
|
||||
ruamel-yaml
|
||||
|
|
@ -90,7 +94,7 @@ buildPythonPackage rec {
|
|||
makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ansible-core ]}" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/ansible-community/ansible-lint";
|
||||
homepage = "https://github.com/ansible/ansible-lint";
|
||||
description = "Best practices checker for Ansible";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ sengaya SuperSandro2000 ];
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "build";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "pypa";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-kT3Gax/ZCeV8Kb7CBArGWn/qzVSVdMRUoid/8cAovnE=";
|
||||
hash = "sha256-P0DFBYsL2Ce/JwfYss64+CY/IvzYZEiz9wuEslij+oU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,26 +2,29 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-polymorphic";
|
||||
version = "2.1.2";
|
||||
version = "3.1";
|
||||
|
||||
# PyPI tarball is missing some test files
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
owner = "django-polymorphic";
|
||||
repo = "django-polymorphic";
|
||||
rev = "v${version}";
|
||||
sha256 = "0zghrq7y7g2ls38cz6y98qj5xwnn992slhb95qyp6l66d420j179";
|
||||
sha256 = "sha256-JJY+FoMPSnWuSsNIas2JedGJpdm6RfPE3E1VIjGuXIc=";
|
||||
};
|
||||
|
||||
checkInputs = [ dj-database-url ];
|
||||
propagatedBuildInputs = [ django ];
|
||||
|
||||
checkInputs = [ dj-database-url ];
|
||||
|
||||
checkPhase = ''
|
||||
${python.interpreter} runtests.py
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "polymorphic" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/django-polymorphic/django-polymorphic";
|
||||
description = "Improved Django model inheritance with automatic downcasting";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "1.5.0";
|
||||
version = "1.5.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-TB6NPc155uZUb1cMH/QKIZYm+yJKAukZh0SUZQZgQXM=";
|
||||
sha256 = "sha256-4fB0IIKZNNU7MfHRhdjNhP7RQMWcvfqawj2P01LIPa0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
30
pkgs/development/python-modules/nxt-python/default.nix
Normal file
30
pkgs/development/python-modules/nxt-python/default.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchgit
|
||||
, isPy3k
|
||||
, pyusb
|
||||
, pybluez
|
||||
, pytest
|
||||
, git
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "3.0.1";
|
||||
pname = "nxt-python";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/schodet/nxt-python.git";
|
||||
rev = version;
|
||||
sha256 = "004c0dr6767bjiddvp0pchcx05falhjzj33rkk03rrl0ha2nhxvz";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pyusb pybluez pytest git ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python driver/interface for Lego Mindstorms NXT robot";
|
||||
homepage = "https://github.com/schodet/nxt-python";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ ibizaman ];
|
||||
};
|
||||
}
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "plugwise";
|
||||
version = "0.18.4";
|
||||
version = "0.18.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
|||
owner = pname;
|
||||
repo = "python-plugwise";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-a4mbkwjdLOnoxe4Cj43IXGALqbTKqinoJAiPWfc79/8=";
|
||||
sha256 = "sha256-J6RwPkObcoXIQ93nD8FNNjwllHoID4nFzqilArBS1C8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyduke-energy";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "mjmeli";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bthEWsitnZwK4eyhLXv5RxlOaWyJG1fK0cC4wMEqCbI=";
|
||||
sha256 = "sha256-qHVQ7ehvhVM2IL8DcoB6TU2Q4GBn4Ewmzs6Yp46r6xE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,17 +5,21 @@
|
|||
, pyparsing
|
||||
, pytestCheckHook
|
||||
, python-dateutil
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyhocon";
|
||||
version = "0.3.59";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chimpler";
|
||||
repo = "pyhocon";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1yr24plg3d4girg27ajjkf9mndig706fs8b2kmnmhi4l2xi866yh";
|
||||
sha256 = "sha256-0BuDYheURFhtnWIh7Qw4LzZbk5tSqiNejo+08eglIvs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -28,18 +32,36 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pyhocon" ];
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "pyparsing~=2.0" "pyparsing>=2.0"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pyhocon"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# pyparsing.exceptions.ParseException: Expected end of text, found '='
|
||||
# https://github.com/chimpler/pyhocon/issues/273
|
||||
"tests/test_tool.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# AssertionError: assert ConfigTree([(...
|
||||
"test_dict_merge"
|
||||
"test_parse_override"
|
||||
"test_include_dict"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/chimpler/pyhocon/";
|
||||
description = "HOCON parser for Python";
|
||||
# taken from https://pypi.org/project/pyhocon/
|
||||
homepage = "https://github.com/chimpler/pyhocon/";
|
||||
longDescription = ''
|
||||
A HOCON parser for Python. It additionally provides a tool
|
||||
(pyhocon) to convert any HOCON content into json, yaml and properties
|
||||
format
|
||||
A HOCON parser for Python. It additionally provides a tool (pyhocon) to convert
|
||||
any HOCON content into JSON, YAML and properties format.
|
||||
'';
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.chreekat ];
|
||||
maintainers = with maintainers; [ chreekat ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
{ lib, fetchPypi, buildPythonPackage
|
||||
, requests, chardet, cssselect, lxml
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "PyReadability";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1k6fq416pdmjcdqh6gdxl0y0k8kj1zlpzwp5574xsvsha18p2zpn";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests chardet cssselect lxml ];
|
||||
|
||||
# ModuleNotFoundError: No module named 'tests'
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/hyperlinkapp/python-readability";
|
||||
description = "fast python port of arc90's readability tool, updated to match latest readability.js!";
|
||||
license = lib.licenses.asl20;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -1,4 +1,12 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, numpy, pillow, zbar, pytestCheckHook }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, numpy
|
||||
, pillow
|
||||
, zbar
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyzbar";
|
||||
|
|
@ -19,7 +27,9 @@ buildPythonPackage rec {
|
|||
# https://github.com/NixOS/nixpkgs/issues/7307
|
||||
postPatch = ''
|
||||
substituteInPlace pyzbar/zbar_library.py \
|
||||
--replace "find_library('zbar')" "'${lib.getLib zbar}/lib/libzbar.so.0'"
|
||||
--replace \
|
||||
"find_library('zbar')" \
|
||||
'"${lib.getLib zbar}/lib/libzbar${stdenv.hostPlatform.extensions.sharedLibrary}"'
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
|
|
|
|||
|
|
@ -85,6 +85,7 @@ buildPythonPackage rec {
|
|||
"qiskit.providers.aer.backends.qasm_simulator"
|
||||
"qiskit.providers.aer.backends.controller_wrappers" # Checks C++ files built correctly. Only exists if built & moved to output
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# these tests don't work with cvxpy >= 1.1.15
|
||||
"test_clifford"
|
||||
|
|
@ -113,16 +114,20 @@ buildPythonPackage rec {
|
|||
"_144"
|
||||
"test_sparse_output_probabilities"
|
||||
"test_reset_2_qubit"
|
||||
|
||||
# Fails with 0.10.4
|
||||
"test_extended_stabilizer_sparse_output_probs"
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
ddt
|
||||
fixtures
|
||||
pytest-timeout
|
||||
qiskit-terra
|
||||
setuptools # temporary workaround for pbr missing setuptools, see https://github.com/NixOS/nixpkgs/pull/132614
|
||||
testtools
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"--timeout=30"
|
||||
"--durations=10"
|
||||
|
|
@ -137,6 +142,7 @@ buildPythonPackage rec {
|
|||
# Add qiskit-aer compiled files to cython include search
|
||||
pushd $HOME
|
||||
'';
|
||||
|
||||
postCheck = "popd";
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,19 +1,22 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, chardet
|
||||
, cssselect
|
||||
, lxml
|
||||
, timeout-decorator
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "readability-lxml";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-5R/qVrWQmq+IbTB9SOeeCWKTJVr6Vnt9CLypTSWxpOE=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "buriy";
|
||||
repo = "python-readability";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MKdQRety24qOG9xgIdaCJ72XEImP42SlMG6tC7bwzo4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ chardet cssselect lxml ];
|
||||
|
|
@ -22,7 +25,10 @@ buildPythonPackage rec {
|
|||
substituteInPlace setup.py --replace 'sys.platform == "darwin"' "False"
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
timeout-decorator
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast python port of arc90's readability tool";
|
||||
|
|
|
|||
|
|
@ -1,43 +1,52 @@
|
|||
{ buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, isPy27
|
||||
, lib
|
||||
|
||||
# pythonPackages
|
||||
{ lib
|
||||
, astroid
|
||||
, pytest
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, packaging
|
||||
, poetry-core
|
||||
, poetry-semver
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, toml
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "requirements-detector";
|
||||
version = "0.7";
|
||||
disabled = isPy27;
|
||||
version = "1.0.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "landscapeio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-DdPNqbTsL2+GUp8vppqUSa0mUVMxk73MCcpwo8u51tU=";
|
||||
hash = "sha256-AEXCguf5Q9lU5ygFJUlbc1F637hkQ0wJybbRK7uhB9s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
astroid
|
||||
packaging
|
||||
poetry-semver
|
||||
toml
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
pytest
|
||||
'';
|
||||
pythonImportsCheck = [
|
||||
"requirements_detector"
|
||||
];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Python tool to find and list requirements of a Python project";
|
||||
homepage = "https://github.com/landscapeio/requirements-detector";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
kamadorueda
|
||||
];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ kamadorueda ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +1,32 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, attrs, pytestCheckHook }:
|
||||
{ lib
|
||||
, attrs
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sumtypes";
|
||||
version = "0.1a5";
|
||||
version = "0.1a6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "radix";
|
||||
repo = "sumtypes";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0wcw1624xxx2h6lliv13b59blg60j8sgf5v2ni3cwx3j4wld4csr";
|
||||
sha256 = "sha256-qwQyFKVnGEqHUqFmUSnHVvedsp2peM6rJZcS90paLOo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ attrs ];
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
propagatedBuildInputs = [
|
||||
attrs
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Algebraic data types for Python";
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, isPy27
|
||||
, numpy
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, scipy
|
||||
, sparse
|
||||
}:
|
||||
|
|
@ -11,32 +11,51 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "tensorly";
|
||||
version = "0.7.0";
|
||||
disabled = isPy27;
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "VcX3pCczZQUYZaD7xrrkOcj0QPJt28cYTwpZm5D/X3c=";
|
||||
sha256 = "sha256-VcX3pCczZQUYZaD7xrrkOcj0QPJt28cYTwpZm5D/X3c=";
|
||||
};
|
||||
|
||||
# nose is not actually required for anything
|
||||
# (including testing with the minimal dependencies)
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
scipy
|
||||
sparse
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace ", 'nose'" ""
|
||||
# nose is not actually required for anything
|
||||
# (including testing with the minimal dependencies)
|
||||
substituteInPlace setup.py \
|
||||
--replace ", 'nose'" ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ numpy scipy sparse ];
|
||||
pythonImportsCheck = [
|
||||
"tensorly"
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
pytestFlagsArray = [ "tensorly" ];
|
||||
pytestFlagsArray = [
|
||||
"tensorly"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "tensorly" ];
|
||||
disabledTests = [
|
||||
# AssertionError: Partial_SVD took too long, maybe full_matrices set wrongly
|
||||
"test_svd_time"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tensor learning in Python";
|
||||
homepage = "https://tensorly.org/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.bcdarwin ];
|
||||
maintainers = with maintainers; [ bcdarwin ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
29
pkgs/development/python-modules/types-redis/default.nix
Normal file
29
pkgs/development/python-modules/types-redis/default.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-redis";
|
||||
version = "4.2.5";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-iPBNmfIMIMPQEpw3YB+ecMAbcfH670c3Zs+j3dvV5dU=";
|
||||
};
|
||||
|
||||
# Module doesn't have tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"redis-stubs"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Typing stubs for redis";
|
||||
homepage = "https://github.com/python/typeshed";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ gador ];
|
||||
};
|
||||
}
|
||||
|
|
@ -32,13 +32,13 @@ with py.pkgs;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.0.1153";
|
||||
version = "2.0.1160";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-9J7KvHUT6u8Dl9ElUmUgu/EC9p2gx52AB9prMFmyX2k=";
|
||||
hash = "sha256-9vxmNJuRvBGJ9vBBx24C2CUirOpOpzfX7bxyOFrsAp4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with py.pkgs; [
|
||||
|
|
@ -97,7 +97,7 @@ buildPythonApplication rec {
|
|||
--replace "bc-python-hcl2==0.3.39" "bc-python-hcl2>=0.3.39" \
|
||||
--replace "cyclonedx-python-lib>=0.11.0,<1.0.0" "cyclonedx-python-lib>=0.11.0" \
|
||||
--replace "prettytable>=3.0.0" "prettytable" \
|
||||
--replace "pycep-parser==0.3.4" "pycep-parser"
|
||||
--replace "pycep-parser==0.3.6" "pycep-parser"
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
|
|
|
|||
|
|
@ -46,13 +46,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "github-runner";
|
||||
version = "2.291.1";
|
||||
version = "2.292.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "actions";
|
||||
repo = "runner";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0Eijq2vXY+Y2g3bhEhIGnFxTCLXpw7k3iXpgj3x8nL4=";
|
||||
hash = "sha256-vmHUu4coAxFLfi+G4xLjy3+LzFnmGllhWhCXcWuDQnc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
|
|||
postPatch = ''
|
||||
# Relax the version requirement
|
||||
substituteInPlace src/global.json \
|
||||
--replace '6.0.100' '${dotnetSdk.version}'
|
||||
--replace '6.0.300' '${dotnetSdk.version}'
|
||||
|
||||
# Disable specific tests
|
||||
substituteInPlace src/dir.proj \
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ index 1c91e0c..8b27d3f 100644
|
|||
|
||||
<Target Name="Test" DependsOnTargets="GenerateConstant">
|
||||
- <Exec Command="dotnet build Test/Test.csproj -c $(BUILDCONFIG) /p:PackageRuntime=$(PackageRuntime)" ConsoleToMSBuild="true" />
|
||||
- <Exec Command="dotnet test Test/Test.csproj --no-build --logger:trx" ConsoleToMSBuild="true" />
|
||||
- <Exec Command="dotnet test Test/Test.csproj -c $(BUILDCONFIG) --no-build --logger:trx" ConsoleToMSBuild="true" />
|
||||
+ <Exec Command="dotnet build Test/Test.csproj --no-restore -c $(BUILDCONFIG) /p:PackageRuntime=$(PackageRuntime)" ConsoleToMSBuild="true" />
|
||||
+ <Exec Command="dotnet test Test/Test.csproj --no-restore --no-build --logger:trx" ConsoleToMSBuild="true" />
|
||||
</Target>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
let
|
||||
pname = "dump_syms";
|
||||
version = "unstable-2022-05-05";
|
||||
version = "1.0.0";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit pname version;
|
||||
|
|
@ -19,11 +19,11 @@ rustPlatform.buildRustPackage {
|
|||
src = fetchFromGitHub {
|
||||
owner = "mozilla";
|
||||
repo = pname;
|
||||
rev = "c2743d59b5aa321ade698f84b90f86b3d35a1b06";
|
||||
hash = "sha256-hWK9KrYqbfrF8b7i33InlTa/XkoZs+h49kUsKeSaAok=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cgLlCNNid7JIukdWKy3nPJwyZ84YpKrnCC4Rm6E7DDk=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256:0vsr867nl156wpxpw01bv9fxsp6rhj9vvpz2i2yhx4kjgr1qk1kw";
|
||||
cargoSha256 = "sha256-0qRaBgIoWXYnQkxY7hFkvj3v/7mEGGRzQV7JFib8JRk=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib
|
||||
, pkgs
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
}:
|
||||
|
||||
|
|
@ -14,21 +14,15 @@ buildPythonApplication rec {
|
|||
version = "1.7.7";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6.1";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
src = fetchFromGitHub {
|
||||
owner = "PyCQA";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-sbPZmVeJtNphtjuZEfKcUgty9bJ3E/2Ya9RuX3u/XEs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'pep8-naming = ">=0.3.3,<=0.10.0"' 'pep8-naming = "*"' \
|
||||
--replace 'mccabe = "^0.6.0"' 'mccabe = "*"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
|
@ -60,6 +54,17 @@ buildPythonApplication rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'requirements-detector = "^0.7"' 'requirements-detector = "*"' \
|
||||
--replace 'pep8-naming = ">=0.3.3,<=0.10.0"' 'pep8-naming = "*"' \
|
||||
--replace 'mccabe = "^0.6.0"' 'mccabe = "*"'
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"prospector"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to analyse Python code and output information about errors, potential problems, convention violations and complexity";
|
||||
homepage = "https://github.com/PyCQA/prospector";
|
||||
|
|
|
|||
|
|
@ -25,6 +25,12 @@ stdenv.mkDerivation rec {
|
|||
})
|
||||
];
|
||||
|
||||
# Workaround build failure on -fno-common toolchains like upstream
|
||||
# gcc-10. Otherwise build fails as:
|
||||
# ld: modules/.libs/libmodules.a(rocket_pad.o):/build/lincity-1.13.1/modules/../screen.h:23:
|
||||
# multiple definition of `monthgraph_style'; ldsvguts.o:/build/lincity-1.13.1/screen.h:23: first defined here
|
||||
NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
|
||||
meta = with lib; {
|
||||
description = "City simulation game";
|
||||
license = licenses.gpl2Plus;
|
||||
|
|
|
|||
|
|
@ -23,6 +23,12 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ flex bison ];
|
||||
|
||||
# Workaround build failure on -fno-common toolchains like upstream
|
||||
# gcc-10. Otherwise build fails as:
|
||||
# ld: lockdep.o:/build/linux-5.0.21/tools/lib/lockdep/../../include/linux/rcu.h:5: multiple definition of
|
||||
# `rcu_scheduler_active'; common.o:/build/linux-5.0.21/tools/lib/lockdep/../../include/linux/rcu.h:5: first defined here
|
||||
NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
|
||||
buildPhase = ''
|
||||
make defconfig
|
||||
make headers_install
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Linux driver for setting the backlight brightness on laptops using NVIDIA GPU";
|
||||
homepage = "https://github.com/guillaumezin/nvidiabl";
|
||||
homepage = "https://github.com/yorickvP/nvidiabl";
|
||||
license = licenses.gpl2;
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
maintainers = with maintainers; [ yorickvp ];
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
lua, speex, libopus, opusfile, libogg,
|
||||
srtp, wget, curl, iksemel, pkg-config,
|
||||
autoconf, libtool, automake,
|
||||
python39, writeScript,
|
||||
withOpus ? true,
|
||||
}:
|
||||
|
||||
|
|
@ -92,9 +93,9 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
pjproject_2_10 = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.10/pjproject-2.10.tar.bz2";
|
||||
sha256 = "14qmddinm4bv51rl0wwg5133r64x5bd6inwbx27ahb2n0151m2if";
|
||||
pjproject_2_12 = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.12/pjproject-2.12.tar.bz2";
|
||||
hash = "sha256-T3q4r/4WCAZCNGnULxMnNKH9wEK7gkseV/sV8IPasHQ=";
|
||||
};
|
||||
|
||||
mp3-202 = fetchsvn {
|
||||
|
|
@ -115,11 +116,17 @@ let
|
|||
versions = lib.mapAttrs (_: {version, sha256}: common {
|
||||
inherit version sha256;
|
||||
externals = {
|
||||
"externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10;
|
||||
"externals_cache/pjproject-2.12.tar.bz2" = pjproject_2_12;
|
||||
"addons/mp3" = mp3-202;
|
||||
};
|
||||
}) (lib.importJSON ./versions.json);
|
||||
|
||||
updateScript_python = python39.withPackages (p: with p; [ packaging beautifulsoup4 requests ]);
|
||||
updateScript = writeScript "asterisk-update" ''
|
||||
#!/usr/bin/env bash
|
||||
exec ${updateScript_python}/bin/python ${toString ./update.py}
|
||||
'';
|
||||
|
||||
in {
|
||||
# Supported releases (as of 2022-04-05).
|
||||
# Source: https://wiki.asterisk.org/wiki/display/AST/Asterisk+Versions
|
||||
|
|
@ -131,6 +138,8 @@ in {
|
|||
# 19.x Standard 2021-11-02 2022-11-02 2023-11-02
|
||||
asterisk-lts = versions.asterisk_18;
|
||||
asterisk-stable = versions.asterisk_19;
|
||||
asterisk = versions.asterisk_19;
|
||||
asterisk = versions.asterisk_19.overrideAttrs (o: {
|
||||
passthru = (o.passthru or {}) // { inherit updateScript; };
|
||||
});
|
||||
|
||||
} // versions
|
||||
|
|
|
|||
|
|
@ -1,8 +1,11 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i python3 -p python39 python39.pkgs.packaging python39.pkgs.beautifulsoup4 python39.pkgs.requests
|
||||
# mirrored in ./default.nix
|
||||
from packaging import version
|
||||
from bs4 import BeautifulSoup
|
||||
import re, requests, json
|
||||
import os, sys
|
||||
from pathlib import Path
|
||||
|
||||
URL = "https://downloads.asterisk.org/pub/telephony/asterisk"
|
||||
|
||||
|
|
@ -23,8 +26,10 @@ for mv in major_versions.keys():
|
|||
"sha256": sha
|
||||
}
|
||||
|
||||
versions_path = Path(sys.argv[0]).parent / "versions.json"
|
||||
|
||||
try:
|
||||
with open("versions.json", "r") as in_file:
|
||||
with open(versions_path, "r") as in_file:
|
||||
in_data = json.loads(in_file.read())
|
||||
for v in in_data.keys():
|
||||
print(v + ":", in_data[v]["version"], "->", out[v]["version"])
|
||||
|
|
@ -32,5 +37,5 @@ except:
|
|||
# nice to have for the PR, not a requirement
|
||||
pass
|
||||
|
||||
with open("versions.json", "w") as out_file:
|
||||
with open(versions_path, "w") as out_file:
|
||||
out_file.write(json.dumps(out, sort_keys=True, indent=2) + "\n")
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{
|
||||
"asterisk_16": {
|
||||
"sha256": "379c5529b9957c28734192999543486a0b0b24f6671b2e02e77cc809774e7ba9",
|
||||
"version": "16.25.1"
|
||||
"sha256": "201c92e591fc1db2c71b264907beef594d62d660168d42b5e83f9dc593b1bce0",
|
||||
"version": "16.26.1"
|
||||
},
|
||||
"asterisk_18": {
|
||||
"sha256": "9db0e94e005a91a5433fc11173247065a5c40c9a7ca946577908f65d130b888e",
|
||||
"version": "18.11.1"
|
||||
"sha256": "acbb58e5c3cd2b9c7c4506fa80b717c3c3c550ce9722ff0177b4f11f98725563",
|
||||
"version": "18.12.1"
|
||||
},
|
||||
"asterisk_19": {
|
||||
"sha256": "3e1fa31ef1de7813365dd8b98ef93744ff87902255472814d0232b955c794706",
|
||||
"version": "19.3.1"
|
||||
"sha256": "6b0b985163f20fcc8f8878069b8a9ee725eef4cfbdb1c1031fe3840fb32d7abe",
|
||||
"version": "19.4.1"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,6 +35,12 @@ in stdenv.mkDerivation rec {
|
|||
./autogen.sh
|
||||
'';
|
||||
|
||||
# Workaround build failure on -fno-common toolchains like upstream
|
||||
# gcc-10. Otherwise build fails as:
|
||||
# ld: bgpd-rde_peer.o:/build/source/src/bgpd/bgpd.h:133: multiple definition of `bgpd_process';
|
||||
# bgpd-bgpd.o:/build/source/src/bgpd/bgpd.h:133: first defined here
|
||||
NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
|
||||
meta = with lib; {
|
||||
description =
|
||||
"A free implementation of the Border Gateway Protocol, Version 4. It allows ordinary machines to be used as routers exchanging routes with other systems speaking the BGP protocol";
|
||||
|
|
|
|||
|
|
@ -22,15 +22,13 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ libuuid gettext ]
|
||||
++ lib.optionals stdenv.isLinux [ fuse ];
|
||||
|
||||
# Only use glibc's __GNUC_PREREQ(X,Y) (checks if compiler is gcc version >= X.Y) when using glibc
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2022-1304.patch";
|
||||
url = "https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/patch/?id=ab51d587bb9b229b1fade1afd02e1574c1ba5c76";
|
||||
sha256 = "sha256-YEEow34/81NBOc6F6FS6i505FCQ7GHeIz0a0qWNs7Fg=";
|
||||
})
|
||||
] ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [
|
||||
(fetchpatch {
|
||||
(fetchpatch { # avoid using missing __GNUC_PREREQ(X,Y)
|
||||
url = "https://raw.githubusercontent.com/void-linux/void-packages/9583597eb3e6e6b33f61dbc615d511ce030bc443/srcpkgs/e2fsprogs/patches/fix-glibcism.patch";
|
||||
sha256 = "1gfcsr0i3q8q2f0lqza8na0iy4l4p3cbii51ds6zmj0y4hz2dwhb";
|
||||
excludes = [ "lib/ext2fs/hashmap.h" ];
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, python3, git }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, ninja, python3, git }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "directx-shader-compiler";
|
||||
version = "1.6.2106";
|
||||
version = "1.6.2112";
|
||||
|
||||
# Put headers in dev, there are lot of them which aren't necessary for
|
||||
# using the compiler binary.
|
||||
|
|
@ -12,20 +12,13 @@ stdenv.mkDerivation rec {
|
|||
owner = "microsoft";
|
||||
repo = "DirectXShaderCompiler";
|
||||
rev = "v${version}";
|
||||
sha256 = "6kQgAESYiQ06LkiGTfDBYwd/ORLSm1W+BcO+OUp4yXY=";
|
||||
# We rely on the side effect of leaving the .git directory here for the
|
||||
# version-grabbing functionality of the build system.
|
||||
hash = "sha256-+oh7oWJCE0CLehnqpE2J9aIfMFbtfLAKwI9ETmCg/TA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake git python3 ];
|
||||
nativeBuildInputs = [ cmake git ninja python3 ];
|
||||
|
||||
configurePhase = ''
|
||||
# Requires some additional flags to cmake from a file in the repo
|
||||
additionalCMakeFlags=$(< utils/cmake-predefined-config-params)
|
||||
cmakeFlags="$additionalCMakeFlags''${cmakeFlags:+ $cmakeFlags}"
|
||||
cmakeConfigurePhase
|
||||
'';
|
||||
cmakeFlags = [ "-C../cmake/caches/PredefinedParams.cmake" ];
|
||||
|
||||
# The default install target installs heaps of LLVM stuff.
|
||||
#
|
||||
|
|
@ -45,6 +38,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/microsoft/DirectXShaderCompiler";
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
license = licenses.ncsa;
|
||||
maintainers = with maintainers; [ expipiplus1 ];
|
||||
maintainers = with maintainers; [ expipiplus1 Flakebi ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, libusb1, pkg-config }:
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, libusb1, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "OpenCorsairLink";
|
||||
|
|
@ -16,6 +16,15 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1nizicl0mc9pslc6065mnrs0fnn8sh7ca8iiw7w9ix57zrhabpld";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull upstream fix for -fno-common toolchain
|
||||
(fetchpatch {
|
||||
name = "fno-common.patch";
|
||||
url = "https://github.com/audiohacked/OpenCorsairLink/commit/d600c7ff032a3911d30b039844a31f0b3acfe26a.patch";
|
||||
sha256 = "030rwka5bvf79x6ir18vqb09izhz1crp94x5gqjxwv3b20vvv4kx";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Linux and Mac OS support for the CorsairLink Devices ";
|
||||
homepage = "https://github.com/audiohacked/OpenCorsairLink";
|
||||
|
|
|
|||
|
|
@ -12,19 +12,19 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "uutils-coreutils";
|
||||
version = "0.0.13";
|
||||
version = "0.0.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uutils";
|
||||
repo = "coreutils";
|
||||
rev = version;
|
||||
sha256 = "sha256-Fb5X3xpve6pRRlHSzevBvOdRpR0MrHzcOB83C15//zg=";
|
||||
sha256 = "sha256-BLNWtf5RLeHQGH97M6vfZCXvCdPxUAU+hY1PBsGZ8jU=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-pSEo1XW/zywFoqt8vx55HS28CVbEC6/858ANknt1FPU=";
|
||||
hash = "sha256-lHyIrzf286Hjef6cqy3tJF6U2OnnokGXcH4yMotZay4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ rustPlatform.cargoSetupHook sphinx ];
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-audit";
|
||||
version = "0.16.0";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RustSec";
|
||||
repo = "rustsec";
|
||||
rev = "cargo-audit%2Fv${version}";
|
||||
sha256 = "sha256-6Jb7ViVY4YcnNvGarnHWyBPnpz7xiHQjumOmVaA8rzg=";
|
||||
sha256 = "sha256-x91x5XjIRXLhs96r06ITbpHCkHoaCaMXH+VCp6f57Gg=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-31zZMjIFnMIzSmTEACFBE4nSMje9SvE9KzZdoxTg4VM=";
|
||||
cargoSha256 = "sha256-/CzRkdo4kfvRwOZsfyu0zL3UnjEKCBj7wj40jlydSDI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Audit Cargo.lock files for crates with security vulnerabilities";
|
||||
homepage = "https://rustsec.org";
|
||||
license = with licenses; [ mit asl20 ];
|
||||
maintainers = with maintainers; [ basvandijk ];
|
||||
license = with licenses; [ mit /* or */ asl20 ];
|
||||
maintainers = with maintainers; [ basvandijk jk ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patches = [ ./no-root.patch ];
|
||||
|
||||
# Workaround build failure on -fno-common toolchains like upstream
|
||||
# gcc-10. Otherwise build fails as:
|
||||
# ld: src/common/mgmt/pint-worker-external.po:(.data.rel.local+0x0): multiple definition of
|
||||
# `PINT_worker_external_impl'; src/common/mgmt/pint-mgmt.po:(.bss+0x20): first defined here
|
||||
NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
|
||||
buildPhase = ''
|
||||
echo "en
|
||||
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "terrascan";
|
||||
version = "1.15.0";
|
||||
version = "1.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "accurics";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-up79ryjN9WciEl6fVgTLUZHhXSu7+utQB2ACPAx207E=";
|
||||
sha256 = "sha256-4Yd+ifOW5T84hPv+tyEO5HPq2esSk8DkK0G5YSjY+V8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-EfHcCk2NkicSPeJYgHJT2kh9EwLldksET75ZQambrWA=";
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@ with lib;
|
|||
let
|
||||
go-d-plugin = callPackage ./go.d.plugin.nix {};
|
||||
in stdenv.mkDerivation rec {
|
||||
version = "1.33.1";
|
||||
version = "1.34.1";
|
||||
pname = "netdata";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netdata";
|
||||
repo = "netdata";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4rx8EHtOSd/lHcSHZCtiXkjJjL7B175cVGvFOZ9Bzi8=";
|
||||
sha256 = "sha256-MGXHIbmoPRyjjYHV/RD9sd8Dn74YVlET2V3d/wJ3blo=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
@ -49,8 +49,6 @@ in stdenv.mkDerivation rec {
|
|||
# Therefore we put it into `/run/netdata`, which is owned
|
||||
# by netdata only.
|
||||
./ipc-socket-in-run.patch
|
||||
# This is only needed for 1.33.1, remove on the next release
|
||||
./fix-protobuf.patch
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1";
|
||||
|
|
|
|||
|
|
@ -1,23 +0,0 @@
|
|||
diff --git a/daemon/buildinfo.c b/daemon/buildinfo.c
|
||||
index b64a78f29..ccd1c884d 100644
|
||||
--- a/daemon/buildinfo.c
|
||||
+++ b/daemon/buildinfo.c
|
||||
@@ -60,7 +60,6 @@
|
||||
// Optional libraries
|
||||
|
||||
#ifdef HAVE_PROTOBUF
|
||||
-#if defined(ACLK_NG) || defined(ENABLE_PROMETHEUS_REMOTE_WRITE)
|
||||
#define FEAT_PROTOBUF 1
|
||||
#ifdef BUNDLED_PROTOBUF
|
||||
#define FEAT_PROTOBUF_BUNDLED " (bundled)"
|
||||
@@ -71,10 +70,6 @@
|
||||
#define FEAT_PROTOBUF 0
|
||||
#define FEAT_PROTOBUF_BUNDLED ""
|
||||
#endif
|
||||
-#else
|
||||
-#define FEAT_PROTOBUF 0
|
||||
-#define FEAT_PROTOBUF_BUNDLED ""
|
||||
-#endif
|
||||
|
||||
#ifdef ENABLE_JSONC
|
||||
#define FEAT_JSONC 1
|
||||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "netdata-go.d.plugin";
|
||||
version = "0.31.0";
|
||||
version = "0.32.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netdata";
|
||||
repo = "go.d.plugin";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wS8+C03K/qn8zKIAQvZ7nF7CmFfIvKU/dtm80bTeniM=";
|
||||
sha256 = "sha256-SayFqr6n6OLLUXseYiR8iBIf2xeDEHXHD0qBrgHY6+o=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-17/f6tAxDD5TgjmwnqAlnQSxDhnFidjsN55/sUMDej8=";
|
||||
vendorSha256 = "sha256-tIuHWfAjvr5s2nJSnhnMZIjyy77BbobwgQoDOy4gdGI=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -60,6 +60,7 @@ mapAliases ({
|
|||
django_extensions = django-extensions; # added 2022-01-09
|
||||
django_guardian = django-guardian; # added 2022-05-19
|
||||
django_modelcluster = django-modelcluster; # added 2022-04-02
|
||||
django_polymorphic = django-polymorphic; # added 2022-05-24
|
||||
django_redis = django-redis; # added 2021-10-11
|
||||
django_taggit = django-taggit; # added 2021-10-11
|
||||
dns = dnspython; # added 2017-12-10
|
||||
|
|
@ -107,6 +108,7 @@ mapAliases ({
|
|||
pycallgraph = throw "pycallgraph has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
|
||||
pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20
|
||||
pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04
|
||||
pyreadability = readability-lxml; # added 2022-05-24
|
||||
pysmart-smartx = pysmart; # added 2021-10-22
|
||||
pytest_6 = pytest; # added 2022-02-10
|
||||
pytestcov = pytest-cov; # added 2021-01-04
|
||||
|
|
|
|||
|
|
@ -2366,7 +2366,7 @@ in {
|
|||
|
||||
django-picklefield = callPackage ../development/python-modules/django-picklefield { };
|
||||
|
||||
django_polymorphic = callPackage ../development/python-modules/django-polymorphic { };
|
||||
django-polymorphic = callPackage ../development/python-modules/django-polymorphic { };
|
||||
|
||||
django-postgresql-netfields = callPackage ../development/python-modules/django-postgresql-netfields { };
|
||||
|
||||
|
|
@ -5865,6 +5865,8 @@ in {
|
|||
|
||||
nvchecker = callPackage ../development/python-modules/nvchecker { };
|
||||
|
||||
nxt-python = callPackage ../development/python-modules/nxt-python { };
|
||||
|
||||
python-nvd3 = callPackage ../development/python-modules/python-nvd3 { };
|
||||
|
||||
py-deprecate = callPackage ../development/python-modules/py-deprecate { };
|
||||
|
|
@ -7800,8 +7802,6 @@ in {
|
|||
|
||||
pyramid_multiauth = callPackage ../development/python-modules/pyramid_multiauth { };
|
||||
|
||||
pyreadability = callPackage ../development/python-modules/pyreadability { };
|
||||
|
||||
pyrealsense2 = toPythonModule (pkgs.librealsense.override {
|
||||
enablePython = true;
|
||||
pythonPackages = self;
|
||||
|
|
@ -10600,6 +10600,8 @@ in {
|
|||
|
||||
types-pytz = callPackage ../development/python-modules/types-pytz { };
|
||||
|
||||
types-redis = callPackage ../development/python-modules/types-redis { };
|
||||
|
||||
types-requests = callPackage ../development/python-modules/types-requests { };
|
||||
|
||||
types-setuptools = callPackage ../development/python-modules/types-setuptools { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue