dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2022-12-11 12:01:38 +00:00 committed by GitHub
commit 5dca623c6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
30 changed files with 830 additions and 575 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/pt2-clone/default.nix
View File

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "pt2-clone";
version = "1.54";
version = "1.55";
src = fetchFromGitHub {
owner = "8bitbubsy";
repo = "pt2-clone";
rev = "v${version}";
sha256 = "sha256-d/BUt6jqJmw2MnerbvvhuUWpTHgQr47XuSoFDXo7GEQ=";
sha256 = "sha256-NwkHb0FOg9wAgtcEtWqOpNGvBXjQIoc4pMmf/32Gxr0=";
};
nativeBuildInputs = [ cmake ];

15
pkgs/applications/audio/pyradio/default.nix
View File

@ -1,17 +1,23 @@
{ lib, python3Packages, fetchFromGitHub, installShellFiles }:
{ lib
, python3Packages
, fetchFromGitHub
, installShellFiles
}:
python3Packages.buildPythonApplication rec {
pname = "pyradio";
version = "0.8.9.31";
version = "0.8.9.32";
src = fetchFromGitHub {
owner = "coderholic";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-9Fc42f0plduihXDDLXWBdt62maxDJ0cwumIvbiMcrGc=";
hash = "sha256-1lczH8xTZV1XVVByLAGXJbjXd20JUJALIJJ3s9+orxM=";
};
nativeBuildInputs = [ installShellFiles ];
nativeBuildInputs = [
installShellFiles
];
propagatedBuildInputs = with python3Packages; [
requests
@ -30,6 +36,7 @@ python3Packages.buildPythonApplication rec {
meta = with lib; {
homepage = "http://www.coderholic.com/pyradio/";
description = "Curses based internet radio player";
changelog = "https://github.com/coderholic/pyradio/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ contrun ];
};

144
pkgs/applications/maui/srcs.nix
View File

@ -12,123 +12,139 @@
};
};
booth = {
version = "1.0.0";
version = "1.0.1";
src = fetchurl {
url = "${mirror}/stable/maui/booth/1.0.0/booth-1.0.0.tar.xz";
sha256 = "0cdn3vkbf1mlq32akz86mdyjfrq661h4jrfmp1x62ih63930hix2";
name = "booth-1.0.0.tar.xz";
url = "${mirror}/stable/maui/booth/1.0.1/booth-1.0.1.tar.xz";
sha256 = "02p3xxfk1fsqd8z55gmkhj68j8sjbgjyrj2anpq8qsmblznsvmdn";
name = "booth-1.0.1.tar.xz";
};
};
buho = {
version = "2.2.0";
version = "2.2.1";
src = fetchurl {
url = "${mirror}/stable/maui/buho/2.2.0/buho-2.2.0.tar.xz";
sha256 = "1jj9kygh5b88ksg22969zlsrbgps6z7z2n77g6ldqzvg8mmh2cwr";
name = "buho-2.2.0.tar.xz";
url = "${mirror}/stable/maui/buho/2.2.1/buho-2.2.1.tar.xz";
sha256 = "1iv30avnfdh78zq7kxigxlkzdp2jfzx0sl88vssjcisniabyd1ri";
name = "buho-2.2.1.tar.xz";
};
};
clip = {
version = "2.2.0";
version = "2.2.1";
src = fetchurl {
url = "${mirror}/stable/maui/clip/2.2.0/clip-2.2.0.tar.xz";
sha256 = "0ggymdscd7c942vvii3mswkq84lkygdcbvpg3s2lhqaqxpivy96z";
name = "clip-2.2.0.tar.xz";
url = "${mirror}/stable/maui/clip/2.2.1/clip-2.2.1.tar.xz";
sha256 = "00w9kgqw4dxb9b9rq11jzdb9pj48qdkdj23wdjwdk52nyfkw7sbh";
name = "clip-2.2.1.tar.xz";
};
};
communicator = {
version = "2.2.0";
version = "2.2.1";
src = fetchurl {
url = "${mirror}/stable/maui/communicator/2.2.0/communicator-2.2.0.tar.xz";
sha256 = "0njyjzf8w2aamrj1yajjw7551dc72db9m0iv14mnb0gcd9pphni7";
name = "communicator-2.2.0.tar.xz";
url = "${mirror}/stable/maui/communicator/2.2.1/communicator-2.2.1.tar.xz";
sha256 = "1h689dr9iy07r7ypyfgrb3n0ljigz847m6vq1jaia6phgix07hn6";
name = "communicator-2.2.1.tar.xz";
};
};
index-fm = {
version = "2.2.0";
version = "2.2.1";
src = fetchurl {
url = "${mirror}/stable/maui/index/2.2.0/index-fm-2.2.0.tar.xz";
sha256 = "0v39sfdqb21669cx96nd78vprwaxsvg3cpp3lly43n09nv6gkw41";
name = "index-fm-2.2.0.tar.xz";
url = "${mirror}/stable/maui/index/2.2.1/index-fm-2.2.1.tar.xz";
sha256 = "1gin3may65f8nafbgyv90k31z69xwx1awnnxmciqn5zz7cdh9slm";
name = "index-fm-2.2.1.tar.xz";
};
};
mauikit = {
version = "2.2.0";
version = "2.2.1";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit/2.2.0/mauikit-2.2.0.tar.xz";
sha256 = "05bvgwl1yfbfrlxhl6ngvkdk34rg4y12fsrddm8f19b6dkvjzxq2";
name = "mauikit-2.2.0.tar.xz";
url = "${mirror}/stable/maui/mauikit/2.2.1/mauikit-2.2.1.tar.xz";
sha256 = "0rwjd2g82j1cvspr0l889nss6p26yf19h39q20h3d9ls7fbj897h";
name = "mauikit-2.2.1.tar.xz";
};
};
mauikit-accounts = {
version = "2.2.0";
version = "2.2.1";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-accounts/2.2.0/mauikit-accounts-2.2.0.tar.xz";
sha256 = "1wc67mhhmxq0dq1g10338zm52kx274yry2ja34kagva3qkbhbb2i";
name = "mauikit-accounts-2.2.0.tar.xz";
url = "${mirror}/stable/maui/mauikit-accounts/2.2.1/mauikit-accounts-2.2.1.tar.xz";
sha256 = "13k9y7z9mw17rdn1z9ixgi1bf6q2hf0afp53nb8d9gz5mqkaf6qh";
name = "mauikit-accounts-2.2.1.tar.xz";
};
};
mauikit-calendar = {
version = "1.0.0";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-calendar/1.0.0/mauikit-calendar-1.0.0.tar.xz";
sha256 = "1zqaf0nddb220w14ar9gg6p695p0my8whn8p8wgxm7mwjfb6hlil";
name = "mauikit-calendar-1.0.0.tar.xz";
};
};
mauikit-documents = {
version = "1.0.0";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-documents/1.0.0/mauikit-documents-1.0.0.tar.xz";
sha256 = "1dniab7f113vbxng9b1nwmh6wviv1m1gb842k98vxgnhmsljq24a";
name = "mauikit-documents-1.0.0.tar.xz";
};
};
mauikit-filebrowsing = {
version = "2.2.0";
version = "2.2.1";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-filebrowsing/2.2.0/mauikit-filebrowsing-2.2.0.tar.xz";
sha256 = "1377mgkx1q66jzdlra87airqkmkl9cfj6n5xw1my1nihxcjq9bz1";
name = "mauikit-filebrowsing-2.2.0.tar.xz";
url = "${mirror}/stable/maui/mauikit-filebrowsing/2.2.1/mauikit-filebrowsing-2.2.1.tar.xz";
sha256 = "1szghmp1p9pvsfqx8sk345j7riqxv2kib41l277rm14pwbs6zx1c";
name = "mauikit-filebrowsing-2.2.1.tar.xz";
};
};
mauikit-imagetools = {
version = "2.2.0";
version = "2.2.1";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-imagetools/2.2.0/mauikit-imagetools-2.2.0.tar.xz";
sha256 = "07clir651sfi4c9awv0jnq4pck2cfzfv0fdkwcapl6hh0zq9qvpr";
name = "mauikit-imagetools-2.2.0.tar.xz";
url = "${mirror}/stable/maui/mauikit-imagetools/2.2.1/mauikit-imagetools-2.2.1.tar.xz";
sha256 = "1wfhzkw4bs3518gylfxyp1arg2w204f73wg1l2s4pygbdh5ylav2";
name = "mauikit-imagetools-2.2.1.tar.xz";
};
};
mauikit-texteditor = {
version = "2.2.0";
version = "2.2.1";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-texteditor/2.2.0/mauikit-texteditor-2.2.0.tar.xz";
sha256 = "0x1cblydgqkhcy86x6yd8dipwhy9l5d7xlmk5igh5dllnzvcaicq";
name = "mauikit-texteditor-2.2.0.tar.xz";
url = "${mirror}/stable/maui/mauikit-texteditor/2.2.1/mauikit-texteditor-2.2.1.tar.xz";
sha256 = "0dzzlmdpl0y843lywfjc4za152r87kncafkmmbp8bdwc9j5fdzzv";
name = "mauikit-texteditor-2.2.1.tar.xz";
};
};
mauiman = {
version = "1.0.0";
version = "1.0.1";
src = fetchurl {
url = "${mirror}/stable/maui/mauiman/1.0.0/mauiman-1.0.0.tar.xz";
sha256 = "1risxzgjg684c8zwmwl03ihfrxx44lbb4j43v8z3wnjkq7p44w82";
name = "mauiman-1.0.0.tar.xz";
url = "${mirror}/stable/maui/mauiman/1.0.1/mauiman-1.0.1.tar.xz";
sha256 = "0awqb8kygacirlhha58bzgrd47zsxmfm3h5k68g8liymqn00fh30";
name = "mauiman-1.0.1.tar.xz";
};
};
nota = {
version = "2.2.0";
version = "2.2.1";
src = fetchurl {
url = "${mirror}/stable/maui/nota/2.2.0/nota-2.2.0.tar.xz";
sha256 = "1nr8craafima1khkcxv47v1868yfwykjzaczlmmqmjha7bm1dlbd";
name = "nota-2.2.0.tar.xz";
url = "${mirror}/stable/maui/nota/2.2.1/nota-2.2.1.tar.xz";
sha256 = "1fl4w0l3l6rdgxw5w479nzbcff7rmdcxil7y6jdr8z2q50lkazj8";
name = "nota-2.2.1.tar.xz";
};
};
pix = {
version = "2.2.0";
version = "2.2.1";
src = fetchurl {
url = "${mirror}/stable/maui/pix/2.2.0/pix-2.2.0.tar.xz";
sha256 = "0nghp69ax73yf0wybd724a3lgbj7jiiznnmwp67n2ls74q8yrwwy";
name = "pix-2.2.0.tar.xz";
url = "${mirror}/stable/maui/pix/2.2.1/pix-2.2.1.tar.xz";
sha256 = "0j2kpcxgdz21phdl0mx84ynalzf6bf3qalq524j7p297pdkrq3d6";
name = "pix-2.2.1.tar.xz";
};
};
shelf = {
version = "2.2.0";
version = "2.2.1";
src = fetchurl {
url = "${mirror}/stable/maui/shelf/2.2.0/shelf-2.2.0.tar.xz";
sha256 = "028ll3pi4h3jxgilsf4s5ic2rq0z9q8kh9pram9dsjvgz24p7g0c";
name = "shelf-2.2.0.tar.xz";
url = "${mirror}/stable/maui/shelf/2.2.1/shelf-2.2.1.tar.xz";
sha256 = "1h24mrzq5p63b11caml51az99gjipdlyrbx3na2jsxy4rvzryddm";
name = "shelf-2.2.1.tar.xz";
};
};
station = {
version = "2.2.0";
version = "2.2.1";
src = fetchurl {
url = "${mirror}/stable/maui/station/2.2.0/station-2.2.0.tar.xz";
sha256 = "0za3jh5clkx8xf436vzs83nrsw5fyna4wcy73ihlf3xbra0358v1";
name = "station-2.2.0.tar.xz";
url = "${mirror}/stable/maui/station/2.2.1/station-2.2.1.tar.xz";
sha256 = "1ch5c4728hahh90nlpqwnlaljpingvwrjwxajan1j2kgwb5lynwz";
name = "station-2.2.1.tar.xz";
};
};
strike = {
@ -140,11 +156,11 @@
};
};
vvave = {
version = "2.2.0";
version = "2.2.1";
src = fetchurl {
url = "${mirror}/stable/maui/vvave/2.2.0/vvave-2.2.0.tar.xz";
sha256 = "0qnwklc875j6g2rg610dmvcizg3m4q80fhjk4c3i1xzn8dybbg5s";
name = "vvave-2.2.0.tar.xz";
url = "${mirror}/stable/maui/vvave/2.2.1/vvave-2.2.1.tar.xz";
sha256 = "0mg4p44da16xkcra1akvh6f2fixd682clmd6wqgc34j7n1a9y773";
name = "vvave-2.2.1.tar.xz";
};
};
}

