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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2023-01-25 06:01:06 +00:00 committed by GitHub
commit a2f216a003
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
41 changed files with 240 additions and 257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/module-list.nix
View File

@ -172,7 +172,6 @@
./programs/geary.nix
./programs/git.nix
./programs/gnome-disks.nix
./programs/gnome-documents.nix
./programs/gnome-terminal.nix
./programs/gnupg.nix
./programs/gpaste.nix

54
nixos/modules/programs/gnome-documents.nix
View File

@ -1,54 +0,0 @@
# GNOME Documents.
{ config, pkgs, lib, ... }:
with lib;
{
meta = {
maintainers = teams.gnome.members;
};
# Added 2019-08-09
imports = [
(mkRenamedOptionModule
[ "services" "gnome" "gnome-documents" "enable" ]
[ "programs" "gnome-documents" "enable" ])
];
###### interface
options = {
programs.gnome-documents = {
enable = mkOption {
type = types.bool;
default = false;
description = lib.mdDoc ''
Whether to enable GNOME Documents, a document
manager application for GNOME.
'';
};
};
};
###### implementation
config = mkIf config.programs.gnome-documents.enable {
environment.systemPackages = [ pkgs.gnome.gnome-documents ];
services.dbus.packages = [ pkgs.gnome.gnome-documents ];
services.gnome.gnome-online-accounts.enable = true;
services.gnome.gnome-online-miners.enable = true;
};
}

1
nixos/modules/rename.nix
View File

@ -36,6 +36,7 @@ with lib;
'')
(mkRemovedOptionModule [ "networking" "vpnc" ] "Use environment.etc.\"vpnc/service.conf\" instead.")
(mkRemovedOptionModule [ "networking" "wicd" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "programs" "gnome-documents" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "programs" "tilp2" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "programs" "way-cooler" ] ("way-cooler is abandoned by its author: " +
"https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"))

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

@ -3,13 +3,13 @@
mkDerivation rec {
pname = "AusweisApp2";
version = "1.26.1";
version = "1.26.2";
src = fetchFromGitHub {
owner = "Governikus";
repo = "AusweisApp2";
rev = version;
sha256 = "sha256-Q+ZWnbYH80FMazKB1iSTh9cuYvuPom+qDjMZvC1gUoY=";
hash = "sha256-jN4xKgdNO+LyDy+ySM13M5YCaijDq8zAxS+x4Io1ThE=";
};
nativeBuildInputs = [ cmake pkg-config ];

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

@ -5,19 +5,19 @@
buildGoModule rec {
pname = "dasel";
version = "2.1.0";
version = "2.1.1";
src = fetchFromGitHub {
owner = "TomWright";
repo = "dasel";
rev = "v${version}";
sha256 = "sha256-7JGafJE9nwZ95bOWUyVw2uWA2LltE9HxolHGYU079to=";
sha256 = "sha256-27tQEWnirDhqYt5smRFwADa9wKXSk6yXR8+mXvJVtYI=";
};
vendorHash = "sha256-GO5Vg8zsXfjMBzRDC1/s/SYpviKUf59JB14vauKVFcE=";
ldflags = [
"-s" "-w" "-X github.com/tomwright/dasel/internal.Version=${version}"
"-s" "-w" "-X github.com/tomwright/dasel/v2/internal.Version=${version}"
];
doInstallCheck = true;

7
pkgs/applications/misc/parsec/bin.nix
View File

@ -12,11 +12,11 @@
stdenvNoCC.mkDerivation {
pname = "parsec-bin";
version = "150_28";
version = "150_86e";
src = fetchurl {
url = "https://web.archive.org/web/20220622215230id_/https://builds.parsecgaming.com/package/parsec-linux.deb";
sha256 = "1hfdzjd8qiksv336m4s4ban004vhv00cv2j461gc6zrp37s0fwhc";
url = "https://web.archive.org/web/20230124210253/https://builds.parsecgaming.com/package/parsec-linux.deb";
sha256 = "sha256-wwBy86TdrHaH9ia40yh24yd5G84WTXREihR+9I6o6uU=";
};
unpackPhase = ''
@ -76,6 +76,7 @@ stdenvNoCC.mkDerivation {
meta = with lib; {
homepage = "https://parsecgaming.com/";
changelog = "https://parsec.app/changelog";
description = "Remote streaming service client";
license = licenses.unfree;
maintainers = with maintainers; [ arcnmx ];

12
pkgs/applications/networking/cluster/terraform-providers/providers.json
View File

@ -222,13 +222,13 @@
"vendorHash": "sha256-PALZGyGZ6Ggccl4V9gG+gsEdNipYG+DCaZkqF0W1IMQ="
},
"cloudflare": {
"hash": "sha256-X7rNVMl5K/Z0w/N6+5fuODjR08gF9s3jQ1HqCo3b1WU=",
"hash": "sha256-Y48H7P69ORr8U0yXf1HEBqh//oOmWn3Uj8GQ12PsV/M=",
"homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare",
"owner": "cloudflare",
"repo": "terraform-provider-cloudflare",
"rev": "v3.32.0",
"rev": "v3.33.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-7X2T3C775Nq5jc7n41nBREUsOa+EYmBsfBJM5YIo9xI="
"vendorHash": "sha256-3JH+4ExREL3vtq6CiQN0G0x08ScrzOf2pTAnsWcGgq8="
},
"cloudfoundry": {
"hash": "sha256-/Zxj9cous0SjYxeDo+8/u61pqDwMGt/UsS/OC1oSR2U=",
@ -1050,13 +1050,13 @@
"vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8="
},
"spotinst": {
"hash": "sha256-JT+kWE6k22qp905soDbnptr7gJZiZ8uRZ4+ZBw++8Mo=",
"hash": "sha256-2w4Qh9S0YxvcNdgtPLsNEumZiJn3+VH80zwamJW1FWQ=",
"homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
"owner": "spotinst",
"repo": "terraform-provider-spotinst",
"rev": "v1.95.2",
"rev": "v1.96.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-vW+1tH+3bT70RrHOTKemM23e0EoX3AO5AMXOAuyyKPA="
"vendorHash": "sha256-SRQWZGyQDbESrpu0tsy6EBfvjY/l89fQexCdhSYPzGI="
},
"stackpath": {
"hash": "sha256-nTR9HgSmuNCt7wxE4qqIH2+HA2igzqVx0lLRx6FoKrE=",

6
pkgs/applications/office/treesheets/default.nix
View File

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "treesheets";
version = "unstable-2023-01-20";
version = "unstable-2023-01-23";
src = fetchFromGitHub {
owner = "aardappel";
repo = "treesheets";
rev = "4d48bbe730b19963efeb3bb6f59e92aa3968b229";
sha256 = "03REE7/jn1uuU89DKkGD1QqqzOt+DR6qmoyyaf8042c=";
rev = "f676cba7f9749825744ec705ee58b9fbea47db51";
sha256 = "Zx1fGicCuX+HJm2QFSYQhcd9Ibg3qj5h9NPlSNNVLag=";
};
nativeBuildInputs = [

10
pkgs/applications/version-management/srvc/default.nix
View File

@ -1,23 +1,23 @@
{ lib, rustPlatform, fetchFromGitHub, stdenv, Security, webfs }:
{ lib, rustPlatform, fetchFromGitHub, stdenv, Security, git }:
rustPlatform.buildRustPackage rec {
pname = "srvc";
version = "0.10.1";
version = "0.13.0";
src = fetchFromGitHub {
owner = "insilica";
repo = "rs-srvc";
rev = "v${version}";
sha256 = "sha256-yeyAorVMHFl9wm57gmK6ZAI1w5daN2xl29Gqq0DsTtc=";
sha256 = "sha256-m4mN+vDEKPHRavtI9CbszOOdJcLYa+XqlzEyPvPXE0g=";
};
cargoHash = "sha256-/1TL0lWb4I9h6nGV7exx7U6ACrieN0EULTWg7Weexeg=";
cargoHash = "sha256-USOYXb6/hEE9HVz5YcNZPY5yuvDxbrH4YyZxY7XNAto=";
buildInputs = lib.optionals stdenv.isDarwin [
Security
];
nativeCheckInputs = [ webfs ];
nativeCheckInputs = [ git ];
# remove timeouts in tests to make them less flaky
TEST_SRVC_DISABLE_TIMEOUT = 1;

2
pkgs/data/icons/bibata-cursors/extra.nix
View File

@ -50,5 +50,7 @@ stdenvNoCC.mkDerivation rec {
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ dtzWill AdsonCicilioti ];
# unmaintained as of Nov 9, 2022. unable to be build with clickgen version 2.x
broken = true;
};
}

4
pkgs/desktops/pantheon/apps/elementary-mail/default.nix
View File

@ -41,8 +41,8 @@ stdenv.mkDerivation rec {
# build: support webkit2gtk-4.1
# https://github.com/elementary/mail/pull/794
(fetchpatch {
url = "https://github.com/elementary/mail/commit/7d4878543b27251664852c708d54abc1e4580eab.patch";
sha256 = "sha256-yl6Bzjinp+ti/aX+t22GibGeQFtharZNk3MmbuJm0Tk=";
url = "https://github.com/elementary/mail/commit/9e6eb73a8420c9bf327e59c25e7e6d8fa87d480a.patch";
sha256 = "sha256-idkVymePLa7vgfuou0HIrbWRCaWAgZliDcp4HyZBArs=";
})
];

6
pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
View File

@ -28,10 +28,10 @@ stdenv.mkDerivation rec {
patches = [
# build: support evolution-data-server 3.45
# https://github.com/elementary/switchboard-plug-onlineaccounts/pull/244
# https://github.com/elementary/switchboard-plug-onlineaccounts/pull/248
(fetchpatch {
url = "https://github.com/elementary/switchboard-plug-onlineaccounts/commit/b60f0458a23a2f76ad14d399f145e150e1ab82d3.patch";
sha256 = "sha256-C7woN4shPrVlSWZeW0Fz+xFi5CTQd2K5BsF5YeI9x0Y=";
url = "https://github.com/elementary/switchboard-plug-onlineaccounts/commit/08faf7b4241547b7900596af12a03d816712a808.patch";
sha256 = "sha256-QLe+NPHuo3hLM9n1f4hT5IK4nkWtYSe91L1wVSBzw6k=";
})
];

8
pkgs/development/libraries/dqlite/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "dqlite";
version = "1.9.0";
version = "1.13.0";
src = fetchFromGitHub {
owner = "canonical";
repo = pname;
rev = "v${version}";
sha256 = "0zalsvr0vy7632nhm96a29lrfy18iqsmbxpyz2lvq80mrjlbrzsn";
rev = "refs/tags/v${version}";
hash = "sha256-KVQa11gw/8h3Be+52V44W2M+fd7sB35emrS/aUEUGl0=";
};
nativeBuildInputs = [ autoreconfHook file pkg-config ];
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://dqlite.io/";
license = licenses.asl20;
maintainers = with maintainers; [ joko ];
maintainers = with maintainers; [ joko adamcstephens ];
platforms = platforms.linux;
};
}

4
pkgs/development/mobile/maestro/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "maestro";
version = "1.19.5";
version = "1.20.0";
src = fetchurl {
url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip";
sha256 = "1chrfwpxbnbn6k6ciwbflz1b8d7sd3r945m5g2d9gz1r1nn6d4v1";
sha256 = "0hrfnx66yr1q57875m3ff4b2blq0k641iqjxjys8kwzp3nix34w2";
};
dontUnpack = true;

4
pkgs/development/python-modules/google-cloud-error-reporting/default.nix
View File

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "google-cloud-error-reporting";
version = "1.8.0";
version = "1.8.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-XFOgoe6xphHyp/zbd+RR+9dXebMcU7/c2ETFGy+lg3U=";
hash = "sha256-Xl+Jc05daQZPh4xggf/JYYlJ5Lx6LafqWhMcVdk/r6o=";
};
propagatedBuildInputs = [

6
pkgs/development/python-modules/openai-whisper/default.nix
View File

@ -20,14 +20,14 @@
buildPythonPackage rec {
pname = "whisper";
version = "unstable-2022-09-30";
version = "20230117";
format = "setuptools";
src = fetchFromGitHub {
owner = "openai";
repo = pname;
rev = "60132ade70e00b843d93542fcb37b58c0d8bf9e7";
hash = "sha256-4mhlCvewA0bVo5bq2sbSEKHq99TQ6jUauiCUkdRSdas=";
rev = "refs/tags/v${version}";
hash = "sha256-DVYQw+h5xsgWLA6dD+qg4ud0pqFOn6oVAzTqRywE30g=";
};
patches = [

60
pkgs/development/python-modules/particle/default.nix
View File

@ -1,56 +1,66 @@
{ lib
, attrs
, buildPythonPackage
, fetchFromGitHub
, fetchPypi
, setuptools-scm
, attrs
, deprecated
, hatch-vcs
, hatchling
, hepunits
, pytestCheckHook
, tabulate
, pandas
, pytestCheckHook
, pythonOlder
, setuptools-scm
, tabulate
}:
buildPythonPackage rec {
pname = "particle";
version = "0.21.0";
version = "0.21.1";
format = "pyproject";
disabled = pythonOlder "3.9";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-SDdIg05+gfLNaQ+glitTf3Z/6K9HBci62mjIu9rIoX0=";
hash = "sha256-Mw9IVQoXZU8ByU6OI2Wtmo3PJuVz6KzzH7I+pPYkssQ=";
};
postPatch = ''
# Disable benchmark tests, so we won't need pytest-benchmark and pytest-cov
# as dependencies
substituteInPlace pyproject.toml \
--replace '"--benchmark-disable",' ""
'';
nativeBuildInputs = [
setuptools-scm
hatch-vcs
hatchling
];
propagatedBuildInputs = [
attrs
deprecated
hepunits
];
pythonImportsCheck = [
"particle"
];
preCheck = ''
# Disable benchmark tests, so we won't need pytest-benchmark and pytest-cov
# as dependencies
substituteInPlace pyproject.toml \
--replace '"--benchmark-disable", ' ""
rm tests/particle/test_performance.py
'';
nativeCheckInputs = [
pytestCheckHook
tabulate
pandas
];
meta = {
description = "Package to deal with particles, the PDG particle data table, PDGIDs, etc.";
pythonImportsCheck = [
"particle"
];
disabledTestPaths = [
"tests/particle/test_performance.py"
];
meta = with lib; {
description = "Package to deal with particles, the PDG particle data table and others";
homepage = "https://github.com/scikit-hep/particle";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ doronbehar ];
changelog = "https://github.com/scikit-hep/particle/releases/tag/v${version}";
license = licenses.bsd3;
maintainers = with maintainers; [ doronbehar ];
};
}

2
pkgs/development/python-modules/pip-tools/default.nix
View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "pip-tools";
version = "6.12.1";
format = "setuptools";
format = "pyproject";
disabled = pythonOlder "3.7";

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

@ -5,13 +5,14 @@
, beautifulsoup4
, lxml
, cssutils
, nltk
, pytest-lazy-fixture
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "pycaption";
version = "2.1.0";
version = "2.1.1";
disabled = pythonOlder "3.6";
@ -19,7 +20,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
hash = "sha256-mV//EYdP7wKYD3Vc49z6LQVQeOuhzNKFZLf28RYdABk=";
hash = "sha256-B+uIh8WTPPeNVU3yP8FEGc8OinY0MpJb9dHLC+nhi4I=";
};
propagatedBuildInputs = [
@ -28,6 +29,10 @@ buildPythonPackage rec {
cssutils
];
passthru.optional-dependencies = {
transcript = [ nltk ];
};
nativeCheckInputs = [
pytest-lazy-fixture
pytestCheckHook

30
pkgs/development/python-modules/python-redis-lock/default.nix
View File

@ -1,28 +1,39 @@
{ lib
, stdenv
, buildPythonPackage
, eventlet
, fetchPypi
, redis
, pytestCheckHook
, process-tests
, gevent
, pkgs
, withDjango ? false, django-redis
, process-tests
, pytestCheckHook
, pythonOlder
, redis
, withDjango ? false
, django-redis
}:
buildPythonPackage rec {
pname = "python-redis-lock";
version = "4.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Sr0Lz0kTasrWZye/VIbdJJQHjKVeSe+mk/eUB3MZCRo=";
hash = "sha256-Sr0Lz0kTasrWZye/VIbdJJQHjKVeSe+mk/eUB3MZCRo=";
};
propagatedBuildInputs = [
redis
] ++ lib.optional withDjango django-redis;
] ++ lib.optional withDjango [
django-redis
];
nativeCheckInputs = [
eventlet
gevent
pytestCheckHook
process-tests
pkgs.redis
@ -37,10 +48,15 @@ buildPythonPackage rec {
"test_reset_all_signalizes"
];
pythonImportsCheck = [
"redis_lock"
];
meta = with lib; {
changelog = "https://github.com/ionelmc/python-redis-lock/blob/v${version}/CHANGELOG.rst";
description = "Lock context manager implemented via redis SETNX/BLPOP";
homepage = "https://github.com/ionelmc/python-redis-lock";
license = licenses.bsd2;
description = "Lock context manager implemented via redis SETNX/BLPOP";
maintainers = with maintainers; [ vanschelven ];
};
}

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

@ -3,6 +3,7 @@
, fetchPypi
, pytestCheckHook
, pythonOlder
, zeep
}:
buildPythonPackage rec {
@ -17,10 +18,21 @@ buildPythonPackage rec {
hash = "sha256-vMdj2cSa4j2l0remhtX9He7J2QUTQRYKENGscjomvsA=";
};
postPatch = ''
substituteInPlace setup.cfg \
--replace " --cov=stdnum --cov-report=term-missing:skip-covered --cov-report=html" ""
'';
nativeCheckInputs = [
pytestCheckHook
];
passthru.optional-dependencies = {
SOAP = [
zeep
];
};
pythonImportsCheck = [
"stdnum"
];
@ -28,6 +40,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python module to handle standardized numbers and codes";
homepage = "https://arthurdejong.org/python-stdnum/";
changelog = "https://github.com/arthurdejong/python-stdnum/blob/${version}/ChangeLog";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ johbo ];
};

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

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "whois";
version = "0.9.23";
version = "0.9.24";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "DannyCork";
repo = "python-whois";
rev = "refs/tags/${version}";
hash = "sha256-HYzCdWX0gz1W73ZPlrdt+kqUPbBRrDnkGJE56nQ3UVc=";
hash = "sha256-DxjfRBJh/qLafxXN2VcXHTWuajDg6lvmJ5U86Na3L5g=";
};
propagatedBuildInputs = [

8
pkgs/development/tools/protoscope/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "protoscope";
version = "unstable-2022-10-04";
version = "unstable-2022-11-09";
src = fetchFromGitHub {
owner = "protocolbuffers";
repo = "protoscope";
rev = "8b1d63939ee1a5d922b38f3976e1e58cae525163";
sha256 = "sha256-/vt02rvKVsryJZ+Bw4QLaGzDErGI04/4NUbSBkbbN3Y=";
rev = "8e7a6aafa2c9958527b1e0747e66e1bfff045819";
hash = "sha256-+VIy+CD6bKJzwtpHXRr9MqmsPE2MJ1dRdtvSMUkCh5I=";
};
vendorSha256 = "sha256-mK8eGo6oembs4nofvROn4g0+oO5E5/zQrmPKMe3xXik=";
vendorHash = "sha256-mK8eGo6oembs4nofvROn4g0+oO5E5/zQrmPKMe3xXik=";
ldflags = [ "-s" "-w" ];

6
pkgs/development/tools/rust/cargo-hack/default.nix
View File

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-hack";
version = "0.5.26";
version = "0.5.27";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-ZVR3bycEWpOV4T/85OsERNjKooz2rwBF5kMSEfHnmEI=";
sha256 = "sha256-oiCZiwJr1BqMCWCNUOTQT3XPX0QZRr0wLewf8OU6lHA=";
};
cargoSha256 = "sha256-4TChr6dKxUerpuaX63WShrWyXTLH4m85P6E30a5rmH8=";
cargoSha256 = "sha256-g5O51V4BPNqzsQo1prLIpamqwcOy+SJat2Rb5UDHRLc=";
# some necessary files are absent in the crate version
doCheck = false;

6
pkgs/development/tools/rust/cargo-semver-checks/default.nix
View File

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-semver-checks";
version = "0.15.2";
version = "0.16.2";
src = fetchFromGitHub {
owner = "obi1kenobi";
repo = pname;
rev = "v${version}";
sha256 = "sha256-+YRyShALdDQDfh5XDY36R29SzbBjlT8mCIucwJ++KrQ=";
sha256 = "sha256-2t3LWb2oeCYDAePXX1YuIN0o4LLEL58Hxt/1sNeuD3M=";
};
cargoSha256 = "sha256-wwsFqoQXasCKfnCBF4qGFIoD7Kj53K9IKQ1auuqTPAM=";
cargoSha256 = "sha256-K+eLQ7zGEGkh4vMABWucY/Ho2id/afwl4FSo5+Ca1Ec=";
nativeBuildInputs = [ pkg-config ];

25
pkgs/development/tools/rust/panamax/default.nix
View File

@ -1,19 +1,34 @@
{ lib, rustPlatform, fetchCrate, pkg-config, openssl, stdenv, Security }:
{ lib
, rustPlatform
, fetchCrate
, pkg-config
, libgit2
, openssl
, zlib
, stdenv
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "panamax";
version = "1.0.3";
version = "1.0.6";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-w4waFdzd/Ps0whOp39QLBE/YF2eyc4t2Ili7FskUt1M=";
sha256 = "sha256-/JW2QB5PtwKo0TLU/QmkgsE6/ne+51EVmWyGn7Lljdw=";
};
cargoSha256 = "sha256-52snmkTFHI26xJo9qJkmqh1M5lLzhDxw8WT6uFd57aw=";
cargoSha256 = "sha256-aKdDismdPcExqznS6S2LvAij6gv9/Hw2FBvkhr9rJGo=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
buildInputs = [
libgit2
openssl
zlib
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];
meta = with lib; {
description = "Mirror rustup and crates.io repositories for offline Rust and cargo usage";

8
pkgs/development/tools/txtpbfmt/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "txtpbfmt";
version = "unstable-2022-06-08";
version = "unstable-2023-01-18";
src = fetchFromGitHub {
owner = "protocolbuffers";
repo = "txtpbfmt";
rev = "fc78c767cd6a4e6e3953f5d72f1e0e4c5811990b";
sha256 = "sha256-5Pj2REFrzWCzrqdplNlyfX+sJqPjXEld6MFNy0S3MFM=";
rev = "fcc1fa29197ce17bc56812f84f5ff311f767fcd1";
hash = "sha256-U+Kk2tQw+rJX7Xa8b5Hd7x0xY/6PN6TTYsLJkpB1Osg=";
};
vendorSha256 = "sha256-shjcQ3DJQYeAW0bX3OuF/esgIvrQ4yuLEa677iFV82g=";
vendorHash = "sha256-shjcQ3DJQYeAW0bX3OuF/esgIvrQ4yuLEa677iFV82g=";
ldflags = [ "-s" "-w" ];

13
pkgs/games/classicube/default.nix
View File

@ -5,7 +5,8 @@
, makeWrapper
, makeDesktopItem
, copyDesktopItems
, SDL2
, libX11
, libXi
, libGL
, curl
, openal
@ -14,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "ClassiCube";
version = "1.3.4";
version = "1.3.5";
src = fetchFromGitHub {
owner = "UnknownShadow200";
repo = "ClassiCube";
rev = version;
sha256 = "sha256-m7pg9OL2RuCVKgFD3hMtIeY0XdJ1YviXBFVJH8/T5gI=";
sha256 = "sha256-anBi9hPwX1AAIc8dXsKyX4u7UbkKqC1P+7f7wdKWAig=";
};
nativeBuildInputs = [ dos2unix makeWrapper copyDesktopItems ];
@ -46,12 +47,8 @@ stdenv.mkDerivation rec {
patches = [
# Fix hardcoded font paths
./font-location.patch
# ClassiCube doesn't compile with its X11 backend
# because of issues with libXi.
./use-sdl.patch
# For some reason, the Makefile doesn't link
# with libcurl and openal when ClassiCube requires them.
# Also links with SDL2 instead of libX11 and libXi.
./fix-linking.patch
];
@ -71,7 +68,7 @@ stdenv.mkDerivation rec {
--replace 'JOBS=1' "JOBS=$NIX_BUILD_CORES"
'';
buildInputs = [ SDL2 libGL curl openal liberation_ttf ];
buildInputs = [ libX11 libXi libGL curl openal liberation_ttf ];
preBuild = "cd src";

2
pkgs/games/classicube/fix-linking.patch
View File

@ -7,7 +7,7 @@ index 83188ce..3439cdb 100644
ifeq ($(PLAT),linux)
-LIBS=-lX11 -lXi -lpthread -lGL -lm -ldl
+LIBS=-lSDL2 -lpthread -lGL -lm -ldl -lcurl -lopenal
+LIBS=-lX11 -lXi -lpthread -lGL -lm -ldl -lcurl -lopenal
endif
ifeq ($(PLAT),sunos)

13
pkgs/games/classicube/use-sdl.patch
View File

@ -1,13 +0,0 @@
diff --git a/src/Core.h b/src/Core.h
index e94a39e..96527d0 100644
--- a/src/Core.h
+++ b/src/Core.h
@@ -170,7 +170,7 @@ Thus it is **NOT SAFE** to allocate a string on the stack. */
#define CC_BUILD_LINUX
#define CC_BUILD_POSIX
#define CC_BUILD_GL
-#define CC_BUILD_X11
+#define CC_BUILD_SDL
#define CC_BUILD_CURL
#define CC_BUILD_OPENAL
#if defined CC_BUILD_RPI

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

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "rasdaemon";
version = "0.6.8";
version = "0.7.0";
src = fetchFromGitHub {
owner = "mchehab";
repo = "rasdaemon";
rev = "v${version}";
sha256 = "sha256-gcwoc9lIJyqUiCSAHf1U8geLG58CxzjMFYFl8moaA2Q=";
sha256 = "sha256-oLwR+bNgKceVgLTOLYiKHNUkRmLouaQshdp/8UJnfqg=";
};
nativeBuildInputs = [ autoreconfHook ];

33
pkgs/servers/dns/trust-dns/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ lib
, fetchFromGitHub
, openssl
, pkg-config
, rustPlatform
}:
rustPlatform.buildRustPackage rec {
pname = "trust-dns";
version = "0.22.0";
src = fetchFromGitHub {
owner = "bluejekyll";
repo = "trust-dns";
rev = "v${version}";
sha256 = "sha256-b9tK1JbTwB3ZuRPh0wb3cOFj9dMW7URXIaFzUq0Yipw=";
};
cargoHash = "sha256-mpobdeTRWJzIEmhwtcM6UE66qRD5ot/0yLeQM6Tec+0=";
buildInputs = [ openssl ];
nativeBuildInputs = [ pkg-config ];
# tests expect internet connectivity to query real nameservers like 8.8.8.8
doCheck = false;
meta = with lib; {
description = "A Rust based DNS client, server, and resolver";
homepage = "https://trust-dns.org/";
maintainers = with maintainers; [ colinsane ];
platforms = platforms.linux;
license = with licenses; [ asl20 mit ];
};
}

8
pkgs/servers/web-apps/peering-manager/default.nix
View File

@ -32,19 +32,15 @@ let
in py.pkgs.buildPythonApplication rec {
pname = "peering-manager";
version = "1.7.3";
version = "1.7.4";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-vrRMdqEpsps4ZKgunMhznJr/TQ9+WVMNYFu76ZU7iMI=";
sha256 = "sha256-mXva4c5Rtjq/jFJl3yGGlVrggzGJ3awN0+xoDnDWBSA=";
};
patches = [
./redis-unix-sock.patch
];
format = "other";
propagatedBuildInputs = with py.pkgs; [

47
pkgs/servers/web-apps/peering-manager/redis-unix-sock.patch
View File

@ -1,47 +0,0 @@
commit 1e64a7f6ca456249305f6a3c90f9acf84af194db
Author: Yureka <yuka@yuka.dev>
Date: Tue Nov 29 14:03:08 2022 +0100
support unix sockets for redis connections
diff --git a/peering_manager/settings.py b/peering_manager/settings.py
index 739d6ff..b5edf4d 100644
--- a/peering_manager/settings.py
+++ b/peering_manager/settings.py
@@ -270,6 +270,7 @@ TASKS_REDIS_PASSWORD = TASKS_REDIS.get("PASSWORD", "")
TASKS_REDIS_DATABASE = TASKS_REDIS.get("DATABASE", 0)
TASKS_REDIS_DEFAULT_TIMEOUT = TASKS_REDIS.get("DEFAULT_TIMEOUT", 300)
TASKS_REDIS_SSL = TASKS_REDIS.get("SSL", False)
+TASKS_REDIS_UNIX_SOCKET_PATH = TASKS_REDIS.get("UNIX_SOCKET_PATH", "")
if "DEFAULT_TIMEOUT" in TASKS_REDIS:
warnings.warn(
"DEFAULT_TIMEOUT is no longer supported under REDIS configuration. Set RQ_DEFAULT_TIMEOUT instead."
@@ -294,6 +295,7 @@ CACHING_REDIS_PASSWORD = CACHING_REDIS.get("PASSWORD", "")
CACHING_REDIS_DATABASE = CACHING_REDIS.get("DATABASE", 0)
CACHING_REDIS_DEFAULT_TIMEOUT = CACHING_REDIS.get("DEFAULT_TIMEOUT", 300)
CACHING_REDIS_SSL = CACHING_REDIS.get("SSL", False)
+CACHING_REDIS_UNIX_SOCKET_PATH = CACHING_REDIS.get("UNIX_SOCKET_PATH", "")
if CACHING_REDIS_USING_SENTINEL:
CACHEOPS_SENTINEL = {
@@ -301,6 +303,8 @@ if CACHING_REDIS_USING_SENTINEL:
"service_name": CACHING_REDIS_SENTINEL_SERVICE,
"db": CACHING_REDIS_DATABASE,
}
+elif CACHING_REDIS_UNIX_SOCKET_PATH != "":
+ CACHEOPS_REDIS = f"unix://{CACHING_REDIS_UNIX_SOCKET_PATH}?db={CACHING_REDIS_DATABASE}"
else:
REDIS_CACHE_CON_STRING = "rediss://" if CACHING_REDIS_SSL else "redis://"
if CACHING_REDIS_PASSWORD:
@@ -334,6 +338,11 @@ if TASKS_REDIS_USING_SENTINEL:
"SOCKET_TIMEOUT": None,
"CONNECTION_KWARGS": {"socket_connect_timeout": TASKS_REDIS_DEFAULT_TIMEOUT},
}
+elif TASKS_REDIS_UNIX_SOCKET_PATH != "":
+ RQ_PARAMS = {
+ "UNIX_SOCKET_PATH": TASKS_REDIS_UNIX_SOCKET_PATH,
+ "DB": TASKS_REDIS_DATABASE,
+ }
else:
RQ_PARAMS = {
"HOST": TASKS_REDIS_HOST,

12
pkgs/tools/misc/android-tools/default.nix
View File

@ -9,21 +9,13 @@ in
stdenv.mkDerivation rec {
pname = "android-tools";
version = "33.0.3p1";
version = "33.0.3p2";
src = fetchurl {
url = "https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz";
hash = "sha256-viBHzyVgUWdK9a60u/7SdpiVEvgNEZHihkyRkGH5Ydg=";
hash = "sha256-a/a1LXOJ55/JK2PMIGRR7kL8T32naddpIhk+mNdfVgQ=";
};
patches = [
(fetchpatch {
name = "add-macos-platform.patch";
url = "https://github.com/nmeum/android-tools/commit/a1ab35b31525966e0f0770047cd82accb36d025b.patch";
hash = "sha256-6O3ekDf0qPdzcfINFF8Ae4XOYgnQWTBhvu9SCFSHkXY=";
})
];
nativeBuildInputs = [ cmake pkg-config perl go ];
buildInputs = [ protobuf zlib gtest brotli lz4 zstd libusb1 pcre2 ];
propagatedBuildInputs = [ pythonEnv ];

9
pkgs/tools/misc/autorandr/default.nix
View File

@ -4,14 +4,15 @@
, fetchFromGitHub
, systemd
, xrandr
, installShellFiles }:
, installShellFiles
, desktop-file-utils }:
python3.pkgs.buildPythonApplication rec {
pname = "autorandr";
version = "1.13.1";
version = "1.13.2";
format = "other";
nativeBuildInputs = [ installShellFiles ];
nativeBuildInputs = [ installShellFiles desktop-file-utils ];
propagatedBuildInputs = [ python3Packages.packaging ];
buildPhase = ''
@ -59,7 +60,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "phillipberndt";
repo = "autorandr";
rev = "refs/tags/${version}";
sha256 = "sha256-702x4O0rHW/VZIfu1+5G1gBSDQYVoAx167igz/M3Ea4=";
sha256 = "sha256-Yn950V7DgLhwYSoGyUvjTH0Vwg/FodxhKsBP5iLTgqA=";
};
meta = with lib; {

4
pkgs/tools/misc/flexoptix-app/default.nix
View File

@ -1,11 +1,11 @@
{ lib, appimageTools, fetchurl, nodePackages }: let
pname = "flexoptix-app";
version = "5.13.1";
version = "5.13.3";
src = fetchurl {
name = "${pname}-${version}.AppImage";
url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage";
hash = "sha256-+rHktjZd6P4JGYRhEXdZYVI64XMYc7cBGojAQNd8Mq8=";
hash = "sha256-kDw9+Llqvq4NgN89Cw/HwEqYlv42wLbho1eHjI6wVSQ=";
};
udevRules = fetchurl {

10
pkgs/tools/misc/trashy/default.nix
View File

@ -2,16 +2,20 @@
rustPlatform.buildRustPackage rec {
pname = "trashy";
version = "1.0.3";
version = "2.0.0";
src = fetchFromGitHub {
owner = "oberblastmeister";
repo = "trashy";
rev = "v${version}";
sha256 = "sha256-b50Q7knJzXKDfM1kw6wLvXunhgOXVs+zYvZx/NYqMdk=";
sha256 = "sha256-xYSk0M8oNwbwZbKWDXMQlnt7vKi0p3+2Tr4eXCvtHEM=";
};
cargoSha256 = "sha256-2hNNLXuAHd1bquhHimniqryTVMfBmPAOossggICScqQ=";
cargoSha256 = "sha256-ZWqWtWzb+CLH1ravBb/oV+aPxplEyiC1wEFhvchcLqg=";
# this patch must be removed after oberblastmeister/trashy#70 is solved or new
# version is released.
cargoPatches = [ ./lock-version.patch ];
nativeBuildInputs = [ installShellFiles ];

13
pkgs/tools/misc/trashy/lock-version.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/Cargo.lock b/Cargo.lock
index 7af0268..dc197a0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -889,7 +889,7 @@ dependencies = [
[[package]]
name = "trashy"
-version = "1.0.3"
+version = "2.0.0"
dependencies = [
"aho-corasick",
"ansi_term",

13
pkgs/tools/text/hck/default.nix
View File

@ -3,26 +3,27 @@
, fetchFromGitHub
, cmake
, stdenv
, CoreFoundation
, Security
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "hck";
version = "0.7.5";
version = "0.8.2";
src = fetchFromGitHub {
owner = "sstadick";
repo = pname;
rev = "v${version}";
sha256 = "sha256-29uxcbqAnWCdxKqVdrMVtorXvSLUC+jlt4YwE19Gh+A=";
sha256 = "sha256-66wunZuRAJ6QVWgBUy2+HGaow33F5+16LitGSQC4kCE=";
};
cargoSha256 = "sha256-VHuzv6Zq83byXDEEyYDtlaPC4DZ3GNJaJfO0ACrrqO8=";
cargoSha256 = "sha256-4CAj94wm9qxr9wejD2ffKSdRV1UeofMhxNxLi++At+I=";
nativeBuildInputs = [ cmake ];
buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation Security ];
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];
# link System as a dylib instead of a framework on macos
postPatch = lib.optionalString stdenv.isDarwin ''

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

@ -15753,9 +15753,7 @@ with pkgs;
maturin = callPackage ../development/tools/rust/maturin {
inherit (darwin.apple_sdk.frameworks) Security;
};
panamax = callPackage ../development/tools/rust/panamax {
inherit (darwin.apple_sdk.frameworks) Security;
};
panamax = callPackage ../development/tools/rust/panamax { };
ograc = callPackage ../development/tools/rust/ograc { };
@ -26502,6 +26500,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
trust-dns = callPackage ../servers/dns/trust-dns { };
tunctl = callPackage ../os-specific/linux/tunctl { };
twa = callPackage ../tools/networking/twa { };
@ -37287,9 +37287,7 @@ with pkgs;
gummy = callPackage ../tools/misc/gummy { };
hck = callPackage ../tools/text/hck {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
};
hck = callPackage ../tools/text/hck { };
helm = callPackage ../applications/audio/helm { };