Merge master into staging-next

main
github-actions[bot] 2 years ago committed by GitHub
commit da208c1f1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      maintainers/maintainer-list.nix
  2. 51
      pkgs/applications/editors/textadept/10/default.nix
  3. 42
      pkgs/applications/editors/textadept/10/deps.nix
  4. 4
      pkgs/applications/editors/textadept/default.nix
  5. 0
      pkgs/applications/editors/textadept/deps.nix
  6. 4
      pkgs/applications/graphics/drawio/default.nix
  7. 12
      pkgs/applications/misc/galculator/default.nix
  8. 2
      pkgs/development/interpreters/ruby/default.nix
  9. 4
      pkgs/development/libraries/opencv/4.x.nix
  10. 15
      pkgs/development/python-modules/pyialarmxr-homeassistant/default.nix
  11. 3
      pkgs/development/python2-modules/pyjwt/default.nix
  12. 3
      pkgs/development/python2-modules/urllib3/default.nix
  13. 43
      pkgs/development/tools/analysis/smatch/default.nix
  14. 11
      pkgs/development/tools/misc/terraform-lsp/default.nix
  15. 4
      pkgs/servers/home-assistant/component-packages.nix
  16. 4
      pkgs/servers/home-assistant/default.nix
  17. 8
      pkgs/tools/filesystems/httm/default.nix
  18. 2
      pkgs/tools/graphics/jpegexiforient/default.nix
  19. 12
      pkgs/tools/package-management/nixops/default.nix
  20. 22
      pkgs/tools/system/rwc/default.nix
  21. 11
      pkgs/top-level/all-packages.nix
  22. 1
      pkgs/top-level/python-aliases.nix
  23. 2
      pkgs/top-level/python-packages.nix

@ -9856,6 +9856,12 @@
githubId = 6931743;
name = "pasqui23";
};
patricksjackson = {
email = "patrick@jackson.dev";
github = "patricksjackson";
githubId = 160646;
name = "Patrick Jackson";
};
patryk27 = {
email = "pwychowaniec@pm.me";
github = "Patryk27";

@ -1,51 +0,0 @@
{ lib, gcc10Stdenv, fetchhg, fetchurl, gtk2, glib, pkg-config, unzip, ncurses, zip }:
gcc10Stdenv.mkDerivation rec {
version = "10.8";
pname = "textadept";
nativeBuildInputs = [ pkg-config unzip ];
buildInputs = [
gtk2 ncurses glib zip
];
src = fetchhg {
url = "http://foicica.com/hg/textadept";
rev = "textadept_${version}";
sha256 = "sha256-dEZSx2tuHTWYhk9q5iGlrWTAvDvKaM8HaHwXcFcv33s=";
};
preConfigure =
lib.concatStringsSep "\n" (lib.mapAttrsToList (name: params:
"ln -s ${fetchurl params} $PWD/src/${name}"
) (import ./deps.nix)) + ''
cd src
make deps
'';
postBuild = ''
make curses
'';
preInstall = ''
mkdir -p $out/share/applications
mkdir -p $out/share/pixmaps
'';
postInstall = ''
make curses install PREFIX=$out MAKECMDGOALS=curses
'';
makeFlags = [
"PREFIX=$(out) WGET=true PIXMAPS_DIR=$(out)/share/pixmaps"
];
meta = with lib; {
description = "An extensible text editor based on Scintilla with Lua scripting";
homepage = "http://foicica.com/textadept";
license = licenses.mit;
maintainers = with maintainers; [ raskin mirrexagon ];
platforms = platforms.linux;
};
}

@ -1,42 +0,0 @@
{
"99fa62b828ee.zip" = {
url = "http://foicica.com/hg/scintilla/archive/99fa62b828ee.zip";
sha256 = "sha256-QO4iGhx72CfB1/0Pp/Qab92qm98VZn/EkrHZGndoHVc=";
};
"lua-5.3.5.tar.gz" = {
url = "http://www.lua.org/ftp/lua-5.3.5.tar.gz";
sha256 = "1b2qn2rv96nmbm6zab4l877bd4zq7wpwm8drwjiy2ih4jqzysbhc";
};
"lpeg-1.0.2.tar.gz" = {
url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz";
sha256 = "sha256-SNZldgUbbHg4j6rQm3BJMJMmRYj80PJY3aqxzdShX/4=";
};
"v1_7_0_2.zip" = {
url = "https://github.com/keplerproject/luafilesystem/archive/v1_7_0_2.zip";
sha256 = "sha256-kXSriR8dOStCpYeyr7c3+VZez4qGDS5aK/9FeFj1hHg=";
};
"db67f8a489e8.zip" = {
url = "http://foicica.com/hg/gtdialog/archive/db67f8a489e8.zip";
sha256 = "sha256-UIvjbDrg3jyz7t2tm4y1zzH/TG6Kqaz3LE5y2U6OHuM=";
};
"cdk-5.0-20150928.tgz" = {
url = "http://invisible-mirror.net/archives/cdk/cdk-5.0-20150928.tgz";
sha256 = "0j74l874y33i26y5kjg3pf1vswyjif8k93pqhi0iqykpbxfsg382";
};
"libtermkey-0.20.tar.gz" = {
url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.20.tar.gz";
sha256 = "1xfj6lchhfljmbcl6dz8dpakppyy13nbl4ykxiv5x4dr9b4qf3bc";
};
"pdcurs36.zip" = {
url = "http://prdownloads.sourceforge.net/pdcurses/pdcurs36.zip";
sha256 = "0y91zpygrxms7d1l5ksrz42bkvq8jd2xqlj5j7wgyxcl58chcw9b";
};
"bombay.zip" = {
url = "http://foicica.com/hg/bombay/archive/b25520cc76bb.zip";
sha256 = "07spq7jmkfyq20gv67yffara3ln3ns2xi0k02m2mxdms3xm1q36h";
};
"cloc-1.60.pl" = {
url = "http://prdownloads.sourceforge.net/cloc/cloc-1.60.pl";
sha256 = "0p504bi19va3dh274v7lb7giqrydwa5yyry60f7jpz84y6z71a2a";
};
}

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "11.3";
pname = "textadept11";
pname = "textadept";
nativeBuildInputs = [ pkg-config unzip zip ];
buildInputs = [
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
description = "An extensible text editor based on Scintilla with Lua scripting.";
homepage = "http://foicica.com/textadept";
license = licenses.mit;
maintainers = with maintainers; [ raskin mirrexagon ];
maintainers = with maintainers; [ raskin mirrexagon patricksjackson ];
platforms = platforms.linux;
};
}

@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "drawio";
version = "19.0.0";
version = "19.0.1";
src = fetchurl {
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm";
sha256 = "aabf2addc3182996c76a01df16024b77ae16a489e52cedf87bcfb14891f72118";
sha256 = "da9fb38970987b7d5b84fd0d91824f206ba7a3681a7354adc6d6e795c7613828";
};
nativeBuildInputs = [

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub
{ lib, stdenv, fetchFromGitHub, fetchpatch
, autoreconfHook, intltool
, gtk, pkg-config, flex }:
@ -13,6 +13,16 @@ stdenv.mkDerivation rec {
sha256 = "0q0hb62f266709ncyq96bpx4a40a1i6dc5869byvd7x285sx1c2w";
};
patches = [
# Pul patch pending upstream inclusion for -fno-common toolchain support:
# https://github.com/galculator/galculator/pull/45
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/galculator/galculator/commit/501a9e3feeb2e56889c0ff98ab6d0ab20348ccd6.patch";
sha256 = "08c9d2b49a1mizgk7v37dp8r96x389zc13mzv4dcy16x448lhp67";
})
];
nativeBuildInputs = [ autoreconfHook intltool pkg-config ];
buildInputs = [ gtk flex ];

@ -79,13 +79,13 @@ let
++ (op opensslSupport openssl)
++ (op gdbmSupport gdbm)
++ (op yamlSupport libyaml)
++ (op jemallocSupport jemalloc)
# Looks like ruby fails to build on darwin without readline even if curses
# support is not enabled, so add readline to the build inputs if curses
# support is disabled (if it's enabled, we already have it) and we're
# running on darwin
++ op (!cursesSupport && stdenv.isDarwin) readline
++ ops stdenv.isDarwin [ libiconv libobjc libunwind Foundation ];
propagatedBuildInputs = op jemallocSupport jemalloc;
enableParallelBuilding = true;

@ -244,9 +244,9 @@ stdenv.mkDerivation {
echo '"(build info elided)"' > modules/core/version_string.inc
'';
buildInputs =
[ zlib pcre hdf5 boost gflags protobuf ]
buildInputs = [ zlib pcre boost gflags protobuf ]
++ lib.optional enablePython pythonPackages.python
++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) hdf5
++ lib.optional enableGtk2 gtk2
++ lib.optional enableGtk3 gtk3
++ lib.optional enableVtk vtk

@ -1,24 +1,23 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchPypi
, lxml
, pythonOlder
, xmltodict
}:
buildPythonPackage rec {
pname = "pyialarmxr";
pname = "pyialarmxr-homeassistant";
version = "1.0.18";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "bigmoby";
repo = pname;
rev = version;
hash = "sha256-Q1NsPLA1W4nxSG/9jlMf6BkC3ZrUrhl8oDX7U4aAjxM=";
src = fetchPypi {
inherit pname version;
hash = "sha256-aQHJiSmaGyABHP17oFH+6JQ9zNJ6pj2+PcE+gsRuhaQ=";
};
propagatedBuildInputs = [
lxml
xmltodict
@ -33,7 +32,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library to interface with Antifurto365 iAlarmXR systems";
homepage = "https://github.com/bigmoby/pyialarmxr";
homepage = "https://pypi.org/project/pyialarmxr-homeassistant/";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};

@ -40,5 +40,8 @@ buildPythonPackage rec {
description = "JSON Web Token implementation in Python";
homepage = "https://github.com/jpadilla/pyjwt";
license = licenses.mit;
knownVulnerabilities = [
"CVE-2022-29217"
];
};
}

@ -77,5 +77,8 @@ buildPythonPackage rec {
homepage = "https://github.com/shazow/urllib3";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
knownVulnerabilities = [
"CVE-2021-33503"
];
};
}