13
pkgs/applications/networking/browsers/offpunk/default.nix
View File

@ -1,5 +1,5 @@
{
fetchFromGitea,
fetchFromSourcehut,
less,
lib,
makeWrapper,
@ -31,14 +31,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "offpunk";
version = "1.7.1";
version = "1.8";
src = fetchFromGitea {
domain = "notabug.org";
owner = "ploum";
src = fetchFromSourcehut {
owner = "~lioploum";
repo = "offpunk";
rev = "v${finalAttrs.version}";
sha256 = "1y1xb1ccsprl0xkn4hlh09j8y5xpdn6r860xlrmk12wfk2xrfbfy";
sha256 = "0xv7b3qkwyq55sz7c0v0pknrpikhzyqgr5y4y30cwa7jd8sn423f";
};
nativeBuildInputs = [ makeWrapper ];
@ -60,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "An Offline-First browser for the smolnet ";
homepage = "https://notabug.org/ploum/offpunk";
homepage = finalAttrs.src.meta.homepage;
maintainers = with maintainers; [ DamienCassou ];
platforms = platforms.linux;
license = licenses.bsd2;

32
pkgs/desktops/pantheon/apps/elementary-music/default.nix
View File

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, meson
, ninja
@ -19,42 +18,15 @@
stdenv.mkDerivation rec {
pname = "elementary-music";
version = "7.0.0";
version = "7.0.1";
src = fetchFromGitHub {
owner = "elementary";
repo = "music";
rev = version;
sha256 = "sha256-fZbOjZd6udJWM+jWXCmGwt6cyl/lXPsgM9XeTScbqts=";
sha256 = "sha256-PttmC1Z3rX2XWCECc320HMs692hSBsxkmnh1Q8a/Mg8=";
};
patches = [
# Use file basename for fallback audio object title
# https://github.com/elementary/music/pull/710
(fetchpatch {
url = "https://github.com/elementary/music/commit/97a437edc7652e0b85b7d3c6fd87089c14ec02e2.patch";
sha256 = "sha256-VmK5dKfSKWAIxfaKXsC8tjg6Pqq1XSGxJDQOZWJX92w=";
})
# Skip invalid files instead of stopping playback
# https://github.com/elementary/music/pull/711
(fetchpatch {
url = "https://github.com/elementary/music/commit/88f332197d2131daeff3306ec2a484a28fa4db21.patch";
sha256 = "sha256-Zga0UmL1PAq4P58IjOuEiXGGn187a0/LHbXXze4sSpY=";
})
# Enable the NEXT button if repeat mode is set to ALL or ONE
# https://github.com/elementary/music/pull/712
(fetchpatch {
url = "https://github.com/elementary/music/commit/3249e3ca247dfd5ff6b14f4feeeeed63b435bcb8.patch";
sha256 = "sha256-nx/nlSSRxu4wy8QG5yYBi0BdRoUmnyry7mwzuk5NJxU=";
})
# Hard code GTK styles
# https://github.com/elementary/music/pull/723
(fetchpatch {
url = "https://github.com/elementary/music/commit/4e22268d38574e56eb3b42ae201c99cc98b510db.patch";
sha256 = "sha256-DZds7pg0vYL9vga+tP7KJHcjQTmdKHS+D+q/2aYfMmk=";
})
];
nativeBuildInputs = [
meson
ninja

4
pkgs/development/libraries/LAStools/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "LAStools";
version = "2.0.1";
version = "2.0.2";
src = fetchFromGitHub {
owner = "LAStools";
repo = "LAStools";
rev = "v${version}";
sha256 = "sha256-Mxic/zLk/qkB/rSlvkLZPgtNscrTrzSzrxiqXAMeDVU=";
sha256 = "sha256-HL64koe0GNzJzyA0QP4I0M1y2HSxigsZTqOw67RCwNc=";
};
patches = [

2
pkgs/development/ocaml-modules/piqi/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
strictDeps = true;
patches = [ ./no-ocamlpath-override.patch ];
patches = [ ./no-stream.patch ./no-ocamlpath-override.patch ];
createFindlibDestdir = true;

14
pkgs/development/ocaml-modules/piqi/no-stream.patch Normal file
View File

@ -0,0 +1,14 @@
--- ./piqilib/piq_lexer.ml
+++ ./piqilib/piq_lexer.ml
@@ -476,11 +476,6 @@ let init_from_string s =
make_buf lexbuf
-let init_from_stream s =
- let lexbuf = Sedlexing.Utf8.from_stream s in
- make_buf lexbuf
-
-
let init_from_channel ch =
let lexbuf = Sedlexing.Utf8.from_channel ch in
make_buf lexbuf

4
pkgs/development/ocaml-modules/sedlex/default.nix
View File

@ -10,8 +10,8 @@
let param =
if lib.versionAtLeast ppxlib.version "0.26.0" then {
version = "2.6";
sha256 = "sha256-AU+dV+jTG9v3BXzip2Bnv04Ewyo3pyUglDDBFsOsFf0=";
version = "3.0";
sha256 = "sha256-+4ggynMznVfjviMBjXil8CXdMByq4kSmDz6P2PyEETA=";
} else {
version = "2.5";
sha256 = "sha256:062a5dvrzvb81l3a9phljrhxfw9nlb61q341q0a6xn65hll3z2wy";

7
pkgs/development/python-modules/apache-beam/default.nix
View File

@ -62,6 +62,13 @@ buildPythonPackage rec {
hash = "sha256-iUmnzrItTFM98w3mpadzrmtI3t0fucpSujAg/6qxCGk=";
stripLen = 2;
})
(fetchpatch {
# https://github.com/apache/beam/pull/24573
name = "relax-httplib2-version.patch";
url = "https://github.com/apache/beam/commit/4045503575ae5ccef3de8d7b868c54e37fef658b.patch";
hash = "sha256-YqT+sHaa1R9vLQnEQN2K0lYoCdnGoPY9qduGBpXPaek=";
stripLen = 2;
})
];
pythonRelaxDeps = [

69
pkgs/development/python-modules/databricks-cli/default.nix
View File

@ -1,42 +1,65 @@
{ lib, buildPythonPackage, fetchPypi
{ lib
, buildPythonPackage
, click
, oauthlib
, requests
, tabulate
, six
, configparser
, pytest
, decorator
, fetchFromGitHub
, mock
, oauthlib
, pyjwt
, pytestCheckHook
, pythonOlder
, requests
, requests-mock
, six
, tabulate
}:
buildPythonPackage rec {
pname = "databricks-cli";
version = "0.17.3";
version = "0.17.4";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-LwDz5w6FmAnwWViF7Hb8c7pgrQzM1pVk999dlbbJAGY=";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "databricks";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-srrNxiOGrU1u5shssRssr8Hwdy20U4coOAjYsT7eTSA=";
};
checkInputs = [
pytest
];
checkPhase = "pytest tests";
# tests folder is missing in PyPI
doCheck = false;
propagatedBuildInputs = [
click
oauthlib
requests
tabulate
six
configparser
oauthlib
pyjwt
requests
requests-mock
six
tabulate
];
checkInputs = [
decorator
mock
pytestCheckHook
];
disabledTestPaths = [
# Disabled due to option parsing which we don't have
"integration/dbfs/test_integration.py"
"integration/workspace/test_integration.py"
];
pythonImportsCheck = [
"databricks_cli"
];
meta = with lib; {
description = "Command line interface for Databricks";
homepage = "https://github.com/databricks/databricks-cli";
description = "A command line interface for Databricks";
changelog = "https://github.com/databricks/databricks-cli/releases/tag/${version}";
license = licenses.asl20;
maintainers = with maintainers; [ tbenst ];
};

4
pkgs/development/python-modules/diff-cover/default.nix
View File

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "diff-cover";
version = "7.2.0";
version = "7.3.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -26,7 +26,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "diff_cover";
inherit version;
hash = "sha256-MJvP3bwTZQsSFGIlLz9pZ6wZaBb4uR6WWi4MAroVzJI=";
hash = "sha256-qbHyu9FJYs1Sedc1ijuo1ya5pswD2/QJ+JzCB2pCQjQ=";
};
propagatedBuildInputs = [

22
pkgs/development/python-modules/vdirsyncer/default.nix
View File

@ -7,25 +7,30 @@
, click-threading
, requests-toolbelt
, requests
, requests-oauthlib
, atomicwrites
, hypothesis
, pytestCheckHook
, pytest-localserver
, pytest-subtesthack
, setuptools-scm
, aiostream
, aiohttp
, pytest-asyncio
, trustme
, aioresponses
, vdirsyncer
, testers
}:
buildPythonPackage rec {
pname = "vdirsyncer";
version = "0.18.0";
version = "0.19.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-J7w+1R93STX7ujkpFcjI1M9jmuUaRLZ0aGtJoQJfwgE=";
hash = "sha256:0995bavlv8s9j0127ncq3yzy5p72lam9qgpswyjfanc6l01q87lf";
};
postPatch = ''
@ -41,8 +46,9 @@ buildPythonPackage rec {
click-log
click-threading
requests
requests-oauthlib
requests-toolbelt
aiostream
aiohttp
];
nativeBuildInputs = [
@ -52,8 +58,10 @@ buildPythonPackage rec {
checkInputs = [
hypothesis
pytestCheckHook
pytest-localserver
pytest-subtesthack
pytest-asyncio
trustme
aioresponses
];
preCheck = ''
@ -66,6 +74,8 @@ buildPythonPackage rec {
"test_verbosity"
];
passthru.tests.version = testers.testVersion { package = vdirsyncer; };
meta = with lib; {
homepage = "https://github.com/pimutils/vdirsyncer";
description = "Synchronize calendars and contacts";

4
pkgs/development/tools/altair-graphql-client/default.nix
View File

@ -2,11 +2,11 @@
let
pname = "altair";
version = "5.0.5";
version = "5.0.9";
src = fetchurl {
url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage";
sha256 = "sha256-dBIY7VINBI7hPTzkdPEq2iwWMNkpr6aVfVTHQR2eZ0w=";
sha256 = "sha256-7eodAj48MMmdLEZPbYlhsgM01NEm0HxRTiIPPtlxdrA=";
};
appimageContents = appimageTools.extract { inherit pname version src; };

6
pkgs/development/tools/kube-linter/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kube-linter";
version = "0.5.0";
version = "0.5.1";
src = fetchFromGitHub {
owner = "stackrox";
repo = pname;
rev = version;
sha256 = "sha256-YEcEXXtCuK4Yg9EsaDFOfM+ri6iGoU7d0O6SlYYKG+U=";
sha256 = "sha256-FEiUnJFmrHj97aSjfJtsjS9Qy4A6mzXicIrJZdgZbag=";
};
vendorSha256 = "sha256-UVa+0mrQ2pW/4Zmegon/IOrH4SiWhrdCc3/fs3pxGq8=";
vendorSha256 = "sha256-5dsM5jfD/apRs5NT/XqM8eHEgiyGQHHG3MG6cOFQKr8=";
ldflags = [
"-s" "-w" "-X golang.stackrox.io/kube-linter/internal/version.version=${version}"

4
pkgs/development/tools/open-policy-agent/default.nix
View File

@ -11,13 +11,13 @@ assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm o
buildGoModule rec {
pname = "open-policy-agent";
version = "0.47.0";
version = "0.47.2";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "opa";
rev = "v${version}";
sha256 = "sha256-aN/3xJFAc4r1nXF01tz4G4lP1KEQZQ3y+QuJ+wToD6M=";
sha256 = "sha256-OAL7sYR4SFFQbRhVTx3NAQiDTr5l/4ejtFTVnT1idCU=";
};
vendorSha256 = null;

2
pkgs/development/tools/poetry2nix/poetry2nix/default.nix
View File

@ -5,7 +5,7 @@
}:
let
# Poetry2nix version
version = "1.38.0";
version = "1.39.1";
inherit (poetryLib) isCompatible readTOML normalizePackageName normalizePackageSet;

1
pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix
View File

@ -165,6 +165,7 @@ pythonPackages.callPackage
(
builtins.fetchGit ({
inherit (source) url;
submodules = true;
rev = source.resolved_reference or source.reference;
ref = sourceSpec.branch or (if sourceSpec ? tag then "refs/tags/${sourceSpec.tag}" else "HEAD");
} // (

20
pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json
View File

@ -2938,6 +2938,9 @@
"cometblue-lite": [
"setuptools"
],
"comm": [
"hatchling"
],
"commandparse": [
"setuptools"
],
@ -9892,7 +9895,8 @@
"setuptools"
],
"packaging": [
"setuptools"
"setuptools",
"flit-core"
],
"packbits": [
"setuptools"
@ -14254,7 +14258,9 @@
"setuptools"
],
"rapidfuzz": [
"setuptools"
"setuptools",
"packaging",
"scikit-build"
],
"rapidfuzz-capi": [
"setuptools"
@ -14949,7 +14955,8 @@
"setuptools-scm"
],
"scikit-image": [
"cython"
"cython",
"setuptools"
],
"scikit-learn": [
"cython",
@ -16893,6 +16900,9 @@
"trimesh": [
"setuptools"
],
"trino": [
"setuptools"
],
"trio": [
"setuptools"
],
@ -16905,6 +16915,10 @@
"troposphere": [
"setuptools"
],
"trove-classifiers": [
"setuptools",
"calver"
],
"trueskill": [
"setuptools"
],

50
pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix
View File

@ -390,7 +390,7 @@ lib.composeManyExtensions [
scrypto =
if isWheel then
(
super.cryptography.override { preferWheel = true; }
super.cryptography.overridePythonAttrs { preferWheel = true; }
) else super.cryptography;
in
scrypto.overridePythonAttrs
@ -1324,9 +1324,10 @@ lib.composeManyExtensions [
open3d = super.open3d.overridePythonAttrs (old: {
propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.ipywidgets ];
buildInputs = (old.buildInputs or [ ]) ++ [
pkgs.udev
pkgs.libusb1
] ++ (if lib.versionAtLeast super.open3d.version "0.16.0" then [
] ++ lib.optionals stdenv.isLinux [
pkgs.udev
] ++ lib.optionals (lib.versionAtLeast super.open3d.version "0.16.0") [
pkgs.mesa
(
pkgs.symlinkJoin {
@ -1341,15 +1342,35 @@ lib.composeManyExtensions [
)
];
})
] else [ ]);
];
# Patch the dylib in the binary distribution to point to the nix build of libomp
preFixup = lib.optionalString (stdenv.isDarwin && lib.versionAtLeast super.open3d.version "0.16.0") ''
install_name_tool -change /opt/homebrew/opt/libomp/lib/libomp.dylib ${pkgs.llvmPackages.openmp}/lib/libomp.dylib $out/lib/python*/site-packages/open3d/cpu/pybind.cpython-*-darwin.so
'';
# TODO(Sem Mulder): Add overridable flags for CUDA/PyTorch/Tensorflow support.
autoPatchelfIgnoreMissingDeps = true;
});
# Overrides for building packages based on OpenCV
# These flags are inspired by the opencv 4.x package in nixpkgs
_opencv-python-override =
old: {
# Disable OpenCL on macOS
# Can't use cmakeFlags because cmake is called by setup.py
CMAKE_ARGS = lib.optionalString stdenv.isDarwin "-DWITH_OPENCL=OFF";
nativeBuildInputs = [ pkgs.cmake ] ++ old.nativeBuildInputs;
buildInputs = [ self.scikit-build ] ++ (old.buildInputs or [ ]);
buildInputs = [
self.scikit-build
] ++ lib.optionals stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [
AVFoundation
Cocoa
CoreMedia
MediaToolbox
VideoDecodeAcceleration
]) ++ (old.buildInputs or [ ]);
dontUseCmakeConfigure = true;
};
@ -1357,13 +1378,7 @@ lib.composeManyExtensions [
opencv-python-headless = super.opencv-python.overridePythonAttrs self._opencv-python-override;
opencv-contrib-python = super.opencv-contrib-python.overridePythonAttrs (
old: {
nativeBuildInputs = [ pkgs.cmake ] ++ old.nativeBuildInputs;
buildInputs = [ self.scikit-build ] ++ (old.buildInputs or [ ]);
dontUseCmakeConfigure = true;
}
);
opencv-contrib-python = super.opencv-contrib-python.overridePythonAttrs self._opencv-python-override;
openexr = super.openexr.overridePythonAttrs (
old: {
@ -1775,6 +1790,13 @@ lib.composeManyExtensions [
++ [ pkgs.freetds ];
});
pyopencl = super.pyopencl.overridePythonAttrs (
old: {
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.numpy ];
propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.ocl-icd pkgs.opencl-headers ];
}
);
pyopenssl = super.pyopenssl.overridePythonAttrs (
old: {
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openssl ];
@ -2705,6 +2727,10 @@ lib.composeManyExtensions [
'if True:'
'';
});
mkdocs = super.mkdocs.overridePythonAttrs (old: {
propagatedBuildInputs = old.propagatedBuildInputs or [ ] ++ [ self.babel ];
});
}
)

3
pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix
View File

@ -52,8 +52,5 @@ poetry2nix.mkPoetryApplication {
meta = with lib; {
inherit (python.meta) platforms;
maintainers = with maintainers; [ adisbladis jakewaksbaum ];
knownVulnerabilities = [
"CVE-2022-42966" # cleo version in poetry.lock is vulnerable
];
};
}

860
pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock generated
View File

File diff suppressed because it is too large Load Diff

42
pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml
View File

@ -1,6 +1,6 @@
[tool.poetry]
name = "poetry"
version = "1.2.2"
version = "1.3.0"
description = "Python dependency management and packaging made easy."
authors = [
"Sébastien Eustace <sebastien@eustace.io>",
@ -37,6 +37,9 @@ classifiers = [
"Topic :: Software Development :: Libraries :: Python Modules"
]
[tool.poetry.urls]
Changelog = "https://python-poetry.org/history/"
[tool.poetry.build]
generate-setup-file = false
@ -44,39 +47,46 @@ generate-setup-file = false
[tool.poetry.dependencies]
python = "^3.7"
poetry-core = "1.3.2"
poetry-plugin-export = "^1.1.2"
poetry-core = "1.4.0"
poetry-plugin-export = "^1.2.0"
"backports.cached-property" = { version = "^1.0.2", python = "<3.8" }
cachecontrol = { version = "^0.12.9", extras = ["filecache"] }
cachy = "^0.3.0"
cleo = "^1.0.0a5"
crashtest = "^0.3.0"
cleo = "^2.0.0"
crashtest = "^0.4.1"
dulwich = "^0.20.46"
filelock = "^3.8.0"
html5lib = "^1.0"
importlib-metadata = { version = "^4.4", python = "<3.10" }
jsonschema = "^4.10.0"
# keyring uses calver, so version is unclamped
keyring = ">=21.2.0"
keyring = "^23.9.0"
# packaging uses calver, so version is unclamped
packaging = ">=20.4"
pexpect = "^4.7.0"
pkginfo = "^1.5"
platformdirs = "^2.5.2"
requests = "^2.18"
requests-toolbelt = "^0.9.1"
requests-toolbelt = ">=0.9.1,<0.11.0"
shellingham = "^1.5"
tomli = { version = "^2.0.1", python = "<3.11" }
# exclude 0.11.2 and 0.11.3 due to https://github.com/sdispater/tomlkit/issues/225
tomlkit = ">=0.11.1,<1.0.0,!=0.11.2,!=0.11.3"
# trove-classifiers uses calver, so version is unclamped
trove-classifiers = ">=2022.5.19"
# exclude 20.4.5 - 20.4.6 due to https://github.com/pypa/pip/issues/9953
virtualenv = ">=20.4.3,!=20.4.5,!=20.4.6"
xattr = { version = "^0.9.7", markers = "sys_platform == 'darwin'" }
virtualenv = [
{ version = "^20.4.3,!=20.4.5,!=20.4.6", markers = "sys_platform != 'win32' or python_version != '3.9'" },
# see https://github.com/python-poetry/poetry/pull/6950 for details
{ version = "^20.4.3,!=20.4.5,!=20.4.6,<20.16.6", markers = "sys_platform == 'win32' and python_version == '3.9'" },
]
xattr = { version = "^0.10.0", markers = "sys_platform == 'darwin'" }
urllib3 = "^1.26.0"
dulwich = "^0.20.46"
[tool.poetry.group.dev.dependencies]
tox = "^3.18"
pre-commit = "^2.6"
[tool.poetry.group.test.dependencies]
# Cachy frozen to test backwards compatibility for `poetry.utils.cache`.
cachy = "0.3.0"
deepdiff = "^5.0"
flatdict = "^4.0.1"
httpretty = "^1.0"
@ -88,7 +98,7 @@ pytest-xdist = { version = "^2.5", extras = ["psutil"] }
zipp = { version = "^3.4", python = "<3.8" }
[tool.poetry.group.typing.dependencies]
mypy = ">=0.971"
mypy = ">=0.990"
types-html5lib = ">=1.1.9"
types-jsonschema = ">=4.9.0"
types-requests = ">=2.28.8"
@ -163,9 +173,7 @@ warn_unused_ignores = false
[[tool.mypy.overrides]]
module = [
'cachecontrol.*',
'cachy.*',
'cleo.*',
'crashtest.*',
'lockfile.*',
'pexpect.*',
'pkginfo.*',
'requests_toolbelt.*',

4
pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json
View File

@ -1,8 +1,8 @@
{
"owner": "python-poetry",
"repo": "poetry",
"rev": "1.2.2",
"sha256": "04cdrq9mjdnp28jx63vjlwj72wrad7941hp3k7263qskzlp27ql6",
"rev": "1.3.0",
"sha256": "16ng59ykm7zkjizmwb482y0hawpjjr5mvl0ahjd790xzxcc2bbbv",
"fetchSubmodules": true
}

28
pkgs/development/tools/roswell/default.nix
View File

@ -1,14 +1,22 @@
{ lib, stdenv, fetchFromGitHub, curl, autoconf, automake, makeWrapper, sbcl }:
{ lib
, stdenv
, fetchFromGitHub
, curl
, autoconf
, automake
, makeWrapper
, sbcl
}:
stdenv.mkDerivation rec {
pname = "roswell";
version = "21.10.14.111";
version = "22.12.14.112";
src = fetchFromGitHub {
owner = "roswell";
repo = pname;
rev = "v${version}";
sha256 = "sha256-K4RDNTY8g6MNjjiwXMmYaZm0fChJ1C1eTpc0h7ja1ds=";
hash = "sha256-Aqgv2WPmQDuBR4/OgjPeC+kzHL3DrImL24z7fbsfGRo=";
};
patches = [
@ -31,16 +39,24 @@ stdenv.mkDerivation rec {
--prefix PATH : ${lib.makeBinPath [ sbcl ]} --argv0 ros
'';
nativeBuildInputs = [ autoconf automake makeWrapper ];
nativeBuildInputs = [
autoconf
automake
makeWrapper
];
buildInputs = [ sbcl curl ];
buildInputs = [
sbcl
curl
];
meta = with lib; {
description = "Roswell is a Lisp implementation installer/manager, launcher, and much more";
description = "Lisp implementation installer/manager and launcher";
license = licenses.mit;
maintainers = with maintainers; [ hiro98 ];
platforms = platforms.unix;
homepage = "https://github.com/roswell/roswell";
changelog = "https://github.com/roswell/roswell/blob/v${version}/ChangeLog";
mainProgram = "ros";
};
}

4
pkgs/servers/home-assistant/component-packages.nix
View File

@ -2889,8 +2889,9 @@
pillow
pyserial
pyudev
ruuvitag-ble
sqlalchemy
]; # missing inputs: ruuvitag-ble
];
"sabnzbd" = ps: with ps; [
pysabnzbd
];
@ -4568,6 +4569,7 @@
"rss_feed_template"
"rtsp_to_webrtc"
"ruckus_unleashed"
"ruuvitag_ble"
"sabnzbd"
"safe_mode"
"samsungtv"

16
pkgs/servers/monitoring/prometheus/artifactory-exporter.nix
View File

@ -1,23 +1,28 @@
{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
{ lib
, buildGoModule
, fetchFromGitHub
, nixosTests
}:
buildGoModule rec {
pname = "artifactory_exporter";
version = "1.9.5";
version = "1.10.0";
rev = "v${version}";
src = fetchFromGitHub {
owner = "peimanja";
repo = pname;
rev = rev;
sha256 = "sha256-QUluuxuOgeq5CnpmVh5uDC4SEWD97JbQCHiYjYUs/nI=";
hash = "sha256-Yzdh9xpgPLbN9J5oBvrrPuVMTq2F3mpE544sAo7gmng=";
};
vendorSha256 = "sha256-5yzBKgjJCv4tgdBS6XmZUq1ebbka0LOuv6BARWO7kQg=";
vendorHash = "sha256-5yzBKgjJCv4tgdBS6XmZUq1ebbka0LOuv6BARWO7kQg=";
subPackages = [ "." ];
ldflags = [
"-s" "-w"
"-s"
"-w"
"-X github.com/prometheus/common/version.Version=${version}"
"-X github.com/prometheus/common/version.Revision=${rev}"
"-X github.com/prometheus/common/version.Branch=master"
@ -29,6 +34,7 @@ buildGoModule rec {
meta = with lib; {
description = "JFrog Artifactory Prometheus Exporter";
homepage = "https://github.com/peimanja/artifactory_exporter";
changelog = "https://github.com/peimanja/artifactory_exporter/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ lbpdt ];
};

15
pkgs/servers/web-apps/snipe-it/default.nix
View File

@ -1,4 +1,10 @@
{ pkgs, stdenv, lib, fetchFromGitHub, dataDir ? "/var/lib/snipe-it", mariadb }:
{ lib
, pkgs
, stdenv
, fetchFromGitHub
, dataDir ? "/var/lib/snipe-it"
, mariadb
}:
let
package = (import ./composition.nix {
@ -27,17 +33,17 @@ let
in package.override rec {
pname = "snipe-it";
version = "6.0.13";
version = "6.0.14";
src = fetchFromGitHub {
owner = "snipe";
repo = pname;
rev = "v${version}";
sha256 = "sha256-QwPl3JXB8gZS1/VyPBCc3PIQa+qtUNpuANSx4+oxWYg=";
hash = "sha256-c2hzuNOpvVl+ZriCo3TRl/GHY+LCrIb2GO2U894S2yk=";
};
meta = with lib; {
description = "A free open source IT asset/license management system ";
description = "A free open source IT asset/license management system";
longDescription = ''
Snipe-IT was made for IT asset management, to enable IT departments to track
who has which laptop, when it was purchased, which software licenses and accessories
@ -45,6 +51,7 @@ in package.override rec {
Details for snipe-it can be found on the official website at https://snipeitapp.com/.
'';
homepage = "https://snipeitapp.com/";
changelog = "https://github.com/snipe/snipe-it/releases/tag/v${version}";
license = licenses.agpl3Only;
maintainers = with maintainers; [ yayayayaka ];
platforms = platforms.linux;

6
pkgs/tools/admin/kics/default.nix
View File

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "kics";
version = "1.6.5";
version = "1.6.6";
src = fetchFromGitHub {
owner = "Checkmarx";
repo = "kics";
rev = "v${version}";
sha256 = "sha256-Y/fG10WKdSXNU9pLSItPKmTNfx8hL/YO8wtwTHob1QQ=";
sha256 = "sha256-/ceo4/dq9K3yZBl0P5C018C4IyhINUuZLTtA5t5K+v0=";
};
vendorSha256 = "sha256-sIIEWIVb1d4GDZVLfXz1myeQcxaG6aF8gYJn9+C8zQk=";
vendorSha256 = "sha256-1C2Sf9yvjklXOFy181VaeQ205VnlhLd8ucD9TsLIyg0=";
subPackages = [ "cmd/console" ];

6
pkgs/tools/misc/infracost/default.nix
View File

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "infracost";
version = "0.10.13";
version = "0.10.14";
src = fetchFromGitHub {
owner = "infracost";
rev = "v${version}";
repo = "infracost";
sha256 = "sha256-zxVFF+2KKBGtgnA3YNMZdhG3jDylgMjaiGUPbtg5Dss=";
sha256 = "sha256-5fgJEkAb9F7krTWlRssG+AqViFuMu2NkYUr78b/9oA8=";
};
vendorSha256 = "sha256-3WUU9Yid9PxqzHg+QBVkqxNxnRKU0zzcBYcpSslFzyM=";
vendorSha256 = "sha256-S51NwHeJm3gSJ+9r8RgGY3zHJFddI8uNfYSpQl33M3M=";
ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ];