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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2022-10-10 00:04:21 +00:00 committed by GitHub
commit e92f9b319a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
35 changed files with 258 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -6507,6 +6507,12 @@
githubId = 297653;
name = "Joe Salisbury";
};
john-shaffer = {
email = "jdsha@proton.me";
github = "john-shaffer";
githubId = 53870456;
name = "John Shaffer";
};
johanot = {
email = "write@ownrisk.dk";
github = "johanot";

7
nixos/tests/sssd-ldap.nix
View File

@ -91,6 +91,11 @@ in import ./make-test-python.nix ({pkgs, ...}: {
machine.start()
machine.wait_for_unit("openldap.service")
machine.wait_for_unit("sssd.service")
machine.succeed("getent passwd ${testUser}")
result = machine.execute("getent passwd ${testUser}")
if result[0] == 0:
assert "${testUser}" in result[1]
else:
machine.wait_for_console_text("Backend is online")
machine.succeed("getent passwd ${testUser}")
'';
})

7
pkgs/applications/audio/reaper/default.nix
View File

@ -17,12 +17,15 @@
, libpulseaudio
}:
let
url_for_platform = version: arch: "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_${arch}.tar.xz";
in
stdenv.mkDerivation rec {
pname = "reaper";
version = "6.66";
src = fetchurl {
url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_${stdenv.hostPlatform.qemuArch}.tar.xz";
url = url_for_platform version stdenv.hostPlatform.qemuArch;
hash = {
x86_64-linux = "sha256-kMXHHd+uIc5tKlDlxKjphZsfNMYvvV/4Zx84eRwPGcs=";
aarch64-linux = "sha256-pB3qj9CJbI5iWBNKNX2niIfHrpSz9+qotX/zKGYDwYo=";
@ -75,6 +78,8 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
passthru.updateScript = ./updater.sh;
meta = with lib; {
description = "Digital audio workstation";
homepage = "https://www.reaper.fm/";

18
pkgs/applications/audio/reaper/updater.sh Executable file
View File

@ -0,0 +1,18 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl common-updater-scripts
set -euo pipefail
reaper_ver=$(curl -Ls https://www.reaper.fm/download.php | grep -o 'Version [0-9]\.[0-9]*' | head -n1 | cut -d' ' -f2)
function set_hash_for_arch() {
local arch=$1
pkg_hash=$(nix-prefetch-url https://www.reaper.fm/files/${reaper_ver%.*}.x/reaper${reaper_ver/./}_linux_$arch.tar.xz)
pkg_hash=$(nix hash to-sri "sha256:$pkg_hash")
# reset the version so the second architecture update doesn't get ignored
update-source-version reaper 0 "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" --system=$arch-linux
update-source-version reaper "${reaper_ver}" "$pkg_hash" --system=$arch-linux
}
set_hash_for_arch aarch64
set_hash_for_arch x86_64

6
pkgs/applications/misc/josm/default.nix
View File

@ -3,15 +3,15 @@
}:
let
pname = "josm";
version = "18565";
version = "18570";
srcs = {
jar = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
hash = "sha256-sL0u/lXxmJGn0RB2/6Vl0mLO5FyLrUIkRXD4TvZJp/Y=";
hash = "sha256-EAEh/n7M56rzjtkIs8ZteDvOLuHxNsMyT7VGFyPre6s=";
};
macosx = fetchurl {
url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip";
hash = "sha256-YeriOUQqGbdIRaYTzm3/jXnNUIVsSNxCQ+BqJhS1bRI=";
hash = "sha256-2xsHsaDxm/wjiCyS5tmD8uUlLrBdd3sS8JLal3pX3pA=";
};
pkg = fetchsvn {
url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";

4
pkgs/applications/misc/pgmodeler/default.nix
View File

@ -10,13 +10,13 @@
mkDerivation rec {
pname = "pgmodeler";
version = "0.9.4";
version = "1.0.0-beta";
src = fetchFromGitHub {
owner = "pgmodeler";
repo = "pgmodeler";
rev = "v${version}";
sha256 = "sha256-FwLPhIc2ofaB8Z2ZUYMFFt5XdoosEfEOwoIaI7pSxa0=";
sha256 = "sha256-1+1hKOY8unu6Z7LLv/WQ86JlwWUubQuhPP9OUjyXOrM=";
};
nativeBuildInputs = [ pkg-config qmake ];

4
pkgs/development/libraries/jellyfin-ffmpeg/default.nix
View File

@ -8,13 +8,13 @@
nv-codec-headers = nv-codec-headers-11;
}).overrideAttrs (old: rec {
pname = "jellyfin-ffmpeg";
version = "5.1.1-2";
version = "5.1.2-1";
src = fetchFromGitHub {
owner = "jellyfin";
repo = "jellyfin-ffmpeg";
rev = "v${version}";
sha256 = "sha256-aviluHVNGxbWkmJ6mnlFbtRKKb0FoKkNw0Bgl+tmqyA=";
sha256 = "sha256-56IDFZnHDL3jArNd/U/ZRdHyJ54oqhY+U4XcwOLTGqQ=";
};
configureFlags = old.configureFlags ++ [

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

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "aiounifi";
version = "37";
version = "38";
disabled = pythonOlder "3.9";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "Kane610";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-VKR01lbXznkO/OQvvxvMJOjPIPSynLWT6G/YV4Essy0=";
hash = "sha256-NKraMxpP9O22NzO4UDl6zYBeJldTRdf4U43WVQYcPyQ=";
};
propagatedBuildInputs = [

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

@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "bellows";
version = "0.34.1";
version = "0.34.2";
format = "setuptools";
src = fetchFromGitHub {
owner = "zigpy";
repo = "bellows";
rev = "refs/tags/${version}";
sha256 = "sha256-a2skDJVqbct1+Ky2D8LXv8VMqFwqznUzXh+o+M6GtvQ=";
sha256 = "sha256-78LUQBFV4TFPDLiSHBG+RLnQLaCPX4LZpow9aszQAQA=";
};
propagatedBuildInputs = [

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

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "pebble";
version = "5.0.1";
version = "5.0.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "Pebble";
inherit version;
hash = "sha256-7kHDO+PUEihVcfLMfPkU1MKoGrPTiMaLPHRrerOwuGU=";
hash = "sha256-nFjAPq+SDDEodETG/vOdxTuurJ3iIerRBPXJtI6L1Yc=";
};
checkInputs = [

14
pkgs/development/python-modules/pydaikin/default.nix
View File

@ -12,14 +12,16 @@
buildPythonPackage rec {
pname = "pydaikin";
version = "2.7.0";
version = "2.7.2";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchFromBitbucket {
owner = "mustang51";
repo = pname;
rev = "v${version}";
sha256 = "sha256-k6NAQvt79Qo7sAXQwOjq4Coz2iTZAUImasc/oMSpmmg=";
hash = "sha256-IONmzrCW/5nAEa7GlWMZsnweQWTSUwV4HwhXww6/9ig=";
};
propagatedBuildInputs = [
@ -28,17 +30,15 @@ buildPythonPackage rec {
urllib3
];
# while they have tests, they do not run them in their CI and they fail as of 2.7.0
# AttributeError: 'DaikinBRP069' object has no attribute 'last_hour_cool_energy_consumption'
doCheck = false;
checkInputs = [
freezegun
pytest-aiohttp
pytestCheckHook
];
pythonImportsCheck = [ "pydaikin" ];
pythonImportsCheck = [
"pydaikin"
];
meta = with lib; {
description = "Python Daikin HVAC appliances interface";

9
pkgs/development/python-modules/pyhumps/default.nix
View File

@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, poetry-core
, pytestCheckHook
, pythonOlder
@ -20,6 +21,14 @@ buildPythonPackage rec {
hash = "sha256-7jkwf4qGQ+AD4/hOrEe/oAPY+gnSySUVBWFf70rU7xc=";
};
patches = [
(fetchpatch {
# https://github.com/nficano/humps/pull/281
url = "https://github.com/nficano/humps/commit/e248c26195804fa04c43e88c5682528f367e27b3.patch";
hash = "sha256-+TCVfuMgfkDaS1tPu4q6PIOC3Kn1MBWyuoyAO6W0/h4=";
})
];
nativeBuildInputs = [
poetry-core
];

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

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "pymicrobot";
version = "0.0.6";
version = "0.0.8";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -16,7 +16,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "PyMicroBot";
inherit version;
hash = "sha256-BvxF/9bnA0oXCAXq1GXoR7AUnPF9hQLxmlOHxfYX+u8=";
hash = "sha256-I4EkiG39v0yJXOAR7lmaqedLf9zHQCcxLXQ0nTfYq70=";
};
propagatedBuildInputs = [

14
pkgs/development/python-modules/pyoverkiz/default.nix
View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "pyoverkiz";
version = "1.5.4";
version = "1.5.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -24,9 +24,14 @@ buildPythonPackage rec {
owner = "iMicknl";
repo = "python-overkiz-api";
rev = "refs/tags/v${version}";
hash = "sha256-+2L62GG9amP+0RROk9GzJqcaXsXCv+BMmMyUMH7VxYI=";
hash = "sha256-5HoCoVgq1pg+VxD324Fijosk2ln4sGE0oWpemFVAsfc=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'pyhumps = "^3.0.2,!=3.7.3"' 'pyhumps = "^3.0.2"'
'';
nativeBuildInputs = [
poetry-core
];
@ -45,11 +50,6 @@ buildPythonPackage rec {
pytestCheckHook
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'backoff = "^1.10.0"' 'backoff = "*"'
'';
pythonImportsCheck = [
"pyoverkiz"
];

72
pkgs/development/python-modules/rst2pdf/default.nix Normal file
View File

@ -0,0 +1,72 @@
{ lib
, buildPythonPackage
, fetchPypi
, setuptools
, docutils
, importlib-metadata
, jinja2
, packaging
, pygments
, pyyaml
, reportlab
, smartypants
, pillow
, pytestCheckHook
, pymupdf
, sphinx
}:
buildPythonPackage rec {
pname = "rst2pdf";
version = "0.99";
format = "pyproject";
src = fetchPypi {
inherit pname version;
sha256 = "8fa23fa93bddd1f52d058ceaeab6582c145546d80f2f8a95974f3703bd6c8152";
};
outputs = [ "out" "man" ];
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
docutils
importlib-metadata
jinja2
packaging
pygments
pyyaml
reportlab
smartypants
pillow
];
pythonImportsCheck = [
"rst2pdf"
];
checkInputs = [
pytestCheckHook
pymupdf
sphinx
];
# Test suite fails: https://github.com/rst2pdf/rst2pdf/issues/1067
doCheck = false;
postInstall = ''
mkdir -p $man/share/man/man1/
${docutils}/bin/rst2man.py doc/rst2pdf.rst $man/share/man/man1/rst2pdf.1
'';
meta = with lib; {
description = "Convert reStructured Text to PDF via ReportLab";
homepage = "https://rst2pdf.org/";
license = licenses.mit;
maintainers = with maintainers; [ marsam ];
};
}

6
pkgs/development/python-modules/zigpy-xbee/default.nix
View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "zigpy-xbee";
version = "0.16.0";
version = "0.16.1";
# https://github.com/Martiusweb/asynctest/issues/152
# broken by upstream python bug with asynctest and
# is used exclusively by home-assistant with python 3.8
@ -22,8 +22,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "zigpy";
repo = "zigpy-xbee";
rev = version;
sha256 = "sha256-0Eg+XaMDEB3Zh0Ksn8Nsaf7AYdhRqzpscuZIz19DxCI=";
rev = "refs/tags/${version}";
sha256 = "sha256-75LftepCexIsqVMgrJKeTJWHlPI5zcj2aZbJt09JSwE=";
};
buildInputs = [

4
pkgs/development/python-modules/zigpy-zigate/default.nix
View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "zigpy-zigate";
version = "0.10.0";
version = "0.10.1";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = "zigpy-zigate";
rev = "refs/tags/v${version}";
hash = "sha256-JcKmLD3ET17PaNm1DoAV8TDMw88Qd5okDPOStLUqASM=";
hash = "sha256-g6EFc9z9LrUawDczgGaIt5o+Vgp5U3swJJD8VftL4bQ=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/zigpy-znp/default.nix
View File

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "zigpy-znp";
version = "0.9.0";
version = "0.9.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-GvGWda+vsDwJrRIjc3hkl9zMrJ/cj2HGvHSeCROE69g=";
sha256 = "sha256-32QSFBzYg+E++5euCWKgbF3/uLEn1uObenmR/Wv9XZc=";
};
propagatedBuildInputs = [

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

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "zigpy";
version = "0.51.2";
version = "0.51.3";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = "zigpy";
rev = "refs/tags/${version}";
hash = "sha256-6JHj75ntbW3Pu4P6/nw0/xhZ+fZCfpNCzB1ZB7WJ0jY=";
hash = "sha256-IfYWuJfmQtJnVANyiBE3AurhucqZ8qzYXBV3jprS5qw=";
};
propagatedBuildInputs = [

4
pkgs/development/tools/analysis/actionlint/default.nix
View File

@ -10,7 +10,7 @@
buildGoModule rec {
pname = "actionlint";
version = "1.6.20";
version = "1.6.21";
subPackages = [ "cmd/actionlint" ];
@ -18,7 +18,7 @@ buildGoModule rec {
owner = "rhysd";
repo = "actionlint";
rev = "v${version}";
sha256 = "sha256-WQqEST5f3yUsvjw86ckS/jRaxcnUd13zb7lmQvfmsjM=";
sha256 = "sha256-EbiyWDcDin11pGNIJtIVI44avNdZZ/4EmV5w22yx/YI=";
};
vendorSha256 = "sha256-vWU3tEC+ZlrrTnX3fbuEuZRoSg1KtfpgpXmK4+HWrNY=";

1
pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
View File

@ -46,6 +46,7 @@
tree-sitter-jsdoc = lib.importJSON ./tree-sitter-jsdoc.json;
tree-sitter-json = lib.importJSON ./tree-sitter-json.json;
tree-sitter-json5 = lib.importJSON ./tree-sitter-json5.json;
tree-sitter-jsonnet = lib.importJSON ./tree-sitter-jsonnet.json;
tree-sitter-julia = lib.importJSON ./tree-sitter-julia.json;
tree-sitter-kotlin = lib.importJSON ./tree-sitter-kotlin.json;
tree-sitter-latex = lib.importJSON ./tree-sitter-latex.json;

11
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsonnet.json Normal file
View File

@ -0,0 +1,11 @@
{
"url": "https://github.com/sourcegraph/tree-sitter-jsonnet",
"rev": "0475a5017ad7dc84845d1d33187f2321abcb261d",
"date": "2022-05-27T01:23:53-04:00",
"path": "/nix/store/n4yijz5b0bky4zd8kvh632a5zlxc3rfv-tree-sitter-jsonnet",
"sha256": "1dh8wqi8mnsapzicrdjg6cj6skj9f2ia4ijg08pl45bcxc1lidzc",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
}

6
pkgs/development/tools/parsing/tree-sitter/update.nix
View File

@ -53,7 +53,7 @@ let
# this is the haskell language bindings, tree-sitter-haskell is the grammar
"haskell-tree-sitter"
# this is the ruby language bindings, tree-sitter-ruby is the grammar
"ruby-tree-sitter"
"ruby-tree-sitter.old"
# this is the (unmaintained) rust language bindings, tree-sitter-rust is the grammar
"rust-tree-sitter"
# this is the nodejs language bindings, tree-sitter-javascript is the grammar
@ -347,6 +347,10 @@ let
orga = "indoorvivants";
repo = "tree-sitter-smithy";
};
"tree-sitter-jsonnet" = {
orga = "sourcegraph";
repo = "tree-sitter-jsonnet";
};
};
allGrammars =

4
pkgs/os-specific/linux/sssd/default.nix
View File

@ -13,13 +13,13 @@ let
in
stdenv.mkDerivation rec {
pname = "sssd";
version = "2.7.4";
version = "2.8.0";
src = fetchFromGitHub {
owner = "SSSD";
repo = pname;
rev = version;
sha256 = "sha256-tPrximWUeG3wcuZZNo8l4QqC9ZwcZupIBZGF7bm7hqQ=";
sha256 = "sha256-i2RRvIFQLuFw9Q3pLOgomvCH9j8h3JAailoIww1dnLs=";
};
postPatch = ''

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

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2022.10.1";
version = "2022.10.2";
components = {
"abode" = ps: with ps; [
abodepy

5
pkgs/servers/home-assistant/default.nix
View File

@ -261,7 +261,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.10.1";
hassVersion = "2022.10.2";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@ -279,7 +279,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
hash = "sha256-+hf+Qjj/UrEJ8gHsaXZonKkANVJpjEsb5HoaSbsCFJ8=";
hash = "sha256-bx4bixTWeOho8MG5yPBmVp07a7k8xfCli8OhQovG7Qw=";
};
# leave this in, so users don't have to constantly update their downstream patch handling
@ -302,6 +302,7 @@ in python.pkgs.buildPythonApplication rec {
"orjson"
"PyJWT"
"requests"
"typing-extensions"
"yarl"
];
in ''

8
pkgs/servers/prowlarr/default.nix
View File

@ -16,14 +16,14 @@ let
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
hash = {
x64-linux_hash = "sha256-t5KjzB+dJGNr80mbRRlGvzuC6NvicyScoVeCygzjKeA=";
arm64-linux_hash = "sha256-wj1B573MgLZee3pjzbDyYsEYQ6fIyWQkYQnAbV6IW2Q=";
x64-osx_hash = "sha256-sbaWK5FK9luSpra/8aujd02/8Z1LOKkAm5eAghT6LJk=";
x64-linux_hash = "sha256-IGCRQWI0jz7t8dMAgvRNTdPTOFp5469VgEJgZCz5zyQ=";
arm64-linux_hash = "sha256-X/SCgKM7hZQQLwkrBlTLkV4GkxymEC1JuvKaxe+RAxY=";
x64-osx_hash = "sha256-sFfuiwTYvizTJR47Vhtk7KMAo8fg8WvI7RFIuhltnWc=";
}."${arch}-${os}_hash";
in stdenv.mkDerivation rec {
pname = "prowlarr";
version = "0.4.5.1960";
version = "0.4.6.1969";
src = fetchurl {
url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.develop.${version}.${os}-core-${arch}.tar.gz";

4
pkgs/servers/sickbeard/sickgear.nix
View File

@ -4,13 +4,13 @@ let
pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 lxml ]);
in stdenv.mkDerivation rec {
pname = "sickgear";
version = "0.25.40";
version = "0.25.44";
src = fetchFromGitHub {
owner = "SickGear";
repo = "SickGear";
rev = "release_${version}";
sha256 = "sha256-AHV/HSKuVWZFdZdkFp9p7okAcFO40d9OqV20MaHKXaU=";
sha256 = "sha256-j9sLIxUru2rjKaL4uV03yQfEdbXpKo1xGunrNZc/t7E=";
};
patches = [

4
pkgs/servers/web-apps/dolibarr/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "dolibarr";
version = "15.0.3";
version = "16.0.0";
src = fetchFromGitHub {
owner = "Dolibarr";
repo = "dolibarr";
rev = version;
sha256 = "sha256-HMOYj93ZvqM0FQjt313yuGj/r9ELqQlnNkg/CxrBjRM=";
sha256 = "sha256-6BS1UHcfxiG1AXJSagxydtl5TU7tyZt21Q3geNmwkYY=";
};
dontBuild = true;

4
pkgs/shells/murex/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "murex";
version = "2.11.2030";
version = "2.11.2200";
src = fetchFromGitHub {
owner = "lmorg";
repo = pname;
rev = "v${version}";
sha256 = "sha256-/W0nNmMdjtkktwkNGHrxHHibqqbujC591nC4NwEG47U=";
sha256 = "sha256-nyrZttTOWpr7rBc2Ks04cWMGZFmd7lVIz6mHa0m+dDE=";
};
vendorSha256 = "sha256-hLz36ESf6To6sT/ha/yXyhG0U1gGw8HDfnrPJnws25g=";

8
pkgs/tools/backup/zfsbackup/default.nix
View File

@ -6,17 +6,17 @@
buildGoModule rec {
pname = "zfsbackup";
version = "unstable-2021-05-26";
rev = "2d4534b920d3c57552667e1c6da9978b3a9278f0";
version = "unstable-2022-09-23";
rev = "a30f1a44bcae5f64cfb36a12926242a968a759c6";
src = fetchFromGitHub {
owner = "someone1";
repo = "zfsbackup-go";
inherit rev;
sha256 = "sha256-slVwXXGLvq+eAlqzD8p1fnc17CGUBY0Z68SURBBuf2k=";
sha256 = "sha256-ZJ7gtT4AdMLEs2+hJa2Sia0hSoQd3CftdqRsH/oJxd8=";
};
vendorSha256 = "sha256-jpxp8RKDBrkBBaY89QnKYGWFI/DUURUVX8cPJ/qoLrg=";
vendorSha256 = "sha256-aYAficUFYYhZygfQZyczP49CeouAKKZJW8IFlkFh9lI=";
ldflags = [ "-w" "-s" ];

22
pkgs/tools/misc/csv2parquet/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ lib, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "csv2parquet";
version = "0.6.0";
src = fetchFromGitHub {
owner = "domoritz";
repo = pname;
rev = "v${version}";
sha256 = "sha256-kb5j7d5lhElbDuoDpsijaXy3Dxjs7nRCUorkg4vKQi8=";
};
cargoSha256 = "sha256-rfwqLWNl05GyIBCOv9PaaYmkHBa58x0ck8Jz1qZyeos=";
meta = with lib; {
description = "Convert CSV files to Apache Parquet";
homepage = "https://github.com/domoritz/csv2parquet";
license = licenses.mit;
maintainers = with maintainers; [ john-shaffer ];
};
}

33
pkgs/tools/misc/star-history/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ lib
, rustPlatform
, fetchCrate
, pkg-config
, openssl
, stdenv
, Security
}:
rustPlatform.buildRustPackage rec {
pname = "star-history";
version = "1.0.4";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-sVcYQneWEZXcsbzMJ2ZfHS0C529J6s1sDxrcIojEC4U=";
};
cargoSha256 = "sha256-d0PesmJTZFVoVwBLMZzOsF76hcUbRaEoymmfw3Qh9mc=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [
Security
];
meta = with lib; {
description = "Command line program to generate a graph showing number of GitHub stars of a user, org or repo over time";
homepage = "https://github.com/dtolnay/star-history";
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ figsoda ];
};
}

11
pkgs/top-level/all-packages.nix
View File

@ -3592,6 +3592,8 @@ with pkgs;
csv2odf = callPackage ../applications/office/csv2odf { };
csv2parquet = callPackage ../tools/misc/csv2parquet { };
csvdiff = callPackage ../tools/text/csvdiff { };
csview = callPackage ../tools/text/csview { };
@ -12960,10 +12962,7 @@ with pkgs;
zfs-autobackup = callPackage ../tools/backup/zfs-autobackup { };
zfsbackup = callPackage ../tools/backup/zfsbackup {
# pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
buildGoModule = buildGo117Module;
};
zfsbackup = callPackage ../tools/backup/zfsbackup { };
zfstools = callPackage ../tools/filesystems/zfstools { };
@ -26467,6 +26466,10 @@ with pkgs;
stdmanpages = callPackage ../data/documentation/std-man-pages { };
star-history = callPackage ../tools/misc/star-history {
inherit (darwin.apple_sdk.frameworks) Security;
};
starfetch = callPackage ../tools/misc/starfetch { };
starship = callPackage ../tools/misc/starship {

2
pkgs/top-level/python-packages.nix
View File

@ -9890,6 +9890,8 @@ in {
rst2ansi = callPackage ../development/python-modules/rst2ansi { };
rst2pdf = callPackage ../development/python-modules/rst2pdf { };
rstcheck = callPackage ../development/python-modules/rstcheck { };
rstcheck-core = callPackage ../development/python-modules/rstcheck-core { };