@ -1,34 +1,39 @@
{ lib, stdenv, fetchgit, sqlite, pkg-config, perl
, buildllvmsparse ? true
, buildc2xml ? true
, llvm, libxml2
{ lib
, stdenv
, fetchFromGitHub
, pkg-config
, sqlite
, openssl
, buildllvmsparse ? false
, buildc2xml ? false
, libllvm
, libxml2
}:
stdenv.mkDerivation rec {
pname = "smatch";
version = "20120924";
version = "1.72";
src = fetchgit {
url = "git://repo.or.cz/${pname}.git";
rev = "23656e3e578b700cbf96d043f039e6341a3ba5b9";
sha256 = "0r43qi6vryqg450fj73yjwbb7gzcgx64rhrhb3r1m6a252srijiy";
src = fetchFromGitHub {
owner = "error27";
repo = "smatch";
rev = version;
sha256 = "sha256-XVW4sAgIxaJjAk75bp/O286uddIfgfKtIA2LniUGWBM=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ sqlite perl ]
++ lib.optional buildllvmsparse llvm
++ lib.optional buildc2xml libxml2;
preBuild = ''
sed -i Makefile \
-e "s|^PREFIX=.*|PREFIX = $out|g"
'';
buildInputs = [ sqlite openssl ]
++ lib.optionals buildllvmsparse [ libllvm ]
++ lib.optionals buildc2xml [ libxml2.dev ];
makeFlags = [ "PREFIX=${placeholder "out"}" "CXX=${stdenv.cc.targetPrefix}c++" ];
meta = with lib; {
description = "A semantic analysis tool for C";
homepage = "http://smatch.sourceforge.net/";
maintainers = with maintainers; [];
license = licenses.free; /* OSL, see http://www.opensource.org */
platforms = platforms.linux;
maintainers = with maintainers; [ marsam ];
license = licenses.gpl2Plus;
platforms = platforms.all;
};
}

@ -1,6 +1,9 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoPackage rec {
buildGoModule rec {
pname = "terraform-lsp";
version = "0.0.12";
@ -11,7 +14,7 @@ buildGoPackage rec {
sha256 = "111350jbq0dp0qhk48j12hrlisd1fwzqpcv357igrbqf6ki7r78q";
};
goPackagePath = "github.com/juliosueiras/terraform-lsp";
vendorSha256 = null;
ldflags = [ "-s" "-w" "-X main.Version=${version}" "-X main.GitCommit=${src.rev}" ];
@ -19,6 +22,6 @@ buildGoPackage rec {
description = "Language Server Protocol for Terraform";
homepage = "https://github.com/juliosueiras/terraform-lsp";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
maintainers = with maintainers; [ marsam ];
};
}

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2022.6.2";
version = "2022.6.3";
components = {
"abode" = ps: with ps; [
abodepy
@ -1207,7 +1207,7 @@
pyialarm
];
"ialarm_xr" = ps: with ps; [
pyialarmxr
pyialarmxr-homeassistant
];
"iammeter" = ps: with ps; [
]; # missing inputs: iammeter

@ -166,7 +166,7 @@ let
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
# Don't forget to run parse-requirements.py after updating
hassVersion = "2022.6.2";
hassVersion = "2022.6.3";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@ -184,7 +184,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
hash = "sha256-M0wBvAdvoGrvJrE96ZM9+X1KMp796vtzbzIo8ScXcy8=";
hash = "sha256-dYJbYrOwjJ2OO+gYT9UmCam+gNvSycFGUEeHBoGTqSM=";
};
# leave this in, so users don't have to constantly update their downstream patch handling

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "httm";
version = "0.10.16";
version = "0.11.1";
src = fetchFromGitHub {
owner = "kimono-koans";
repo = pname;
rev = version;
sha256 = "09zdexeMu54Y/4HbieZ0EJLxhwCv7upRJxqVbqr2hUw=";
sha256 = "GNiqWm6MsgLYjrkrbIHgKxtLmE4IJntcLd9GVRu1v2A=";
};
cargoSha256 = "SLEp88KwRg1RN78oX+fMYNR6ia9omrfH2bnJb+PrTAY=";
cargoSha256 = "87BkVAZ3BPtnuNUBTzdR4oiE0ZLIr5CacdYenU4V9qU=";
nativeBuildInputs = [ installShellFiles ];
@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
'';
meta = with lib; {
description = "Interactive, file-level ZFS Time Machine-like tool";
description = "Interactive, file-level Time Machine-like tool for ZFS/btrfs";
homepage = "https://github.com/kimono-koans/httm";
license = licenses.mpl20;
platforms = platforms.unix;

@ -10,7 +10,7 @@ stdenv.mkDerivation {
cp $src jpegexiforient.c
'';
buildPhase = ''
cc -o jpegexiforient jpegexiforient.c
$CC -o jpegexiforient jpegexiforient.c
'';
installPhase = ''
install -Dt $out/bin jpegexiforient

@ -6,6 +6,18 @@ let
inherit (poetry2nix.mkPoetryPackages {
projectDir = ./python-env;
python = python2;
overrides = [
poetry2nix.defaultPoetryOverrides
(self: super: {
pyjwt = super.pyjwt.overridePythonAttrs (old: {
meta = old.meta // {
knownVulnerabilities = lib.optionals (lib.versionOlder old.version "2.4.0") [
"CVE-2022-29217"
];
};
});
})
];
}) python;
pythonPackages = python.pkgs;

@ -0,0 +1,22 @@
{ stdenv, fetchFromGitHub, lib }:
stdenv.mkDerivation rec {
pname = "rwc";
version = "0.2";
src = fetchFromGitHub {
owner = "leahneukirchen";
repo = pname;
rev = "v${version}";
sha256 = "sha256-axHBkrbLEcYygCDofhqfIeZ5pv1sR34I5UgFUwVb2rI=";
};
makeFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
description = "Report when files are changed";
license = licenses.publicDomain;
platforms = platforms.linux;
maintainers = with maintainers; [ somasis ];
};
}

@ -10042,6 +10042,8 @@ with pkgs;
rw = callPackage ../tools/misc/rw { };
rwc = callPackage ../tools/system/rwc { };
rxp = callPackage ../tools/text/xml/rxp { };
rzip = callPackage ../tools/compression/rzip { };
@ -10846,9 +10848,7 @@ with pkgs;
texstudio = libsForQt5.callPackage ../applications/editors/texstudio { };
textadept = callPackage ../applications/editors/textadept/10 { };
textadept11 = callPackage ../applications/editors/textadept/11 { stdenv = gcc10StdenvCompat; };
textadept = callPackage ../applications/editors/textadept { };
texworks = libsForQt5.callPackage ../applications/editors/texworks { };
@ -16215,10 +16215,7 @@ with pkgs;
sloc = nodePackages.sloc;
smatch = callPackage ../development/tools/analysis/smatch {
buildllvmsparse = false;
buildc2xml = false;
};
smatch = callPackage ../development/tools/analysis/smatch { };
smc = callPackage ../tools/misc/smc { };

@ -111,6 +111,7 @@ mapAliases ({
pydrive = throw "pydrive is broken and deprecated and has been replaced with pydrive2."; # added 2022-06-01
pyGtkGlade = throw "Glade support for pygtk has been removed"; # added 2022-01-15
pycallgraph = throw "pycallgraph has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
pyialarmxr = pyialarmxr-homeassistant; # added 2022-06-07
pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20
pymc3 = pymc; # added 2022-06-05, module was rename starting with 4.0.0
pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04

@ -7448,7 +7448,7 @@ in {
pyialarm = callPackage ../development/python-modules/pyialarm { };
pyialarmxr = callPackage ../development/python-modules/pyialarmxr { };
pyialarmxr-homeassistant = callPackage ../development/python-modules/pyialarmxr-homeassistant { };
pyicloud = callPackage ../development/python-modules/pyicloud { };

Loading…
Cancel
Save