nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-04 04:46:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into haskell-updates

Browse Source
This commit is contained in:
Domen Kožar 2023-01-06 20:20:58 +00:00 committed by GitHub
commit 9f873b90fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
121 changed files with 7027 additions and 4995 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
nixos/modules/services/web-apps/dokuwiki.nix
View File

@ -8,6 +8,13 @@ let
user = "dokuwiki";
webserver = config.services.${cfg.webserver};
mkPhpIni = generators.toKeyValue {
mkKeyValue = generators.mkKeyValueDefault {} " = ";
};
mkPhpPackage = cfg: cfg.phpPackage.buildEnv {
extraConfig = mkPhpIni cfg.phpOptions;
};
dokuwikiAclAuthConfig = hostName: cfg: pkgs.writeText "acl.auth-${hostName}.php" ''
# acl.auth.php
# <?php exit()?>
@ -173,18 +180,14 @@ let
'';
example = literalExpression ''
let
# Let's package the icalevents plugin
plugin-icalevents = pkgs.stdenv.mkDerivation {
plugin-icalevents = pkgs.stdenv.mkDerivation rec {
name = "icalevents";
# Download the plugin from the dokuwiki site
src = pkgs.fetchurl {
url = "https://github.com/real-or-random/dokuwiki-plugin-icalevents/releases/download/2017-06-16/dokuwiki-plugin-icalevents-2017-06-16.zip";
sha256 = "e40ed7dd6bbe7fe3363bbbecb4de481d5e42385b5a0f62f6a6ce6bf3a1f9dfa8";
version = "2017-06-16";
src = pkgs.fetchzip {
stripRoot = false;
url = "https://github.com/real-or-random/dokuwiki-plugin-icalevents/releases/download/''${version}/dokuwiki-plugin-icalevents-''${version}.zip";
hash = "sha256-IPs4+qgEfe8AAWevbcCM9PnyI0uoyamtWeg4rEb+9Wc=";
};
sourceRoot = ".";
# We need unzip to build this package
buildInputs = [ pkgs.unzip ];
# Installing simply means copying all files to the output directory
installPhase = "mkdir -p $out; cp -R * $out/";
};
# And then pass this theme to the plugin list like this:
@ -204,19 +207,17 @@ let
'';
example = literalExpression ''
let
# Let's package the bootstrap3 theme
template-bootstrap3 = pkgs.stdenv.mkDerivation {
name = "bootstrap3";
# Download the theme from the dokuwiki site
src = pkgs.fetchurl {
url = "https://github.com/giterlizzi/dokuwiki-template-bootstrap3/archive/v2019-05-22.zip";
sha256 = "4de5ff31d54dd61bbccaf092c9e74c1af3a4c53e07aa59f60457a8f00cfb23a6";
};
# We need unzip to build this package
buildInputs = [ pkgs.unzip ];
# Installing simply means copying all files to the output directory
installPhase = "mkdir -p $out; cp -R * $out/";
template-bootstrap3 = pkgs.stdenv.mkDerivation rec {
name = "bootstrap3";
version = "2022-07-27";
src = pkgs.fetchFromGitHub {
owner = "giterlizzi";
repo = "dokuwiki-template-bootstrap3";
rev = "v''${version}";
hash = "sha256-B3Yd4lxdwqfCnfmZdp+i/Mzwn/aEuZ0ovagDxuR6lxo=";
};
installPhase = "mkdir -p $out; cp -R * $out/";
};
# And then pass this theme to the template list like this:
in [ template-bootstrap3 ]
'';
@ -238,6 +239,33 @@ let
'';
};
phpPackage = mkOption {
type = types.package;
relatedPackages = [ "php80" "php81" ];
default = pkgs.php81;
defaultText = "pkgs.php81";
description = lib.mdDoc ''
PHP package to use for this dokuwiki site.
'';
};
phpOptions = mkOption {
type = types.attrsOf types.str;
default = {};
description = lib.mdDoc ''
Options for PHP's php.ini file for this dokuwiki site.
'';
example = literalExpression ''
{
"opcache.interned_strings_buffer" = "8";
"opcache.max_accelerated_files" = "10000";
"opcache.memory_consumption" = "128";
"opcache.revalidate_freq" = "15";
"opcache.fast_shutdown" = "1";
}
'';
};
extraConfig = mkOption {
type = types.nullOr types.lines;
default = null;
@ -276,8 +304,8 @@ in
Further nginx configuration can be done by adapting `services.nginx.virtualHosts.<name>`.
See [](#opt-services.nginx.virtualHosts) for further information.
Further apache2 configuration can be done by adapting `services.httpd.virtualHosts.<name>`.
See [](#opt-services.httpd.virtualHosts) for further information.
Further caddy configuration can be done by adapting `services.caddy.virtualHosts.<name>`.
See [](#opt-services.caddy.virtualHosts) for further information.
'';
};
@ -303,7 +331,7 @@ in
inherit user;
group = webserver.group;
phpPackage = pkgs.php81;
phpPackage = mkPhpPackage cfg;
phpEnv = {
DOKUWIKI_LOCAL_CONFIG = "${dokuwikiLocalConfig hostName cfg}";
DOKUWIKI_PLUGINS_LOCAL_CONFIG = "${dokuwikiPluginsLocalConfig hostName cfg}";

125
nixos/tests/dokuwiki.nix
View File

@ -1,35 +1,63 @@
import ./make-test-python.nix ({ pkgs, ... }:
let
template-bootstrap3 = pkgs.stdenv.mkDerivation {
template-bootstrap3 = pkgs.stdenv.mkDerivation rec {
name = "bootstrap3";
# Download the theme from the dokuwiki site
src = pkgs.fetchurl {
url = "https://github.com/giterlizzi/dokuwiki-template-bootstrap3/archive/v2019-05-22.zip";
sha256 = "4de5ff31d54dd61bbccaf092c9e74c1af3a4c53e07aa59f60457a8f00cfb23a6";
version = "2022-07-27";
src = pkgs.fetchFromGitHub {
owner = "giterlizzi";
repo = "dokuwiki-template-bootstrap3";
rev = "v${version}";
hash = "sha256-B3Yd4lxdwqfCnfmZdp+i/Mzwn/aEuZ0ovagDxuR6lxo=";
};
# We need unzip to build this package
nativeBuildInputs = [ pkgs.unzip ];
# Installing simply means copying all files to the output directory
installPhase = "mkdir -p $out; cp -R * $out/";
};
# Let's package the icalevents plugin
plugin-icalevents = pkgs.stdenv.mkDerivation {
plugin-icalevents = pkgs.stdenv.mkDerivation rec {
name = "icalevents";
# Download the plugin from the dokuwiki site
src = pkgs.fetchurl {
url = "https://github.com/real-or-random/dokuwiki-plugin-icalevents/releases/download/2017-06-16/dokuwiki-plugin-icalevents-2017-06-16.zip";
sha256 = "e40ed7dd6bbe7fe3363bbbecb4de481d5e42385b5a0f62f6a6ce6bf3a1f9dfa8";
version = "2017-06-16";
src = pkgs.fetchzip {
stripRoot = false;
url = "https://github.com/real-or-random/dokuwiki-plugin-icalevents/releases/download/${version}/dokuwiki-plugin-icalevents-${version}.zip";
hash = "sha256-IPs4+qgEfe8AAWevbcCM9PnyI0uoyamtWeg4rEb+9Wc=";
};
# We need unzip to build this package
nativeBuildInputs = [ pkgs.unzip ];
sourceRoot = ".";
# Installing simply means copying all files to the output directory
installPhase = "mkdir -p $out; cp -R * $out/";
};
acronymsFile = pkgs.writeText "acronyms.local.conf" ''
r13y reproducibility
'';
dwWithAcronyms = pkgs.dokuwiki.overrideAttrs (prev: {
installPhase = prev.installPhase or "" + ''
ln -sf ${acronymsFile} $out/share/dokuwiki/conf/acronyms.local.conf
'';
});
mkNode = webserver: { ... }: {
services.dokuwiki = {
inherit webserver;
sites = {
"site1.local" = {
aclUse = false;
superUser = "admin";
};
"site2.local" = {
package = dwWithAcronyms;
usersFile = "/var/lib/dokuwiki/site2.local/users.auth.php";
superUser = "admin";
templates = [ template-bootstrap3 ];
plugins = [ plugin-icalevents ];
};
};
};
networking.firewall.allowedTCPPorts = [ 80 ];
networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ];
};
in {
name = "dokuwiki";
meta = with pkgs.lib; {
@ -40,47 +68,8 @@ in {
};
nodes = {
dokuwiki_nginx = {...}: {
services.dokuwiki = {
sites = {
"site1.local" = {
aclUse = false;
superUser = "admin";
};
"site2.local" = {
usersFile = "/var/lib/dokuwiki/site2.local/users.auth.php";
superUser = "admin";
templates = [ template-bootstrap3 ];
plugins = [ plugin-icalevents ];
};
};
};
networking.firewall.allowedTCPPorts = [ 80 ];
networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ];
};
dokuwiki_caddy = {...}: {
services.dokuwiki = {
webserver = "caddy";
sites = {
"site1.local" = {
aclUse = false;
superUser = "admin";
};
"site2.local" = {
usersFile = "/var/lib/dokuwiki/site2.local/users.auth.php";
superUser = "admin";
templates = [ template-bootstrap3 ];
plugins = [ plugin-icalevents ];
};
};
};
networking.firewall.allowedTCPPorts = [ 80 ];
networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ];
};
dokuwiki_nginx = mkNode "nginx";
dokuwiki_caddy = mkNode "caddy";
};
testScript = ''
@ -102,10 +91,24 @@ in {
machine.succeed("curl -sSfL http://site2.local/ | grep 'DokuWiki'")
machine.succeed("curl -sSfL 'http://site2.local/doku.php?do=login' | grep 'Login'")
machine.succeed(
with subtest("ACL Operations"):
machine.succeed(
"echo 'admin:$2y$10$ijdBQMzSVV20SrKtCna8gue36vnsbVm2wItAXvdm876sshI4uwy6S:Admin:admin@example.test:user' >> /var/lib/dokuwiki/site2.local/users.auth.php",
"curl -sSfL -d 'u=admin&p=password' --cookie-jar cjar 'http://site2.local/doku.php?do=login'",
"curl -sSfL --cookie cjar --cookie-jar cjar 'http://site2.local/doku.php?do=login' | grep 'Logged in as: <bdi>Admin</bdi>'",
)
)
with subtest("Customizing Dokuwiki"):
machine.succeed(
"echo 'r13y is awesome!' >> /var/lib/dokuwiki/site2.local/data/pages/acronyms-test.txt",
"curl -sSfL 'http://site2.local/doku.php?id=acronyms-test' | grep '<abbr title=\"reproducibility\">r13y</abbr>'",
)
# Just to ensure both Webserver configurations are consistent in allowing that
with subtest("Rewriting"):
machine.succeed(
"echo 'Hello, NixOS!' >> /var/lib/dokuwiki/site1.local/data/pages/rewrite-test.txt",
"curl -sSfL http://site1.local/rewrite-test | grep 'Hello, NixOS!'",
)
'';
})

45
pkgs/applications/blockchains/sumokoin/default.nix
View File

@ -1,33 +1,56 @@
{ lib, stdenv, fetchFromGitHub, cmake, unbound, openssl, boost
, libunwind, lmdb, miniupnpc }:
{ lib
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
, boost
, openssl
, libsodium
, libunwind
, lmdb
, unbound
, zeromq
}:
stdenv.mkDerivation rec {
pname = "sumokoin";
version = "0.2.0.0";
version = "0.8.1.0";
src = fetchFromGitHub {
owner = "sumoprojects";
repo = "sumokoin";
rev = "v${version}";
sha256 = "0ndgcawhxh3qb3llrrilrwzhs36qpxv7f53rxgcansbff9b3za6n";
hash = "sha256-CHZ6hh60U6mSR68CYDKMWTYyX1koF4gA7YrA1P5f0Dk=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ unbound openssl boost libunwind lmdb miniupnpc ];
# disable POST_BUILD
postPatch = ''
substituteInPlace src/blockchain_db/lmdb/db_lmdb.cpp --replace mdb_size_t size_t
sed -i 's/if (UNIX)/if (0)/g' src/utilities/*_utilities/CMakeLists.txt
'';
cmakeFlags = [
"-DLMDB_INCLUDE=${lmdb}/include"
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
boost
openssl
libsodium
libunwind
lmdb
unbound
zeromq
];
# cc1: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security]
hardeningDisable = [ "format" ];
meta = with lib; {
description = "A fork of Monero and a truely fungible cryptocurrency";
homepage = "https://www.sumokoin.org/";
license = licenses.bsd3;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ wegank ];
platforms = platforms.linux;
};
}

4
pkgs/applications/editors/ldtk/default.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "ldtk";
version = "1.1.3";
version = "1.2.2";
src = fetchurl {
url = "https://github.com/deepnight/ldtk/releases/download/v${version}/ubuntu-distribution.zip";
sha256 = "sha256-qw7+4k4IH2+9DX4ny8EBbSlyXBrk/y91W04+zWPGupk=";
sha256 = "sha256-t1fKf+y1lHuBKnyh0j4RoDZziIOu1tlona1xyBsl6+Q=";
};
nativeBuildInputs = [ unzip makeWrapper copyDesktopItems appimage-run ];

7
pkgs/applications/editors/vim/plugins/overrides.nix
View File

@ -711,6 +711,13 @@ self: super: {
inherit parinfer-rust;
playground = super.playground.overrideAttrs (old: {
dependencies = with self; [
# we need the 'query' grammer to make
(nvim-treesitter.withPlugins (p: [ p.query ]))
];
});
plenary-nvim = super.plenary-nvim.overrideAttrs (old: {
postPatch = ''
sed -Ei lua/plenary/curl.lua \

2
pkgs/applications/graphics/fluxus/default.nix
View File

@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
openssl.dev
racket_7_9
];
nativeBuildInputs = [ sconsPackages.scons_3_1_2 ];
nativeBuildInputs = [ sconsPackages.scons_latest ];
patches = [ ./fix-build.patch ];
sconsFlags = [

88
pkgs/applications/graphics/fluxus/fix-build.patch
View File

@ -1,11 +1,20 @@
diff --git a/SConstruct b/SConstruct
index 32cb644..0b3a208 100644
index 32cb644..650333a 100644
--- a/SConstruct
+++ b/SConstruct
@@ -225,6 +225,11 @@ if env['PLATFORM'] == 'posix':
@@ -6,7 +6,7 @@
# application, then calls the sconscripts for libfluxus and
# the fluxus Racket modules
-import os, os.path, sys, commands, subprocess
+import os, os.path, sys, subprocess
MajorVersion = "0"
MinorVersion = "19"
@@ -225,13 +225,18 @@ if env['PLATFORM'] == 'posix':
["asound", "alsa/asoundlib.h"],
["openal", "AL/al.h"]]
+env.Append(ENV={'PATH': ' ' + os.environ['PATH'], })
+env.Append(LIBPATH=ARGUMENTS.get('LIBPATH', '').split(':'))
+env.Append(CCFLAGS=' ' + os.environ.get('NIX_CFLAGS_COMPILE',''))
@ -13,4 +22,75 @@ index 32cb644..0b3a208 100644
+
################################################################################
# Make sure we have these libraries availible
if not GetOption('clean'):
- print '--------------------------------------------------------'
- print 'Fluxus: Configuring Build Environment'
- print '--------------------------------------------------------'
+ print('--------------------------------------------------------')
+ print('Fluxus: Configuring Build Environment')
+ print('--------------------------------------------------------')
# detect ode precision
if not GetOption('clean'):
try:
@@ -240,27 +245,27 @@ if not GetOption('clean'):
if isinstance(ode_str[0], str):
env.MergeFlags(ode_str[0])
except:
- print 'WARNING: unable to run ode-config, cannot detect ODE precision'
+ print('WARNING: unable to run ode-config, cannot detect ODE precision')
conf = Configure(env)
# check Racket and OpenAL frameworks on osx
if env['PLATFORM'] == 'darwin':
if not conf.CheckHeader('scheme.h'):
- print "ERROR: 'racket3m' must be installed!"
+ print("ERROR: 'racket3m' must be installed!")
Exit(1)
if racket_framework:
LibList = filter(lambda x: x[0] != 'racket3m', LibList)
# OpenAL should be installed everywhere
if not conf.CheckHeader('OpenAL/al.h'):
- print "ERROR: 'OpenAL' must be installed!"
+ print("ERROR: 'OpenAL' must be installed!")
Exit(1)
# all libraries are required, and some of them require each other,
# hence the order is important, and autoadd=1
for (lib,headers) in LibList:
if not conf.CheckLibWithHeader(lib, headers, 'C', autoadd = 1):
- print "ERROR: '%s' must be installed!" % (lib)
+ print("ERROR: '%s' must be installed!" % (lib))
Exit(1)
if not conf.CheckFunc("dInitODE2"):
@@ -334,7 +339,7 @@ if not GetOption('clean'):
])
if raco_status != 0:
- print "ERROR: Failed to run command 'raco'"
+ print("ERROR: Failed to run command 'raco'")
Exit(1)
@@ -377,8 +382,8 @@ if not GetOption('clean') and static_modules:
app_env['LIBS'].remove("pthread")
app_env['LIBS'].remove("dl")
- app_env['LIBS'].remove("ode")
- app_env['LIBS'].remove("sndfile")
+ app_env['LIBS'].remove("ode")
+ app_env['LIBS'].remove("sndfile")
# now go through the rest of the libs, removing them from
# the environment at the same time
@@ -425,7 +430,7 @@ SConscript(dirs = build_dirs,
if not GetOption('clean'):
helpmap_status = subprocess.call(["racket", "makehelpmap.scm"], cwd="docs/helpmap")
if helpmap_status != 0:
- print "ERROR: Failed to build 'docs/helpmap'"
+ print("ERROR: Failed to build 'docs/helpmap'")
Exit(1)
################################################################################

4
pkgs/applications/graphics/krita/default.nix
View File

@ -1,7 +1,7 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (args // {
version = "5.1.3";
version = "5.1.4";
kde-channel = "stable";
sha256 = "sha256-69+P0wMIciGxuc6tmWG1OospmvvwcZl6zHNQygEngo0=";
sha256 = "sha256-wisCCGJZbrL92RHhsXnbvOewgb4RFFei6sr2rhzKLcs=";
})

66
pkgs/applications/graphics/oculante/default.nix Normal file
View File

@ -0,0 +1,66 @@
{ lib
, rustPlatform
, fetchFromGitHub
, cmake
, pkg-config
, openssl
, fontconfig
, nasm
, libX11
, libXcursor
, libXrandr
, libXi
, libGL
, stdenv
, gtk3
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "oculante";
version = "0.6.38";
src = fetchFromGitHub {
owner = "woelper";
repo = pname;
rev = version;
sha256 = "sha256-0msPeW0FoBzHBDfX2iFH4HzAknaGPNThuCLi2vhdK08=";
};
cargoSha256 = "sha256-eKRn8MC4/jjPRoajhwrtXsa8n9bGO5MAKjDuwHWs7Oc=";
nativeBuildInputs = [
cmake
pkg-config
nasm
];
checkFlagsArray = [ "--skip=tests::net" ]; # requires network access
buildInputs = [
openssl
fontconfig
] ++ lib.optionals stdenv.isLinux [
libX11
libXcursor
libXi
libXrandr
libGL
gtk3
] ++ lib.optionals stdenv.isDarwin [
darwin.libobjc
];
postFixup = lib.optionalString stdenv.isLinux ''
patchelf $out/bin/oculante --add-rpath ${lib.makeLibraryPath [ libGL ]}
'';
meta = with lib; {
broken = stdenv.isDarwin;
description = "A minimalistic crossplatform image viewer written in Rust";
homepage = "https://github.com/woelper/oculante";
changelog = "https://github.com/woelper/oculante/blob/${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ dit7ya ];
};
}

11
pkgs/applications/misc/cpu-x/default.nix
View File

@ -9,15 +9,20 @@
, libXtst
}:
# Known issues:
# - The daemon can't be started from the GUI, because pkexec requires a shell
# registered in /etc/shells. The nix's bash is not in there when running
# cpu-x from nixpkgs.
stdenv.mkDerivation rec {
pname = "cpu-x";
version = "4.5.1";
version = "4.5.2";
src = fetchFromGitHub {
owner = "X0rg";
repo = "CPU-X";
rev = "v${version}";
sha256 = "sha256-rmRfKw2KMLsO3qfy2QznCIugvM2CLSxBUDgIzONYULk=";
sha256 = "sha256-VPmwnzoOBNLDYZsoEknbcX7QP2Tcm08pL/rw1uCK8xM=";
};
nativeBuildInputs = [ cmake pkg-config wrapGAppsHook nasm makeWrapper ];
@ -40,7 +45,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Free software that gathers information on CPU, motherboard and more";
homepage = src.meta.homepage;
homepage = "https://thetumultuousunicornofdarkness.github.io/CPU-X";
license = licenses.gpl3Plus;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ viraptor ];

6
pkgs/applications/misc/geek-life/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "geek-life";
version = "0.1.2";
version = "0.1.3";
src = fetchFromGitHub {
owner = "ajaxray";
repo = "geek-life";
rev = "v${version}";
sha256 = "083y2kv5vb217ghy9g2qylqgdgbjjggjj3cq454csnn3cjgq9zfh";
sha256 = "sha256-7B/4pDOVXef2MaWKvzkUZH0/KM/O1gJjI3xPjEXqc/E=";
};
vendorSha256 = "05fcnmg2rygccf65r8js6kbijx740vfnvbrc035bjs1jvdw29h9j";
vendorHash = "sha256-U80Yb8YXKQ8KJf+FxkC0EIUFKP4PKAFRtKTCvXSc0WI=";
postInstall = ''
mv $out/bin/app $out/bin/geek-life

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

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tut";
version = "1.0.26";
version = "1.0.30";
src = fetchFromGitHub {
owner = "RasmusLindroth";
repo = pname;
rev = version;
sha256 = "sha256-ZSlrPhCArPEVTKX7BbUfKA+hYi7TpmJbGjWmbBUwes0=";
sha256 = "sha256-Cr9aDfreTDeFV5mws29pYRUkUjHVcLGEZyUvZYAp3B8=";
};
vendorSha256 = "sha256-PYVXEPmWgtME3XljJzyGAri/GW19PIkQpscFFRNuVXQ=";
vendorSha256 = "sha256-ECaePGmSaf0vuKbvgdUMOF8oCpc14srFFMmPJPFFqw4=";
meta = with lib; {
description = "A TUI for Mastodon with vim inspired keys";

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

@ -84,11 +84,11 @@
"vendorHash": "sha256-U88K2CZcN7xh1rPmkZpbRWgj3+lPKN7hkB9T60jR1JQ="
},
"auth0": {
"hash": "sha256-87T0ta5xU61COOfIZ1CP3TTWdCyd6RKLJ2hqShq+giM=",
"hash": "sha256-BlMYx6Ockk8YpiA0wCu2tBwhUIznFJ9b4knSeKA6M/g=",
"homepage": "https://registry.terraform.io/providers/auth0/auth0",
"owner": "auth0",
"repo": "terraform-provider-auth0",
"rev": "v0.41.0",
"rev": "v0.42.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-OhtomdRIjKxELnSQGbZvrHAE1ag4VAyuSOMrZvZ5q0s="
},
@ -112,13 +112,13 @@
"vendorHash": null
},
"aws": {
"hash": "sha256-EN8b2mkGys9td4XmTJ4N/Hi1T3EhLo0nv6Mludu3Mso=",
"hash": "sha256-73g1/5JJ9OJ4LtImxIRQ+kwjT/vTyolFUScAcitZ+G4=",
"homepage": "https://registry.terraform.io/providers/hashicorp/aws",
"owner": "hashicorp",
"repo": "terraform-provider-aws",
"rev": "v4.48.0",
"rev": "v4.49.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-BplPkGuyoljbGZnX7uDuEJsWZFWAXKe/asma9/wCGRM="
"vendorHash": "sha256-L4EoUqkA5/nAs65G+mvXfFt/FzrCN/BmJoFSCP4PC7Q="
},
"azuread": {
"hash": "sha256-itaFeOEnoTIJfACvJZCIe9RWNVgewdVFZzXUK7yGglQ=",
@ -340,11 +340,11 @@
"vendorHash": "sha256-z0vos/tZDUClK/s2yrXZG2RU8QgA8IM6bJj6jSdCnBk="
},
"docker": {
"hash": "sha256-+zKOwEMWOZoq4fau/Ieo+s+p+fTb4thMqfhrEnopiVQ=",
"hash": "sha256-70nwqQOMncOOeX/ulrzBqTAqQyHELwM1V8/ZC+jUyXE=",
"homepage": "https://registry.terraform.io/providers/kreuzwerker/docker",
"owner": "kreuzwerker",
"repo": "terraform-provider-docker",
"rev": "v2.24.0",
"rev": "v2.25.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-OdZQb81d7N1TdbDWEImq2U3kLkCPdhRk38+8T8fu+F4="
},
@ -480,11 +480,11 @@
"vendorHash": "sha256-s6VwvxHXny5gCrbxiRI3F7w3HR3lq2NeiHZgTiU37m0="
},
"gridscale": {
"hash": "sha256-k87g+MwzKl++VfKerzRllHsKN8Y8AyEFm1yWV5xrgwI=",
"hash": "sha256-ahYCrjrJPEItGyqbHYtgkIH/RzMyxBQkebSAyd8gwYo=",
"homepage": "https://registry.terraform.io/providers/gridscale/gridscale",
"owner": "gridscale",
"repo": "terraform-provider-gridscale",
"rev": "v1.16.2",
"rev": "v1.17.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -507,11 +507,11 @@
"vendorHash": null
},
"heroku": {
"hash": "sha256-6SNBi4hSGD6XhUSmIOjmPVzo2HnvRBGFW1jMHJLDhuI=",
"hash": "sha256-UGA01N4ToEb3eSKCI2raI3ZXFeRm0MVVXVWgAc7im9g=",
"homepage": "https://registry.terraform.io/providers/heroku/heroku",
"owner": "heroku",
"repo": "terraform-provider-heroku",
"rev": "v5.1.9",
"rev": "v5.1.10",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -1095,11 +1095,11 @@
"vendorHash": "sha256-2wPmLpjhG6QgG+BUCO0oIzHjBOWIOYuptgdtSIm9TZw="
},
"tencentcloud": {
"hash": "sha256-vXd0yZ57bEdZ0OcIANMWdDN8PzOKnXJKw7HgjcOhSeE=",
"hash": "sha256-6rwpOXd/1iCgCDhWI7e5GuQu112KaYIvkgdyRpehI7I=",
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
"owner": "tencentcloudstack",
"repo": "terraform-provider-tencentcloud",
"rev": "v1.79.3",
"rev": "v1.79.4",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -1177,12 +1177,12 @@
"vendorHash": "sha256-jyGp0HIu+VxZ7n6Cctq6pi6Z7IKZ7W7FeqnGXk9Pt7o="
},
"vault": {
"hash": "sha256-y5pK+sZ1xWnzlhT4sFUy5Mp6sggLLtaY4Cx2OPamDIc=",
"hash": "sha256-aNyCUDV1yjpmbPNYlxuJNaiXtG3fJySxRsDLJx/hZ04=",
"homepage": "https://registry.terraform.io/providers/hashicorp/vault",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-vault",
"rev": "v3.11.0",
"rev": "v3.12.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-EOBNoEW9GI21IgXSiEN93B3skxfCrBkNwLxGXaso1oE="
},

49
pkgs/applications/networking/coreth/default.nix Normal file
View File

@ -0,0 +1,49 @@
{ buildGoModule
, fetchFromGitHub
, lib
, stdenv
}:
buildGoModule rec {
pname = "coreth";
version = "0.11.5";
src = fetchFromGitHub {
owner = "ava-labs";
repo = pname;
rev = "v${version}";
hash = "sha256-tXwcwMNSrjgQOXcEIucEZjpmPL0cvgYPOV4CMU51Bz8=";
};
# go mod vendor has a bug, see: golang/go#57529
proxyVendor = true;
vendorHash = "sha256-Wd0m/Bcbn3so0mh83tTfebfOBn51MiAxF3Azmu6ZA0o=";
ldflags = [
"-s"
"-w"
"-X github.com/ava-labs/coreth/plugin/evm.Version=${version}"
"-X github.com/ava-labs/coreth/cmd/abigen.gitCommit=${version}"
"-X github.com/ava-labs/coreth/cmd/abigen.gitDate=1970-01-01"
];
subPackages = [
"cmd/abigen"
"plugin"
];
postInstall = "mv $out/bin/{plugin,evm}";
meta = with lib; {
description = "Code and wrapper to extract Ethereum blockchain functionalities without network/consensus, for building custom blockchain services";
homepage = "https://github.com/ava-labs/coreth";
changelog = "https://github.com/ava-labs/coreth/releases/tag/v${version}";
license = licenses.lgpl3Only;
maintainers = with maintainers; [ urandom ];
# In file included from ../go/pkg/mod/github.com/zondax/hid@v0.9.1-0.20220302062450-5552068d2266/hid_enabled.go:38:
# ./hidapi/mac/hid.c:693:34: error: use of undeclared identifier 'kIOMainPortDefault'
# entry = IORegistryEntryFromPath(kIOMainPortDefault, path);
broken = stdenv.isDarwin;
};
}

4
pkgs/applications/networking/firewalld/default.nix
View File

@ -31,13 +31,13 @@ let
in
stdenv.mkDerivation rec {
pname = "firewalld";
version = "1.2.2";
version = "1.3.0";
src = fetchFromGitHub {
owner = "firewalld";
repo = "firewalld";
rev = "v${version}";
sha256 = "sha256-RdkGwhSx/zluCtBj8hGjkvJ11ZgPRMM9wWoE+/ynnDc=";
sha256 = "sha256-UQ61do0f0bT3VNyZAx2ZuwQ+6SGvKUS6V5Y1B6EpJ5Q=";
};
patches = [

10
pkgs/applications/networking/mailreaders/sylpheed/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, gtk2, openssl ? null, gpgme ? null
, gpgSupport ? true, sslSupport ? true, fetchpatch }:
, gpgSupport ? true, sslSupport ? true, fetchpatch, Foundation }:
assert gpgSupport -> gpgme != null;
assert sslSupport -> openssl != null;
@ -34,18 +34,20 @@ stdenv.mkDerivation rec {
buildInputs = [ gtk2 ]
++ optionals gpgSupport [ gpgme ]
++ optionals sslSupport [ openssl ];
++ optionals sslSupport [ openssl ]
++ optionals stdenv.isDarwin [ Foundation ];
configureFlags = optional gpgSupport "--enable-gpgme"
++ optional sslSupport "--enable-ssl";
# Undefined symbols for architecture arm64: "_OBJC_CLASS_$_NSAutoreleasePool"
NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework Foundation";
meta = {
homepage = "https://sylpheed.sraoss.jp/en/";
description = "Lightweight and user-friendly e-mail client";
maintainers = with maintainers; [ eelco ];
platforms = platforms.linux ++ platforms.darwin;
license = licenses.gpl2;
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

2
pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix
View File

@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
makeWrapper ${electron}/bin/electron \
$out/bin/tutanota-desktop \
--add-flags $out/share/tutanota-desktop/resources/app.asar \
--run "mkdir /tmp/tutanota" \
--run "mkdir -p /tmp/tutanota" \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}
runHook postInstall

15
pkgs/applications/networking/netmaker/default.nix
View File

@ -1,4 +1,12 @@
{ buildGoModule, fetchFromGitHub, installShellFiles, lib, libglvnd, pkg-config, xorg }:
{ buildGoModule
, fetchFromGitHub
, installShellFiles
, lib
, libglvnd
, pkg-config
, subPackages ? ["." "netclient"]
, xorg
}:
buildGoModule rec {
pname = "netmaker";
@ -13,10 +21,7 @@ buildGoModule rec {
vendorHash = "sha256-4LaGwwDu3pKd6I6r/F3isCi9CuFqPGvc5SdVTV34qOI=";
subPackages = [
"."
"netclient"
];
inherit subPackages;
nativeBuildInputs = [ pkg-config ];

2
pkgs/applications/office/jabref/default.nix
View File

@ -141,7 +141,7 @@ stdenv.mkDerivation rec {
binaryBytecode # source bundles dependencies as jars
binaryNativeCode # source bundles dependencies as jars
];
license = licenses.gpl2;
license = licenses.mit;
platforms = [ "x86_64-linux" "aarch64-linux" ];
maintainers = with maintainers; [ gebner linsui ];
};

1
pkgs/applications/science/logic/coq/default.nix
View File

@ -53,6 +53,7 @@ let
"8.15.2".sha256 = "sha256:0qibbvzrhsvs6w3zpkhyclndp29jnr6bs9i5skjlpp431jdjjfqd";
"8.16.0".sha256 = "sha256-3V6kL9j2rn5FHBxq1mtmWWTZS9X5cAyvtUsS6DaM+is=";
"8.16.1".sha256 = "sha256-n7830+zfZeyYHEOGdUo57bH6bb2/SZs8zv8xJhV+iAc=";
"8.17+rc1".sha256 = "sha256-BsVgYa2fAYqRmQNSaY/YSiZhqkmwM+xbE5T4FHOEqkc=";
};
releaseRev = v: "V${v}";
fetched = import ../../../../build-support/coq/meta-fetch/default.nix

16
pkgs/applications/terminal-emulators/kitty/default.nix
View File

@ -7,12 +7,13 @@
, openssl
, installShellFiles
, dbus
, darwin
, Cocoa
, CoreGraphics
, Foundation
, IOKit
, Kernel
, UniformTypeIdentifiers
, UserNotifications
, OpenGL
, libcanberra
, libicns
@ -28,14 +29,14 @@
with python3Packages;
buildPythonApplication rec {
pname = "kitty";
version = "0.26.2";
version = "0.26.5";
format = "other";
src = fetchFromGitHub {
owner = "kovidgoyal";
repo = "kitty";
rev = "v${version}";
sha256 = "sha256-IqXRkKzOfqWolH/534nmM2R/69olhFOk6wbbF4ifRd0=";
rev = "refs/tags/v${version}";
sha256 = "sha256-UloBlV26HnkvbzP/NynlPI77z09MBEVgtrg5SeTmwB4=";
};
buildInputs = [
@ -51,11 +52,11 @@ buildPythonApplication rec {
IOKit
Kernel
OpenGL
UniformTypeIdentifiers
UserNotifications
libpng
python3
zlib
] ++ lib.optionals (stdenv.isDarwin && (builtins.hasAttr "UserNotifications" darwin.apple_sdk.frameworks)) [
darwin.apple_sdk.frameworks.UserNotifications
] ++ lib.optionals stdenv.isLinux [
fontconfig libunistring libcanberra libX11
libXrandr libXinerama libXcursor libxkbcommon libXi libXext
@ -218,6 +219,7 @@ buildPythonApplication rec {
license = licenses.gpl3Only;
changelog = "https://sw.kovidgoyal.net/kitty/changelog/";
platforms = platforms.darwin ++ platforms.linux;
maintainers = with maintainers; [ tex rvolosatovs Luflosi ];
broken = (stdenv.isDarwin && stdenv.isx86_64);
maintainers = with maintainers; [ tex rvolosatovs Luflosi adamcstephens ];
};
}

6
pkgs/applications/virtualization/OVMF/default.nix
View File

@ -13,7 +13,7 @@ let
"OvmfPkg/OvmfPkgIa32.dsc"
else if stdenv.isx86_64 then
"OvmfPkg/OvmfPkgX64.dsc"
else if stdenv.isAarch64 then
else if stdenv.hostPlatform.isAarch then
"ArmVirtPkg/ArmVirtQemu.dsc"
else
throw "Unsupported architecture";
@ -52,7 +52,7 @@ edk2.mkDerivation projectDscPath (finalAttrs: {
cp ${seabios}/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin
'';
postFixup = if stdenv.isAarch64 then ''
postFixup = if stdenv.hostPlatform.isAarch then ''
mkdir -vp $fd/FV
mkdir -vp $fd/AAVMF
mv -v $out/FV/QEMU_{EFI,VARS}.fd $fd/FV
@ -88,7 +88,7 @@ edk2.mkDerivation projectDscPath (finalAttrs: {
description = "Sample UEFI firmware for QEMU and KVM";
homepage = "https://github.com/tianocore/tianocore.github.io/wiki/OVMF";
license = lib.licenses.bsd2;
platforms = ["x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin"];
inherit (edk2.meta) platforms;
maintainers = [ lib.maintainers.raitobezarius ];
};
})

4
pkgs/applications/virtualization/containerd/default.nix
View File

@ -10,13 +10,13 @@
buildGoModule rec {
pname = "containerd";
version = "1.6.14";
version = "1.6.15";
src = fetchFromGitHub {
owner = "containerd";
repo = "containerd";
rev = "v${version}";
sha256 = "sha256-+2K2lLxTXZS8pjgqhJZd+JovUFqG5Cgw9iAbDjnUvvQ=";
sha256 = "sha256-Vlftq//mLYZPoT2R/lHJA6wLnqiuC+Cpy4lGQC8jCPA=";
};
vendorSha256 = null;

2
pkgs/build-support/src-only/default.nix
View File

@ -17,5 +17,7 @@ stdenv.mkDerivation (args // {
installPhase = "cp -r . $out";
outputs = [ "out" ];
separateDebugInfo = false;
dontUnpack = false;
dontInstall = false;
phases = ["unpackPhase" "patchPhase" "installPhase"];
})

2
pkgs/build-support/writers/default.nix
View File

@ -101,7 +101,7 @@ let
interpreter = "${pkgs.bash}/bin/bash";
};
# Like writeScriptBIn but the first line is a shebang to bash
# Like writeScriptBin but the first line is a shebang to bash
writeBashBin = name:
writeBash "/bin/${name}";

4
pkgs/desktops/gnome/core/gnome-bluetooth/default.nix
View File

@ -27,14 +27,14 @@
stdenv.mkDerivation rec {
pname = "gnome-bluetooth";
version = "42.4";
version = "42.5";
# TODO: split out "lib"
outputs = [ "out" "dev" "devdoc" "man" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "HW/PHNtsyZI6szSiwLw3osG7qdGN4VPUhO7cBPPAvNw=";
sha256 = "pPXxrC27e3uS99bStCwDD2Ku2bVCa53BFpRgQfPLqPc=";
};
nativeBuildInputs = [

4
pkgs/desktops/gnome/core/gnome-control-center/default.nix
View File

@ -64,11 +64,11 @@
stdenv.mkDerivation rec {
pname = "gnome-control-center";
version = "43.1";
version = "43.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "sha256-6YvGt4Sv0E8pfbXo5sWZEOLNCQMycQd08m3I3omvT8c=";
sha256 = "sha256-1/JWq6gKkscnsyn9AchgLaS3jw/drsk/zZEJaWRwBWM=";
};
patches = [

4
pkgs/desktops/gnome/games/aisleriot/default.nix
View File

@ -19,14 +19,14 @@
stdenv.mkDerivation rec {
pname = "aisleriot";
version = "3.22.26";
version = "3.22.27";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "aisleriot";
rev = version;
sha256 = "sha256-enUDJ6KM3QDsPb3ckKOxpRzMe4I0bj4TQR94oZWJJJY=";
sha256 = "sha256-XvYQ1JWMBWVZF5u3VL1zPADgMDMN/1FNuwZ4vaOeo7Y=";
};
nativeBuildInputs = [

4
pkgs/development/compilers/edk2/default.nix
View File

@ -17,6 +17,8 @@ targetArch = if stdenv.isi686 then
"IA32"
else if stdenv.isx86_64 then
"X64"
else if stdenv.isAarch32 then
"ARM"
else if stdenv.isAarch64 then
"AARCH64"
else
@ -83,7 +85,7 @@ edk2 = buildStdenv.mkDerivation {
description = "Intel EFI development kit";
homepage = "https://github.com/tianocore/tianocore.github.io/wiki/EDK-II/";
license = licenses.bsd2;
platforms = with platforms; aarch64 ++ i686 ++ x86_64;
platforms = with platforms; aarch64 ++ arm ++ i686 ++ x86_64;
};
passthru = {

1
pkgs/development/compilers/temurin-bin/generate-sources.py
View File

@ -15,6 +15,7 @@ arch_to_nixos = {
"x64": ("x86_64",),
"aarch64": ("aarch64",),
"arm": ("armv6l", "armv7l"),
"ppc64le": ("powerpc64le",),
}
def generate_sources(assets, feature_version, out):

66
pkgs/development/compilers/temurin-bin/sources.json
View File

@ -138,6 +138,12 @@
"version": "11.0.17"
},
"packageType": "jdk",
"powerpc64le": {
"build": "8",
"sha256": "18c636bd103e240d29cdb30d7867720ea9fb9ff7c645738bfb4d5b8027269263",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.17_8.tar.gz",
"version": "11.0.17"
},
"vmType": "hotspot",
"x86_64": {
"build": "8",
@ -166,6 +172,12 @@
"version": "16.0.2"
},
"packageType": "jdk",
"powerpc64le": {
"build": "7",
"sha256": "36ebe6c72f2fc19b8b17371f731390e15fa3aab08c28b55b9a8b71d0a578adc9",
"url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_ppc64le_linux_hotspot_16.0.2_7.tar.gz",
"version": "16.0.2"
},
"vmType": "hotspot",
"x86_64": {
"build": "7",
@ -194,6 +206,12 @@
"version": "17.0.5"
},
"packageType": "jdk",
"powerpc64le": {
"build": "8",
"sha256": "a426a4e2cbc29f46fa686bea8b26613f7b7a9a772a77fed0d40dfe05295be883",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.5_8.tar.gz",
"version": "17.0.5"
},
"vmType": "hotspot",
"x86_64": {
"build": "8",
@ -222,6 +240,12 @@
"version": "18.0.2"
},
"packageType": "jdk",
"powerpc64le": {
"build": "1",
"sha256": "030261a2189a8f773fda543a85ab9beb4c430bf81ca5be37cf6cb970b5ccbb03",
"url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_ppc64le_linux_hotspot_18.0.2.1_1.tar.gz",
"version": "18.0.2"
},
"vmType": "hotspot",
"x86_64": {
"build": "1",
@ -250,6 +274,12 @@
"version": "19.0.0"
},
"packageType": "jdk",
"powerpc64le": {
"build": "10",
"sha256": "79320712bbef13825a0aa308621006f32e54f503142737fb21ff085185a61a96",
"url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jdk_ppc64le_linux_hotspot_19.0.1_10.tar.gz",
"version": "19.0.1"
},
"vmType": "hotspot",
"x86_64": {
"build": "10",
@ -278,6 +308,12 @@
"version": "8.0.345"
},
"packageType": "jdk",
"powerpc64le": {
"build": "8",
"sha256": "863791dd8e0536a678f5e439c9c67199a0f3f18c76138a8e242775dfe1784009",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u352b08.tar.gz",
"version": "8.0.352"
},
"vmType": "hotspot",
"x86_64": {
"build": "8",
@ -308,6 +344,12 @@
"version": "11.0.17"
},
"packageType": "jre",
"powerpc64le": {
"build": "8",
"sha256": "0ca3d806131ab5834c501f9c625bb0248cd528af361c704503348e9c9605bedf",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.17_8.tar.gz",
"version": "11.0.17"
},
"vmType": "hotspot",
"x86_64": {
"build": "8",
@ -336,6 +378,12 @@
"version": "17.0.5"
},
"packageType": "jre",
"powerpc64le": {
"build": "8",
"sha256": "51dd491505bd2e096676b9dc8ecaf196d78993215af16c0f9dfddfe3dbc0205b",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.5_8.tar.gz",
"version": "17.0.5"
},
"vmType": "hotspot",
"x86_64": {
"build": "8",
@ -364,6 +412,12 @@
"version": "18.0.2"
},
"packageType": "jre",
"powerpc64le": {
"build": "1",
"sha256": "2298504c99b4c15f620f70415215e481766d2b2f784d066206eed8c583922f8f",
"url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_ppc64le_linux_hotspot_18.0.2.1_1.tar.gz",
"version": "18.0.2"
},
"vmType": "hotspot",
"x86_64": {
"build": "1",
@ -392,6 +446,12 @@
"version": "19.0.0"
},
"packageType": "jre",
"powerpc64le": {
"build": "10",
"sha256": "c5f3d67edfa0d9b5ec935f944c177c0ee4b2d7a2b5846feaf187b77e954f4242",
"url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jre_ppc64le_linux_hotspot_19.0.1_10.tar.gz",
"version": "19.0.1"
},
"vmType": "hotspot",
"x86_64": {
"build": "10",
@ -420,6 +480,12 @@
"version": "8.0.345"
},
"packageType": "jre",
"powerpc64le": {
"build": "8",
"sha256": "5649672dab65b3519ec16653fb2f154da90a7cd2afc568da03f3bff5c6b30a90",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jre_ppc64le_linux_hotspot_8u352b08.tar.gz",
"version": "8.0.352"
},
"vmType": "hotspot",
"x86_64": {
"build": "8",

2
pkgs/development/coq-modules/Cheerios/default.nix
View File

@ -4,7 +4,7 @@ with lib; mkCoqDerivation {
pname = "cheerios";
owner = "uwplse";
inherit version;
defaultVersion = if versions.isGe "8.6" coq.version then "20200201" else null;
defaultVersion = if versions.range "8.6" "8.16" coq.version then "20200201" else null;
release."20200201".rev = "9c7f66e57b91f706d70afa8ed99d64ed98ab367d";
release."20200201".sha256 = "1h55s6lk47bk0lv5ralh81z55h799jbl9mhizmqwqzy57y8wqgs1";

2
pkgs/development/coq-modules/InfSeqExt/default.nix
View File

@ -4,7 +4,7 @@ mkCoqDerivation {
pname = "InfSeqExt";
owner = "DistributedComponents";
inherit version;
defaultVersion = if lib.versions.isGe "8.5" coq.version then "20200131" else null;
defaultVersion = if lib.versions.range "8.5" "8.16" coq.version then "20200131" else null;
release."20200131".rev = "203d4c20211d6b17741f1fdca46dbc091f5e961a";
release."20200131".sha256 = "0xylkdmb2dqnnqinf3pigz4mf4zmczcbpjnn59g5g76m7f2cqxl0";
preConfigure = ''

1
pkgs/development/coq-modules/bignums/default.nix
View File

@ -8,6 +8,7 @@ with lib; mkCoqDerivation {
defaultVersion = if versions.isGe "8.6" coq.coq-version
then "${coq.coq-version}.0" else null;
release."8.17.0".sha256 = "sha256-MXYjqN86+3O4hT2ql62U83T5H03E/8ysH8erpvC/oyw=";
release."8.16.0".sha256 = "sha256-DH3iWwatPlhhCVYVlgL2WLkvneSVzSXUiKo2e0+1zR4=";
release."8.15.0".sha256 = "093klwlhclgyrba1iv18dyz1qp5f0lwiaa7y0qwvgmai8rll5fns";
release."8.14.0".sha256 = "0jsgdvj0ddhkls32krprp34r64y1rb5mwxl34fgaxk2k4664yq06";

2
pkgs/development/coq-modules/ceres/default.nix
View File

@ -8,7 +8,7 @@ mkCoqDerivation {
owner = "Lysxia";
inherit version;
defaultVersion = if versions.isGe "8.8" coq.version then "0.4.0" else null;
defaultVersion = if versions.range "8.8" "8.16" coq.version then "0.4.0" else null;
release."0.4.0".sha256 = "sha256:0zwp3pn6fdj0qdig734zdczrls886al06mxqhhabms0jvvqijmbi";
meta = {

2
pkgs/development/coq-modules/mathcomp-bigenough/default.nix
View File

@ -12,7 +12,7 @@ with lib; mkCoqDerivation {
};
inherit version;
defaultVersion = with versions; switch coq.version [
{ case = isGe "8.10" ; out = "1.0.1"; }
{ case = range "8.10" "8.16"; out = "1.0.1"; }
{ case = range "8.5" "8.14"; out = "1.0.0"; }
] null;

2
pkgs/development/coq-modules/topology/default.nix
View File

@ -16,7 +16,7 @@ mkCoqDerivation rec {
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = isGe "8.10"; out = "9.0.0"; }
{ case = range "8.10" "8.16"; out = "9.0.0"; }
{ case = "8.9"; out = "8.9.0"; }
{ case = "8.8"; out = "8.8.0"; }
{ case = "8.7"; out = "8.7.0"; }

2
pkgs/development/coq-modules/zorns-lemma/default.nix
View File

@ -17,7 +17,7 @@ with lib;
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = isGe "8.10"; out = "9.0.0"; }
{ case = range "8.10" "8.16"; out = "9.0.0"; }
{ case = "8.9"; out = "8.9.0"; }
{ case = "8.8"; out = "8.8.0"; }
{ case = "8.7"; out = "8.7.0"; }

8
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -852,17 +852,17 @@ self: super: builtins.intersectAttrs super {
];
cachix = super.cachix.override {
nix = pkgs.nixVersions.nix_2_9;
nix = pkgs.nixVersions.nix_2_10;
fsnotify = super.fsnotify_0_4_1_0;
hnix-store-core = super.hnix-store-core_0_6_1_0;
};
hercules-ci-agent = super.hercules-ci-agent.override { nix = pkgs.nixVersions.nix_2_9; };
hercules-ci-agent = super.hercules-ci-agent.override { nix = pkgs.nixVersions.nix_2_10; };
hercules-ci-cnix-expr =
addTestToolDepend pkgs.git (
super.hercules-ci-cnix-expr.override { nix = pkgs.nixVersions.nix_2_9; }
super.hercules-ci-cnix-expr.override { nix = pkgs.nixVersions.nix_2_10; }
);
hercules-ci-cnix-store = super.hercules-ci-cnix-store.override { nix = pkgs.nixVersions.nix_2_9; };
hercules-ci-cnix-store = super.hercules-ci-cnix-store.override { nix = pkgs.nixVersions.nix_2_10; };
# the testsuite fails because of not finding tsc without some help
aeson-typescript = overrideCabal (drv: {

6
pkgs/development/interpreters/luajit/default.nix
View File

@ -127,8 +127,10 @@ stdenv.mkDerivation rec {
homepage = "https://luajit.org/";
license = licenses.mit;
platforms = platforms.linux ++ platforms.darwin;
# See https://github.com/LuaJIT/LuaJIT/issues/628
badPlatforms = [ "riscv64-linux" "riscv64-linux" ];
badPlatforms = [
"riscv64-linux" "riscv64-linux" # See https://github.com/LuaJIT/LuaJIT/issues/628
"powerpc64le-linux" # `#error "No support for PPC64"`
];
maintainers = with maintainers; [ thoughtpolice smironov vcunat lblasc ];
} // extraMeta;
}

19
pkgs/development/libraries/keybinder/default.nix
View File

@ -1,28 +1,29 @@
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome
, gtk-doc, gtk2, python2Packages, lua, gobject-introspection
, gtk-doc, gtk2, lua, gobject-introspection
}:
let
inherit (python2Packages) python pygtk;
in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
pname = "keybinder";
version = "0.3.0";
version = "0.3.1";
src = fetchFromGitHub {
owner = "engla";
repo = "keybinder";
rev = "v${version}";
sha256 = "sha256-q/+hqhvXIknT+/5oENcWSr1OuF00kaZlXFUP1fdCMlk=";
sha256 = "sha256-elL6DZtzCwAtoyGZYP0jAma6tHPks2KAtrziWtBENGU=";
};
nativeBuildInputs = [ pkg-config autoconf automake ];
buildInputs = [
libtool gnome.gnome-common gtk-doc gtk2
python pygtk lua gobject-introspection
lua gobject-introspection
];
configureFlags = [ "--disable-python" ];
preConfigure = ''
./autogen.sh --prefix="$out"
./autogen.sh --prefix="$out" $configureFlags
'';
meta = with lib; {
@ -36,8 +37,6 @@ in stdenv.mkDerivation rec {
* A C library, ``libkeybinder``
* Gobject-Introspection (gir) generated bindings
* Lua bindings, ``lua-keybinder``
* Python bindings, ``python-keybinder``
* An ``examples`` directory with programs in C, Lua, Python and Vala.
'';
homepage = "https://github.com/engla/keybinder/";
license = licenses.gpl2Plus;

4
pkgs/development/libraries/libtommath/default.nix
View File

@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
makefile = "makefile.shared";
NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-DTARGET_OS_IPHONE=0";
enableParallelBuilding = true;
meta = with lib; {
@ -31,7 +33,5 @@ stdenv.mkDerivation rec {
description = "A library for integer-based number-theoretic applications";
license = with licenses; [ publicDomain wtfpl ];
platforms = platforms.unix;
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

1
pkgs/development/libraries/libva/1.nix
View File

@ -18,6 +18,7 @@
stdenv.mkDerivation rec {
pname = "libva" + lib.optionalString minimal "-minimal";
# nixpkgs-update: no auto update
version = "1.8.3";
src = fetchFromGitHub {

15
pkgs/development/libraries/libversion/default.nix
View File

@ -2,19 +2,28 @@
stdenv.mkDerivation rec {
pname = "libversion";
version = "3.0.1";
version = "3.0.2";
src = fetchFromGitHub {
owner = "repology";
repo = "libversion";
rev = version;
sha256 = "13x5djdpv6aryxsbw6a3b6vwzi9f4aa3gn9dqb7axzppggayawyk";
hash = "sha256-P/ykRy+LgcfWls4Zw8noel/K9mh/PnKy3smoQtuSi00=";
};
nativeBuildInputs = [ cmake ];
doCheck = true;
cmakeFlags = [
# https://github.com/NixOS/nixpkgs/issues/144170
# 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"
];
checkTarget = "test";
doCheck = true;
meta = with lib; {
description = "Advanced version string comparison library";

4
pkgs/development/libraries/nss/latest.nix
View File

@ -5,6 +5,6 @@
# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
import ./generic.nix {
version = "3.86";
hash = "sha256-PzhfxoZHa7uoEQNfpoIbVCR11VdHsYwgwiHU1mVzuXU=";
version = "3.87";
hash = "sha256-aKGJRJbT0Vi6vHX4pd2j9Vt8FWBXOTbjsQGhD6SsFS0=";
}

4
pkgs/development/libraries/rlottie/default.nix
View File

@ -28,13 +28,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkg-config ];
NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-U__ARM_NEON__";
meta = with lib; {
homepage = "https://github.com/Samsung/rlottie";
description = "A platform independent standalone c++ library for rendering vector based animations and art in realtime";
license = with licenses; [ mit bsd3 mpl11 ftl ];
platforms = platforms.all;
maintainers = with maintainers; [ CRTified ];
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

1
pkgs/development/node-packages/main-programs.nix
View File

@ -4,6 +4,7 @@
# Packages that provide multiple executables where one is clearly the `mainProgram`.
"@antfu/ni" = "ni";
"@electron-forge/cli" = "electron-forge";
"@microsoft/rush" = "rush";
"@squoosh/cli" = "squoosh-cli";
"@webassemblyjs/cli-1.11.1" = "wasm2wast";
coffee-script = "coffee";

1
pkgs/development/node-packages/node-packages.json
View File

@ -11,6 +11,7 @@
, "@forge/cli"
, "@google/clasp"
, "@medable/mdctl-cli"
, "@microsoft/rush"
, "@nerdwallet/shepherd"
, "@nestjs/cli"
, "@squoosh/cli"

10549
pkgs/development/node-packages/node-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

4
pkgs/development/node-packages/overrides.nix
View File

@ -453,6 +453,10 @@ final: prev: {
}
);
rush = prev."@microsoft/rush".override {
name = "rush";
};
ssb-server = prev.ssb-server.override (oldAttrs: {
buildInputs = [ pkgs.automake pkgs.autoconf final.node-gyp-build ];
meta = oldAttrs.meta // { broken = since "10"; };

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

@ -5,14 +5,14 @@
}:
buildDunePackage rec {
version = "3.9";
version = "3.10";
pname = "containers";
src = fetchFromGitHub {
owner = "c-cube";
repo = "ocaml-containers";
rev = "v${version}";
sha256 = "sha256-uQyKBSXgf3kGx5HvS2VQrrkh0WqNZfxr5j8tTRjeTX4=";
hash = "sha256-eWmju4CD30+wX3sKI8rOUEbqbQygdOtc0U4sb9vYuNA=";
};
buildInputs = [ dune-configurator ];

34
pkgs/development/ocaml-modules/ppxlib/default.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, buildDunePackage, ocaml
{ lib, fetchurl, buildDunePackage, ocaml
, version ?
if lib.versionAtLeast ocaml.version "4.07"
then if lib.versionAtLeast ocaml.version "4.08"
@ -10,45 +10,49 @@
let param = {
"0.8.1" = {
sha256 = "0vm0jajmg8135scbg0x60ivyy5gzv4abwnl7zls2mrw23ac6kml6";
sha256 = "sha256-pct57oO7qAMEtlvEfymFOCvviWaLG0b5/7NzTC8vdSE=";
max_version = "4.10";
useDune2 = false;
useOMP2 = false;
};
"0.13.0" = {
sha256 = "0c54g22pm6lhfh3f7s5wbah8y48lr5lj3cqsbvgi99bly1b5vqvl";
sha256 = "sha256-geHz0whQDg5/YQjVsN2iuHlkClwh7z3Eqb2QOBzuOdk=";
max_version = "4.11";
useDune2 = false;
useOMP2 = false;
};
"0.15.0" = {
sha256 = "1p037kqj5858xrhh0dps6vbf4fnijla6z9fjz5zigvnqp4i2xkrn";
sha256 = "sha256-C2MNf410qJmlXMJxiLXOA+c1qT8H6gwt5WUy2P2TszA=";
min_version = "4.07";
max_version = "4.12";
useOMP2 = false;
};
"0.18.0" = {
sha256 = "1ciy6va2gjrpjs02kha83pzh0x1gkmfsfsdgabbs1v14a8qgfibm";
sha256 = "sha256-nUg8NkZ64GHHDfcWbtFGXq3MNEKu+nYPtcVDm/gEfcM=";
min_version = "4.07";
max_version = "4.12";
};
"0.22.0" = {
sha256 = "0kf7lgcwygf6zlx7rwddqpqvasa6v7xiq0bqal8vxlib6lpg074q";
sha256 = "sha256-PuuR4DlmZiKEoyIuYS3uf0+it2N8U9lXLSp0E0u5bXo=";
min_version = "4.07";
max_version = "4.13";
};
"0.22.2" = {
sha256 = "0fysjqcpv281n52wl3h0dy2lzf9d61wdzk90ldv3p63a4i3mr1j2";
sha256 = "sha256-0Oih69xiILFXTXqSbwCEYMURjM73m/mgzgJC80z/Ilo=";
min_version = "4.07";
max_version = "4.14";
};
"0.23.0" = {
sha256 = "0jg5v4pssbl66hn5davpin1i57a0r3r54l96vpz5y99xk5w70xi1";
sha256 = "sha256-G1g2wYa51aFqz0falPOWj08ItRm3cpzYao/TmXH+EuU=";
min_version = "4.07";
max_version = "4.14";
};
"0.24.0" = {
sha256 = "sha256-wuG7cUZiVP2PdM+nZloip7lGGiWn6Wpkh2YoF/Fuc9o=";
sha256 = "sha256-d2YCfC7ND1s7Rg6SEqcHCcZ0QngRPrkfMXxWxB56kMg=";
min_version = "4.07";
};
"0.28.0" = {
sha256 = "sha256-i/U++sosKQUjyxu9GscPb1Gfv2a3Hbmj+UgIZlewnCo=";
sha256 = "sha256-2Hrl+aCBIGMIypZICbUKZq646D0lSAHouWdUSLYM83c=";
min_version = "4.07";
};
}."${version}"; in
@ -62,12 +66,10 @@ buildDunePackage rec {
pname = "ppxlib";
inherit version;
useDune2 = param.useDune2 or true;
duneVersion = if param.useDune2 or true then "2" else "1";
src = fetchFromGitHub {
owner = "ocaml-ppx";
repo = pname;
rev = version;
src = fetchurl {
url = "https://github.com/ocaml-ppx/ppxlib/releases/download/${version}/ppxlib-${version}.tbz";
inherit (param) sha256;
};
@ -85,6 +87,6 @@ buildDunePackage rec {
description = "Comprehensive ppx tool set";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage;
homepage = "https://github.com/ocaml-ppx/ppxlib";
};
}

65
pkgs/development/python-modules/aiopurpleair/default.nix Normal file
View File

@ -0,0 +1,65 @@
{ lib
, aiohttp
, aresponses
, buildPythonPackage
, fetchFromGitHub
, poetry-core
, pydantic
, pytest-aiohttp
, pytest-asyncio
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "aiopurpleair";
version = "2022.12.1";
format = "pyproject";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "bachya";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-YmJH4brWkTpgzyHwu9UnIWrY5qlDCmMtvF+KxQFXwfk=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'pydantic = "^1.10.2"' 'pydantic = "*"'
'';
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
aiohttp
pydantic
];
checkInputs = [
aresponses
pytest-aiohttp
pytest-asyncio
pytestCheckHook
];
disabledTestPaths = [
# Ignore the examples directory as the files are prefixed with test_.
"examples/"
];
pythonImportsCheck = [
"aiopurpleair"
];
meta = with lib; {
description = "Python library for interacting with the PurpleAir API";
homepage = "https://github.com/bachya/aiopurpleair";
changelog = "https://github.com/bachya/aiopurpleair/releases/tag/${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

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

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "bimmer-connected";
version = "0.10.4";
version = "0.12.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "bimmerconnected";
repo = "bimmer_connected";
rev = "refs/tags/${version}";
hash = "sha256-o4h84WM/p4gVrxv7YDNgwDpyBYu7Aileagwc8PXNwPs=";
hash = "sha256-Efa3Z4pWn+TkpA61COQTFCl+gOc5IGqYv6ZHTqiTC2c=";
};
nativeBuildInputs = [

5
pkgs/development/python-modules/bleak/default.nix
View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "bleak";
version = "0.19.4";
version = "0.19.5";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "hbldh";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-Sdgsf1gFA0UcyFuaScwqmvHV2E6Crb6vSQgUbBox5hw=";
hash = "sha256-KKZrp5yNuslEPn/TS4eAOMT48C4A5Da5/NhklyFcy7M=";
};
nativeBuildInputs = [
@ -53,6 +53,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Bluetooth Low Energy platform agnostic client";
homepage = "https://github.com/hbldh/bleak";
changelog = "https://github.com/hbldh/bleak/blob/v${version}/CHANGELOG.rst";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ oxzi ];

7
pkgs/development/python-modules/bless/default.nix
View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "bless";
version = "0.2.4";
version = "0.2.5";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,8 +19,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "kevincar";
repo = pname;
rev = "v${version}";
hash = "sha256-lC1M6/9uawi4KpcK4/fAygENa9rZv9c7qCVdsZYtl5Q=";
rev = "refs/tags/v${version}";
hash = "sha256-+rnMLqNfhIJASCKkIfOKpVil3S/d8BcMxnLHmdOcRIY=";
};
propagatedBuildInputs = [
@ -41,6 +41,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library for creating a BLE Generic Attribute Profile (GATT) server";
homepage = "https://github.com/kevincar/bless";
changelog = "https://github.com/kevincar/bless/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};

7
pkgs/development/python-modules/bluemaestro-ble/default.nix
View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "bluemaestro-ble";
version = "0.2.0";
version = "0.2.1";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -19,8 +19,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "Bluetooth-Devices";
repo = pname;
rev = "v${version}";
hash = "sha256-lJYbbF6b1CazD/aVTNoZvyfH/XQf5jWBsddDdrP+FKA=";
rev = "refs/tags/v${version}";
hash = "sha256-QGad5o9JZ6ansVh3bRBO+9mE4PKw05acY+9+Ur2OBsY=";
};
nativeBuildInputs = [
@ -49,6 +49,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library for bluemaestro BLE devices";
homepage = "https://github.com/Bluetooth-Devices/bluemaestro-ble";
changelog = "https://github.com/Bluetooth-Devices/bluemaestro-ble/blob/v${version}/CHANGELOG.md";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};

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

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "bthome-ble";
version = "2.4.0";
version = "2.4.1";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-BLRXoKZkSWgzGIztwmO8El8pF25QBrTEX05FWXZrHxc=";
hash = "sha256-BGUqvlikvlZbGB5pNo03QIfG1BBRZFl3/MKymQ/yBxM=";
};
nativeBuildInputs = [

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

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "faraday-plugins";
version = "1.9.0";
version = "1.9.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "infobyte";
repo = "faraday_plugins";
rev = "refs/tags/${version}";
hash = "sha256-ZWPImBqBpiz3y4OpDZLCfL3Oe/J+qP1Hduas3p0unCg=";
hash = "sha256-qtHa2JQ9dl9NzhNZ9l6vRe9wR9rCx7+WwDBhRG+Btj4=";
};
postPatch = ''

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

@ -9,16 +9,16 @@
buildPythonPackage rec {
pname = "fpyutils";
version = "2.2.1";
version = "3.0.1";
format = "setuptools";
disabled = pythonOlder "3.5";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "frnmst";
repo = pname;
rev = version;
sha256 = "sha256-5dikfR648AhQUMX/hS0igIy9gnMyxUHddp1xaxNyYCo=";
rev = "refs/tags/${version}";
hash = "sha256-cmCD8uKPX/7Ak6jAqzCvDqR1FgH09GaLfLTZdBQB+bs=";
};
propagatedBuildInputs = [
@ -46,6 +46,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Collection of useful non-standard Python functions";
homepage = "https://github.com/frnmst/fpyutils";
changelog = "https://blog.franco.net.eu.org/software/fpyutils-${version}/release.html";
license = with licenses; [ gpl3Plus ];
maintainers = with maintainers; [ fab ];
};

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

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "griffe";
version = "0.25.1";
version = "0.25.3";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "mkdocstrings";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-DBjwqQ7tmvpHa0FZYS6Jsb/wQ7cnoynhybBWl9PNejs=";
hash = "sha256-t36uWIREn01/+dIYP5HYlkSPPjgoZoYbJYnFo3Y6qSw=";
};
postPatch = ''

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

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "growattserver";
version = "1.3.0";
version = "1.4.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "indykoning";
repo = "PyPi_GrowattServer";
rev = "refs/tags/${version}";
hash = "sha256-xriI4VFLTTeYkfIu7kb/k1OcgnHhCdvl5Ic/JF4Pf6s=";
hash = "sha256-V0EW3I0FIDx9urbxX/zh3A51B/BiDqUfsrKbKU9FKiE=";
};
propagatedBuildInputs = [

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

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "hahomematic";
version = "2022.12.12";
version = "2023.1.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-AnGoXAeasPwbErTwWZJHzSnvxx4MreHrgbYHKLZQfRA=";
sha256 = "sha256-NS5X/camPjQxQ6paJxu1qpw+Dv2b/dJrA5OkzUufCR0=";
};
nativeBuildInputs = [

5
pkgs/development/python-modules/hatasmota/default.nix
View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "hatasmota";
version = "0.6.1";
version = "0.6.2";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "emontnemery";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-8B3xdSvvxmbjpPk6aWHQTraf2J1oCBvP0/UxTxaN0jY=";
hash = "sha256-viMqtrqyM+O2VEwHp4FJRlJcfj58GjSD37gtv01/sOo=";
};
propagatedBuildInputs = [
@ -35,6 +35,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python module to help parse and construct Tasmota MQTT messages";
homepage = "https://github.com/emontnemery/hatasmota";
changelog = "https://github.com/emontnemery/hatasmota/releases/tag/${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};

4
pkgs/development/python-modules/home-assistant-bluetooth/default.nix
View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "home-assistant-bluetooth";
version = "1.9.0";
version = "1.9.2";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-/ne2pnSmeHuwlGCrMC0x/yNDCvB/P4SqmK/wwcmHlJQ=";
hash = "sha256-8RGwWx/I6Log7qyGiP+LAWC1GCG2A7UEXnO5fGoTsb4=";
};
postPatch = ''

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

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "identify";
version = "2.5.11";
version = "2.5.12";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "pre-commit";
repo = pname;
rev = "v${version}";
sha256 = "sha256-KnOPrJoHaT0XMhv2HoGKt+a6bsLHouCqZqdl1LlB+9g=";
sha256 = "sha256-8hfO2gmgSdhrECsXgG2i+REBIV+OqsQeAabvqKJOU1c=";
};
checkInputs = [

16
pkgs/development/python-modules/inscriptis/default.nix
View File

@ -3,19 +3,22 @@
, fetchFromGitHub
, lxml
, pytestCheckHook
, pythonOlder
, requests
}:
buildPythonPackage rec {
pname = "inscriptis";
version = "2.3.1";
version = "2.3.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "weblyzard";
repo = "inscriptis";
rev = version;
sha256 = "sha256-an/FTbujN2VnTYa0wngM8ugV1LNHJWM32RVqIbaW0KY=";
rev = "refs/tags/${version}";
hash = "sha256-grsyHqt7ahiNsYKcZN/c5cJaag/nTWTBcaHaXnW1SpU=";
};
propagatedBuildInputs = [
@ -27,11 +30,14 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [ "inscriptis" ];
pythonImportsCheck = [
"inscriptis"
];
meta = with lib; {
description = "inscriptis - HTML to text converter";
description = "HTML to text converter";
homepage = "https://github.com/weblyzard/inscriptis";
changelog = "https://github.com/weblyzard/inscriptis/releases/tag/${version}";
license = licenses.asl20;
maintainers = with maintainers; [ SuperSandro2000 ];
};

38
pkgs/development/python-modules/keyrings-passwordstore/default.nix Normal file
View File

@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, keyring
, setuptools-scm
}:
buildPythonPackage rec {
pname = "keyrings.passwordstore";
version = "0.1.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-pylZw45FUtLHzUV4cDyl/nT8tCZwNj4Jf41MMlyskoU=";
};
nativeBuildInputs = [
setuptools-scm
];
checkInputs = [
keyring
];
pythonImportsCheck = [
"keyrings.passwordstore.backend"
];
meta = {
license = lib.licenses.mit;
description = "Keyring backend for password-store";
homepage = "https://github.com/stv0g/keyrings.passwordstore";
maintainers = [ lib.maintainers.shlevy ];
};
}

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

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "md-toc";
version = "8.1.6";
version = "8.1.7";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "frnmst";
repo = pname;
rev = version;
hash = "sha256-Wtb2xHBj6RYVfUkPmRMxUti7UBj1PVh9ZCDienYX4Bw=";
hash = "sha256-zC7//0q4jkj2yjex/Ea4fslCvPQbd8S1LmvL01kSZZk=";
};
propagatedBuildInputs = [

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "meross-iot";
version = "0.4.5.4";
version = "0.4.5.7";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "albertogeniola";
repo = "MerossIot";
rev = "refs/tags/${version}";
hash = "sha256-HPA3oeanFHx+g0nt/nsTzG3RTCdsjNSvDCXILR271P4=";
hash = "sha256-nheTAMXX0IZE1XH2+o9ML1Qt9zMw7oTZi4Cba+LdG4s=";
};
propagatedBuildInputs = [

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

@ -7,16 +7,16 @@
buildPythonPackage rec {
pname = "ofxtools";
version = "0.8.20";
version = "0.9.5";
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
# PyPI distribution does not include tests
src = fetchFromGitHub {
owner = "csingley";
repo = pname;
rev = version;
sha256 = "1s3fhhmj1acnmqglh39003db0bi451m4hcrkcpyrkqf5m32lslz8";
sha256 = "sha256-NsImnD+erhpakQnl1neuHfSKiV6ipNBMPGKMDM0gwWc=";
};
checkInputs = [ nose ];

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

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "peaqevcore";
version = "9.2.3";
version = "10.1.4";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-/NsPRspe/Q1hgcgMatFUPWuSfNz0rnmQ2k2fYDo5CnQ=";
hash = "sha256-h3kNmWa9ZOpI0DG49H3n1MPZu753nrdzSIh8V5N3H6I=";
};
postPatch = ''

6
pkgs/development/python-modules/py-tree-sitter/default.nix
View File

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "py-tree-sitter";
version = "unstable-2022-02-08";
version = "0.20.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "py-tree-sitter";
rev = "9c8261d36e55d9e4a6543dc9e570bfd7911ed7bf";
sha256 = "sha256-YDe9m85LIPNumo9mrhMMotUspq/8B3t5kt2ScMJI+hY=";
rev = "v${version}";
sha256 = "sha256-mdV5zGvVI1MltmOD1BtXxsKB/yigk8d56WwLlX6Uizg=";
fetchSubmodules = true;
};

7
pkgs/development/python-modules/pydevccu/default.nix
View File

@ -6,7 +6,7 @@
buildPythonPackage rec {
pname = "pydevccu";
version = "0.1.3";
version = "0.1.4";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -14,8 +14,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "danielperna84";
repo = pname;
rev = version;
sha256 = "sha256-rbxYTpB6ieZBYbbE1AKVEc/lapWlOUMOrSHCkuwkzLg=";
rev = "refs/tags/${version}";
hash = "sha256-VneuAnt9HkIRBeK2T71MIHbZbz6zY1vVy5vOYZ+82gM=";
};
# Module has no tests
@ -28,6 +28,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "HomeMatic CCU XML-RPC Server with fake devices";
homepage = "https://github.com/danielperna84/pydevccu";
changelog = "https://github.com/danielperna84/pydevccu/releases/tag/${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};

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

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pyeconet";
version = "0.1.17";
version = "0.1.18";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "w1ll1am23";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-ntxITedoJOt5d7V9TSFQHg0oqBEw8jNGeDLM00RRWHI=";
hash = "sha256-nKXYjv1a6nEuy8X0HnLSrvQDV2XVQhQuEm/gqnEVaoY=";
};
nativeBuildInputs = [

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

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pyswitchbot";
version = "0.36.1";
version = "0.36.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "pySwitchbot";
rev = "refs/tags/${version}";
hash = "sha256-eXCHmtdizRJJdwFeZU0yLi8NWwMqbET6ZItQQClYVI4=";
hash = "sha256-I+OnxSQ/984aoloe/1673JDaVzG6yKOSrDvGuupAnkc=";
};
propagatedBuildInputs = [

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "reolink-aio";
version = "0.1.1";
version = "0.1.3";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "starkillerOG";
repo = "reolink_aio";
rev = "refs/tags/${version}";
sha256 = "sha256-KUsBCV8OVPj0QC1DKUBVRqtt1dpGq+JunuBZsZKfQno=";
sha256 = "sha256-4qg43qxrgBSES2ng7DbjgWrsXY+3+olvUe19zW2UXCE=";
};
propagatedBuildInputs = [

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

@ -130,7 +130,7 @@ buildPythonPackage rec {
#pytestFlagsArray = ["-x" "-W" "ignore"]; # uncomment this to debug
pythonImportCheck = [
pythonImportsCheck = [
"shap"
"shap.explainers"
"shap.explainers.other"

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

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "skodaconnect";
version = "1.3.0";
version = "1.3.1";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "lendy007";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-1x1TQNhKL3RgoeYSB8l607mHt0VrHwOU1CFemoaTCt8=";
hash = "sha256-iaA4mvt9R/OH3RS62b6tfKWEYITfYrGY8lP45mGlN/w=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

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

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "whois";
version = "0.9.20";
version = "0.9.21";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "DannyCork";
repo = "python-whois";
rev = "refs/tags/${version}";
hash = "sha256-J2v2TKTrzhi1XLW2e/N3jAGCy3W8cQEFV5cJAf8gT4g=";
hash = "sha256-gsWvmAnzlm31UHT//VbXvryKWN8m/+hvLoKxLmQOK5k=";
};
propagatedBuildInputs = [

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

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "xiaomi-ble";
version = "0.12.2";
version = "0.15.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-MwKhoerfloFT5/x1darfMP/qF5sEy6LiKEogINIUq0c=";
hash = "sha256-6j5hZ9NGmAFpbgYTyC4UuI4XkQwotZND1UMHnmJHCdo=";
};
nativeBuildInputs = [

4
pkgs/development/tools/bbin/default.nix
View File

@ -8,13 +8,13 @@
stdenvNoCC.mkDerivation rec {
pname = "bbin";
version = "0.1.4";
version = "0.1.5";
src = fetchFromGitHub {
owner = "babashka";
repo = "bbin";
rev = "v${version}";
sha256 = "sha256-Oo6YF+uxcUG26Pz1X5uzPE/Hsx0UToOErZ2oUiKuZyI=";
sha256 = "sha256-5hohAr6a8C9jPwhQi3E66onSa6+P9plS939fQM/fl9Q=";
};
nativeBuildInputs = [ makeWrapper ];

6
pkgs/development/tools/eclint/default.nix
View File

@ -6,16 +6,16 @@
buildGoModule
rec {
pname = "eclint";
version = "0.3.6";
version = "0.3.8";
src = fetchFromGitLab {
owner = "greut";
repo = pname;
rev = "v${version}";
sha256 = "sha256-+ZbBmdCl1v4msFFA2kzL/IQTQtR39O5XYgCj7w+QGzE=";
sha256 = "sha256-wAT+lc8cFf9zOZ72EwIeE2z5mCjGN8vpRoS1k15X738=";
};
vendorSha256 = "sha256-CdvxY3uX6i3Xtg50jqlNr+VXpeOeg8M27huasbzA96M=";
vendorHash = "sha256-6aIE6MyNDOLRxn+CYSCVNj4Q50HywSh/Q0WxnxCEtg8=";
ldflags = [ "-X main.version=${version}" ];

48
pkgs/development/tools/godot/4/default.nix
View File

@ -9,11 +9,11 @@
, libX11
, libXcursor
, libXinerama
, libXi
, libXrandr
, libXext
, libXrandr
, libXrender
, libXi
, libXfixes
, libGLU
, freetype
, alsa-lib
, libpulseaudio
@ -21,6 +21,9 @@
, speechd
, fontconfig
, udev
, withPlatform ? "linuxbsd"
, withTarget ? "editor"
, withPrecision ? "single"
, withPulseaudio ? false
, withDbus ? true
, withSpeechd ? false
@ -29,9 +32,16 @@
, withTouch ? true
}:
assert lib.asserts.assertOneOf "withPrecision" withPrecision [ "single" "double" ];
let
# Options from godot/platform/linuxbsd/detect.py
options = {
# Options from 'godot/SConstruct'
platform = withPlatform;
target = withTarget;
precision = withPrecision; # Floating-point precision level
# Options from 'godot/platform/linuxbsd/detect.py'
pulseaudio = withPulseaudio;
dbus = withDbus; # Use D-Bus to handle screensaver and portal desktop settings
speechd = withSpeechd; # Use Speech Dispatcher for Text-to-Speech support
@ -42,13 +52,13 @@ let
in
stdenv.mkDerivation rec {
pname = "godot";
version = "4.0-beta3";
version = "4.0-beta10";
src = fetchFromGitHub {
owner = "godotengine";
repo = "godot";
rev = "01ae26d31befb6679ecd92cd3c73aa5a76162e95";
sha256 = "sha256-Q+zMviGevezjcQKJPOm7zAu4liJ5z8Rl73TYmjRR3MY=";
rev = "d0398f62f08ce0cfba80990b21c6af4181f93fe9";
sha256 = "sha256-h4DpK7YC7/qMc6GAD2nvNVmrlGjKT5d7OK+1NcuZCMg=";
};
nativeBuildInputs = [
@ -59,27 +69,26 @@ stdenv.mkDerivation rec {
buildInputs = [
scons
libGLU
]
++ runtimeDependencies;
runtimeDependencies = [
libX11
libXcursor
libXinerama
libXi
libXrandr
libXext
libXrandr
libXrender
libXi
libXfixes
]
++ runtimeDependencies
# Necessary to make godot see fontconfig.lib and dbus.lib
++ lib.optional withFontconfig fontconfig
++ lib.optional withDbus dbus;
runtimeDependencies = [
vulkan-loader
alsa-lib
vulkan-loader
]
++ lib.optional withPulseaudio libpulseaudio
++ lib.optional withDbus dbus
++ lib.optional withDbus dbus.lib
++ lib.optional withSpeechd speechd
++ lib.optional withFontconfig fontconfig
++ lib.optional withFontconfig fontconfig.lib
++ lib.optional withUdev udev;
@ -91,7 +100,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
sconsFlags = [ "platform=linuxbsd target=editor production=true" ];
# Options from 'godot/SConstruct' and 'godot/platform/linuxbsd/detect.py'
sconsFlags = [ "production=true" ];
preConfigure = ''
sconsFlags+=" ${
lib.concatStringsSep " "

12
pkgs/development/tools/godot/4/xfixes.patch
View File

@ -1,12 +1,12 @@
diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py
index ac69f3806b..14acbf5c58 100644
index 844b15e9fb..0c8bee1757 100644
--- a/platform/linuxbsd/detect.py
+++ b/platform/linuxbsd/detect.py
@@ -191,6 +191,7 @@ def configure(env: "Environment"):
env.ParseConfig("pkg-config xrandr --cflags --libs")
env.ParseConfig("pkg-config xrender --cflags --libs")
env.ParseConfig("pkg-config xi --cflags --libs")
+ env.ParseConfig("pkg-config xfixes --cflags --libs")
@@ -192,6 +192,7 @@ def configure(env: "Environment"):
env.ParseConfig("pkg-config xrandr --cflags")
env.ParseConfig("pkg-config xrender --cflags")
env.ParseConfig("pkg-config xi --cflags")
+ env.ParseConfig("pkg-config xfixes --cflags")
if env["touch"]:
env.Append(CPPDEFINES=["TOUCH_ENABLED"])

8
pkgs/development/tools/language-servers/rnix-lsp/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "rnix-lsp";
version = "0.2.5";
version = "unstable-2022-11-27";
src = fetchFromGitHub {
owner = "nix-community";
repo = "rnix-lsp";
rev = "v${version}";
sha256 = "sha256-WXpj2fgduYlF4t0QEvdfV1Eft8/nFXWF2zyEBKMUEIk=";
rev = "95d40673fe43642e2e1144341e86d0036abd95d9";
sha256 = "sha256-F0s0m62S5bHNVWNHLZD6SeHiLrsDx98VQbRjDyIu+qQ=";
};
cargoSha256 = "sha256-LfbmOhZJVthsLm8lnzHvEt7Vy27y4w4wpPfrf/s3s84=";
cargoSha256 = "sha256-RKHBp+/bEH9FEPLcf1MKmTugk1A8rQU447mNm9Le3DE=";
checkInputs = lib.optional (!stdenv.isDarwin) nix;

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

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-expand";
version = "1.0.36";
version = "1.0.37";
src = fetchFromGitHub {
owner = "dtolnay";
repo = pname;
rev = version;
sha256 = "sha256-8h20Cnu72ychSdtKlAz6US0wXMIcn1ZUWMgF6a0K4uI=";
sha256 = "sha256-BdaOtbZ+F1cgoZRmoQM/5Rzx4OUHmqSnsApeNfWz+J8=";
};
cargoSha256 = "sha256-xIVoEIyp8NygfNu/aola1pM6KokjrPQ5v55eBc7zPZc=";
cargoHash = "sha256-2wD0QJFTW8cIv8S1JSgffBqlcPOVd151WuKlaZF+6aA=";
buildInputs = lib.optional stdenv.isDarwin libiconv;

17
pkgs/development/tools/rust/cargo-modules/default.nix
View File

@ -1,17 +1,26 @@
{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin }:
{ lib, rustPlatform, fetchFromGitHub, fetchpatch, stdenv, darwin }:
rustPlatform.buildRustPackage rec {
pname = "cargo-modules";
version = "0.7.1";
version = "0.7.2";
src = fetchFromGitHub {
owner = "regexident";
repo = pname;
rev = version;
sha256 = "sha256-vMmbed2UOe/N8V7LbvYm7BbOOHD69qaizkYf66VCZMs=";
sha256 = "sha256-QRBhlSHqOTJCdzZhqpcfLeCDuCfJsjyxa2+6yzzN52g=";
};
cargoSha256 = "sha256-xo3EUDWoE1OFTaA9y3ymGA/l2fwNqnPBLpNc8xyjasY=";
cargoSha256 = "sha256-+asFAkUOHP9u/nOoHsr81KeqQkLqaRXhJH32oTG5vYo=";
cargoPatches = [
# https://github.com/regexident/cargo-modules/pull/161;
(fetchpatch {
name = "update-outdated-lock-file.patsh";
url = "https://github.com/regexident/cargo-modules/commit/ea9029b79acdadddbaf4067076690153c38cd09c.patch";
sha256 = "sha256-DOLvo/PP+4/6i1IYbl9oGC6BAnXNI88hK5he9549EJk=";
})
];
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreServices

18
pkgs/games/globulation/default.nix
View File

@ -24,6 +24,22 @@ stdenv.mkDerivation rec {
url = "https://bitbucket.org/giszmo/glob2/commits/c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a/raw";
sha256 = "0017xg5agj3dy0hx71ijdcrxb72bjqv7x6aq7c9zxzyyw0mkxj0k";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/g/glob2/0.9.4.4-6/debian/patches/10_pthread_underlinkage.patch";
sha256 = "sha256-L9POADlkgQbUQEUmx4s3dxXG9tS0w2IefpRGuQNRMI0=";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/g/glob2/0.9.4.4-6/debian/patches/link-boost-system.patch";
sha256 = "sha256-ne6F2ZowB+TUmg3ePuUoPNxXI0ZJC6HEol3oQQHJTy4=";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/g/glob2/0.9.4.4-6/debian/patches/scons.patch";
sha256 = "sha256-Gah7SoVcd/Aljs0Nqo3YF0lZImUWtrGM4HbbQ4yrhHU=";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/g/glob2/0.9.4.4-6/debian/patches/boost-1.69.patch";
sha256 = "sha256-D7agFR4uyIHxQz690Q8EHPF+rTEoiGUpgkm7r5cL5SI=";
})
];
postPatch = ''
@ -32,7 +48,7 @@ stdenv.mkDerivation rec {
sed -i -e "s@env = Environment()@env = Environment( ENV = os.environ )@" SConstruct
'';
nativeBuildInputs = [ sconsPackages.scons_3_0_1 ];
nativeBuildInputs = [ sconsPackages.scons_latest ];
buildInputs = [ libGLU libGL SDL SDL_ttf SDL_image zlib SDL_net speex libvorbis libogg boost fribidi bsdiff ];
postConfigure = ''

2
pkgs/games/osu-lazer-bin/default.nix → pkgs/games/osu-lazer/bin.nix
View File

@ -29,7 +29,9 @@ appimageTools.wrapType2 rec {
cc-by-nc-40
unfreeRedistributable # osu-framework contains libbass.so in repository
];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
maintainers = [ maintainers.delan ];
mainProgram = "osu!";
platforms = [ "x86_64-linux" ];
};
}

17
pkgs/games/vdrift/default.nix
View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, fetchsvn
, pkg-config
, sconsPackages
@ -33,10 +34,22 @@ let
sha256 = "001wq3c4n9wzxqfpq40b1jcl16sxbqv2zbkpy9rq2wf9h417q6hg";
};
nativeBuildInputs = [ pkg-config sconsPackages.scons_3_1_2 ];
nativeBuildInputs = [ pkg-config sconsPackages.scons_latest ];
buildInputs = [ libGLU libGL SDL2 SDL2_image libvorbis bullet curl gettext ];
patches = [ ./0001-Ignore-missing-data-for-installation.patch ];
patches = [
./0001-Ignore-missing-data-for-installation.patch
(fetchpatch {
name = "scons-python-3-fixes.patch";
url = "https://github.com/VDrift/vdrift/commit/2f1f72f2a7ce992b0aad30dc55509b966d1bb63d.patch";
sha256 = "sha256-gpIB95b1s+wpThbNMFXyftBPXkZs9SIjuCcvt068uR8=";
})
(fetchpatch {
name = "sconstruct-python-3-fix.patch";
url = "https://github.com/VDrift/vdrift/commit/7d04c723a165109e015204642f4984a1a4452ccb.patch";
sha256 = "sha256-ASEV46HnR90HXqI9SgHmkH2bPy5Y+vWN57vEN4hJMts=";
})
];
buildPhase = ''
sed -i -e s,/usr/local,$out, SConstruct

4
pkgs/os-specific/linux/android-udev-rules/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "android-udev-rules";
version = "20220611";
version = "20230104";
src = fetchFromGitHub {
owner = "M0Rf30";
repo = "android-udev-rules";
rev = version;
sha256 = "sha256-Ug/c6xBxllyztA+5gpuE3X7DXUuJH2mjFjtKuTVTZYA=";
sha256 = "sha256-tbejLvig+eTG+DHAchWEMMydd6ePRKyfRVPp6uDhP70=";
};
installPhase = ''

45
pkgs/os-specific/linux/kernel/linux-rt-5.15.nix Normal file
View File

@ -0,0 +1,45 @@
{ lib, buildLinux, fetchurl
, kernelPatches ? [ ]
, structuredExtraConfig ? {}
, extraMeta ? {}
, argsOverride ? {}
, ... } @ args:
let
version = "5.15.86-rt56"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
inherit version;
# modDirVersion needs a patch number, change X.Y-rtZ to X.Y.0-rtZ.
modDirVersion = if (builtins.match "[^.]*[.][^.]*-.*" version) == null then version
else lib.replaceStrings ["-"] [".0-"] version;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "1vpjnmwqsx6akph2nvbsv2jl7pp8b7xns3vmwbljsl23lkpxkz40";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "0y7pkzacxh1fsvnbmjq0ljfb4zjw6dq9br6rl8kr3w4dj56fmaxs";
};
}; in [ rt-patch ] ++ kernelPatches;
structuredExtraConfig = with lib.kernel; {
PREEMPT_RT = yes;
# Fix error: unused option: PREEMPT_RT.
EXPERT = yes; # PREEMPT_RT depends on it (in kernel/Kconfig.preempt)
# Fix error: option not set correctly: PREEMPT_VOLUNTARY (wanted 'y', got 'n').
PREEMPT_VOLUNTARY = lib.mkForce no; # PREEMPT_RT deselects it.
# Fix error: unused option: RT_GROUP_SCHED.
RT_GROUP_SCHED = lib.mkForce (option no); # Removed by sched-disable-rt-group-sched-on-rt.patch.
} // structuredExtraConfig;
extraMeta = extraMeta // {
inherit branch;
};
} // argsOverride)

13
pkgs/os-specific/linux/kernel/manual-config.nix
View File

@ -1,5 +1,6 @@
{ lib, stdenv, buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl
, libelf, cpio, elfutils, zstd, python3Minimal, zlib, pahole
, fetchpatch
}:
let
@ -103,7 +104,17 @@ let
++ optional (lib.versionOlder version "5.19") ./randstruct-provide-seed.patch
++ optional (lib.versionAtLeast version "5.19") ./randstruct-provide-seed-5.19.patch
# Fixes determinism by normalizing metadata for the archive of kheaders
++ optional (lib.versionAtLeast version "5.2" && lib.versionOlder version "5.4") ./gen-kheaders-metadata.patch;
++ optional (lib.versionAtLeast version "5.2" && lib.versionOlder version "5.4") ./gen-kheaders-metadata.patch
# Linux 5.12 marked certain PowerPC-only symbols as GPL, which breaks
# OpenZFS; this was fixed in Linux 5.19 so we backport the fix
# https://github.com/openzfs/zfs/pull/13367
++ optional (lib.versionAtLeast version "5.12" &&
lib.versionOlder version "5.19" &&
stdenv.hostPlatform.isPower)
(fetchpatch {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/patch/?id=d9e5c3e9e75162f845880535957b7fd0b4637d23";
hash = "sha256-bBOyJcP6jUvozFJU0SPTOf3cmnTQ6ZZ4PlHjiniHXLU=";
});
postPatch = ''
sed -i Makefile -e 's|= depmod|= ${buildPackages.kmod}/bin/depmod|'

8
pkgs/os-specific/linux/kernel/xanmod-kernels.nix
View File

@ -3,14 +3,14 @@
let
# These names are how they are designated in https://xanmod.org.
ltsVariant = {
version = "5.15.81";
hash = "sha256-EKC1Jvy1ju+HzavmIDYsnvZyicsbXAmsJuIpO1LDLZ0=";
version = "5.15.84";
hash = "sha256-CN3GOuwSicJ6Oa9BiKTyZg7fpzWc846v2SV9JRiOu3M=";
variant = "lts";
};
mainVariant = {
version = "6.1.0";
hash = "sha256-Idt7M6o2Zxqi3LBwuKu+pTHJA5OuP+KgEt2C+GcdO14=";
version = "6.1.3";
hash = "sha256-YtkmbbFEfvww7yJ4MpLQ3M6QjbBXSU9Pjwu0Dq/dIcs=";
variant = "main";
};

8
pkgs/os-specific/linux/kernel/zen-kernels.nix
View File

@ -4,16 +4,16 @@ let
# comments with variant added for update script
# ./update-zen.py zen
zenVariant = {
version = "6.1.2"; #zen
version = "6.1.3"; #zen
suffix = "zen1"; #zen
sha256 = "0wys16f4z221r3g3fc8cb5i0hcymjsk780jk657ihx5xm3anv3kf"; #zen
sha256 = "JOOw24CroRTOaWqdGaiZBDMk0ITmIsZKXZV3KeoqGMw="; #zen
isLqx = false;
};
# ./update-zen.py lqx
lqxVariant = {
version = "6.1.2"; #lqx
version = "6.1.3"; #lqx
suffix = "lqx1"; #lqx
sha256 = "03kwp1c3amk87sjdji9643gr396hca8crqf2z614wkd84vdwary0"; #lqx
sha256 = "0vp6skhw4wsxk2nl3m8y975a9bx78h5wl574wsfgnc5nvzmh250l"; #lqx
isLqx = true;
};
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {

48
pkgs/os-specific/linux/powertop/default.nix
View File

@ -1,44 +1,56 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, gettext, libnl, ncurses, pciutils
, pkg-config, zlib, autoreconfHook }:
{ lib
, stdenv
, fetchFromGitHub
, gettext
, libnl
, ncurses
, pciutils
, pkg-config
, zlib
, autoreconfHook
, autoconf-archive
, nix-update-script
, testers
, powertop
}:
stdenv.mkDerivation rec {
pname = "powertop";
version = "2.14";
version = "2.15";
src = fetchFromGitHub {
owner = "fenrus75";
repo = pname;
rev = "v${version}";
sha256 = "1zkr2y5nb1nr22nq8a3zli87iyfasfq6489p7h1k428pv8k45w4f";
hash = "sha256-53jfqt0dtMqMj3W3m6ravUTzApLQcljDHfdXejeZa4M=";
};
patches = [
# Pull upstream patch for ncurses-6.3 compatibility
(fetchpatch {
name = "ncurses-6.3.patch";
url = "https://github.com/fenrus75/powertop/commit/9ef1559a1582f23d599c149601c3a8e06809296c.patch";
sha256 = "0qx69f3bwhxgsga9nas8lgrclf1rxvr7fq7fd2n8dv3x4lsb46j1";
})
];
outputs = [ "out" "man" ];
nativeBuildInputs = [ pkg-config autoreconfHook ];
nativeBuildInputs = [ pkg-config autoreconfHook autoconf-archive ];
buildInputs = [ gettext libnl ncurses pciutils zlib ];
NIX_LDFLAGS = [ "-lpthread" ];
postPatch = ''
substituteInPlace src/main.cpp --replace "/sbin/modprobe" "modprobe"
substituteInPlace src/calibrate/calibrate.cpp --replace "/usr/bin/xset" "xset"
substituteInPlace src/tuning/bluetooth.cpp --replace "/usr/bin/hcitool" "hcitool"
'';
passthru = {
updateScript = nix-update-script { };
tests.version = testers.testVersion {
package = powertop;
command = "powertop --version";
inherit version;
};
};
meta = with lib; {
inherit (src.meta) homepage;
changelog = "https://github.com/fenrus75/powertop/releases/tag/v${version}";
description = "Analyze power consumption on Intel-based laptops";
homepage = "https://01.org/powertop";
license = licenses.gpl2Only;
maintainers = with maintainers; [ fpletz ];
maintainers = with maintainers; [ fpletz anthonyroussel ];
platforms = platforms.linux;
};
}

1
pkgs/servers/dns/bind/default.nix
View File

@ -60,6 +60,7 @@ stdenv.mkDerivation rec {
'';
doCheck = false; # requires root and the net
enableParallelBuilding = true;
passthru.tests = {
inherit (nixosTests) bind;

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

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2023.1.0";
version = "2023.1.1";
components = {
"3_day_blinds" = ps: with ps; [
];
@ -2674,7 +2674,8 @@
gridnet
];
"purpleair" = ps: with ps; [
]; # missing inputs: aiopurpleair
aiopurpleair
];
"push" = ps: with ps; [
aiohttp-cors
];
@ -4551,6 +4552,7 @@
"proximity"
"prusalink"
"pure_energie"
"purpleair"
"push"
"pushbullet"
"pushover"

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

@ -195,7 +195,7 @@ let
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
# Don't forget to run parse-requirements.py after updating
hassVersion = "2023.1.0";
hassVersion = "2023.1.1";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@ -213,7 +213,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = "refs/tags/${version}";
hash = "sha256-uYQnymJQ893F5fX/yi8S3OZL4LkT5z7QNOzkoedXllM=";
hash = "sha256-qgrUVPh/lSOwRm0FIU6kLuj591XdtNCtA2IMOfhKw/0=";
};
# leave this in, so users don't have to constantly update their downstream patch handling

Some files were not shown because too many files have changed in this diff Show More