b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2023-07-16 18:01:40 +00:00 committed by GitHub
parent a0072edeba d4613a1d45
commit 034c3854f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
48 changed files with 3192 additions and 803 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
doc/contributing/reviewing-contributions.chapter.md
View file

@ -62,6 +62,8 @@ Sample template for a package update review is provided below.
- [ ] package build on ARCHITECTURE
- [ ] executables tested on ARCHITECTURE
- [ ] all depending packages build
- [ ] patches have a comment describing either the upstream URL or a reason why the patch wasn't upstreamed
- [ ] patches that are remotely available are fetched rather than vendored
##### Possible improvements
@ -105,7 +107,8 @@ Sample template for a new package review is provided below.
- [ ] source is fetched using the appropriate function
- [ ] the list of `phases` is not overridden
- [ ] when a phase (like `installPhase`) is overridden it starts with `runHook preInstall` and ends with `runHook postInstall`.
- [ ] patches that are remotely available are fetched with `fetchpatch`
- [ ] patches have a comment describing either the upstream URL or a reason why the patch wasn't upstreamed
- [ ] patches that are remotely available are fetched rather than vendored
##### Possible improvements

11
maintainers/maintainer-list.nix
View file

@ -5190,6 +5190,12 @@
fingerprint = "FC1D 3E4F CBCA 80DF E870 6397 C811 6E3A 0C1C A76A";
}];
};
exploitoverload = {
email = "nix@exploitoverload.com";
github = "exploitoverload";
githubId = 99678549;
name = "Asier Armenteros";
};
extends = {
email = "sharosari@gmail.com";
github = "ImExtends";
@ -10047,6 +10053,11 @@
githubId = 2914269;
name = "Malo Bourgon";
};
malt3 = {
github = "malt3";
githubId = 1780588;
name = "Malte Poll";
};
malte-v = {
email = "nixpkgs@mal.tc";
github = "malte-v";

11
maintainers/scripts/nix-generate-from-cpan.pl
View file

@ -6,6 +6,7 @@ use warnings;
use CPAN::Meta();
use CPANPLUS::Backend();
use MIME::Base64;
use Module::CoreList;
use Getopt::Long::Descriptive qw( describe_options );
use JSON::PP qw( encode_json );
@ -354,6 +355,11 @@ sub render_license {
return $license_line;
}
sub sha256_to_sri {
my ($sha256) = @_;
return "sha256-" . encode_base64(pack("H*", $sha256), '');
}
my ( $opt, $module_name ) = handle_opts();
Log::Log4perl->easy_init(
@ -380,8 +386,9 @@ INFO( "package: ", $module->package, " (", "$pkg_name-$pkg_version", ", ", $attr
INFO( "path: ", $module->path );
my $tar_path = $module->fetch();
my $sri_hash = sha256_to_sri($module->status->checksum_value);
INFO( "downloaded to: ", $tar_path );
INFO( "sha-256: ", $module->status->checksum_value );
INFO( "hash: ", $sri_hash );
my $pkg_path = $module->extract();
INFO( "unpacked to: ", $pkg_path );
@ -436,7 +443,7 @@ print <<EOF;
version = "$pkg_version";
src = fetchurl {
url = "mirror://cpan/${\$module->path}/${\$module->package}";
sha256 = "${\$module->status->checksum_value}";
hash = "$sri_hash";
};
EOF
print <<EOF if scalar @build_deps > 0;

27
pkgs/applications/gis/tunnelx/default.nix
View file

@ -19,34 +19,37 @@ stdenv.mkDerivation (finalAttrs: {
};
nativeBuildInputs = [
jdk
makeWrapper
];
buildInputs = [
jdk
];
runtimeInputs = [
survex
];
buildPhase = ''
runHook preBuild
javac -d . src/*.java
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin $out/java
cp -r symbols Tunnel tutorials $out/java
# `SURVEX_EXECUTABLE_DIR` must include trailing slash
makeWrapper ${jre}/bin/java $out/bin/tunnelx \
--add-flags "-cp $out/java Tunnel.MainBox" \
--set SURVEX_EXECUTABLE_DIR ${survex}/bin/ \
--set SURVEX_EXECUTABLE_DIR ${lib.getBin survex}/bin/ \
--set TUNNEL_USER_DIR $out/java/
runHook postInstall
'';
meta = with lib; {
meta = {
description = "A program for drawing cave surveys in 2D";
homepage = "https://github.com/CaveSurveying/tunnelx/";
license = licenses.gpl3;
maintainers = with maintainers; [ goatchurchprime ];
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ goatchurchprime ];
platforms = lib.platforms.linux;
};
})

7
pkgs/applications/graphics/f3d/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "f3d";
version = "2.0.0";
version = "2.1.0";
src = fetchFromGitHub {
owner = "f3d-app";
repo = "f3d";
rev = "v${version}";
hash = "sha256-od8Wu8+HyQb8qTA6C4kiw5hNI2WPBs/EMt321BJDZoc=";
rev = "refs/tags/v${version}";
hash = "sha256-2LDHIeKgLUS2ujJUx2ZerXmZYB9rrT3PYvrtzV4vcHM=";
};
nativeBuildInputs = [ cmake ];
@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Fast and minimalist 3D viewer using VTK";
homepage = "https://f3d-app.github.io/f3d";
changelog = "https://github.com/f3d-app/f3d/releases/tag/v${version}";
license = licenses.bsd3;
maintainers = with maintainers; [ bcdarwin ];
platforms = with platforms; unix;

6
pkgs/applications/misc/survex/default.nix
View file

@ -45,14 +45,16 @@ stdenv.mkDerivation rec {
buildInputs = [
ffmpeg
glib
libGLU
mesa
proj
wxGTK32
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
Carbon
Cocoa
] ++ lib.optionals stdenv.hostPlatform.isLinux [
# TODO: libGLU doesn't build for macOS because of Mesa issues
# (#233265); is it required for anything?
libGLU
mesa
libICE
libX11
];

4
pkgs/applications/office/portfolio/default.nix
View file

@ -27,11 +27,11 @@ let
in
stdenv.mkDerivation rec {
pname = "PortfolioPerformance";
version = "0.64.1";
version = "0.64.4";
src = fetchurl {
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
hash = "sha256-R3Cj24dZ2wD1c29zRLGnuJm3wfc9+n/sNNW316HT9N4=";
hash = "sha256-RjwZVJxPVbSlC0huGsreMdKDFV97bshoGA302u4N0Vk=";
};
nativeBuildInputs = [

4
pkgs/applications/radio/gnuradio/default.nix
View file

@ -46,13 +46,13 @@
, pname ? "gnuradio"
, versionAttr ? {
major = "3.10";
minor = "6";
minor = "7";
patch = "0";
}
}:
let
sourceSha256 = "sha256-WLxb9vJBlRfo9bKWEIsCI0Zb040XkLNjYw84j6ivOrk=";
sourceSha256 = "sha256-7fIQMcx90wI4mAZmR26/rkBKPKhNxgu3oWpJTV3C+Ek=";
featuresInfo = {
# Needed always
basic = {

2
pkgs/build-support/trivial-builders/default.nix
View file

@ -87,6 +87,8 @@ rec {
inherit buildCommand name;
passAsFile = [ "buildCommand" ]
++ (derivationArgs.passAsFile or []);
}
// lib.optionalAttrs (! derivationArgs?meta) {
pos = let args = builtins.attrNames derivationArgs; in
if builtins.length args > 0
then builtins.unsafeGetAttrPos (builtins.head args) derivationArgs

19
pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix
View file

@ -1,22 +1,27 @@
{ lib
, mkXfceDerivation
, glib
, gtk3
, libxfce4ui
, pcre
, libxfce4util
, pcre2
, xfce4-panel
}:
mkXfceDerivation {
category = "panel-plugins";
pname = "xfce4-verve-plugin";
version = "2.0.1";
rev-prefix = "";
sha256 = "sha256-YwUOSTZMoHsWWmi/ajQv/fX8a0IJoc3re3laVEmnX/M=";
version = "2.0.3";
sha256 = "sha256-K335cs1vWKTNQjZlSUuhK8OmgTsKSzN87IZwS4RtvB8=";
buildInputs = [ gtk3 libxfce4ui pcre libxfce4util xfce4-panel ];
hardeningDisable = [ "format" ];
buildInputs = [
glib
gtk3
libxfce4ui
libxfce4util
pcre2
xfce4-panel
];
meta = with lib; {
description = "A command-line plugin";

32
pkgs/development/libraries/libsolv/default.nix
View file

@ -1,18 +1,28 @@
{ lib, stdenv, fetchFromGitHub, cmake, ninja, pkg-config
, zlib, xz, bzip2, zchunk, zstd
{ lib
, stdenv
, fetchFromGitHub
, cmake
, ninja
, pkg-config
, zlib
, xz
, bzip2
, zchunk
, zstd
, expat
, withRpm ? !stdenv.isDarwin, rpm
, withRpm ? !stdenv.isDarwin
, rpm
, db
}:
stdenv.mkDerivation rec {
version = "0.7.24";
version = "0.7.24";
pname = "libsolv";
src = fetchFromGitHub {
owner = "openSUSE";
repo = "libsolv";
rev = version;
owner = "openSUSE";
repo = "libsolv";
rev = version;
sha256 = "sha256-UTVnGJO/9mQF9RwK75hh6IkoP1MwAlFaLCtdYU8uS34=";
};
@ -24,6 +34,7 @@ stdenv.mkDerivation rec {
"-DENABLE_ZCHUNK_COMPRESSION=true"
"-DWITH_SYSTEM_ZCHUNK=true"
] ++ lib.optionals withRpm [
"-DENABLE_COMPS=true"
"-DENABLE_PUBKEY=true"
"-DENABLE_RPMDB=true"
"-DENABLE_RPMDB_BYRPMHEADER=true"
@ -36,10 +47,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A free package dependency solver";
homepage = "https://github.com/openSUSE/libsolv";
license = licenses.bsd3;
platforms = platforms.linux ++ platforms.darwin;
homepage = "https://github.com/openSUSE/libsolv";
license = licenses.bsd3;
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ copumpkin ];
};
}

4
pkgs/development/libraries/lmdb/default.nix
View file

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "lmdb";
version = "0.9.30";
version = "0.9.31";
src = fetchFromGitLab {
domain = "git.openldap.org";
owner = "openldap";
repo = "openldap";
rev = "LMDB_${version}";
sha256 = "sha256-zLa9BtSPzujHAIZKDl69lTo72cI3m/GZejFw5v8bFsg=";
sha256 = "sha256-SBbo7MX3NST+OFPDtQshevIYrIsZD9bOkSsH91inMBw=";
};
postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb";

4
pkgs/development/libraries/mongoc/default.nix
View file

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "mongoc";
version = "1.24.1";
version = "1.24.2";
src = fetchFromGitHub {
owner = "mongodb";
repo = "mongo-c-driver";
rev = "refs/tags/${version}";
hash = "sha256-IVy2PxFM//AKffYfeLyCNjattnFZmqeg6WNTqXI/yMY=";
hash = "sha256-gey+/DAfAK69f5q568giLNL4R1UqGD6eiImkjyvnZys=";
};
postPatch = ''

80
pkgs/development/lisp-modules/packages.nix
View file

@ -207,18 +207,6 @@ let
lispLibs = super.mathkit.lispLibs ++ [ super.sb-cga ];
};
quri_7_0 = build-asdf-system {
inherit (super.quri) pname systems lispLibs;
version = "0.7.0";
src = pkgs.fetchFromGitHub {
owner = "fukamachi";
repo = "quri";
rev = "0.7.0";
sha256 = "sha256-/9p67rfbkdrx5nn4kXEUAM9MzV7NYUsRcKsrP/e2MlA=";
};
};
cl-colors2_0_5_4 = build-asdf-system {
inherit (super.cl-colors2) pname systems lispLibs;
version = "0.5.4";
@ -230,15 +218,15 @@ let
};
};
cl-webkit2_3_5_8 = build-asdf-system {
cl-webkit2_3_5_9 = build-asdf-system {
inherit (super.cl-webkit2) pname systems nativeLibs lispLibs;
version = "3.5.8";
version = "3.5.9";
src = pkgs.fetchFromGitHub {
owner = "joachifm";
repo = "cl-webkit";
rev = "3.5.8";
sha256 = "sha256-wZ/zRRJlTiOIny4BsU+wsFtxtS5YKx3WalwpCVQPFSY=";
rev = "3.5.9";
sha256 = "sha256-YJo5ahL6+HLeJrxFBuZZjuK3OfA6DnAu82vvXMsNBgI=";
};
};
@ -255,7 +243,7 @@ let
lispLibs = [
self.cl-containers
self.nclasses_0_5_0
self.nclasses
super.alexandria
super.calispel
super.closer-mop
@ -268,7 +256,7 @@ let
};
nasdf-unstable = build-asdf-system {
nasdf = build-asdf-system {
pname = "nasdf";
version = "20230524-git";
src = pkgs.fetchFromGitHub {
@ -279,7 +267,7 @@ let
};
};
njson_1_0_0 = build-asdf-system {
njson = build-asdf-system {
pname = "njson";
version = "1.0.0";
src = pkgs.fetchFromGitHub {
@ -288,11 +276,11 @@ let
rev = "1.0.0";
sha256 = "sha256-zeOxkoi5cPl1sw1oEOaMsKhhs3Pb8EzzKTjvuDNj/Ko=";
};
lispLibs = [ self.nasdf-unstable super.cl-json ];
lispLibs = [ self.nasdf super.cl-json ];
systems = [ "njson" "njson/cl-json" ];
};
nsymbols_0_3_1 = build-asdf-system {
nsymbols = build-asdf-system {
pname = "nsymbols";
version = "0.3.1";
src = pkgs.fetchFromGitHub {
@ -306,7 +294,7 @@ let
};
nclasses_0_5_0 = build-asdf-system {
nclasses = build-asdf-system {
pname = "nclasses";
version = "0.5.0";
src = pkgs.fetchFromGitHub {
@ -315,22 +303,22 @@ let
rev = "0.5.0";
sha256 = "sha256-UcavZ0fCA2hkVU/CqUZfyCqJ8gXKPpXTCP0WLUIF1Ss=";
};
lispLibs = [ self.nasdf-unstable super.moptilities ];
lispLibs = [ self.nasdf super.moptilities ];
};
nfiles_1_1_2 = build-asdf-system {
nfiles = build-asdf-system {
pname = "nfiles";
version = "1.1.2";
version = "20230705-git";
src = pkgs.fetchFromGitHub {
owner = "atlas-engineer";
repo = "nfiles";
rev = "1.1.2";
sha256 = "sha256-YsVcCFrJIFL9Z4wQNAv6chiz6wB/eB8v/EUMXPLs3fw=";
rev = "3626e8d512a84efc12479ceb3969d194511757f7";
sha256 = "sha256-MoJdbTOVfw2rJk4cf/rEnR55BxdXkoqqu9Txd/R9OYQ=";
};
lispLibs = [
self.nasdf-unstable
self.nclasses_0_5_0
self.quri_7_0
self.nasdf
self.nclasses
super.quri
super.alexandria
super.iolib
super.serapeum
@ -372,27 +360,17 @@ let
alexandria
cl-custom-hash-table
local-time
nasdf-unstable
nclasses_0_5_0
nasdf
nclasses
trivial-package-local-nicknames
];
};
nyxt-gtk = build-asdf-system {
pname = "nyxt";
version = "3.3.0";
version = "3.4.0";
lispLibs = (with super; [
self.nasdf-unstable
self.prompter
self.cl-colors2_0_5_4
self.njson_1_0_0
self.nsymbols_0_3_1
self.nclasses_0_5_0
self.nfiles_1_1_2
self.quri_7_0
self.cl-webkit2_3_5_8
self.swank
alexandria
bordeaux-threads
calispel
@ -406,7 +384,6 @@ let
cl-qrencode
cl-tld
closer-mop
cl-containers
dissect
moptilities
dexador
@ -440,17 +417,28 @@ let
cluffer
cl-cffi-gtk
cl-gobject-introspection
quri
]) ++ (with self; [
history-tree
nhooks
nkeymaps
nasdf
prompter
cl-colors2_0_5_4
njson
nsymbols
nclasses
nfiles
cl-webkit2_3_5_9
swank
cl-containers
]);
src = pkgs.fetchFromGitHub {
owner = "atlas-engineer";
repo = "nyxt";
rev = "3.3.0";
sha256 = "sha256-hSu+XGb87yzZPbJgcUhU81VGhNdMiN6GKspGQJU+SxY=";
rev = "3.4.0";
sha256 = "sha256-o+GAMHKi+9q+EGY6SEZrxKCEO4IxdOiB4oPpJPGYO0w=";
};
nativeBuildInputs = [ pkgs.makeWrapper ];

4
pkgs/development/python-modules/blocksat-cli/default.nix
View file

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "blocksat-cli";
version = "0.4.5";
version = "0.4.6";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-BLR1eivvlbSTx/jr7Rl778apPBcoFCaKOsYOqxS6Fo4=";
hash = "sha256-uANAMNoAC4HUoUuR5ldxoiy+LLzZVpKosU5JttXLnqg=";
};
propagatedBuildInputs = [

7
pkgs/development/python-modules/generic/default.nix
View file

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "generic";
version = "1.1.1";
version = "1.1.2";
disabled = pythonOlder "3.7";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-UHz2v6K5lNYb7cxBViTfPkpu2M8LItApGoSg3Bb2bqI=";
hash = "sha256-NfUvmkUIAdm+UZqmBWh0MZTViLJSkeRonPNSnVd+RbA=";
};
nativeBuildInputs = [
@ -32,6 +32,7 @@ buildPythonPackage rec {
description = "Generic programming (Multiple dispatch) library for Python";
maintainers = with maintainers; [ wolfangaukang ];
homepage = "https://github.com/gaphor/generic";
license = licenses.bsdOriginal;
changelog = "https://github.com/gaphor/generic/releases/tag/${version}";
license = licenses.bsd3;
};
}

39
pkgs/development/python-modules/hyperpyyaml/default.nix Normal file
View file

@ -0,0 +1,39 @@
{ buildPythonPackage
, fetchFromGitHub
, lib
, pytestCheckHook
, pyyaml
, ruamel-yaml
}:
buildPythonPackage rec {
pname = "hyperpyyaml";
version = "1.2.1";
format = "setuptools";
src = fetchFromGitHub {
owner = "speechbrain";
repo = "hyperpyyaml";
rev = "refs/tags/v${version}";
hash = "sha256-tC4kLJAY9MVgjWwU2Qu0rPCVDw7CjKVIciRZgYhnR9I=";
};
propagatedBuildInputs = [
pyyaml
ruamel-yaml
];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "hyperpyyaml" ];
meta = with lib; {
description = "Extensions to YAML syntax for better python interaction";
homepage = "https://github.com/speechbrain/HyperPyYAML";
changelog = "https://github.com/speechbrain/HyperPyYAML/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ GaetanLepage ];
};
}

4
pkgs/development/python-modules/oci/default.nix
View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "oci";
version = "2.105.0";
version = "2.106.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "oracle";
repo = "oci-python-sdk";
rev = "refs/tags/v${version}";
hash = "sha256-EiyvAVFEC/hVPTagV4CsyrMRyc89cEzG2NIS2nJg+NU=";
hash = "sha256-46+/uxCwAO9E1YBE337lsD3h2jkcBCYM7o3Vzh42tmI=";
};
pythonRelaxDeps = [

33
pkgs/development/python-modules/pypika/default.nix Normal file
View file

@ -0,0 +1,33 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, parameterized
, unittestCheckHook
}:
buildPythonPackage rec {
pname = "pypika";
version = "0.48.9";
format = "setuptools";
src = fetchFromGitHub {
owner = "kayak";
repo = "pypika";
rev = "v${version}";
hash = "sha256-9HKT1xRu23F5ptiKhIgIR8srLIcpDzpowBNuYOhqMU0=";
};
pythonImportsCheck = ["pypika"];
nativeCheckInputs = [
parameterized
unittestCheckHook
];
meta = with lib; {
description = "A python SQL query builder";
homepage = "https://github.com/kayak/pypika";
license = licenses.asl20;
maintainers = with maintainers; [ blaggacao ];
};
}

55
pkgs/development/python-modules/speechbrain/default.nix Normal file
View file

@ -0,0 +1,55 @@
{ buildPythonPackage
, fetchFromGitHub
, huggingface-hub
, hyperpyyaml
, joblib
, lib
, numpy
, packaging
, pythonOlder
, sentencepiece
, scipy
, torch
, torchaudio
, tqdm
}:
buildPythonPackage rec {
pname = "speechbrain";
version = "0.5.14";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "speechbrain";
repo = "speechbrain";
rev = "refs/tags/v${version}";
hash = "sha256-r1q7JO+H7ynfrzlihRTY0PtMGmvwm98BHUZV534ABXw=";
};
propagatedBuildInputs = [
huggingface-hub
hyperpyyaml
joblib
numpy
packaging
sentencepiece
scipy
torch
torchaudio
tqdm
];
doCheck = false; # requires sox backend
pythonImportsCheck = [ "speechbrain" ];
meta = with lib; {
description = "A PyTorch-based Speech Toolkit";
homepage = "https://speechbrain.github.io";
changelog = "https://github.com/speechbrain/speechbrain/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ GaetanLepage ];
};
}

3
pkgs/development/python-modules/tensorboard/default.nix
View file

@ -2,7 +2,6 @@
, fetchPypi
, buildPythonPackage
, pythonOlder
, pythonAtLeast
, pythonRelaxDepsHook
, numpy
, wheel
@ -26,7 +25,7 @@ buildPythonPackage rec {
pname = "tensorboard";
version = "2.11.0";
format = "wheel";
disabled = pythonOlder "3.6" || pythonAtLeast "3.11";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version format;

4
pkgs/development/python-modules/tern/default.nix
View file

@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "tern";
version = "2.12.0";
version = "2.12.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-XvhKe7mf09Nr3sbpMOKOO63HQ+9thgluU02iEIdWSpg=";
hash = "sha256-yMIvFiliEHrbZMqvX3ZAROWcqii5VmB54QEYHGRJocA=";
};
preBuild = ''

9
pkgs/development/python-modules/vdirsyncer/default.nix
View file

@ -24,14 +24,14 @@
buildPythonPackage rec {
pname = "vdirsyncer";
version = "0.19.1";
version = "0.19.2";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-qnbHclqlpxH2N0vFzYO+eKrmjHSCljWp7Qc81MCfA64=";
hash = "sha256-/QWM7quCk0WaBGbNmw5Ks7OUYsbgiaDwrDfDB0INgro=";
};
postPatch = ''
@ -72,9 +72,10 @@ buildPythonPackage rec {
passthru.tests.version = testers.testVersion { package = vdirsyncer; };
meta = with lib; {
homepage = "https://github.com/pimutils/vdirsyncer";
description = "Synchronize calendars and contacts";
license = licenses.mit;
homepage = "https://github.com/pimutils/vdirsyncer";
changelog = "https://github.com/pimutils/vdirsyncer/blob/v${version}/CHANGELOG.rst";
license = licenses.bsd3;
maintainers = with maintainers; [ loewenheim ];
};
}

4
pkgs/development/tools/buildkit/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "buildkit";
version = "0.11.6";
version = "0.12.0";
src = fetchFromGitHub {
owner = "moby";
repo = "buildkit";
rev = "v${version}";
hash = "sha256-K0PHnrJwDI4myb7/7zyEsqtL1qQYy3ue+r+9EqTB1Oo=";
hash = "sha256-sV5X3+evRDS6Ryi0UKLlPlzmzRE0NXERoVlQ8S5o/4I=";
};
vendorHash = null;

4
pkgs/development/tools/misc/phpunit/default.nix
View file

@ -2,14 +2,14 @@
let
pname = "phpunit";
version = "10.2.2";
version = "10.2.3";
in
stdenv.mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://phar.phpunit.de/phpunit-${version}.phar";
hash = "sha256-UAxqywIMrP42Nul0GV6mkKkXtnS7ah9rl4y1ykpJsxM=";
hash = "sha256-lSNrFsLF5t3vduIUGjlD6L6Ii5R5CU/ViXuSe2dV4X8=";
};
dontUnpack = true;

46
pkgs/development/web/boa/default.nix Normal file
View file

@ -0,0 +1,46 @@
{ lib
, rustPlatform
, fetchFromGitHub
, pkg-config
, bzip2
, openssl
, zstd
, stdenv
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "boa";
version = "0.17";
src = fetchFromGitHub {
owner = "boa-dev";
repo = "boa";
rev = "v${version}";
hash = "sha256-3Iv7Ko6ukbmec4yDKayxW0T6+3ZNbUT4wWwEarBy4Zs=";
fetchSubmodules = true;
};
cargoHash = "sha256-2ZzTvVoA4oxy26rL0tvdvXm2oVWpHP+gooyjB4vIP3M=";
cargoBuildFlags = [ "--package" "boa_cli" ];
nativeBuildInputs = [ pkg-config ];
buildInputs =
[ bzip2 openssl zstd ]
++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreFoundation
darwin.apple_sdk.frameworks.Security
];
env = { ZSTD_SYS_USE_PKG_CONFIG = true; };
meta = with lib; {
description = "An embeddable and experimental Javascript engine written in Rust";
homepage = "https://github.com/boa-dev/boa";
changelog = "https://github.com/boa-dev/boa/blob/${src.rev}/CHANGELOG.md";
license = with licenses; [ mit /* or */ unlicense ];
maintainers = with maintainers; [ dit7ya ];
};
}

19
pkgs/games/srb2/cmake.patch Normal file
View file

@ -0,0 +1,19 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 915912af5..f5c2cf9cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,11 +91,6 @@ if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL Windows)
endif()
endif()
else()
- CPMAddPackage(
- NAME Ccache.cmake
- GITHUB_REPOSITORY TheLartians/Ccache.cmake
- VERSION 1.2
- )
endif()
# Dependencies
--
2.40.1

92
pkgs/games/srb2/default.nix
View file

@ -2,7 +2,6 @@
, stdenv
, fetchurl
, fetchFromGitHub
, substituteAll
, cmake
, curl
, nasm
@ -13,37 +12,29 @@
, SDL2
, SDL2_mixer
, zlib
, unzip
, makeWrapper
, makeDesktopItem
, copyDesktopItems
}:
let
assets_version = "2.2.5";
assets = fetchurl {
url = "https://github.com/mazmazz/SRB2/releases/download/SRB2_assets_220/srb2-${assets_version}-assets.7z";
sha256 = "1m9xf3vraq9nipsi09cyvvfa4i37gzfxg970rnqfswd86z9v6v00";
};
assets_optional = fetchurl {
url = "https://github.com/mazmazz/SRB2/releases/download/SRB2_assets_220/srb2-${assets_version}-optional-assets.7z";
sha256 = "1j29jrd0r1k2bb11wyyl6yv9b90s2i6jhrslnh77qkrhrwnwcdz4";
};
in stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "srb2";
version = "2.2.10";
version = "2.2.11";
src = fetchFromGitHub {
owner = "STJr";
repo = "SRB2";
rev = "SRB2_release_${version}";
sha256 = "03388n094d2yr5si6ngnggbqhm8b2l0s0qvfnkz49li9bd6a81gg";
rev = "SRB2_release_${finalAttrs.version}";
hash = "sha256-tyiXivJWjNnL+4YynUV6k6iaMs8o9HkHrp+qFj2+qvQ=";
};
nativeBuildInputs = [
cmake
nasm
p7zip
makeWrapper
copyDesktopItems
];
buildInputs = [
@ -56,31 +47,62 @@ in stdenv.mkDerivation rec {
zlib
];
assets = stdenv.mkDerivation {
pname = "srb2-data";
version = finalAttrs.version;
nativeBuildInputs = [
unzip
];
src = fetchurl {
url = "https://github.com/STJr/SRB2/releases/download/SRB2_release_${finalAttrs.version}/SRB2-v${lib.replaceStrings ["."] [""] finalAttrs.version}-Full.zip";
hash = "sha256-KsJIkCczD/HyIwEy5dI3zsHbWFCMBaCoCHizfupFoWM=";
};
sourceRoot = ".";
installPhase = ''
mkdir -p $out/share/srb2
cp -r *pk3 *dta *dat models/ $out/share/srb2/
'';
};
cmakeFlags = [
"-DSRB2_ASSET_DIRECTORY=/build/source/assets"
"-DSRB2_ASSET_DIRECTORY=${finalAttrs.assets}/share/srb2"
"-DGME_INCLUDE_DIR=${game-music-emu}/include"
"-DOPENMPT_INCLUDE_DIR=${libopenmpt.dev}/include"
"-DSDL2_MIXER_INCLUDE_DIR=${lib.getDev SDL2_mixer}/include/SDL2"
"-DSDL2_INCLUDE_DIR=${lib.getDev SDL2}/include/SDL2"
"-DSDL2_INCLUDE_DIR=${lib.getDev SDL2.dev}/include/SDL2"
];
patches = [
./wadlocation.patch
# Fix unknown command "CPMAddPackage" by not using Ccache.cmake
./cmake.patch
];
postPatch = ''
substituteInPlace src/sdl/i_system.c \
--replace '@wadlocation@' $out
'';
desktopItems = [
(makeDesktopItem rec {
name = "Sonic Robo Blast 2";
exec = finalAttrs.pname;
icon = finalAttrs.pname;
comment = finalAttrs.meta.description;
desktopName = name;
genericName = name;
categories = [ "Game" ];
})
];
preConfigure = ''
7z x ${assets} -o"/build/source/assets" -aos
7z x ${assets_optional} -o"/build/source/assets" -aos
'';
installPhase = ''
mkdir -p $out/bin $out/share/applications $out/share/pixmaps $out/share/icons
postInstall = ''
mkdir $out/bin
mv $out/lsdlsrb2-${version} $out/bin/srb2
copyDesktopItems
cp ../srb2.png $out/share/pixmaps/.
cp ../srb2.png $out/share/icons/.
cp bin/lsdlsrb2 $out/bin/srb2
wrapProgram $out/bin/srb2 --set SRB2WADDIR "${finalAttrs.assets}/share/srb2"
'';
meta = with lib; {
@ -88,6 +110,6 @@ in stdenv.mkDerivation rec {
homepage = "https://www.srb2.org/";
platforms = platforms.linux;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ zeratax ];
maintainers = with maintainers; [ zeratax donovanglover ];
};
}
})

72
pkgs/games/srb2/wadlocation.patch
View file

@ -1,72 +0,0 @@
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index 10c0747bf..861f00728 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -145,13 +145,7 @@ int TimeFunction(int requested_frequency);
// Locations for searching the srb2.pk3
#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
-#define DEFAULTWADLOCATION1 "/usr/local/share/games/SRB2"
-#define DEFAULTWADLOCATION2 "/usr/local/games/SRB2"
-#define DEFAULTWADLOCATION3 "/usr/share/games/SRB2"
-#define DEFAULTWADLOCATION4 "/usr/games/SRB2"
-#define DEFAULTSEARCHPATH1 "/usr/local/games"
-#define DEFAULTSEARCHPATH2 "/usr/games"
-#define DEFAULTSEARCHPATH3 "/usr/local"
+#define DEFAULTWADLOCATION1 "@wadlocation@"
#elif defined (_WIN32)
#define DEFAULTWADLOCATION1 "c:\\games\\srb2"
#define DEFAULTWADLOCATION2 "\\games\\srb2"
@@ -2812,34 +2806,6 @@ static const char *locateWad(void)
if (((envstr = I_GetEnv("SRB2WADDIR")) != NULL) && isWadPathOk(envstr))
return envstr;
-#ifndef NOCWD
- I_OutputMsg(",.");
- // examine current dir
- strcpy(returnWadPath, ".");
- if (isWadPathOk(returnWadPath))
- return NULL;
-#endif
-
-
-#ifdef CMAKECONFIG
-#ifndef NDEBUG
- I_OutputMsg(","CMAKE_ASSETS_DIR);
- strcpy(returnWadPath, CMAKE_ASSETS_DIR);
- if (isWadPathOk(returnWadPath))
- {
- return returnWadPath;
- }
-#endif
-#endif
-
-#ifdef __APPLE__
- OSX_GetResourcesPath(returnWadPath);
- I_OutputMsg(",%s", returnWadPath);
- if (isWadPathOk(returnWadPath))
- {
- return returnWadPath;
- }
-#endif
// examine default dirs
#ifdef DEFAULTWADLOCATION1
@@ -2884,16 +2850,7 @@ static const char *locateWad(void)
if (isWadPathOk(returnWadPath))
return returnWadPath;
#endif
-#ifndef NOHOME
- // find in $HOME
- I_OutputMsg(",HOME");
- if ((envstr = I_GetEnv("HOME")) != NULL)
- {
- WadPath = searchWad(envstr);
- if (WadPath)
- return WadPath;
- }
-#endif
+
#ifdef DEFAULTSEARCHPATH1
// find in /usr/local
I_OutputMsg(", in:"DEFAULTSEARCHPATH1);

6
pkgs/misc/tmux-plugins/default.nix
View file

@ -92,12 +92,12 @@ in rec {
catppuccin = mkTmuxPlugin {
pluginName = "catppuccin";
version = "unstable-2023-04-03";
version = "unstable-2023-07-15";
src = fetchFromGitHub {
owner = "catppuccin";
repo = "tmux";
rev = "4e48b09a76829edc7b55fbb15467cf0411f07931";
sha256 = "sha256-bXEsxt4ozl3cAzV3ZyvbPsnmy0RAdpLxHwN82gvjLdU=";
rev = "e7b50832f9bc59b0b5ef5316ba2cd6f61e4e22fc";
hash = "sha256-9ZfUqEKEexSh06QyR5C+tYd4tNfBi3PsA+STzUv4+/s=";
};
postInstall = ''
sed -i -e 's|''${PLUGIN_DIR}/catppuccin-selected-theme.tmuxtheme|''${TMUX_TMPDIR}/catppuccin-selected-theme.tmuxtheme|g' $target/catppuccin.tmux

10
pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
View file

@ -20,7 +20,13 @@
extraMeta = {
branch = "master";
broken = stdenv.isAarch64;
maintainers = with lib.maintainers; [ davidak Madouura pedrohlc ];
maintainers = with lib.maintainers; [ davidak Madouura pedrohlc raitobezarius ];
};
structuredExtraConfig = with lib.kernel; {
BCACHEFS_FS = module;
BCACHEFS_QUOTA = option yes;
BCACHEFS_POSIX_ACL = option yes;
};
kernelPatches = [ {
@ -31,7 +37,5 @@
url = "https://evilpiepirate.org/git/bcachefs.git/rawdiff/?id=${currentCommit}&id2=v${lib.versions.majorMinor kernel.version}";
sha256 = diffHash;
};
extraConfig = "BCACHEFS_FS m";
} ] ++ kernelPatches;
}))

