nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 09:23:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into haskell-updates

Browse Source
This commit is contained in:
Malte Brandy 2022-04-03 13:02:04 +02:00
commit 3431c9a905
24 changed files with 95 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/graphics/rnote/default.nix
View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, appstream-glib
, desktop-file-utils
, gio-sharp
, glib
@ -20,22 +21,23 @@
stdenv.mkDerivation rec {
pname = "rnote";
version = "0.3.5";
version = "0.4.0";
src = fetchFromGitHub {
owner = "flxzt";
repo = "rnote";
rev = "v${version}";
sha256 = "5g5SQJc5aopYxtHNP5T85TtcazovrveUCnMhJ90p2t4=";
sha256 = "sha256-J7IW329rWFEoB+44762DAkWA8Hq4IVmXgc+QoDQaxV0=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-vnLesWXdqNzlWNQsUVy03kfmcDNazQ1BbizQDoG1kgM=";
hash = "sha256-elXaikB/RemMxA4OXyZNQOgP1alImQMJHng5oX2j480=";
};
nativeBuildInputs = [
appstream-glib # For appstream-util
desktop-file-utils # For update-desktop-database
meson
ninja

4
pkgs/applications/misc/metadata-cleaner/default.nix
View File

@ -18,7 +18,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "metadata-cleaner";
version = "2.1.5";
version = "2.2.1";
format = "other";
@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "rmnvgr";
repo = "metadata-cleaner";
rev = "v${version}";
hash = "sha256-G7Azeh8+OQILoYEmlIeacoDzN0NRt5NTGavYM9CH8WA=";
hash = "sha256-clCCVOoiInaxg9++GiHMLaD+k0gAvt3oOmqQ/a+WgCE=";
};
nativeBuildInputs = [

6
pkgs/applications/networking/feedreaders/newsboat/default.nix
View File

@ -3,16 +3,16 @@
rustPlatform.buildRustPackage rec {
pname = "newsboat";
version = "2.26";
version = "2.27";
src = fetchFromGitHub {
owner = "newsboat";
repo = "newsboat";
rev = "r${version}";
hash = "sha256-VFeKj8X7gEyxsdsOK6UYJ6xB24gsuzb1Wm4GK5AJCHc=";
hash = "sha256-cHUI95Zrwzg242BM8/roA40sAxijFw6go6BbQNZSzRw=";
};
cargoHash = "sha256-pr/Vzm321/uX4fIGt3kuWrtcgsnDRbeK3AvNO19NDwQ=";
cargoHash = "sha256-YZpaPfExKNLHWHmnCery4fGAJmOhpK3umuO343qe0Zo=";
# TODO: Check if that's still needed
postPatch = lib.optionalString stdenv.isDarwin ''

11
pkgs/applications/office/banking/default.nix
View File

@ -1,5 +1,5 @@
{ lib
, fetchurl
, fetchpatch
, fetchFromGitLab
, python3
, appstream-glib
@ -28,6 +28,15 @@ python3.pkgs.buildPythonApplication rec {
sha256 = "1w5x9iczw5hb9bfdm1df37n8xhdrida1yfrd82k9l8hb1k4q3h9d";
};
patches = [
# Fix build with meson 0.61
# https://gitlab.com/tabos/banking/-/merge_requests/90
(fetchpatch {
url = "https://gitlab.com/tabos/banking/-/commit/c3cc9afc380fe666ae6e331aa8a97659c60397a4.patch";
sha256 = "r9n9l47XU4Tg4U5sfiFdGkbG8QB7O4ol9CB1ya06yOc=";
})
];
postPatch = ''
patchShebangs meson_post_install.py
'';

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

@ -2,7 +2,7 @@
buildDunePackage rec {
pname = "caqti";
version = "1.5.1";
version = "1.7.0";
useDune2 = true;
minimumOCamlVersion = "4.04";
@ -11,7 +11,7 @@ buildDunePackage rec {
owner = "paurkedal";
repo = "ocaml-${pname}";
rev = "v${version}";
sha256 = "1vl61kdyj89whc3mh4k9bis6rbj9x2scf6hnv9afyalp4j65sqx1";
sha256 = "sha256-NGK38so6ZVCRbtV3ww1u31EFAjkHgDdsFfFUwc8ldm4=";
};
nativeBuildInputs = [ cppo ];

13
pkgs/development/python-modules/azure-keyvault/default.nix
View File

@ -1,4 +1,7 @@
{ lib, buildPythonPackage, isPy27, fetchPypi
{ lib
, buildPythonPackage
, pythonOlder
, fetchPypi
, azure-keyvault-certificates
, azure-keyvault-keys
, azure-keyvault-secrets
@ -6,13 +9,15 @@
buildPythonPackage rec {
pname = "azure-keyvault";
version = "4.1.0";
disabled = isPy27;
version = "4.2.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "69002a546921a8290eb54d9a3805cfc515c321bc1d4c0bfcfb463620245eca40";
hash = "sha256-cxrdEIo+KatP1QGjxHclbChsNNCZazg/tqOUVGKTN2E=";
};
propagatedBuildInputs = [

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

@ -9,10 +9,6 @@ buildPythonPackage rec {
sha256 = "sha256-1lP/ee4fQvY7WgkPL5jOAjNdhq2JY7POJmGAXK/pmgQ=";
};
postPatch = ''
substituteInPlace setup.py --replace README.md README.txt
'';
propagatedBuildInputs = [
tkinter
];

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

@ -28,7 +28,7 @@
buildPythonPackage rec {
pname = "elastic-apm";
version = "6.8.1";
version = "6.9.1";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -37,7 +37,7 @@ buildPythonPackage rec {
owner = "elastic";
repo = "apm-agent-python";
rev = "v${version}";
sha256 = "sha256-bH7XCk1jPsGalFQ68rQhSyZv9nCZE+xUJyWX828PQQI=";
sha256 = "sha256-IaCl39rhsFLQwvQdPcqKruV/Mo3f7WH91UVgMG/cnOc=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-nest-sdm/default.nix
View File

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "google-nest-sdm";
version = "1.8.0";
version = "1.9.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "allenporter";
repo = "python-google-nest-sdm";
rev = version;
sha256 = "sha256-oaUR/2G8dcQ5A4YZeLTSzyMNLI8a29pSoEtTdWvTVKE=";
sha256 = "sha256-FHa6/oWV35TPsafgEUTCuu0Rnd1/YBZF3mHOhkVuEU0=";
};
propagatedBuildInputs = [

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

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "ha-philipsjs";
version = "2.7.6";
version = "2.9.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = pname;
rev = version;
sha256 = "sha256-U5XigLFkpRoIXcFB4dpxi8pxqcmmb20sv9i9J70s0C0=";
sha256 = "sha256-B2AQoVyoG6wyE9pTWf/ASQd8iZfIrjUr078rSkoARf0=";
};
propagatedBuildInputs = [

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

@ -19,11 +19,11 @@
buildPythonPackage rec {
pname = "ipyparallel";
version = "8.2.0";
version = "8.2.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-D9n2SlEgmAqJtkKZgGwSu434zuoVXlIAtwUwHrJAHhk=";
sha256 = "sha256-8mdHPFL8aohsa4Fq2xVb7Asne8fSJPs/q+uDg05zPHI=";
};
buildInputs = [ nose ];

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

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "mcstatus";
version = "9.0.3";
version = "9.0.4";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "py-mine";
repo = pname;
rev = "v${version}";
hash = "sha256-ckT3eSjOgIG2/Ci9Ig6QLCrO9iMF9VyZNJy9KfHUg4A=";
hash = "sha256-h5pPtzs04TDqOkDFBpcn6faFN4sz/nEMsjjiH7mTEH0=";
};
nativeBuildInputs = [

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

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pychromecast";
version = "10.3.0";
version = "11.0.0";
format = "setuptools";
disabled = !isPy3k;
@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "PyChromecast";
inherit version;
sha256 = "sha256-TrEHRG/b7YdvSMgyArYhKyIShhaKVcFrPrjt9CAPEKE=";
sha256 = "sha256-FRcjsXgRAFK2c7h2WhIMhdFurowi11V13O6+K+HrHvY=";
};
propagatedBuildInputs = [

20
pkgs/development/python-modules/pysnooper/default.nix
View File

@ -1,25 +1,29 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytest
, isPy27
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
version = "1.1.0";
pname = "pysnooper";
version = "1.1.1";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit version;
pname = "PySnooper";
sha256 = "0fa932ad396d2bac089d4b1f94f0ce49cde4140ee64ddd24a4065fadea10fcc9";
hash = "sha256-0X3JHMoVk8ECMNzkXkax0/8PiRDww46UHt9roSYLOCA=";
};
# test dependency python-toolbox fails with py27
doCheck = !isPy27;
checkInputs = [
pytest
pytestCheckHook
];
pythonImportsCheck = [
"pysnooper"
];
meta = with lib; {

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "python-box";
version = "6.0.1";
version = "6.0.2";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "cdgriffith";
repo = "Box";
rev = version;
hash = "sha256-kH8qHAFuYDXO5Dsl6BpTYCIqh0Xi8Rbwmia+y3sTn6Y=";
hash = "sha256-IE2qyRzvrOTymwga+hCwE785sAVTqQtcN1DL/uADpbQ=";
};
propagatedBuildInputs = [

6
pkgs/servers/libreddit/default.nix
View File

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "libreddit";
version = "0.22.5";
version = "0.22.6";
src = fetchFromGitHub {
owner = "spikecodes";
repo = pname;
rev = "v${version}";
sha256 = "sha256-yzYmlewM9NcNHPUmfGiUP0Px2s+sagZOU82wK4973rY=";
sha256 = "sha256-Dx0eVg1T9WTHeIQO9hwUoCAcUgQey8rlZ5+uxPIX0Wc=";
};
cargoSha256 = "sha256-XZkTfpi9stW13l7yo0LFZryAPITVZa9MALrSWSei5LU=";
cargoSha256 = "sha256-RGZgo9uxRmPpZzXu6AC2FPjOoZxLnh4gCjadAOTWJ4Q=";
buildInputs = lib.optional stdenv.isDarwin Security;

34
pkgs/tools/admin/pulumi/data.nix
View File

@ -1,12 +1,12 @@
# DO NOT EDIT! This file is generated automatically by update.sh
{ }:
{
version = "3.27.0";
version = "3.28.0";
pulumiPkgs = {
x86_64-linux = [
{
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.27.0-linux-x64.tar.gz";
sha256 = "06qvfhjw58ah76yis3yzz1g09h1ykqjm2dlv3bdn82xavw3pgf8l";
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.28.0-linux-x64.tar.gz";
sha256 = "1ngwbv5dhi7xw2dvwlxm8l62h44b5inn3ybhcndsqklwgylsgf88";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.5.0-linux-amd64.tar.gz";
@ -61,8 +61,8 @@
sha256 = "1djm9dh1445yn7hnl3m1hm6cw9cj7m9syv08xjjclwc3dj9k7qw5";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.1.0-linux-amd64.tar.gz";
sha256 = "0ffqah4anhdacmfb8n3hdq17jhqq0qclc0l0cq77hvhvgn39yy4r";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.2.0-linux-amd64.tar.gz";
sha256 = "08hy3qcf8dg36s3p9jm1mbknqp139izjdnr5ic4i8c3vycid0r1i";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-amd64.tar.gz";
@ -163,8 +163,8 @@
];
x86_64-darwin = [
{
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.27.0-darwin-x64.tar.gz";
sha256 = "1n48p228grk2livvfr5bmxaw3mbvxvwbwzd5303kfnhnkza7cbld";
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.28.0-darwin-x64.tar.gz";
sha256 = "0nwpar4vz7af3ylpyg8lf2mmp86qggxihg2nh2acwc0fhdad4jr5";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.5.0-darwin-amd64.tar.gz";
@ -219,8 +219,8 @@
sha256 = "11wnk0ssqzfcvks5qvc2yi6iv9nxxxxqwmnjyavdzp5s5vvpi5zm";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.1.0-darwin-amd64.tar.gz";
sha256 = "0j8ysk4wh78xhk3nv6c1dvvyw5ihs7amwlyqicch52yc6jq3v5a6";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.2.0-darwin-amd64.tar.gz";
sha256 = "1s5zkdf6zf1l4nkmd8pl1mvr2sjj4bw3vcqnr4y9xmmxicjz9d0d";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-amd64.tar.gz";
@ -321,8 +321,8 @@
];
aarch64-linux = [
{
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.27.0-linux-arm64.tar.gz";
sha256 = "0463crsfma4rgwn493r2dpajda86w2286x5z566vic9xp0awjzjd";
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.28.0-linux-arm64.tar.gz";
sha256 = "0nbzl4mhms9v6dr0db5pgnv187a5mipwhnp86a21a5q964dz998v";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.5.0-linux-arm64.tar.gz";
@ -377,8 +377,8 @@
sha256 = "0vn6kgdwd63c62kaq3b09m3yipg43yh12s0a9zhi48p4wplsgf9s";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.1.0-linux-arm64.tar.gz";
sha256 = "1lh1g90ab4blqmvx0yfp516hfsd6n1y751ab7fzhv7hcajf3klvi";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.2.0-linux-arm64.tar.gz";
sha256 = "1a935hi2zdd7bis2d1y818l1gl2dcq9dclbakvzczabksjdf731q";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-arm64.tar.gz";
@ -479,8 +479,8 @@
];
aarch64-darwin = [
{
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.27.0-darwin-arm64.tar.gz";
sha256 = "13jql3kab4vjlq5jfwbkw9bm72n7nzqq5zgjxmfcpyx7incj4462";
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.28.0-darwin-arm64.tar.gz";
sha256 = "03k6ahdki17nmr3gg6956gxrvmikwi719aynhch8azr000fp7vaj";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.5.0-darwin-arm64.tar.gz";
@ -535,8 +535,8 @@
sha256 = "0nl47s8v47jvr4w3v5s2fnwhm56yb3knfb1za7ncynybgw8hizv0";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.1.0-darwin-arm64.tar.gz";
sha256 = "1z0gd0fagv55dl3ki340h0ljw7dqj8818w4072pc5xxy5id90gb0";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.2.0-darwin-arm64.tar.gz";
sha256 = "0ayg0w61lqv22nln95vd02kjhhqi5k3ncpdcxbh2rd09b74bbxvf";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-arm64.tar.gz";

2
pkgs/tools/admin/pulumi/update.sh
View File

@ -10,7 +10,7 @@ fi
# Version of Pulumi from
# https://www.pulumi.com/docs/get-started/install/versions/
VERSION="3.27.0"
VERSION="3.28.0"
# An array of plugin names. The respective repository inside Pulumi's
# Github organization is called pulumi-$name by convention.

4
pkgs/tools/misc/goaccess/default.nix
View File

@ -10,14 +10,14 @@
}:
stdenv.mkDerivation rec {
version = "1.5.5";
version = "1.5.6";
pname = "goaccess";
src = fetchFromGitHub {
owner = "allinurl";
repo = pname;
rev = "v${version}";
sha256 = "sha256-gTdmqyGJ+TipiwDtbnGFrEZjkAyNejNINlB5iZz5yTI=";
sha256 = "sha256-1yvFyTH5m+KIN/x61cbUNgweK38WFdIUDvnkFYmST9s=";
};
nativeBuildInputs = [

6
pkgs/tools/security/naabu/default.nix
View File

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "naabu";
version = "2.0.5";
version = "2.0.6";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "naabu";
rev = "v${version}";
sha256 = "0kbpfb1ryfqy8a54ksm7zm8pqy8f4adh06jc1ccpdxks3k0rygid";
sha256 = "sha256-soYtm8vEkMJq9MeoUqOGJPWxZUrh3mGnApxG154W1wI=";
};
vendorSha256 = "17x60x68hd2jm84xw5mgsclv6phn6ajkp92kpcz013vlkcdaqrxs";
vendorSha256 = "sha256-MR1JUbeGC4N0jDuYdwVFMHBdZEy5BkID2BFdCwjtTAg=";
buildInputs = [
libpcap

6
pkgs/tools/security/terrascan/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "terrascan";
version = "1.13.2";
version = "1.14.0";
src = fetchFromGitHub {
owner = "accurics";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ja7Cpd+BegGdKOWAiH5JsniO4NYlFEgJzqBuNzE2ao4=";
sha256 = "sha256-O4oLtbijTAgUD+X3rxJkH2VmWLX5nQaN5JwoznNpKOM=";
};
vendorSha256 = "sha256-h/mSF4hJ3TS+4b3CCUEXVin8MRcPg8qEe90Mcxk0uVo=";
vendorSha256 = "sha256-dfd5yQ3t23YyFin770UlCtEIldRxTqeWfgl0GLLF+Qw=";
# Tests want to download a vulnerable Terraform project
doCheck = false;

7
pkgs/tools/security/zzuf/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config }:
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook }:
stdenv.mkDerivation rec {
pname = "zzuf";
@ -11,10 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0li1s11xf32dafxq1jbnc8c63313hy9ry09dja2rymk9mza4x2n9";
};
nativeBuildInputs = [ autoconf automake ];
buildInputs = [ libtool pkg-config ];
preConfigure = "./bootstrap";
nativeBuildInputs = [ pkg-config autoreconfHook ];
meta = with lib; {
description = "Transparent application input fuzzer";

4
pkgs/tools/text/xml/jing-trang/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, jre_headless, jdk, ant, saxon }:
{ lib, stdenv, fetchFromGitHub, jre_headless, jdk_headless, ant, saxon }:
stdenv.mkDerivation rec {
pname = "jing-trang";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
buildInputs = [ jdk ant saxon ];
buildInputs = [ jdk_headless ant saxon ];
CLASSPATH = "lib/saxon.jar";

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

@ -6965,7 +6965,7 @@ with pkgs;
jing = res.jing-trang;
jing-trang = callPackage ../tools/text/xml/jing-trang {
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
jdk_headless = jdk8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
jira-cli = callPackage ../development/tools/jira_cli { };
@ -21044,7 +21044,10 @@ with pkgs;
saxonb = saxonb_8_8;
inherit (callPackages ../development/libraries/java/saxon { })
inherit (callPackages ../development/libraries/java/saxon {
jre = jre_headless;
jre8 = jre8_headless;
})
saxon
saxonb_8_8
saxonb_9_1