alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2023-12-07 12:01:24 +00:00 committed by GitHub
parent 32d842483f 4a609ec5d1
commit 860e5725bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
61 changed files with 2619 additions and 398 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
maintainers/maintainer-list.nix
View file

@ -4131,7 +4131,7 @@
email = "davidlewis@mac.com";
github = "oceanlewis";
githubId = 6754950;
name = "David Armstrong Lewis";
name = "Ocean Armstrong Lewis";
};
davidcromp = {
email = "davidcrompton1192@gmail.com";
@ -5163,6 +5163,12 @@
name = "Edvin Källström";
githubId = 84442052;
};
ekimber = {
email = "ekimber@protonmail.com";
github = "ekimber";
name = "Edward Kimber";
githubId = 99987;
};
ekleog = {
email = "leo@gaspard.io";
matrix = "@leo:gaspard.ninja";
@ -11980,7 +11986,7 @@
};
milran = {
email = "milranmike@protonmail.com";
github = "milran";
github = "wattmto";
githubId = 93639059;
name = "Milran Mike";
};
@ -15353,7 +15359,7 @@
revol-xut = {
email = "revol-xut@protonmail.com";
name = "Tassilo Tanneberger";
github = "revol-xut";
github = "tanneberger";
githubId = 32239737;
keys = [{
fingerprint = "91EB E870 1639 1323 642A 6803 B966 009D 57E6 9CC6";
@ -16057,8 +16063,8 @@
};
SamirTalwar = {
email = "lazy.git@functional.computer";
github = "abstracte";
githubId = 47852;
github = "SamirTalwar";
githubId = 47582;
name = "Samir Talwar";
};
samlich = {

12
nixos/modules/services/display-managers/greetd.nix
View file

@ -4,7 +4,7 @@ with lib;
let
cfg = config.services.greetd;
tty = "tty${toString cfg.vt}";
settingsFormat = pkgs.formats.toml {};
settingsFormat = pkgs.formats.toml { };
in
{
options.services.greetd = {
@ -27,7 +27,7 @@ in
'';
};
vt = mkOption {
vt = mkOption {
type = types.int;
default = 1;
description = lib.mdDoc ''
@ -97,12 +97,18 @@ in
systemd.defaultUnit = "graphical.target";
# Create directories potentially required by supported greeters
# See https://github.com/NixOS/nixpkgs/issues/248323
systemd.tmpfiles.rules = [
"d '/var/cache/tuigreet' - greeter greeter - -"
];
users.users.greeter = {
isSystemUser = true;
group = "greeter";
};
users.groups.greeter = {};
users.groups.greeter = { };
};
meta.maintainers = with maintainers; [ queezle ];

2
nixos/modules/services/games/teeworlds.nix
View file

@ -100,7 +100,7 @@ in
serviceConfig = {
DynamicUser = true;
ExecStart = "${pkgs.teeworlds}/bin/teeworlds_srv -f ${teeworldsConf}";
ExecStart = "${pkgs.teeworlds-server}/bin/teeworlds_srv -f ${teeworldsConf}";
# Hardening
CapabilityBoundingSet = false;

6
nixos/modules/services/networking/ejabberd.nix
View file

@ -120,6 +120,12 @@ in {
if [ -z "$(ls -A '${cfg.spoolDir}')" ]; then
touch "${cfg.spoolDir}/.firstRun"
fi
if ! test -e ${cfg.spoolDir}/.erlang.cookie; then
touch ${cfg.spoolDir}/.erlang.cookie
chmod 600 ${cfg.spoolDir}/.erlang.cookie
dd if=/dev/random bs=16 count=1 | base64 > ${cfg.spoolDir}/.erlang.cookie
fi
'';
postStart = ''

14
nixos/modules/services/web-apps/keycloak.nix
View file

@ -25,7 +25,6 @@ let
maintainers
catAttrs
collect
splitString
hasPrefix
;
@ -329,7 +328,8 @@ in
};
hostname = mkOption {
type = str;
type = nullOr str;
default = null;
example = "keycloak.example.com";
description = lib.mdDoc ''
The hostname part of the public URL used as base for
@ -451,7 +451,7 @@ in
keycloakConfig = lib.generators.toKeyValue {
mkKeyValue = lib.flip lib.generators.mkKeyValueDefault "=" {
mkValueString = v: with builtins;
mkValueString = v:
if isInt v then toString v
else if isString v then v
else if true == v then "true"
@ -480,6 +480,14 @@ in
assertion = createLocalPostgreSQL -> config.services.postgresql.settings.standard_conforming_strings or true;
message = "Setting up a local PostgreSQL db for Keycloak requires `standard_conforming_strings` turned on to work reliably";
}
{
assertion = cfg.settings.hostname != null || cfg.settings.hostname-url or null != null;
message = "Setting the Keycloak hostname is required, see `services.keycloak.settings.hostname`";
}
{
assertion = !(cfg.settings.hostname != null && cfg.settings.hostname-url or null != null);
message = "`services.keycloak.settings.hostname` and `services.keycloak.settings.hostname-url` are mutually exclusive";
}
];
environment.systemPackages = [ keycloakBuild ];

6
nixos/modules/services/web-servers/caddy/default.nix
View file

@ -147,7 +147,7 @@ in
default = configFile;
defaultText = "A Caddyfile automatically generated by values from services.caddy.*";
example = literalExpression ''
pkgs.writeTextDir "Caddyfile" '''
pkgs.writeText "Caddyfile" '''
example.com
root * /var/www/wordpress
@ -164,9 +164,9 @@ in
};
adapter = mkOption {
default = if (builtins.baseNameOf cfg.configFile) == "Caddyfile" then "caddyfile" else null;
default = if ((cfg.configFile != configFile) || (builtins.baseNameOf cfg.configFile) == "Caddyfile") then "caddyfile" else null;
defaultText = literalExpression ''
if (builtins.baseNameOf cfg.configFile) == "Caddyfile" then "caddyfile" else null
if ((cfg.configFile != configFile) || (builtins.baseNameOf cfg.configFile) == "Caddyfile") then "caddyfile" else null
'';
example = literalExpression "nginx";
type = with types; nullOr str;

15
nixos/tests/caddy.nix
View file

@ -48,11 +48,19 @@ import ./make-test-python.nix ({ pkgs, ... }: {
};
};
};
specialisation.explicit-config-file.configuration = {
services.caddy.configFile = pkgs.writeText "Caddyfile" ''
localhost:80
respond "hello world"
'';
};
};
};
testScript = { nodes, ... }:
let
explicitConfigFile = "${nodes.webserver.system.build.toplevel}/specialisation/explicit-config-file";
justReloadSystem = "${nodes.webserver.system.build.toplevel}/specialisation/config-reload";
multipleConfigs = "${nodes.webserver.system.build.toplevel}/specialisation/multiple-configs";
rfc42Config = "${nodes.webserver.system.build.toplevel}/specialisation/rfc42";
@ -84,5 +92,12 @@ import ./make-test-python.nix ({ pkgs, ... }: {
)
webserver.wait_for_open_port(80)
webserver.succeed("curl http://localhost | grep hello")
with subtest("explicit configFile"):
webserver.succeed(
"${explicitConfigFile}/bin/switch-to-configuration test >&2"
)
webserver.wait_for_open_port(80)
webserver.succeed("curl http://localhost | grep hello")
'';
})

6
pkgs/applications/audio/radiotray-ng/default.nix
View file

@ -17,7 +17,9 @@
, libxdg_basedir
, wxGTK
# GStreamer
, glib-networking
, gst_all_1
, libsoup_3
# User-agent info
, lsb-release
# rt2rtng
@ -58,6 +60,8 @@ stdenv.mkDerivation rec {
libxdg_basedir
lsb-release
wxGTK
# for https gstreamer / libsoup
glib-networking
] ++ gstInputs
++ pythonInputs;
@ -89,6 +93,8 @@ stdenv.mkDerivation rec {
preFixup = ''
gappsWrapperArgs+=(--suffix PATH : ${lib.makeBinPath [ dbus ]})
wrapProgram $out/bin/rt2rtng --prefix PYTHONPATH : $PYTHONPATH
# for GStreamer
gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${lib.getLib libsoup_3}/lib")
'';
meta = with lib; {

8
pkgs/applications/audio/reaper/default.nix
View file

@ -28,13 +28,13 @@ let
in
stdenv.mkDerivation rec {
pname = "reaper";
version = "7.05";
version = "7.06";
src = fetchurl {
url = url_for_platform version stdenv.hostPlatform.qemuArch;
hash = if stdenv.isDarwin then "sha256-jaT+3cIFVfBopgeeTkpNs9rFX50unlPJogdhkI9bsWU=" else {
x86_64-linux = "sha256-P/PnbJPr4ErDz5ho1/dLERhqkKjdetHzKpCpfVZAYb0=";
aarch64-linux = "sha256-PdnBVlHwoEEv2SPq/p5oyiOlduCEqL35gAY+QIJU1Ys=";
hash = if stdenv.isDarwin then "sha256-4ANi5KhNbJvDCO2iPX/oayGf/ZeIMfkhp0FQRrBYowo=" else {
x86_64-linux = "sha256-tq0K2HSDTZg7iw6ypS5oUuQi3HIYzbl9DWo2SOKGDVY=";
aarch64-linux = "sha256-MGpfdSQsMykp6QNq1JqxIsFqdhNyefPnEIyC4t1S6Vs=";
}.${stdenv.hostPlatform.system};
};

4
pkgs/applications/blockchains/exodus/default.nix
View file

@ -27,13 +27,13 @@
stdenv.mkDerivation rec {
pname = "exodus";
version = "23.10.24";
version = "23.11.6";
src = fetchurl {
name = "exodus-linux-x64-${version}.zip";
url = "https://downloads.exodus.com/releases/${pname}-linux-x64-${version}.zip";
curlOptsList = [ "--user-agent" "Mozilla/5.0" ];
sha256 = "sha256-g28jSQaqjnM34sCpyYLSipUoU3pqAcXQIyWhlrR4xz4=";
sha256 = "sha256-s7LPOUDDQIgASMr3EmEUgtwWHl6mdDez4H3L+Mj3LQA=";
};
nativeBuildInputs = [ unzip ];

7
pkgs/applications/blockchains/ton/default.nix
View file

@ -9,17 +9,18 @@
, openssl
, readline
, zlib
, nix-update-script
}:
stdenv.mkDerivation rec {
pname = "ton";
version = "2023.06";
version = "2023.10";
src = fetchFromGitHub {
owner = "ton-blockchain";
repo = "ton";
rev = "v${version}";
sha256 = "sha256-mDYuOokCGS1sDP6fHDXhGboDjn4JeyA5ea4/6RRt9x4=";
sha256 = "sha256-K1RhhW7EvwYV7/ng3NPjSGdHEQvJZ7K97YXd7s5wghc=";
fetchSubmodules = true;
};
@ -39,6 +40,8 @@ stdenv.mkDerivation rec {
zlib
];
passthru.updateScript = nix-update-script { };
meta = with lib; {
description = "A fully decentralized layer-1 blockchain designed by Telegram";
homepage = "https://ton.org/";

17
pkgs/applications/networking/instant-messengers/qq/default.nix
View file

@ -2,7 +2,6 @@
, cups
, dpkg
, fetchurl
, gjs
, glib
, gtk3
, lib
@ -11,6 +10,7 @@
, libgcrypt
, libkrb5
, mesa # for libgbm
, libGL
, nss
, xorg
, systemd
@ -19,7 +19,6 @@
, at-spi2-core
, autoPatchelfHook
, wrapGAppsHook
, makeWrapper
}:
let
@ -43,8 +42,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [
autoPatchelfHook
# makeBinaryWrapper not support shell wrapper specifically for `NIXOS_OZONE_WL`.
(wrapGAppsHook.override { inherit makeWrapper; })
wrapGAppsHook
dpkg
];
@ -76,7 +74,9 @@ stdenv.mkDerivation {
substituteInPlace $out/share/applications/qq.desktop \
--replace "/opt/QQ/qq" "$out/bin/qq" \
--replace "/usr/share" "$out/share"
ln -s $out/opt/QQ/qq $out/bin/qq
makeWrapper $out/opt/QQ/qq $out/bin/qq \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
# Remove bundled libraries
rm -r $out/opt/QQ/resources/app/sharp-lib
@ -91,13 +91,6 @@ stdenv.mkDerivation {
runHook postInstall
'';
preFixup = ''
gappsWrapperArgs+=(
--prefix PATH : "${lib.makeBinPath [ gjs ]}"
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
)
'';
passthru.updateScript = ./update.sh;
meta = with lib; {

10
pkgs/applications/networking/instant-messengers/qq/sources.nix
View file

@ -1,8 +1,8 @@
# Generated by ./update.sh - do not update manually!
# Last updated: 2023-11-14
# Last updated: 2023-12-05
{
version = "3.2.2-18394";
urlhash = "fd2e886e";
arm64_hash = "sha256-6E3h7Z4936YKZb+G0FoMb90T3EzH8z07mmGMnL4SDFk=";
amd64_hash = "sha256-L1M8O0FzVKLXNNYGGMPf1Nbh/DFxLHBlbzapr7uz5Sk=";
version = "3.2.3-19189";
urlhash = "06d558c3";
arm64_hash = "sha256-qNcw6P985F/JAB9roxaBR5hz2KcLiffUDKu/14nvvgE=";
amd64_hash = "sha256-37d7F1VB2puEFJC12x57aRj4NIYcCYyPCK06Z/OwNiM=";
}

11
pkgs/applications/version-management/sourcehut/builds.nix
View file

@ -11,6 +11,9 @@
, lxml
, python
, unzip
, pip
, pythonOlder
, setuptools
}:
let
version = "0.86.10";
@ -39,12 +42,20 @@ in
buildPythonPackage rec {
inherit src version;
pname = "buildsrht";
pyproject = true;
disabled = pythonOlder "3.7";
postPatch = ''
substituteInPlace Makefile \
--replace "all: api worker" ""
'';
nativeBuildInputs = [
pip
setuptools
];
propagatedBuildInputs = [
srht
redis

9
pkgs/applications/version-management/sourcehut/core.nix
View file

@ -21,12 +21,17 @@
, importlib-metadata
, tinycss2
, sassc
, pythonOlder
, minify
, setuptools
}:
buildPythonPackage rec {
pname = "srht";
version = "0.69.15";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromSourcehut {
owner = "~sircmpwn";
@ -41,6 +46,10 @@ buildPythonPackage rec {
patches/redis-socket/core/0001-Fix-Unix-socket-support-in-RedisQueueCollector.patch
];
nativeBuildInputs = [
setuptools
];
propagatedNativeBuildInputs = [
sassc
minify

11
pkgs/applications/version-management/sourcehut/git.nix
View file

@ -7,7 +7,10 @@
, scmsrht
, pygit2
, minio
, pythonOlder
, unzip
, pip
, setuptools
}:
let
version = "0.84.2";
@ -78,12 +81,20 @@ in
buildPythonPackage rec {
inherit src version;
pname = "gitsrht";
pyproject = true;
disabled = pythonOlder "3.7";
postPatch = ''
substituteInPlace Makefile \
--replace "all: api gitsrht-dispatch gitsrht-keys gitsrht-shell gitsrht-update-hook" ""
'';
nativeBuildInputs = [
pip
setuptools
];
propagatedBuildInputs = [
srht
scmsrht

11
pkgs/applications/version-management/sourcehut/hg.nix
View file

@ -8,11 +8,17 @@
, unidiff
, python
, unzip
, pip
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "hgsrht";
version = "0.32.4";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromSourcehut {
owner = "~sircmpwn";
@ -49,6 +55,11 @@ buildPythonPackage rec {
'';
};
nativeBuildInputs = [
pip
setuptools
];
propagatedBuildInputs = [
python-hglib
scmsrht

19
pkgs/applications/version-management/sourcehut/hub.nix
View file

@ -4,13 +4,19 @@
, buildPythonPackage
, python
, srht
, setuptools
, pip
, pyyaml
, pythonOlder
, unzip
}:
buildPythonPackage rec {
pname = "hubsrht";
version = "0.17.2";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromSourcehut {
owner = "~sircmpwn";
@ -30,6 +36,11 @@ buildPythonPackage rec {
vendorHash = "sha256-K5EmZ4U+xItTR85+SCwhwg5KUGLkKHo9Nr2pkvmJpfo=";
} // import ./fix-gqlgen-trimpath.nix { inherit unzip; });
nativeBuildInputs = [
pip
setuptools
];
propagatedBuildInputs = [
srht
pyyaml
@ -44,7 +55,13 @@ buildPythonPackage rec {
ln -s ${hubsrht-api}/bin/api $out/bin/hubsrht-api
'';
pythonImportsCheck = [ "hubsrht" ];
# Module has no tests
doCheck = false;
pythonImportsCheck = [
"hubsrht"
];
meta = with lib; {
homepage = "https://git.sr.ht/~sircmpwn/hub.sr.ht";

11
pkgs/applications/version-management/sourcehut/lists.nix
View file

@ -9,11 +9,17 @@
, emailthreads
, python
, unzip
, pip
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "listssrht";
version = "0.57.8";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromSourcehut {
owner = "~sircmpwn";
@ -34,6 +40,11 @@ buildPythonPackage rec {
--replace "all: api" ""
'';
nativeBuildInputs = [
pip
setuptools
];
propagatedBuildInputs = [
srht
aiosmtpd

11
pkgs/applications/version-management/sourcehut/man.nix
View file

@ -6,11 +6,17 @@
, pygit2
, python
, unzip
, pip
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "mansrht";
version = "0.16.1";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromSourcehut {
owner = "~sircmpwn";
@ -30,6 +36,11 @@ buildPythonPackage rec {
vendorHash = "sha256-K5EmZ4U+xItTR85+SCwhwg5KUGLkKHo9Nr2pkvmJpfo=";
} // import ./fix-gqlgen-trimpath.nix { inherit unzip; });
nativeBuildInputs = [
pip
setuptools
];
propagatedBuildInputs = [
srht
pygit2

11
pkgs/applications/version-management/sourcehut/meta.nix
View file

@ -13,6 +13,9 @@
, zxcvbn
, python
, unzip
, pip
, pythonOlder
, setuptools
}:
let
version = "0.64.8";
@ -35,12 +38,20 @@ in
buildPythonPackage rec {
pname = "metasrht";
inherit version src;
pyproject = true;
disabled = pythonOlder "3.7";
postPatch = ''
substituteInPlace Makefile \
--replace "all: api" ""
'';
nativeBuildInputs = [
pip
setuptools
];
propagatedBuildInputs = [
alembic
bcrypt

11
pkgs/applications/version-management/sourcehut/paste.nix
View file

@ -3,8 +3,11 @@
, buildGoModule
, buildPythonPackage
, srht
, pip
, pyyaml
, python
, pythonOlder
, setuptools
, unzip
}:
@ -28,12 +31,20 @@ in
buildPythonPackage rec {
inherit src version;
pname = "pastesrht";
pyproject = true;
disabled = pythonOlder "3.7";
postPatch = ''
substituteInPlace Makefile \
--replace "all: api" ""
'';
nativeBuildInputs = [
pip
setuptools
];
propagatedBuildInputs = [
srht
pyyaml

10
pkgs/applications/version-management/sourcehut/scm.nix
View file

@ -4,11 +4,16 @@
, srht
, pyyaml
, buildsrht
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "scmsrht";
version = "0.22.23";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromSourcehut {
owner = "~sircmpwn";
@ -17,6 +22,10 @@ buildPythonPackage rec {
sha256 = "sha256-058dOEYJDY3jtxH1VkV1CFq5CZTkauSnTWg57DCnNtw=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
srht
pyyaml
@ -28,6 +37,7 @@ buildPythonPackage rec {
'';
dontUseSetuptoolsCheck = true;
pythonImportsCheck = [ "scmsrht" ];
meta = with lib; {

9
pkgs/applications/version-management/sourcehut/todo.nix
View file

@ -8,11 +8,16 @@
, factory-boy
, python
, unzip
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "todosrht";
version = "0.74.6";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromSourcehut {
owner = "~sircmpwn";
@ -33,6 +38,10 @@ buildPythonPackage rec {
vendorHash = "sha256-rvfG5F6ez8UM0dYVhKfzwtb7ZEJlaKMBAfKDbo3Aofc=";
} // import ./fix-gqlgen-trimpath.nix { inherit unzip; });
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
srht
alembic

26
pkgs/by-name/ca/cargo-swift/package.nix Normal file
View file

@ -0,0 +1,26 @@
{ lib
, stdenv
, rustPlatform
, fetchFromGitHub
}:
rustPlatform.buildRustPackage rec {
pname = "cargo-swift";
version = "0.4.0";
src = fetchFromGitHub {
owner = "antoniusnaumann";
repo = "cargo-swift";
rev = "v${version}";
hash = "sha256-dW0/h7uS0BEstiochACIySSKXsz+E6Tj5MaLtdin7gw=";
};
cargoHash = "sha256-LsjDeKfAvgVYM4qYyWq9MoXB4jIh870urrFHpiGCGPc=";
meta = with lib; {
description = "A cargo plugin to easily build Swift packages from Rust code";
homepage = "https://github.com/antoniusnaumann/cargo-swift";
license = with licenses; [ asl20 mit ];
maintainers = with maintainers; [ elliot ];
};
}

4
pkgs/by-name/cp/cpu-x/package.nix
View file

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "cpu-x";
version = "5.0.1";
version = "5.0.2";
src = fetchFromGitHub {
owner = "X0rg";
repo = "CPU-X";
rev = "v${version}";
sha256 = "sha256-g3k9P7EevVeDHvnc1dG8cI4C7xhjrDy7gwdoWj6G6zA=";
sha256 = "sha256-tdxIbs5jR4sQHt1ZLUmiAYszP2e5SCMqEFq+eW1k7+s=";
};
nativeBuildInputs = [ cmake pkg-config wrapGAppsHook nasm makeWrapper ];

3
pkgs/by-name/gu/guile-lzma/package.nix
View file

@ -27,6 +27,9 @@ stdenv.mkDerivation rec {
doCheck = true;
# In procedure bytevector-u8-ref: Argument 2 out of range
dontStrip = stdenv.isDarwin;
meta = with lib; {
homepage = "https://ngyro.com/software/guile-lzma.html";
description = "Guile wrapper for lzma library";

2079
pkgs/by-name/la/lazymc/Cargo.lock generated Normal file
View file

File diff suppressed because it is too large Load diff

42
pkgs/by-name/la/lazymc/package.nix Normal file
View file

@ -0,0 +1,42 @@
{
lib
, rustPlatform
, fetchFromGitHub
, stdenv
, darwin
, nix-update-script
}:
rustPlatform.buildRustPackage rec {
pname = "lazymc";
version = "0.2.10";
src = fetchFromGitHub {
owner = "timvisee";
repo = "lazymc";
rev = "v${version}";
hash = "sha256-IObLjxuMJDjZ3M6M1DaPvmoRqAydbLKdpTQ3Vs+B9Oo=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"minecraft-protocol-0.1.0" = "sha256-vSFS1yVxTBSpx/ZhzA3EjcZyOWHbmoGARl0eMn1fJ+4=";
};
};
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreServices
];
passthru.updateScript = nix-update-script { };
meta = with lib; {
description = "Remote wake-up daemon for minecraft servers";
homepage = "https://github.com/timvisee/lazymc";
license = licenses.gpl3Only;
maintainers = with maintainers; [ h7x4 dandellion ];
platforms = platforms.unix;
mainProgram = "lazymc";
};
}

27
pkgs/by-name/me/mev-boost/package.nix Normal file
View file

@ -0,0 +1,27 @@
{ lib
, stdenv
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "mev-boost";
version = "1.6";
src = fetchFromGitHub {
owner = "flashbots";
repo = "mev-boost";
rev = "v${version}";
hash = "sha256-vzgX9irpI5i85bohppyL5KWQuf71SryRu1gkhWSCVKk=";
};
vendorHash = "sha256-xw3xVbgKUIDXu4UQD5CGftON8E4o1u2FcrPo3n6APBE=";
meta = with lib; {
description = "Ethereum block-building middleware";
homepage = "https://github.com/flashbots/mev-boost";
license = licenses.mit;
mainProgram = "mev-boost";
maintainers = with maintainers; [ ekimber ];
platforms = platforms.unix;
};
}

1
pkgs/desktops/gnome/extensions/extensionOverrides.nix
View file

@ -49,6 +49,7 @@ super: lib.trivial.pipe super [
nativeBuildInputs = [ gobject-introspection wrapGAppsHook ];
buildInputs = [ vte ];
postFixup = ''
substituteInPlace "$out/share/gnome-shell/extensions/ddterm@amezin.github.com/bin/com.github.amezin.ddterm" --replace "gjs" "${gjs}/bin/gjs"
wrapGApp "$out/share/gnome-shell/extensions/ddterm@amezin.github.com/bin/com.github.amezin.ddterm"
'';
}))

10
pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
View file

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, meson
, ninja
@ -29,6 +30,15 @@ stdenv.mkDerivation rec {
sha256 = "sha256-MJybc2yAchU6qMqkoRz45QdhR7bj/UFk2nyxcBivsHI=";
};
patches = [
# Add support for AppStream 1.0
# https://github.com/elementary/switchboard-plug-about/pull/275
(fetchpatch {
url = "https://github.com/elementary/switchboard-plug-about/commit/72d7da13da2824812908276751fd3024db2dd0f8.patch";
hash = "sha256-R7oW3mL77/JNqxuMiqxtdMlHWMJgGRQBBzVeRiqx8PY=";
})
];
nativeBuildInputs = [
meson
ninja

3
pkgs/development/guile-modules/guile-gcrypt/default.nix
View file

@ -33,6 +33,9 @@ stdenv.mkDerivation rec {
makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
doCheck = true;
# In procedure bytevector-u8-ref: Argument 2 out of range
dontStrip = stdenv.isDarwin;
meta = with lib; {
description = "Bindings to Libgcrypt for GNU Guile";
homepage = "https://notabug.org/cwebber/guile-gcrypt";

4
pkgs/development/guile-modules/guile-ncurses/default.nix
View file

@ -29,6 +29,10 @@ stdenv.mkDerivation rec {
"--with-gnu-filesystem-hierarchy"
];
env = lib.optionalAttrs stdenv.cc.isClang {
NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
};
postFixup = ''
for f in $out/${guile.siteDir}/ncurses/**.scm; do \
substituteInPlace $f \

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

@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "hwloc";
version = "2.9.3";
version = "2.10.0";
src = fetchurl {
url = "https://www.open-mpi.org/software/hwloc/v${lib.versions.majorMinor version}/downloads/hwloc-${version}.tar.bz2";
sha256 = "sha256-XEBizlVvbTRR/Bd/+4ZzohIPgd9oNd6mohqQ+9//Dew=";
sha256 = "sha256-AwXdYMneL75lGf4qTo/cbT243ldKDKeBK5LoDAWuE5I=";
};
configureFlags = [

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

@ -61,6 +61,10 @@ stdenv.mkDerivation {
"-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15"
];
env = lib.optionalAttrs stdenv.cc.isClang {
NIX_CFLAGS_COMPILE = "-Wno-error=enum-constexpr-conversion";
};
postInstall = lib.optionalString stdenv.isDarwin ''
# No rules to install the mac app, so do it manually.
mkdir -p $out/Applications

14
pkgs/development/libraries/x264/default.nix
View file

@ -1,6 +1,10 @@
{ stdenv, lib, fetchFromGitLab, fetchpatch, nasm
{ stdenv
, lib
, fetchFromGitLab
, fetchpatch
, nasm
, enableShared ? !stdenv.hostPlatform.isStatic
}:
}:
stdenv.mkDerivation rec {
pname = "x264";
@ -49,9 +53,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Library for encoding H264/AVC video streams";
homepage = "http://www.videolan.org/developers/x264.html";
license = licenses.gpl2Plus;
platforms = platforms.unix;
homepage = "http://www.videolan.org/developers/x264.html";
license = licenses.gpl2Plus;
platforms = platforms.unix ++ platforms.windows;
maintainers = with maintainers; [ tadeokondrak ];
};
}

74
pkgs/development/python-modules/aws-xray-sdk/default.nix
View file

@ -1,35 +1,77 @@
{ lib
, aiohttp
, botocore
, bottle
, buildPythonPackage
, fetchPypi
, pythonOlder
, django
, fetchFromGitHub
, httpx
, importlib-metadata
, jsonpickle
, wrapt
, pymysql
, pytest-asyncio
, pynamodb
, pytestCheckHook
, pythonOlder
, requests
, future
, botocore
, sqlalchemy
, webtest
, wrapt
}:
buildPythonPackage rec {
pname = "aws-xray-sdk";
version = "2.12.0";
version = "2.12.1";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-KVr8I3BzqAlW19TyfDGDDty5qMzKnviqRJkLre8V5bc=";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "aws";
repo = "aws-xray-sdk-python";
rev = "refs/tags/${version}";
hash = "sha256-NLFNst4Yqsz2u5IXwe8OdJPW77irLRO5tWWn1uV3tMg=";
};
propagatedBuildInputs = [
jsonpickle wrapt requests future botocore
botocore
jsonpickle
requests
wrapt
] ++ lib.optionals (pythonOlder "3.8") [
importlib-metadata
];
meta = {
description = "AWS X-Ray SDK for the Python programming language";
license = lib.licenses.asl20;
homepage = "https://github.com/aws/aws-xray-sdk-python";
};
nativeCheckInputs = [
aiohttp
bottle
django
httpx
pymysql
pynamodb
pytest-asyncio
pytestCheckHook
sqlalchemy
webtest
];
doCheck = false;
disabledTestPaths = [
# This reduces the amount of dependencies
"tests/ext/"
# We don't care about benchmarks
"tests/test_local_sampling_benchmark.py"
"tests/test_patcher.py"
];
pythonImportsCheck = [
"aws_xray_sdk"
];
meta = with lib; {
description = "AWS X-Ray SDK for the Python programming language";
homepage = "https://github.com/aws/aws-xray-sdk-python";
changelog = "https://github.com/aws/aws-xray-sdk-python/blob/${version}/CHANGELOG.rst";
license = licenses.asl20;
maintainers = with maintainers; [ ];
};
}

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

@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "bash-kernel";
version = "0.9.1";
version = "0.9.3";
pyproject = true;
src = fetchPypi {
pname = "bash_kernel";
inherit version;
hash = "sha256-AYPVPjYP+baEcQUqmiiagWIXMlFrA04njpcgtdFaFis=";
hash = "sha256-n3oDgRyn2csfv/gIIjfPBFC5cYIlL9C4BYeha2XmbVg=";
};
patches = [

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

@ -28,14 +28,14 @@
buildPythonPackage rec {
pname = "celery";
version = "5.3.4";
version = "5.3.6";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-kCPfaoli2nnrMMDITV9IY9l5OkZjVMyTHX9yQjmW3ig=";
hash = "sha256-hwzHHXN8AgDDlykNcwNEzJkdE6BXU0NT0STJOAJnqrk=";
};
propagatedBuildInputs = [

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

@ -27,7 +27,7 @@ let
in
buildPythonPackage rec {
pname = "jax";
version = "0.4.20";
version = "0.4.21";
pyproject = true;
disabled = pythonOlder "3.9";
@ -37,7 +37,7 @@ buildPythonPackage rec {
repo = "jax";
# google/jax contains tags for jax and jaxlib. Only use jax tags!
rev = "refs/tags/${pname}-v${version}";
hash = "sha256-WLYXUtchOaA6SGnKuVhN9CmV06xMCLQTEuEtL13ttZU=";
hash = "sha256-CMsW/t4/itJxN4pST8EKkN0ooHWdjRnLs073FwbXRJM=";
};
nativeBuildInputs = [

34
pkgs/development/python-modules/jaxlib/bin.nix
View file

@ -35,7 +35,7 @@
let
inherit (cudaPackagesGoogle) cudatoolkit cudnn;
version = "0.4.20";
version = "0.4.21";
inherit (python) pythonVersion;
@ -56,65 +56,65 @@ let
"3.9-x86_64-linux" = getSrcFromPypi {
platform = "manylinux2014_x86_64";
dist = "cp39";
hash = "sha256-eIE+rz5x5BEkO85zncIWE8p/wDPxV8bnVJdHiknS998=";
hash = "sha256-mFA/ZSlluDy96Dy7Ez5MyV/onyXOXfwr+v4YBJ8YAKM=";
};
"3.9-aarch64-darwin" = getSrcFromPypi {
platform = "macosx_11_0_arm64";
dist = "cp39";
hash = "sha256-dxInv8/aQiHsN7DpScuZao2ZyHDjF0AaTqUDA0qqg/M=";
hash = "sha256-pxFJPKl7LqwRpL0u53zAmp1XvFKPXv0tT/ioQ3EF/Cs=";
};
"3.9-x86_64-darwin" = getSrcFromPypi {
platform = "macosx_10_14_x86_64";
dist = "cp39";
hash = "sha256-wva6LkSokEHN+WQLCancVC7YBIxfImPsQpB1LzFcyqM=";
hash = "sha256-m8VBotK4tvrEgi8Ub5diHjTv8KU5C384srlSIRcX50o=";
};
"3.10-x86_64-linux" = getSrcFromPypi {
platform = "manylinux2014_x86_64";
dist = "cp310";
hash = "sha256-Yo2TYnkIelyy4vb5+nC/yY8SjV34i/jJvCe/VRQppmo=";
hash = "sha256-jd4+HWPtGt4xLCabVWg99MP+F2bwrhMAJ/BAXfRmIZE=";
};
"3.10-aarch64-darwin" = getSrcFromPypi {
platform = "macosx_11_0_arm64";
dist = "cp310";
hash = "sha256-ufA/ACE4s4R/Fiq5SN7T44SVEN1Z5OfkJ/98lKxRFmo=";
hash = "sha256-/zEl2jm9A5iwELPPaSeLlubaFyIkgwdNFzCMKaLvK2A=";
};
"3.10-x86_64-darwin" = getSrcFromPypi {
platform = "macosx_10_14_x86_64";
dist = "cp310";
hash = "sha256-hBSrYQyOGMn0BexRWQKYnJdEYYlzHUWuWGHmjVT10TE=";
hash = "sha256-BaMQQHdIGtRKDDvjacYLhD7lB058Q8ZYVo6JckVjyxE=";
};
"3.11-x86_64-linux" = getSrcFromPypi {
platform = "manylinux2014_x86_64";
dist = "cp311";
hash = "sha256-5N0nghTBrsa7d8kt8hZC2ghqlxCNC7U8ApD0PG7DHn8=";
hash = "sha256-/N41pyv1AOFegCXUH/XmOUiaAfH5/k/ydT8JaFGq+bM=";
};
"3.11-aarch64-darwin" = getSrcFromPypi {
platform = "macosx_11_0_arm64";
dist = "cp311";
hash = "sha256-j13Br64cKe0hFh/cMBbOMuTXqauAvSKE+KzEmN7U6RA=";
hash = "sha256-gYN77bddkBWYQIzPWXusN+xwpga47zSAFdQ4php+AZM=";
};
"3.11-x86_64-darwin" = getSrcFromPypi {
platform = "macosx_10_14_x86_64";
dist = "cp311";
hash = "sha256-nTnyawU4Ngq9VTE6oDuEfR6iJPRy+E/VLt98cU6eW4M=";
hash = "sha256-GaneuQIfERYAcHQtQ6OwL87098QS+h8GrZOfmef0a70=";
};
"3.12-x86_64-linux" = getSrcFromPypi {
platform = "manylinux2014_x86_64";
dist = "cp312";
hash = "sha256-qPMoa7cso7DRBWuCJQoiOEzLPL3m76MPZZMYmZUj400=";
hash = "sha256-AkyF07UGTfkQHJ/qN2lHe0ki1Fh1uJZkkGQYRkiTIis=";
};
"3.12-aarch64-darwin" = getSrcFromPypi {
platform = "macosx_11_0_arm64";
dist = "cp312";
hash = "sha256-VqTC5egDHaDIvwVa3sAc9Sdtd0CwEFcXjDU/i54h844=";
hash = "sha256-qGxiVdHNChS5WObW8j9E6G/oEa9FOLRY0/xowQNns0Y=";
};
"3.12-x86_64-darwin" = getSrcFromPypi {
platform = "macosx_10_14_x86_64";
dist = "cp312";
hash = "sha256-1F98Je2rMJJKrksI/EVAsX9n+dOpmDehUeAaMq/BY7o=";
hash = "sha256-eYDUrenaHxlCvBYbt12r2VMLBpBBU6o/3ekyj9Ll+AE=";
};
};
@ -124,19 +124,19 @@ let
gpuSrcs = {
"3.9" = fetchurl {
url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp39-cp39-manylinux2014_x86_64.whl";
hash = "sha256-VM2HuyMnG+hzrsTQEB5KJpqpBXyyp+eV1LVxmY1ZCGU=";
hash = "sha256-VKWX2pTgHWXzbUYXkshmPRxiBs6YDw1WeK72TY1koLc=";
};
"3.10" = fetchurl {
url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp310-cp310-manylinux2014_x86_64.whl";
hash = "sha256-TLq3z3T2fjTcO3ESahboKG33mrOpjtj9C92f4d4nJKo=";
hash = "sha256-/4wNdMHNT1izYfyX58KH9CAgnQPcv1/GjNlKhFM4X/U=";
};
"3.11" = fetchurl {
url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp311-cp311-manylinux2014_x86_64.whl";
hash = "sha256-CUXwyJq0HOo2j3Sw+NguBCnFkDuJpc3wfZUc90yyhOY=";
hash = "sha256-xAITc/5KbAiaKp6020OWFD7SL3FQGvE0jQcHckIjb7s=";
};
"3.12" = fetchurl {
url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp312-cp312-manylinux2014_x86_64.whl";
hash = "sha256-bAR8FLtiqufU+rL2a1q9c61CjH1eXxGTNGnDUkHlDBA=";
hash = "sha256-tTbpoF/YINx2Vw1JNKsh3PqUbHqQ1XnQLGFczGmimCw=";
};
};

10
pkgs/development/python-modules/jaxlib/default.nix
View file

@ -54,7 +54,7 @@ let
inherit (cudaPackagesGoogle) backendStdenv cudatoolkit cudaFlags cudnn nccl;
pname = "jaxlib";
version = "0.4.20";
version = "0.4.21";
meta = with lib; {
description = "JAX is Autograd and XLA, brought together for high-performance machine learning research.";
@ -150,7 +150,7 @@ let
repo = "jax";
# google/jax contains tags for jax and jaxlib. Only use jaxlib tags!
rev = "refs/tags/${pname}-v${version}";
hash = "sha256-WLYXUtchOaA6SGnKuVhN9CmV06xMCLQTEuEtL13ttZU=";
hash = "sha256-CMsW/t4/itJxN4pST8EKkN0ooHWdjRnLs073FwbXRJM=";
};
nativeBuildInputs = [
@ -263,10 +263,10 @@ let
];
sha256 = (if cudaSupport then {
x86_64-linux = "sha256-QczClHxHElLZCqIZlHc3z3DXJ7rZQJaMs2XIb+lxarI=";
x86_64-linux = "sha256-TgIH7r1IXNkbOFSXvaKVbU9kL+TuQqxVrBge7iv2ykQ=";
} else {
x86_64-linux = "sha256-mqiJe4u0NYh1PKCbQfbo0U2e9/kYiBqj98d+BPHFSxQ=";
aarch64-linux = "sha256-EuLqamVBJ+qoVMCFIYUT846AghltZolfLGdtO9UeXSM=";
x86_64-linux = "sha256-on14CAolJ3mvJmKxX2PE21BsYOJJFUSQuUOnOuVR2GQ=";
aarch64-linux = "sha256-2tcIiQlMUKMc+juCy+dt37s+lFqr2pcVizCyYkkQtOM=";
}).${stdenv.system} or (throw "jaxlib: unsupported system: ${stdenv.system}");
};

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

@ -2,6 +2,7 @@
, buildPythonPackage
, fetchPypi
, pytestCheckHook
, pythonOlder
, flit-core
, requests
, tomli
@ -9,12 +10,14 @@
buildPythonPackage rec {
pname = "wn";
version = "0.9.4";
format = "pyproject";
version = "0.9.5";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-n03hFoGMAqLu57gw52tY2jkE8uuLFAbwTZ63sHG2168=";
hash = "sha256-muYuDmYH9W5j6euDYJMMgzfsxE6eBIhDCqH6P7nFG+Q=";
};
nativeBuildInputs = [

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

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "yfinance";
version = "0.2.32";
version = "0.2.33";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "ranaroussi";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-sEEYi2qp3LcgBxN0tlbmOaCpkjiDO80lFIaY0qdbuoo=";
hash = "sha256-dj5ZGmvroUCK43q7cykwdJLQBWlpsN1FpKGcJrman+I=";
};
propagatedBuildInputs = [

3
pkgs/development/scheme-modules/scheme-bytestructures/default.nix
View file

@ -28,6 +28,9 @@ stdenv.mkDerivation rec {
doCheck = true;
makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
# In procedure bytevector-u8-ref: Argument 2 out of range
dontStrip = stdenv.isDarwin;
meta = with lib; {
description = "Structured access to bytevector contents";
homepage = "https://github.com/TaylanUB/scheme-bytestructures";

111
pkgs/development/tools/build-managers/apache-ant/1.9.nix
View file

@ -1,111 +0,0 @@
{ fetchurl, lib, stdenv, coreutils, makeWrapper }:
stdenv.mkDerivation rec {
pname = "ant";
version = "1.9.16";
nativeBuildInputs = [ makeWrapper ];
src = fetchurl {
url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2";
sha256 = "0rif9kj6njajy951w3aapk27y1mbaxb08whs126v533h96rb1kjp";
};
contrib = fetchurl {
url = "mirror://sourceforge/ant-contrib/ant-contrib-1.0b3-bin.tar.bz2";
sha256 = "96effcca2581c1ab42a4828c770b48d54852edf9e71cefc9ed2ffd6590571ad1";
};
installPhase =
''
mkdir -p $out/bin $out/lib/ant
mv * $out/lib/ant/
# Get rid of the manual (35 MiB). Maybe we should put this in a
# separate output. Keep the antRun script since it's vanilla sh
# and needed for the <exec/> task (but since we set ANT_HOME to
# a weird value, we have to move antRun to a weird location).
# Get rid of the other Ant scripts since we provide our own.
mv $out/lib/ant/bin/antRun $out/bin/
rm -rf $out/lib/ant/{manual,bin,WHATSNEW}
mkdir $out/lib/ant/bin
mv $out/bin/antRun $out/lib/ant/bin/
# Install ant-contrib.
unpackFile $contrib
cp -p ant-contrib/ant-contrib-*.jar $out/lib/ant/lib/
cat >> $out/bin/ant <<EOF
#! ${stdenv.shell} -e
ANT_HOME=$out/lib/ant
# Find the JDK by looking for javac. As a fall-back, find the
# JRE by looking for java. The latter allows just the JRE to be
# used with (say) ECJ as the compiler. Finally, allow the GNU
# JVM.
if [ -z "\''${JAVA_HOME-}" ]; then
for i in javac java gij; do
if p="\$(type -p \$i)"; then
export JAVA_HOME="\$(${coreutils}/bin/dirname \$(${coreutils}/bin/dirname \$(${coreutils}/bin/readlink -f \$p)))"
break
fi
done
if [ -z "\''${JAVA_HOME-}" ]; then
echo "\$0: cannot find the JDK or JRE" >&2
exit 1
fi
fi
if [ -z \$NIX_JVM ]; then
if [ -e \$JAVA_HOME/bin/java ]; then
NIX_JVM=\$JAVA_HOME/bin/java
elif [ -e \$JAVA_HOME/bin/gij ]; then
NIX_JVM=\$JAVA_HOME/bin/gij
else
NIX_JVM=java
fi
fi
LOCALCLASSPATH="\$ANT_HOME/lib/ant-launcher.jar\''${LOCALCLASSPATH:+:}\$LOCALCLASSPATH"
exec \$NIX_JVM \$NIX_ANT_OPTS \$ANT_OPTS -classpath "\$LOCALCLASSPATH" \
-Dant.home=\$ANT_HOME -Dant.library.dir="\$ANT_LIB" \
org.apache.tools.ant.launch.Launcher \$NIX_ANT_ARGS \$ANT_ARGS \
-cp "\$CLASSPATH" "\$@"
EOF
chmod +x $out/bin/ant
''; # */
meta = {
homepage = "https://ant.apache.org/";
description = "A Java-based build tool";
longDescription = ''
Apache Ant is a Java-based build tool. In theory, it is kind of like
Make, but without Make's wrinkles.
Why another build tool when there is already make, gnumake, nmake, jam,
and others? Because all those tools have limitations that Ant's
original author couldn't live with when developing software across
multiple platforms. Make-like tools are inherently shell-based -- they
evaluate a set of dependencies, then execute commands not unlike what
you would issue in a shell. This means that you can easily extend
these tools by using or writing any program for the OS that you are
working on. However, this also means that you limit yourself to the
OS, or at least the OS type such as Unix, that you are working on.
Ant is different. Instead of a model where it is extended with
shell-based commands, Ant is extended using Java classes. Instead of
writing shell commands, the configuration files are XML-based, calling
out a target tree where various tasks get executed. Each task is run
by an object that implements a particular Task interface.
'';
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.eelco ];
platforms = lib.platforms.all;
};
}

5
pkgs/development/tools/compass/Gemfile
View file

@ -1,3 +1,2 @@
source "https://rubygems.org" do
gem 'compass'
end
source 'https://rubygems.org'
gem 'compass'

4
pkgs/development/tools/compass/Gemfile.lock
View file

@ -25,7 +25,7 @@ PLATFORMS
ruby
DEPENDENCIES
compass!
compass
BUNDLED WITH
2.2.24
2.4.22

9
pkgs/development/tools/compass/default.nix
View file

@ -1,9 +1,11 @@
{ lib, bundlerApp, bundlerUpdateScript }:
{ lib, bundlerEnv, bundlerUpdateScript, ruby }:
bundlerApp {
bundlerEnv {
pname = "compass";
version = "1.0.3";
inherit ruby;
gemdir = ./.;
exes = [ "compass" ];
passthru.updateScript = bundlerUpdateScript "compass";
@ -12,6 +14,7 @@ bundlerApp {
homepage = "https://github.com/Compass/compass";
license = with licenses; mit;
maintainers = with maintainers; [ offline manveru nicknovitski ];
mainProgram = "compass";
platforms = platforms.unix;
};
}

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

@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "fastgron";
version = "0.7.0";
version = "0.7.7";
src = fetchFromGitHub {
owner = "adamritter";
repo = "fastgron";
rev = "v${finalAttrs.version}";
hash = "sha256-IBs6oC+dbssAkUGk84vXteSlO6j88LZlmlmcV77M2YM=";
hash = "sha256-dAfFSQ/UbAovQQr5AnCsyQtq1JkdQjvlG/SbuFnTx0E=";
};
nativeBuildInputs = [ cmake ];

6
pkgs/games/aaaaxy/default.nix
View file

@ -19,17 +19,17 @@
buildGoModule rec {
pname = "aaaaxy";
version = "1.4.72";
version = "1.4.101";
src = fetchFromGitHub {
owner = "divVerent";
repo = pname;
rev = "v${version}";
hash = "sha256-wKnwyjgEV1M5CJR0uxs9vNbF3iJvDPWOqya0iLHXjGw=";
hash = "sha256-Eg8RvViTPqlVmvUX3k+/ph4YYU7xfFQY1Gs/e1at6No=";
fetchSubmodules = true;
};
vendorHash = "sha256-hK5w3JhcYUW5bAUovv/ldHoYcY0oIh5q4LWxiGuP2NQ=";
vendorHash = "sha256-Qd5ytSrW42pDzKt9xg3hWD9rWFvQi1PPYF+m56+/cHE=";
buildInputs = [
alsa-lib

4
pkgs/games/path-of-building/default.nix
View file

@ -2,13 +2,13 @@
let
data = stdenv.mkDerivation(finalAttrs: {
pname = "path-of-building-data";
version = "2.35.4";
version = "2.35.5";
src = fetchFromGitHub {
owner = "PathOfBuildingCommunity";
repo = "PathOfBuilding";
rev = "v${finalAttrs.version}";
hash = "sha256-OiEfPKJQ19x+CcnI906LAwA78MPTr2IOm9B1iyi+m3s=";
hash = "sha256-SnsmXoxr5zSORLSpdDGw3OTTNJUDUEfCqBs6lYm4lP0=";
};
nativeBuildInputs = [ unzip ];

136
pkgs/games/stepmania/0001-fix-build-with-ffmpeg-4.patch
View file

@ -1,136 +0,0 @@
From 33d928c54f4b35f8877cacd1e2c77b68b4dddc06 Mon Sep 17 00:00:00 2001
From: Zane van Iperen <zane@zanevaniperen.com>
Date: Sun, 7 Nov 2021 15:46:37 +1000
Subject: [PATCH] fix build with ffmpeg 4
---
src/arch/MovieTexture/MovieTexture_FFMpeg.cpp | 5 +----
src/arch/MovieTexture/MovieTexture_FFMpeg.h | 22 +++++++++----------
2 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp b/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
index bdf2356..f79fea2 100644
--- a/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
+++ b/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
@@ -445,7 +445,7 @@ RString MovieDecoder_FFMpeg::Open( RString sFile )
return "Couldn't find any video streams";
m_pStream = m_fctx->streams[stream_idx];
- if( m_pStream->codec->codec_id == avcodec::CODEC_ID_NONE )
+ if( m_pStream->codec->codec_id == avcodec::AV_CODEC_ID_NONE )
return ssprintf( "Unsupported codec %08x", m_pStream->codec->codec_tag );
RString sError = OpenCodec();
@@ -474,9 +474,6 @@ RString MovieDecoder_FFMpeg::OpenCodec()
m_pStream->codec->idct_algo = FF_IDCT_AUTO;
m_pStream->codec->error_concealment = 3;
- if( pCodec->capabilities & CODEC_CAP_DR1 )
- m_pStream->codec->flags |= CODEC_FLAG_EMU_EDGE;
-
LOG->Trace("Opening codec %s", pCodec->name );
int ret = avcodec::avcodec_open2( m_pStream->codec, pCodec, NULL );
diff --git a/src/arch/MovieTexture/MovieTexture_FFMpeg.h b/src/arch/MovieTexture/MovieTexture_FFMpeg.h
index f4d25ef..32564e5 100644
--- a/src/arch/MovieTexture/MovieTexture_FFMpeg.h
+++ b/src/arch/MovieTexture/MovieTexture_FFMpeg.h
@@ -64,7 +64,7 @@ private:
avcodec::AVStream *m_pStream;
avcodec::AVFrame *m_Frame;
- avcodec::PixelFormat m_AVTexfmt; /* PixelFormat of output surface */
+ avcodec::AVPixelFormat m_AVTexfmt; /* PixelFormat of output surface */
avcodec::SwsContext *m_swsctx;
avcodec::AVFormatContext *m_fctx;
@@ -90,7 +90,7 @@ static struct AVPixelFormat_t
{
int bpp;
uint32_t masks[4];
- avcodec::PixelFormat pf;
+ avcodec::AVPixelFormat pf;
bool bHighColor;
bool bByteSwapOnLittleEndian;
MovieDecoderPixelFormatYCbCr YUV;
@@ -101,7 +101,7 @@ static struct AVPixelFormat_t
0x00FF0000,
0x0000FF00,
0x000000FF },
- avcodec::PIX_FMT_YUYV422,
+ avcodec::AV_PIX_FMT_YUYV422,
false, /* N/A */
true,
PixelFormatYCbCr_YUYV422,
@@ -112,7 +112,7 @@ static struct AVPixelFormat_t
0x00FF0000,
0xFF000000,
0x000000FF },
- avcodec::PIX_FMT_BGRA,
+ avcodec::AV_PIX_FMT_BGRA,
true,
true,
PixelFormatYCbCr_Invalid,
@@ -123,7 +123,7 @@ static struct AVPixelFormat_t
0x0000FF00,
0x000000FF,
0xFF000000 },
- avcodec::PIX_FMT_ARGB,
+ avcodec::AV_PIX_FMT_ARGB,
true,
true,
PixelFormatYCbCr_Invalid,
@@ -135,7 +135,7 @@ static struct AVPixelFormat_t
0x0000FF00,
0x00FF0000,
0xFF000000 },
- avcodec::PIX_FMT_ABGR,
+ avcodec::AV_PIX_FMT_ABGR,
true,
true,
PixelFormatYCbCr_Invalid,
@@ -146,7 +146,7 @@ static struct AVPixelFormat_t
0x00FF0000,
0x0000FF00,
0x000000FF },
- avcodec::PIX_FMT_RGBA,
+ avcodec::AV_PIX_FMT_RGBA,
true,
true,
PixelFormatYCbCr_Invalid,
@@ -157,7 +157,7 @@ static struct AVPixelFormat_t
0x00FF00,
0x0000FF,
0x000000 },
- avcodec::PIX_FMT_RGB24,
+ avcodec::AV_PIX_FMT_RGB24,
true,
true,
PixelFormatYCbCr_Invalid,
@@ -168,7 +168,7 @@ static struct AVPixelFormat_t
0x00FF00,
0xFF0000,
0x000000 },
- avcodec::PIX_FMT_BGR24,
+ avcodec::AV_PIX_FMT_BGR24,
true,
true,
PixelFormatYCbCr_Invalid,
@@ -179,12 +179,12 @@ static struct AVPixelFormat_t
0x03E0,
0x001F,
0x0000 },
- avcodec::PIX_FMT_RGB555,
+ avcodec::AV_PIX_FMT_RGB555,
false,
false,
PixelFormatYCbCr_Invalid,
},
- { 0, { 0,0,0,0 }, avcodec::PIX_FMT_NB, true, false, PixelFormatYCbCr_Invalid }
+ { 0, { 0,0,0,0 }, avcodec::AV_PIX_FMT_NB, true, false, PixelFormatYCbCr_Invalid }
};
#endif
--
2.31.1

55
pkgs/games/stepmania/default.nix
View file

@ -1,21 +1,40 @@
{ stdenv, lib, fetchFromGitHub, cmake, nasm
, gtk2, glib, ffmpeg_4, alsa-lib, libmad, libogg, libvorbis
, glew, libpulseaudio, udev
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, nasm
, alsa-lib
, ffmpeg_6
, glew
, glib
, gtk2
, libmad
, libogg
, libpulseaudio
, libvorbis
, udev
, xorg
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "stepmania";
version = "5.1.0-b2";
version = "5.1.0-b2-unstable-2022-11-14";
src = fetchFromGitHub {
owner = "stepmania";
repo = "stepmania";
rev = "v${version}";
sha256 = "0a7y9l7xm510vgnpmj1is7p9m6d6yd0fcaxrjcickz295k5w3rdn";
rev = "d55acb1ba26f1c5b5e3048d6d6c0bd116625216f";
hash = "sha256-49H2Q61R4l/G0fWsjCjiAUXeWwG3lcsDpV5XvR3l3QE=";
};
patches = [
./0001-fix-build-with-ffmpeg-4.patch
# https://github.com/stepmania/stepmania/pull/2247
(fetchpatch {
name = "fix-building-with-ffmpeg6.patch";
url = "https://github.com/stepmania/stepmania/commit/3fef5ef60b7674d6431f4e1e4ba8c69b0c21c023.patch";
hash = "sha256-m+5sP+mIpcSjioRBdzChqja5zwNcwdSNAfvSJ2Lww+g=";
})
];
postPatch = ''
@ -25,8 +44,17 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake nasm ];
buildInputs = [
gtk2 glib ffmpeg_4 alsa-lib libmad libogg libvorbis
glew libpulseaudio udev
alsa-lib
ffmpeg_6
glew
glib
gtk2
libmad
libogg
libpulseaudio
libvorbis
udev
xorg.libXtst
];
cmakeFlags = [
@ -38,6 +66,11 @@ stdenv.mkDerivation rec {
postInstall = ''
mkdir -p $out/bin
ln -s $out/stepmania-5.1/stepmania $out/bin/stepmania
mkdir -p $out/share/
cp -r $src/icons $out/share/
install -Dm444 $src/stepmania.desktop -t $out/share/applications
'';
meta = with lib; {
@ -45,7 +78,7 @@ stdenv.mkDerivation rec {
description = "Free dance and rhythm game for Windows, Mac, and Linux";
platforms = platforms.linux;
license = licenses.mit; # expat version
maintainers = [ ];
maintainers = with maintainers; [ h7x4 ];
# never built on aarch64-linux since first introduction in nixpkgs
broken = stdenv.isLinux && stdenv.isAarch64;
mainProgram = "stepmania";

3
pkgs/servers/dico/default.nix
View file

@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
strictDeps = true;
doCheck = true;
# ERROR: All 188 tests were run, 90 failed unexpectedly.
doCheck = !stdenv.isDarwin;
meta = with lib; {
description = "Flexible dictionary server and client implementing RFC 2229";

49
pkgs/tools/misc/yubico-piv-tool/default.nix
View file

@ -1,38 +1,53 @@
{ lib
, stdenv
, fetchurl
, fetchFromGitHub
, pkg-config
, openssl
, check
, pcsclite
, PCSC
, gengetopt
, help2man
, cmake
, zlib
, withApplePCSC ? stdenv.isDarwin
, gitUpdater
, nix-update-script
, testers
, yubico-piv-tool
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "yubico-piv-tool";
version = "2.3.1";
version = "2.4.1";
src = fetchurl {
url = "https://developers.yubico.com/yubico-piv-tool/Releases/yubico-piv-tool-${version}.tar.gz";
hash = "sha256-2ona/YthhapjU0Z1P53bKa8pvEq9kt2B832dZWC11k4=";
outputs = [ "out" "dev" "man" ];
src = fetchFromGitHub {
owner = "Yubico";
repo = "yubico-piv-tool";
rev = "refs/tags/yubico-piv-tool-${finalAttrs.version}";
hash = "sha256-KprY5BX7Fi/qWRT1pda9g8fqnmDB1Bh7oFM7sCwViuw=";
};
postPatch = ''
substituteInPlace CMakeLists.txt --replace "-Werror" ""
'';
nativeBuildInputs = [ pkg-config cmake gengetopt ];
buildInputs = [ openssl check ]
++ (if withApplePCSC then [ PCSC ] else [ pcsclite ]);
nativeBuildInputs = [
pkg-config
cmake
gengetopt
help2man
];
buildInputs = [
openssl
check
zlib.dev
]
++ (if withApplePCSC then [ PCSC ] else [ pcsclite ]);
cmakeFlags = [
"-DGENERATE_MAN_PAGES=OFF" # Use the man page generated at release time
"-DGENERATE_MAN_PAGES=ON"
"-DCMAKE_INSTALL_BINDIR=bin"
"-DCMAKE_INSTALL_INCLUDEDIR=include"
"-DCMAKE_INSTALL_MANDIR=share/man"
@ -42,13 +57,11 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-backend=${if withApplePCSC then "macscard" else "pcsc"}" ];
passthru = {
updateScript = gitUpdater {
url = "https://github.com/Yubico/yubico-piv-tool.git";
rev-prefix = "yubico-piv-tool-";
updateScript = nix-update-script {
extraArgs = [ "--version-regex" "yubico-piv-tool-([0-9.]+)$" ];
};
tests.version = testers.testVersion {
inherit version;
package = yubico-piv-tool;
package = finalAttrs.finalPackage;
command = "yubico-piv-tool --version";
};
};
@ -72,4 +85,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ viraptor anthonyroussel ];
mainProgram = "yubico-piv-tool";
};
}
})

12
pkgs/tools/networking/mozillavpn/default.nix
View file

@ -26,13 +26,13 @@
let
pname = "mozillavpn";
version = "2.16.1";
version = "2.19.0";
src = fetchFromGitHub {
owner = "mozilla-mobile";
repo = "mozilla-vpn-client";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-UMWBn3DoEU1fG7qh6F0GOhOqod+grPwp15wSSdP0eCo=";
hash = "sha256-aXfxUtGm+vq8U3jYTxYhOP7UXL6ukCJgmGQO2Wsqobo=";
};
patches = [ ];
@ -46,19 +46,19 @@ let
inherit src patches;
name = "${pname}-${version}-extension-bridge";
preBuild = "cd extension/bridge";
hash = "sha256-1wYTRc+NehiHwAd/2CmsJNv/TV6wH5wXwNiUdjzEUIk=";
hash = "sha256-23GTXsbjL8qfGA5NdPlrbdaA8rg8vOZsZCXvevi7Chc=";
};
signatureDeps = rustPlatform.fetchCargoTarball {
inherit src patches;
name = "${pname}-${version}-signature";
preBuild = "cd signature";
hash = "sha256-oaKkQWMYkAy1c2biVt+GyjHBeYb2XkuRvFrWQJJIdPw=";
hash = "sha256-TB172hVIilDTl+y0shNp55if+FhrXjWSaGNF7K6GSH8=";
};
qtgleanDeps = rustPlatform.fetchCargoTarball {
inherit src patches;
name = "${pname}-${version}-qtglean";
preBuild = "cd qtglean";
hash = "sha256-cqfiOBS8xFC2BbYp6BJWK6NHIU0tILSgu4eo3Ik4YqY=";
hash = "sha256-tfQ2ogSDDXNPeygBy+el+71iwcafSfY78hvYPHurKPE=";
};
in
@ -110,7 +110,7 @@ stdenv.mkDerivation {
dontCargoSetupPostUnpack = true;
postPatch = ''
substituteInPlace src/apps/vpn/cmake/linux.cmake \
substituteInPlace src/cmake/linux.cmake \
--replace '/etc/xdg/autostart' "$out/etc/xdg/autostart" \
--replace '/usr/share/dbus-1' "$out/share/dbus-1" \
--replace '${"$"}{SYSTEMD_UNIT_DIR}' "$out/lib/systemd/system"

3
pkgs/tools/networking/wakelan/default.nix
View file

@ -9,6 +9,9 @@ stdenv.mkDerivation rec {
hash = "sha256-PfXrj4d2SHmatiPPFxjsxvhusML1HTRNjoYEQtzFzW8=";
};
# code predates c99
env.CFLAGS = "-std=c89";
preInstall = ''
mkdir -p $out/man/man1 $out/bin
'';

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

@ -69,6 +69,7 @@ mapAliases ({
alsaUtils = alsa-utils; # Added 2021-06-10
angelfish = libsForQt5.kdeGear.angelfish; # Added 2021-10-06
ansible_2_12 = throw "Ansible 2.12 goes end of life in 2023/05 and can't be supported throughout the 23.05 release cycle"; # Added 2023-05-16
apacheAnt_1_9 = throw "Ant 1.9 has been removed since it's not used in nixpkgs anymore"; # Added 2023-11-12
antimicroX = antimicrox; # Added 2021-10-31
arcanPackages = throw "arcanPackages was removed and its sub-attributes were promoted to top-level"; # Added 2023-11-26
ardour_6 = throw "ardour_6 has been removed in favor of newer versions"; # Added 2023-10-13

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

@ -18413,7 +18413,6 @@ with pkgs;
antlr = antlr4;
apacheAnt = callPackage ../development/tools/build-managers/apache-ant { };
apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };
ant = apacheAnt;
apacheKafka = apacheKafka_3_5;