10
pkgs/servers/dendrite/default.nix
View file

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub
{ lib, buildGoModule, fetchFromGitHub, fetchpatch
, nixosTests, postgresql, postgresqlTestHook }:
buildGoModule rec {
@ -12,6 +12,14 @@ buildGoModule rec {
hash = "sha256-2DqEfTXD3W6MxfBb6aHaKH+zpxLc2tHaGuWGQuncySo=";
};
patches = [
# Fix SQLite db lockup
(fetchpatch {
url = "https://github.com/matrix-org/dendrite/commit/c08c7405dbe9d88c1364f6f1f2466db5045506cc.patch";
hash = "sha256-gTF9jK5Ihfe1v49gPCK68BLeiUZa2Syo+7D9r62iEXQ=";
})
];
vendorHash = "sha256-dc0zpKh7J+fi2b5GD/0BQ120UXbBvJLUF74RmYMSOMw=";
subPackages = [

6
pkgs/servers/mautrix-whatsapp/default.nix
View file

@ -2,18 +2,18 @@
buildGoModule rec {
pname = "mautrix-whatsapp";
version = "0.8.6";
version = "0.9.0";
src = fetchFromGitHub {
owner = "mautrix";
repo = "whatsapp";
rev = "v${version}";
hash = "sha256-+uMpAsIadkdUrKkAr6ejOc1NfRIISA2R0AOjIXGXVpY=";
hash = "sha256-9o8AjZclSVzpAIqnW28/iaP10pA5cg7eC1q/kbMI3jI=";
};
buildInputs = [ olm ];
vendorSha256 = "sha256-emUCf6ZKFjBDr5WEKzYfbBNR44FDbjedmCgHfkjHQtw=";
vendorSha256 = "sha256-Gnr3+653gy3C8G0NSYsjsQFkfDPs013pyl/ARD5yweM=";
doCheck = false;

32
pkgs/tools/admin/fastlane/Gemfile.lock
View file

@ -8,20 +8,20 @@ GEM
artifactory (3.0.15)
atomos (0.1.3)
aws-eventstream (1.2.0)
aws-partitions (1.769.0)
aws-sdk-core (3.173.1)
aws-partitions (1.786.0)
aws-sdk-core (3.178.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.5)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.64.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sdk-kms (1.71.0)
aws-sdk-core (~> 3, >= 3.177.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.122.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sdk-s3 (1.130.0)
aws-sdk-core (~> 3, >= 3.177.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
aws-sigv4 (1.5.2)
aws-sigv4 (~> 1.6)
aws-sigv4 (1.6.0)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
claide (1.1.0)
@ -30,13 +30,13 @@ GEM
commander (4.6.0)
highline (~> 2.0.0)
declarative (0.0.20)
digest-crc (0.6.4)
digest-crc (0.6.5)
rake (>= 12.0.0, < 14.0.0)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.8.1)
emoji_regex (3.2.3)
excon (0.99.0)
excon (0.100.0)
faraday (1.10.3)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
@ -66,7 +66,7 @@ GEM
faraday_middleware (1.2.0)
faraday (~> 1.0)
fastimage (2.2.7)
fastlane (2.213.0)
fastlane (2.214.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
@ -106,7 +106,7 @@ GEM
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
gh_inspector (1.1.3)
google-apis-androidpublisher_v3 (0.42.0)
google-apis-androidpublisher_v3 (0.45.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-core (0.11.0)
addressable (~> 2.5, >= 2.5.1)
@ -137,7 +137,7 @@ GEM
google-cloud-core (~> 1.6)
googleauth (>= 0.16.2, < 2.a)
mini_mime (~> 1.0)
googleauth (1.5.2)
googleauth (1.6.0)
faraday (>= 0.17.3, < 3.a)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
@ -150,7 +150,7 @@ GEM
httpclient (2.8.3)
jmespath (1.6.2)
json (2.6.3)
jwt (2.7.0)
jwt (2.7.1)
memoist (0.16.2)
mini_magick (4.12.0)
mini_mime (1.1.2)
@ -161,7 +161,7 @@ GEM
optparse (0.1.1)
os (1.1.4)
plist (3.7.0)
public_suffix (5.0.1)
public_suffix (5.0.3)
rake (13.0.6)
representable (3.2.0)
declarative (< 0.1.0)
@ -215,4 +215,4 @@ DEPENDENCIES
fastlane
BUNDLED WITH
2.4.13
2.4.14

48
pkgs/tools/admin/fastlane/gemset.nix
View file

@ -45,10 +45,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05qrwx39gqwsivs60yrym3md4pis1imvqcl6n5mvbwn72x2i1zdn";
sha256 = "1iiwrygwrjw81dflnxy808iay5x6kja3kcm5325h2gmmk2l221hm";
type = "gem";
};
version = "1.769.0";
version = "1.786.0";
};
aws-sdk-core = {
dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
@ -56,10 +56,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xnrn7mixwna9cszlsmps7675kqrs9vv17bsx6ywps5wjp7wyak9";
sha256 = "1jv5h7n0vkyjq0v3xqad5xhrl4ijnh214zq3xg4ghvsk6ah8a90r";
type = "gem";
};
version = "3.173.1";
version = "3.178.0";
};
aws-sdk-kms = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
@ -67,10 +67,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1bcm0c9f7xy5qj5f0z3gddqslhb2vzrj9smc39pgqyq4jmn5kpj0";
sha256 = "1zr5w2cjd895abyn7y5gifhq37bxcinssvdx2l1qmlkllbdxbwq0";
type = "gem";
};
version = "1.64.0";
version = "1.71.0";
};
aws-sdk-s3 = {
dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
@ -78,10 +78,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01cryf8kfkmlsxb327szcwcagsp7lss5gmk6zxlgap65lv8bc7rx";
sha256 = "0an76swqnm99r5g6xxsfys6188lsf49fqbys38pwdp0mvqg3kb40";
type = "gem";
};
version = "1.122.0";
version = "1.130.0";
};
aws-sigv4 = {
dependencies = ["aws-eventstream"];
@ -89,10 +89,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "11hkna2av47bl0yprgp8k4ya70rc3m2ib5w10fn0piplgkkmhz7m";
sha256 = "0z889c4c1w7wsjm3szg64ay5j51kjl4pdf94nlr1yks2rlanm7na";
type = "gem";
};
version = "1.5.2";
version = "1.6.0";
};
babosa = {
groups = ["default"];
@ -172,10 +172,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1czaak53w8n13y1fr0q23gp0fhklvxjac5n562qj3xk6sh5ad0x2";
sha256 = "09114ndpnnyamc2q07bmpzw7kp3rbbfv7plmxcbzzi9d6prmd92w";
type = "gem";
};
version = "0.6.4";
version = "0.6.5";
};
domain_name = {
dependencies = ["unf"];
@ -213,10 +213,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0j826kfvzn7nc5pv950n270r0sx1702k988ad11cdlav3dcxxw09";
sha256 = "08r6qgbpkxxsihjmlspk3l1sr69q5hx35p1l4wp7rmkbzys89867";
type = "gem";
};
version = "0.99.0";
version = "0.100.0";
};
faraday = {
dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"];
@ -368,10 +368,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01h45x1lzxbyb9qj20v6xmm6dgv5bglxw6glbdlcgdz1l984ql75";
sha256 = "159ak2wixfp7rfjpvgqdjlixc83y294fd0klmnc3h881p2ajfk0f";
type = "gem";
};
version = "2.213.0";
version = "2.214.0";
};
gh_inspector = {
groups = ["default"];
@ -389,10 +389,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ks2ak4fcvlflhyinykvd88g2ybxwsbc347aww349zhn1mqprbvg";
sha256 = "1hyn54bninb9vz8adp4j2qhsykl1m1m8kwrgspyaig4197ngi9v0";
type = "gem";
};
version = "0.42.0";
version = "0.45.0";
};
google-apis-core = {
dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "webrick"];
@ -487,10 +487,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1lj5haarpn7rybbq9s031zcn9ji3rlz5bk64bwa2j34q5s1h5gis";
sha256 = "0931zj8wsh8v4qppaspfs5fqlvarsx5bsm5ldbncvgn0sg3dir8d";
type = "gem";
};
version = "1.5.2";
version = "1.6.0";
};
highline = {
groups = ["default"];
@ -548,10 +548,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09yj3z5snhaawh2z1w45yyihzmh57m6m7dp8ra8gxavhj5kbiq5p";
sha256 = "16z11alz13vfc4zs5l3fk6n51n2jw9lskvc4h4prnww0y797qd87";
type = "gem";
};
version = "2.7.0";
version = "2.7.1";
};
memoist = {
groups = ["default"];
@ -658,10 +658,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35";
sha256 = "0n9j7mczl15r3kwqrah09cxj8hxdfawiqxa60kga2bmxl9flfz9k";
type = "gem";
};
version = "5.0.1";
version = "5.0.3";
};
rake = {
groups = ["default"];

2023
pkgs/tools/backup/conserve/Cargo.lock generated Normal file
View file

File diff suppressed because it is too large Load diff

30
pkgs/tools/backup/conserve/default.nix Normal file
View file

@ -0,0 +1,30 @@
{ lib
, rustPlatform
, fetchFromGitHub
}:
rustPlatform.buildRustPackage rec {
pname = "conserve";
version = "23.5.0";
src = fetchFromGitHub {
owner = "sourcefrog";
repo = "conserve";
rev = "v${version}";
hash = "sha256-OzSTueaw2kWc2e45zckXS2O4bfykREOcz8/PpUIK09w=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"nutmeg-0.1.3-pre" = "sha256-WcbQf8DZ9ryY+TWcVObdHj005GvfeMG+wesr6FiCUCE=";
};
};
meta = with lib; {
description = "Robust portable backup tool in Rust";
homepage = "https://github.com/sourcefrog/conserve";
license = licenses.gpl2Only;
maintainers = with maintainers; [ happysalada ];
};
}

5
pkgs/tools/networking/inadyn/default.nix
View file

@ -16,6 +16,11 @@ stdenv.mkDerivation rec {
buildInputs = [ gnutls libite libconfuse ];
configureFlags = [
"--sysconfdir=/etc"
"--localstatedir=/var"
];
enableParallelBuilding = true;
meta = with lib; {

94
pkgs/tools/package-management/dnf5/default.nix Normal file
View file

@ -0,0 +1,94 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, createrepo_c
, gettext
, help2man
, pkg-config
, cppunit
, fmt
, glib
, json_c
, libmodulemd
, libpeas
, librepo
, libsmartcols
, libsolv
, libxml2
, rpm
, sdbus-cpp
, sqlite
, systemd
, toml11
, zchunk
}:
stdenv.mkDerivation (finalAttrs: {
pname = "dnf5";
version = "5.0.15";
src = fetchFromGitHub {
owner = "rpm-software-management";
repo = "dnf5";
rev = finalAttrs.version;
hash = "sha256-0MR9CJDFL1vbuO7FZyyn3PNb0p27oaho6I2eminTyYU=";
};
nativeBuildInputs = [ cmake createrepo_c gettext help2man pkg-config ];
buildInputs = [
cppunit
fmt
glib
json_c
libmodulemd
libpeas
librepo
libsmartcols
libsolv
libxml2
rpm
sdbus-cpp
sqlite
systemd
toml11
zchunk
];
# workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105329
NIX_CFLAGS_COMPILE = "-Wno-restrict -Wno-maybe-uninitialized";
cmakeFlags = [
"-DWITH_PERL5=OFF"
"-DWITH_PYTHON3=OFF"
"-DWITH_RUBY=OFF"
"-DWITH_TESTS=OFF"
# TODO: fix man installation paths
"-DWITH_MAN=OFF"
# the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly
# (setting it to an absolute path causes include files to go to $out/$out/include,
# because the absolute path is interpreted with root at $out).
"-DCMAKE_INSTALL_INCLUDEDIR=include"
"-DCMAKE_INSTALL_LIBDIR=lib"
];
prePatch = ''
substituteInPlace dnf5daemon-server/dbus/CMakeLists.txt \
--replace '/etc' "$out/etc" \
--replace '/usr' "$out"
substituteInPlace dnf5daemon-server/polkit/CMakeLists.txt \
--replace '/usr' "$out"
substituteInPlace dnf5/CMakeLists.txt \
--replace '/etc/bash_completion.d' "$out/etc/bash_completion.d"
'';
dontFixCmake = true;
meta = with lib; {
description = "Next-generation RPM package management system";
homepage = "https://github.com/rpm-software-management/dnf5";
license = licenses.gpl2Plus;
maintainers = with lib.maintainers; [ malt3 ];
platforms = platforms.linux ++ platforms.darwin;
};
})

31
pkgs/tools/security/bloodhound-py/default.nix Normal file
View file

@ -0,0 +1,31 @@
{ lib
, fetchPypi
, python3
}:
python3.pkgs.buildPythonApplication rec {
pname = "bloodhound-py";
version = "1.6.1";
src = fetchPypi {
inherit version;
pname = "bloodhound";
hash = "sha256-SRP74I5euKJErnSkm6OSdAwznv/ZQeEtNG4XofnIEec=";
};
propagatedBuildInputs = with python3.pkgs; [
impacket
ldap3
dnspython
];
# the package has no tests
doCheck = false;
meta = with lib; {
description = "Ingestor for BloodHound";
homepage = "https://github.com/fox-it/BloodHound.py";
license = licenses.mit;
maintainers = with maintainers; [ exploitoverload ];
};
}

6
pkgs/tools/system/nvitop/default.nix
View file

@ -1,19 +1,17 @@
{ lib
, stdenv
, python3Packages
, fetchFromGitHub
, makeWrapper
}:
python3Packages.buildPythonApplication rec {
pname = "nvitop";
version = "1.0.0";
version = "1.1.2";
src = fetchFromGitHub {
owner = "XuehaiPan";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-GcwPFPE9opGMvdeIUg0Pj6qkk0qPU8MNnFTq9qIxFFs=";
hash = "sha256-+Yq/UHjrR2nT+TLXEDbNP2yMy4+LZGgbMrDLmWcrxqg=";
};
propagatedBuildInputs = with python3Packages; [

31
pkgs/tools/typesetting/typst-fmt/default.nix
View file

@ -1,31 +0,0 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "typst-fmt";
version = "unstable-2023-04-26";
src = fetchFromGitHub {
owner = "astrale-sharp";
repo = pname;
rev = "cb299645244551bfc91dc4579a2543a0d4cc84b0";
hash = "sha256-/+m3HkOsBiOAhOqBfv+hPauvDKqfCrwOWGDtYfW5zJQ=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"typst-0.2.0" = "sha256-6Uezm3E/qGl9303auqjvfWe3KKsqwsHeXUrjWemjJKU=";
};
};
checkFlags = [
# test_eof is ignored upstream
"--skip=rules::tests_typst_format::test_eof"
];
meta = with lib; {
description = "A formatter for the Typst language";
homepage = "https://github.com/astrale-sharp/typst-fmt";
license = licenses.mit;
maintainers = with maintainers; [ geri1701 ];
};
}

934
pkgs/tools/typesetting/typst-fmt/Cargo.lock → pkgs/tools/typesetting/typstfmt/Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

28
pkgs/tools/typesetting/typstfmt/default.nix Normal file
View file

@ -0,0 +1,28 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage {
pname = "typstfmt";
version = "unstable-2023-07-15";
src = fetchFromGitHub {
owner = "astrale-sharp";
repo = "typstfmt";
rev = "dd7715ee4bcb8637e207c21222f3168cfc384e9e";
hash = "sha256-m5PN19JxMRKRVHzoxl5n6osz3bZlBNO1hxgfQMxJuok=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"svg2pdf-0.5.0" = "sha256-yBQpvDAnJ7C0PWIM/o0PzOg9JlDZCEiVdCTDDPSwrmE=";
"typst-0.6.0" = "sha256-igNAs3946Mq8GjOSrDnmcIxjrVMPbYGC86EUHIDAugM=";
};
};
meta = with lib; {
description = "A formatter for the Typst language";
homepage = "https://github.com/astrale-sharp/typstfmt";
license = licenses.mit;
maintainers = with maintainers; [ figsoda geri1701 ];
};
}

1
pkgs/top-level/aliases.nix
View file

@ -1729,6 +1729,7 @@ mapAliases ({
twister = throw "twister has been removed: abandoned by upstream and python2-only"; # Added 2022-04-26
tychus = throw "tychus has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03
typora = throw "Newer versions of typora use anti-user encryption and refuse to start. As such it has been removed"; # Added 2021-09-11
typst-fmt = typstfmt; # Added 2023-07-15
### U ###

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

@ -350,6 +350,8 @@ with pkgs;
blst = callPackage ../development/libraries/blst { };
bloodhound-py = callPackage ../tools/security/bloodhound-py { };
bodyclose = callPackage ../development/tools/bodyclose { };
bootstrap-studio = callPackage ../development/web/bootstrap-studio { };
@ -495,6 +497,8 @@ with pkgs;
compdb = callPackage ../tools/misc/compdb { };
conserve = callPackage ../tools/backup/conserve { };
conserver = callPackage ../tools/misc/conserver { };
containerlab = callPackage ../tools/networking/containerlab { };
@ -553,6 +557,8 @@ with pkgs;
dec-decode = callPackage ../development/tools/dec-decode { };
dnf5 = callPackage ../tools/package-management/dnf5 { };
dsq = callPackage ../tools/misc/dsq { };
dtv-scan-tables = callPackage ../data/misc/dtv-scan-tables { };
@ -6749,6 +6755,8 @@ with pkgs;
bluetooth_battery = python3Packages.callPackage ../applications/misc/bluetooth_battery { };
boa = callPackage ../development/web/boa { };
bombardier = callPackage ../tools/networking/bombardier { };
caeml = callPackage ../applications/networking/mailreaders/caeml { };
@ -13685,7 +13693,7 @@ with pkgs;
typst = callPackage ../tools/typesetting/typst { };
typst-fmt = callPackage ../tools/typesetting/typst-fmt { };
typstfmt = callPackage ../tools/typesetting/typstfmt { };
typst-live = callPackage ../tools/typesetting/typst-live { };

73
pkgs/top-level/perl-packages.nix
View file

@ -3541,6 +3541,22 @@ with self; {
};
};
ClassRefresh = buildPerlPackage {
pname = "Class-Refresh";
version = "0.07";
src = fetchurl {
url = "mirror://cpan/authors/id/D/DO/DOY/Class-Refresh-0.07.tar.gz";
hash = "sha256-47ADU1XLs1oq7j8iNojVeJRqenxXCs05iyjN2x/UvrM=";
};
buildInputs = [ TestFatal TestRequires ];
propagatedBuildInputs = [ ClassLoad ClassUnload DevelOverrideGlobalRequire TryTiny ];
meta = {
homepage = "http://metacpan.org/release/Class-Refresh";
description = "Refresh your classes during runtime";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
ClassReturnValue = buildPerlPackage {
pname = "Class-ReturnValue";
version = "0.55";
@ -3885,6 +3901,22 @@ with self; {
};
};
CompilerLexer = buildPerlModule {
pname = "Compiler-Lexer";
version = "0.23";
src = fetchurl {
url = "mirror://cpan/authors/id/G/GO/GOCCY/Compiler-Lexer-0.23.tar.gz";
hash = "sha256-YDHOSv67+k9JKidJSb57gjIxTpECOCjEOOR5gf8Kmds=";
};
nativeBuildInputs = [ pkgs.ld-is-cc-hook ];
buildInputs = [ ModuleBuildXSUtil ];
meta = {
homepage = "https://github.com/goccy/p5-Compiler-Lexer";
description = "Lexical Analyzer for Perl5";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
CompressBzip2 = buildPerlPackage {
pname = "Compress-Bzip2";
version = "2.28";
@ -7401,6 +7433,20 @@ with self; {
};
};
DevelOverrideGlobalRequire = buildPerlPackage {
pname = "Devel-OverrideGlobalRequire";
version = "0.001";
src = fetchurl {
url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Devel-OverrideGlobalRequire-0.001.tar.gz";
hash = "sha256-B5GJLeOuKSr0qU44LyHbHuiCEIdQMYUebqgsNBB4Xvk=";
};
meta = {
homepage = "https://metacpan.org/release/Devel-OverrideGlobalRequire";
description = "Override CORE::GLOBAL::require safely";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
DevelPartialDump = buildPerlPackage {
pname = "Devel-PartialDump";
version = "0.20";
@ -10944,6 +10990,19 @@ with self; {
};
};
HashSafeKeys = buildPerlPackage {
pname = "Hash-SafeKeys";
version = "0.04";
src = fetchurl {
url = "mirror://cpan/authors/id/M/MO/MOB/Hash-SafeKeys-0.04.tar.gz";
hash = "sha256-pSStO/naZ3wfi+bhWXG3ZXVAj3RJI9onZHro8dPDfMw=";
};
meta = {
description = "Get hash contents without resetting each iterator";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
HashSharedMem = buildPerlModule {
pname = "Hash-SharedMem";
version = "0.005";
@ -19710,6 +19769,20 @@ with self; {
};
};
PerlLanguageServer = buildPerlPackage {
pname = "Perl-LanguageServer";
version = "2.5.0";
src = fetchurl {
url = "mirror://cpan/authors/id/G/GR/GRICHTER/Perl-LanguageServer-2.5.0.tar.gz";
hash = "sha256-LQYcIkepqAT1JMkSuIN6mxivz6AZkpShcRsVD1oTmQQ=";
};
propagatedBuildInputs = [ AnyEvent AnyEventAIO ClassRefresh CompilerLexer Coro DataDump HashSafeKeys IOAIO JSON Moose PadWalker ];
meta = {
description = "Language Server and Debug Protocol Adapter for Perl";
license = lib.licenses.artistic2;
};
};
perlldap = buildPerlPackage {
pname = "perl-ldap";
version = "0.68";

6
pkgs/top-level/python-packages.nix
View file

@ -4871,6 +4871,8 @@ self: super: with self; {
hyperopt = callPackage ../development/python-modules/hyperopt { };
hyperpyyaml = callPackage ../development/python-modules/hyperpyyaml { };
hypothesis-auto = callPackage ../development/python-modules/hypothesis-auto { };
hypothesis = callPackage ../development/python-modules/hypothesis { };
@ -9342,6 +9344,8 @@ self: super: with self; {
pyphotonfile = callPackage ../development/python-modules/pyphotonfile { };
pypika = callPackage ../development/python-modules/pypika { };
pypillowfight = callPackage ../development/python-modules/pypillowfight { };
pypinyin = callPackage ../development/python-modules/pypinyin { };
@ -11723,6 +11727,8 @@ self: super: with self; {
spectral-cube = callPackage ../development/python-modules/spectral-cube { };
speechbrain = callPackage ../development/python-modules/speechbrain { };
speedtest-cli = callPackage ../development/python-modules/speedtest-cli { };
speg = callPackage ../development/python-modules/speg { };