nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-10-30 22:21:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2023-12-15 00:02:26 +00:00 committed by GitHub
commit f7d72376c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
31 changed files with 397 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maintainers/maintainer-list.nix
View File

@ -18441,6 +18441,11 @@
github = "NoneTirex";
githubId = 26038207;
};
tirimia = {
name = "Theodor-Alexandru Irimia";
github = "tirimia";
githubId = 11174371;
};
titanous = {
email = "jonathan@titanous.com";
github = "titanous";

1
nixos/doc/manual/release-notes/release-notes.md
View File

@ -3,6 +3,7 @@
This section lists the release notes for each stable version of NixOS and current unstable revision.
```{=include=} sections
rl-2405.section.md
rl-2311.section.md
rl-2305.section.md
rl-2211.section.md

2
nixos/modules/services/databases/postgresql.nix
View File

@ -404,7 +404,7 @@ in
default = {};
description = lib.mdDoc ''
PostgreSQL configuration. Refer to
<https://www.postgresql.org/docs/15/config-setting.html#CONFIG-SETTING-CONFIGURATION-FILE>
<https://www.postgresql.org/docs/current/config-setting.html#CONFIG-SETTING-CONFIGURATION-FILE>
for an overview of `postgresql.conf`.
::: {.note}

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

@ -20,13 +20,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "setzer";
version = "63";
version = "65";
src = fetchFromGitHub {
owner = "cvfosammmm";
repo = "Setzer";
rev = "v${version}";
hash = "sha256-/DAd3Neypx/H9mPVC9VkvpdQhLRNIBoR8GXxuIdJF0Y=";
hash = "sha256-5Hpj/RkD11bNcr9/gQG0Y7BNMsh1BGZQiN4IMbI4osc=";
};
format = "other";

4
pkgs/applications/emulators/vbam/default.nix
View File

@ -18,12 +18,12 @@
stdenv.mkDerivation rec {
pname = "visualboyadvance-m";
version = "2.1.7";
version = "2.1.8";
src = fetchFromGitHub {
owner = "visualboyadvance-m";
repo = "visualboyadvance-m";
rev = "v${version}";
sha256 = "sha256-XMb4+YPH1xgbiRC4vmooxALmjX2QURLWOGOwepdWI7o=";
sha256 = "sha256-r/LF9mYwKPwkIidMAb4k4B6Q2UYjW0TucKI5LJ2gjl0=";
};
nativeBuildInputs = [ cmake pkg-config ];

36
pkgs/applications/misc/revanced-cli/default.nix Normal file
View File

@ -0,0 +1,36 @@
{ lib, stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec {
pname = "revanced-cli";
version = "2.22.0";
src = fetchurl {
url = "https://github.com/revanced/revanced-cli/releases/download/v${version}/revanced-cli-${version}-all.jar";
hash = "sha256-jyaqkZL7aOc5WXjlomZThyaCUwKU7AyKKrgtKadUo5s=";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jre ];
dontUnpack = true;
installPhase = ''
runHook preInstall
mkdir -p "$prefix/bin"
makeWrapper ${jre}/bin/java $out/bin/revanced-cli \
--add-flags "-jar $src" \
--prefix PATH : "$PATH"
runHook postInstall
'';
meta = with lib; {
description = "Command line application as an alternative to the ReVanced Manager";
homepage = "https://github.com/revanced/revanced-cli";
license = licenses.gpl3Only;
sourceProvenance = with sourceTypes; [ binaryBytecode ];
maintainers = with maintainers; [ jopejoe1 ];
};
}

5
pkgs/applications/networking/instant-messengers/dino/default.nix
View File

@ -1,4 +1,5 @@
{ lib, stdenv, fetchFromGitHub
, buildPackages
, vala, cmake, ninja, wrapGAppsHook, pkg-config, gettext
, gobject-introspection, glib, gdk-pixbuf, gtk4, glib-networking
, libadwaita
@ -86,6 +87,10 @@ stdenv.mkDerivation rec {
"-DVERSION_FOUND=true"
"-DVERSION_IS_RELEASE=true"
"-DVERSION_FULL=${version}"
"-DXGETTEXT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/xgettext"
"-DMSGFMT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/msgfmt"
"-DGLIB_COMPILE_RESOURCES_EXECUTABLE=${lib.getDev buildPackages.glib}/bin/glib-compile-resources"
"-DSOUP_VERSION=${lib.versions.major libsoup.version}"
];
# Undefined symbols for architecture arm64: "_gpg_strerror"

6
pkgs/applications/networking/instant-messengers/signald/default.nix
View File

@ -16,6 +16,8 @@ let
sha256 = "sha256-EofgwZSDp2ZFhlKL2tHfzMr3EsidzuY4pkRZrV2+1bA=";
};
gradleWithJdk = gradle.override { java = jdk17_headless; };
jre' = jre_minimal.override {
jdk = jdk17_headless;
# from https://gitlab.com/signald/signald/-/blob/0.23.0/build.gradle#L173
@ -39,7 +41,7 @@ let
deps = stdenv.mkDerivation {
pname = "${pname}-deps";
inherit src version;
nativeBuildInputs = [ gradle perl ];
nativeBuildInputs = [ gradleWithJdk perl ];
patches = [ ./0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch ];
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d)
@ -118,7 +120,7 @@ in stdenv.mkDerivation {
runHook postInstall
'';
nativeBuildInputs = [ git gradle makeWrapper ];
nativeBuildInputs = [ git gradleWithJdk makeWrapper ];
doCheck = true;

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

@ -2,7 +2,7 @@
, stdenv
, fetchurl
, makeDesktopItem
, jre
, openjdk19
, gtk3
, glib
, gnome
@ -10,14 +10,16 @@
, libXtst
, which
}:
let
jre = openjdk19;
in
stdenv.mkDerivation rec {
pname = "smartgithg";
version = "22.1.5";
version = "23.1.1";
src = fetchurl {
url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${builtins.replaceStrings [ "." ] [ "_" ] version}.tar.gz";
sha256 = "sha256-s31sYEC1g7eLMhT9UkmjbBnHePY9wnQPmgGQXgVX4j4=";
sha256 = "sha256-LXB+OymApJjL4bgOZ8Vfd193jZHVbQ6G2zmrHNE/OJk=";
};
nativeBuildInputs = [ wrapGAppsHook ];

4
pkgs/applications/video/kodi/addons/future/default.nix
View File

@ -3,11 +3,11 @@
buildKodiAddon rec {
pname = "future";
namespace = "script.module.future";
version = "0.18.2+matrix.1";
version = "0.18.3+matrix.1";
src = fetchzip {
url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
sha256 = "sha256-QBG7V70Dwmfq8ISILxGNvtmQT9fJp2e5gs2C9skRwIw=";
sha256 = "sha256-jKO2Qxi54z6UiCmMkxU+2pog40K2yb8/KYbNPFYuSsQ=";
};
passthru = {

4
pkgs/applications/video/kodi/addons/six/default.nix
View File

@ -3,11 +3,11 @@
buildKodiAddon rec {
pname = "six";
namespace = "script.module.six";
version = "1.15.0+matrix.1";
version = "1.16.0+matrix.1";
src = fetchzip {
url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
sha256 = "sha256-zjbPAEB39dWpNsgoBqCKpLLXmqBI/v0wnnbCTRhYGzE=";
sha256 = "sha256-d6BNpnTg6K7NPX3uWp5X0rog33C+B7YoAtLH/CrUYno=";
};
passthru.updateScript = addonUpdateScript {

51
pkgs/by-name/aw/aws-gate/disable-bootstrap.patch Normal file
View File

@ -0,0 +1,51 @@
diff --git a/aws_gate/cli.py b/aws_gate/cli.py
index ac37c2f..9743415 100644
--- a/aws_gate/cli.py
+++ b/aws_gate/cli.py
@@ -7,7 +7,6 @@ from marshmallow import ValidationError
from yaml.scanner import ScannerError
from aws_gate import __version__, __description__
-from aws_gate.bootstrap import bootstrap
from aws_gate.config import load_config_from_files
from aws_gate.constants import (
SUPPORTED_KEY_TYPES,
@@ -59,10 +58,14 @@ def get_argument_parser(*args, **kwargs):
# 'bootstrap' subcommand
bootstrap_parser = subparsers.add_parser(
- "bootstrap", help="Download and install session-manager-plugin"
+ "bootstrap",
+ help="Download and install session-manager-plugin (disabled by nix)",
)
bootstrap_parser.add_argument(
- "-f", "--force", action="store_true", help="Forces bootstrap operation"
+ "-f",
+ "--force",
+ action="store_true",
+ help="Forces bootstrap operation (disabled by nix)",
)
# 'exec' subcommand
@@ -268,7 +271,9 @@ def main(args=None, argument_parser=None):
logger.debug('Using AWS profile "%s" in region "%s"', profile, region)
if args.subcommand == "bootstrap":
- bootstrap(force=args.force)
+ print(
+ f"The SSM Plugin will not be downloaded as aws-gate was installed from nixpkgs and the plugin comes pre-bundled. The '--force' flag will not override this behavior."
+ )
elif args.subcommand == "exec":
exec(
config=config,
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 50b203e..8c3496f 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -3,5 +3,4 @@ cryptography==39.0.2
marshmallow==3.19.0
packaging==23.0
PyYAML>=5.1,<6.1
-requests==2.28.2
unix-ar==0.2.1
wrapt==1.15.0

55
pkgs/by-name/aw/aws-gate/package.nix Normal file
View File

@ -0,0 +1,55 @@
{ lib
, fetchFromGitHub
, installShellFiles
, python3Packages
, ssm-session-manager-plugin
}:
python3Packages.buildPythonApplication rec {
pname = "aws-gate";
version = "0.11.3";
pyproject = true;
src = fetchFromGitHub {
owner = "xen0l";
repo = pname;
rev = version;
hash = "sha256-9w2jP4s1HXf1gYiXX05Dt2iXt0bR0U48yc8h9T5M+EQ=";
};
patches = [
./disable-bootstrap.patch
];
postPatch = ''
rm aws_gate/bootstrap.py tests/unit/test_bootstrap.py
'';
nativeBuildInputs = [
python3Packages.setuptools
python3Packages.wheel
installShellFiles
];
propagatedBuildInputs = [ ssm-session-manager-plugin ] ++ builtins.attrValues {
inherit (python3Packages) marshmallow boto3 pyyaml wrapt cryptography;
};
postInstall = ''
installShellCompletion --bash completions/bash/aws-gate
installShellCompletion --zsh completions/zsh/_aws-gate
'';
checkPhase = ''
$out/bin/${pname} --version
'';
meta = with lib; {
description = "Better AWS SSM Session manager CLI client";
homepage = "https://github.com/xen0l/aws-gate";
license = licenses.bsd3;
maintainers = with maintainers; [ tirimia ];
platforms = with platforms; linux ++ darwin;
mainProgram = pname;
};
}

4
pkgs/by-name/no/nom/package.nix
View File

@ -4,13 +4,13 @@
}:
buildGoModule rec {
pname = "nom";
version = "2.0.5";
version = "2.1.0";
src = fetchFromGitHub {
owner = "guyfedwards";
repo = "nom";
rev = "v${version}";
hash = "sha256-mYE8cu7qHRyG/pZSr4u6tMEF3ZM5Qz+CX+oLf/chwl4=";
hash = "sha256-RKuaMgPYBD2G9WOKvfb+hj01aBVsCP0eOXULE+JpLR8=";
};
vendorHash = "sha256-fP6yxfIQoVaBC9hYcrCyo3YP3ntEVDbDTwKMO9TdyDI=";

2
pkgs/desktops/xfce/default.nix
View File

@ -122,6 +122,8 @@ makeScopeWithSplicing' {
xfce4-dockbarx-plugin = callPackage ./panel-plugins/xfce4-dockbarx-plugin { };
xfce4-docklike-plugin = callPackage ./panel-plugins/xfce4-docklike-plugin { };
xfce4-embed-plugin = callPackage ./panel-plugins/xfce4-embed-plugin { };
xfce4-eyes-plugin = callPackage ./panel-plugins/xfce4-eyes-plugin { };

39
pkgs/desktops/xfce/panel-plugins/xfce4-docklike-plugin/default.nix Normal file
View File

@ -0,0 +1,39 @@
{ lib
, mkXfceDerivation
, glib
, gtk3
, libxfce4ui
, libxfce4util
, xfce4-panel
, xfconf
, libwnck
, exo
}:
mkXfceDerivation {
category = "panel-plugins";
pname = "xfce4-docklike-plugin";
version = "0.4.1";
sha256 = "sha256-BKxd2TFEbRHeFy/dC2Wx5ppErsi7d2m7JicFCcZbjTo=";
buildInputs = [
glib
gtk3
libxfce4ui
libxfce4util
xfce4-panel
xfconf
libwnck
exo
];
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
meta = with lib; {
homepage = "https://docs.xfce.org/panel-plugins/xfce4-docklike-plugin/start";
description = "A modern, minimalist taskbar for Xfce";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ ] ++ teams.xfce.members;
};
}

1
pkgs/development/compilers/jetbrains-jdk/default.nix
View File

@ -96,6 +96,7 @@ openjdk17.overrideAttrs (oldAttrs: rec {
''
runHook preInstall
mv build/linux-${cpu}-server-${buildType}/images/jdk/man build/linux-${cpu}-server-${buildType}/images/${jbrsdkDir}
rm -rf build/linux-${cpu}-server-${buildType}/images/jdk
mv build/linux-${cpu}-server-${buildType}/images/${jbrsdkDir} build/linux-${cpu}-server-${buildType}/images/jdk
'' + oldAttrs.installPhase + "runHook postInstall";

14
pkgs/development/libraries/geogram/default.nix
View File

@ -13,17 +13,17 @@ let
testdata = fetchFromGitHub {
owner = "BrunoLevy";
repo = "geogram.data";
rev = "8fd071a560bd6859508f1710981386d0b2ba01b1";
hash = "sha256-jMUGX6/uYIZMVwXxTAAGUaOXqF+NrFQqgmIPCD58cwM=";
rev = "43dd49054a78d9b3fb8ef729f48ab47a272c718c";
hash = "sha256-F2Lyt4nEOczVYLz6WLny+YrsxNwREBGPkProN8NHFN4=";
};
in
stdenv.mkDerivation rec {
pname = "geogram";
version = "1.8.3";
version = "1.8.6";
src = fetchurl {
url = "https://github.com/BrunoLevy/geogram/releases/download/v${version}/geogram_${version}.tar.gz";
hash = "sha256-91q0M/4kAr0UoWXOQIEYS1VbgEQ/F4EBOfJE9Vr1bnw=";
hash = "sha256-Xqha5HVqD2Ao0z++RKcQdMZUmtMb5eZ1DMJEVrfNUzE=";
};
outputs = [ "bin" "lib" "dev" "doc" "out" ];
@ -59,9 +59,6 @@ stdenv.mkDerivation rec {
];
patches = [
# See https://github.com/BrunoLevy/geogram/pull/76
./fix-cmake-install-destination.patch
# This patch replaces the bundled (outdated) zlib with our zlib
# Should be harmless, but if there are issues this patch can also be removed
# Also check https://github.com/BrunoLevy/geogram/issues/49 for progress
@ -93,6 +90,9 @@ stdenv.mkDerivation rec {
# Skip slow RVD test
"RVD"
# Flaky as of 1.8.5 (SIGSEGV, possibly a use-after-free)
"Delaunay"
];
in
''

92
pkgs/development/libraries/geogram/fix-cmake-install-destination.patch
View File

@ -1,92 +0,0 @@
--- a/cmake/utilities.cmake 1970-01-01 01:00:01.000000000 +0100
+++ b/cmake/utilities.cmake 2023-03-09 19:28:16.556251981 +0100
@@ -241,9 +241,9 @@
install(
TARGETS ${ARGN}
COMPONENT runtime
- RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
endfunction()
@@ -270,9 +270,9 @@
install(
TARGETS ${ARGN}
COMPONENT ${component}
- RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
endforeach()
endfunction()
--- a/src/lib/geogram/CMakeLists.txt 1970-01-01 01:00:01.000000000 +0100
+++ b/src/lib/geogram/CMakeLists.txt 2023-03-09 20:29:12.346780432 +0100
@@ -76,7 +76,7 @@
# Install include files for the standard devkit
install(
DIRECTORY api
- DESTINATION include/${VORPALINE_INCLUDE_SUBPATH}/geogram
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${VORPALINE_INCLUDE_SUBPATH}/geogram
COMPONENT devkit
FILES_MATCHING PATTERN *.h
)
@@ -84,7 +84,7 @@
# Install include files for the full devkit
install(
DIRECTORY .
- DESTINATION include/${VORPALINE_INCLUDE_SUBPATH}/geogram
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${VORPALINE_INCLUDE_SUBPATH}/geogram
COMPONENT devkit-full
FILES_MATCHING PATTERN *.h
# Exclude all files related to licensing
@@ -93,7 +93,7 @@
install(
FILES "${PROJECT_BINARY_DIR}/geogram${VORPALINE_VERSION_MAJOR}.pc"
- DESTINATION lib${LIB_SUFFIX}/pkgconfig
+ DESTINATION ${GEOGRAM_INSTALL_PKGCONFIG_DIR}
)
--- a/CMakeLists.txt 1970-01-01 01:00:01.000000000 +0100
+++ b/CMakeLists.txt 2023-03-09 20:40:20.075218356 +0100
@@ -158,7 +158,7 @@
# FindGeogram.cmake
-install(FILES cmake/FindGeogram.cmake DESTINATION lib/cmake/modules COMPONENT devkit)
+install(FILES cmake/FindGeogram.cmake DESTINATION ${GEOGRAM_INSTALL_CMAKE_DIR} COMPONENT devkit)
# Configure CPack
--- a/doc/CMakeLists.txt 1970-01-01 01:00:01.000000000 +0100
+++ b/doc/CMakeLists.txt 2023-03-09 21:12:04.386327003 +0100
@@ -25,14 +25,14 @@
# Install documentation
if(GEOGRAM_WITH_VORPALINE)
- install(FILES README.txt DESTINATION doc COMPONENT runtime)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt DESTINATION doc COMPONENT runtime OPTIONAL)
+ install(FILES README.txt DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT runtime)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT runtime OPTIONAL)
endif()
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION.txt DESTINATION doc/geogram COMPONENT runtime OPTIONAL)
-
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/devkit/html DESTINATION doc/devkit COMPONENT doc-devkit OPTIONAL)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/devkit-full/html DESTINATION doc/devkit COMPONENT doc-devkit-full OPTIONAL)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/devkit-internal/html DESTINATION doc/devkit COMPONENT doc-devkit-internal OPTIONAL)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION.txt DESTINATION ${CMAKE_INSTALL_DOCDIR}/geogram COMPONENT runtime OPTIONAL)
+
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/devkit/html DESTINATION ${CMAKE_INSTALL_DOCDIR}/devkit COMPONENT doc-devkit OPTIONAL)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/devkit-full/html DESTINATION ${CMAKE_INSTALL_DOCDIR}/devkit COMPONENT doc-devkit-full OPTIONAL)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/devkit-internal/html DESTINATION ${CMAKE_INSTALL_DOCDIR}/devkit COMPONENT doc-devkit-internal OPTIONAL)
endif()

40
pkgs/development/libraries/libdicom/default.nix Normal file
View File

@ -0,0 +1,40 @@
{ lib
, stdenv
, fetchFromGitHub
, uthash
, meson
, ninja
, pkg-config
, check
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libdicom";
version = "1.0.5";
src = fetchFromGitHub {
owner = "ImagingDataCommons";
repo = "libdicom";
rev = "v${finalAttrs.version}";
sha256 = "sha256-9n0Gp9+fmTM/shgWC8zpwt1pic9BrvDubOt7f+ZDMeE=";
};
buildInputs = [ uthash ];
nativeBuildInputs = [ meson ninja pkg-config ]
++ lib.optionals (finalAttrs.finalPackage.doCheck) [ check ];
mesonBuildType = "release";
mesonFlags = lib.optionals (!finalAttrs.finalPackage.doCheck) [ "-Dtests=false" ];
doCheck = true;
meta = with lib; {
description = "C library for reading DICOM files";
homepage = "https://github.com/ImagingDataCommons/libdicom";
license = licenses.mit;
maintainers = with maintainers; [ lromor ];
platforms = platforms.unix;
};
})

48
pkgs/development/python-modules/grafanalib/default.nix Normal file
View File

@ -0,0 +1,48 @@
{ attrs
, buildPythonPackage
, fetchFromGitHub
, fetchPypi
, lib
, pytestCheckHook
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "grafanalib";
version = "0.7.0";
pyproject = true;
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = "v${version}";
hash = "sha256-yQIDAQMG84onYWqBxIl5IXSaBlJBO/uUIy4CVvoFyGk=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
attrs
];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"grafanalib"
];
meta = with lib; {
description = "Library for building Grafana dashboards";
homepage = "https://github.com/weaveworks/grafanalib/";
changelog = "https://github.com/weaveworks/grafanalib/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ michaelgrahamevans ];
};
}

15
pkgs/development/python-modules/pulp/default.nix
View File

@ -1,4 +1,5 @@
{ lib
, cbc
, amply
, buildPythonPackage
, fetchFromGitHub
@ -21,6 +22,12 @@ buildPythonPackage rec {
hash = "sha256-j0f6OiscJyTqPNyLp0qWRjCGLWuT3HdU1S/sxpnsiMo=";
};
postPatch = ''
sed -i pulp/pulp.cfg.linux \
-e 's|CbcPath = .*|CbcPath = ${cbc}/bin/cbc|' \
-e 's|PulpCbcPath = .*|PulpCbcPath = ${cbc}/bin/cbc|'
'';
propagatedBuildInputs = [
amply
pyparsing
@ -34,14 +41,8 @@ buildPythonPackage rec {
"pulp"
];
disabledTests = [
# The solver is not available
"PULP_CBC_CMDTest"
"test_examples"
];
meta = with lib; {
description = "Module to generate generate MPS or LP files";
description = "Module to generate MPS or LP files";
homepage = "https://github.com/coin-or/pulp";
license = licenses.mit;
maintainers = with maintainers; [ teto ];

22
pkgs/tools/package-management/reuse/default.nix → pkgs/development/python-modules/reuse/default.nix
View File

@ -1,6 +1,16 @@
{ lib, python3Packages, fetchFromGitHub }:
{ lib
, buildPythonPackage
, fetchFromGitHub
, poetry-core
, binaryornot
, boolean-py
, debian
, jinja2
, license-expression
, pytestCheckHook
}:
python3Packages.buildPythonApplication rec {
buildPythonPackage rec {
pname = "reuse";
version = "2.1.0";
format = "pyproject";
@ -12,11 +22,11 @@ python3Packages.buildPythonApplication rec {
hash = "sha256-MEQiuBxe/ctHlAnmLhQY4QH62uAcHb7CGfZz+iZCRSk=";
};
nativeBuildInputs = with python3Packages; [
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = with python3Packages; [
propagatedBuildInputs = [
binaryornot
boolean-py
debian
@ -24,13 +34,15 @@ python3Packages.buildPythonApplication rec {
license-expression
];
nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
nativeCheckInputs = [ pytestCheckHook ];
disabledTestPaths = [
# pytest wants to execute the actual source files for some reason, which fails with ImportPathMismatchError()
"src/reuse"
];
pythonImportsCheck = [ "reuse" ];
meta = with lib; {
description = "A tool for compliance with the REUSE Initiative recommendations";
homepage = "https://github.com/fsfe/reuse-tool";

27
pkgs/development/python-modules/unix-ar/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
}:
buildPythonPackage rec {
pname = "unix-ar";
version = "0.2.1";
format = "wheel";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit format version;
pname = "unix_ar";
hash = "sha256-Kstxi8Ewi/gOW52iYU2CQswv475M2LL9Rxm84Ymq/PE=";
};
meta = with lib; {
description = "AR file handling for Python (including .deb files)";
homepage = "https://github.com/getninjas/unix_ar";
license = licenses.bsd3;
maintainers = with maintainers; [ tirimia ];
platforms = with platforms; linux ++ darwin;
};
}

6
pkgs/development/tools/supabase-cli/default.nix
View File

@ -9,16 +9,16 @@
buildGoModule rec {
pname = "supabase-cli";
version = "1.112.0";
version = "1.123.6";
src = fetchFromGitHub {
owner = "supabase";
repo = "cli";
rev = "v${version}";
hash = "sha256-2Cw+TQMKWwjWUgsif+Ot9OZ1kIlancoT4TfJ343mnLY=";
hash = "sha256-xDtFSUAETUgSvV5X1PU2hLfQKIxhSkj4D7vSvNRJqTY=";
};
vendorHash = "sha256-vseD7Oov7Gi1lEnF1hEAChoPByFa8T82njWBINC/Ea4=";
vendorHash = "sha256-PdWGqv0BekvutUAUNFMQuVUEnx9r22FjzBPoIdIRpdI=";
ldflags = [
"-s"

6
pkgs/shells/zsh/oh-my-zsh/default.nix
View File

@ -5,14 +5,14 @@
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }:
stdenv.mkDerivation rec {
version = "2023-06-26";
version = "2023-11-29";
pname = "oh-my-zsh";
src = fetchFromGitHub {
owner = "ohmyzsh";
repo = "ohmyzsh";
rev = "8cbe98469d9862d37d43ca4229dc8e915ec377a9";
sha256 = "sha256-/bFD1z/icQe4OfVcudMjIbkCh7MU6pEZiKBOYOFiCXs=";
rev = "418046e9583f635b0303e4b8cf31c356b175cec3";
sha256 = "sha256-r36vF37J+3rLGg0QzmT4U8Lp5nqRhAs8We0aDtBJKJM=";
};
strictDeps = true;

9
pkgs/tools/graphics/pngtoico/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, libpng }:
{ lib, stdenv, fetchurl, libpng, fetchpatch }:
stdenv.mkDerivation rec {
pname = "pngtoico";
@ -9,6 +9,13 @@ stdenv.mkDerivation rec {
sha256 = "1xb4aa57sjvgqfp01br3dm72hf7q0gb2ad144s1ifrs09215fgph";
};
patches = [
(fetchpatch {
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/pngtoico/files/pngtoico-1.0.1-libpng15.patch";
hash = "sha256-MeRV4FL37Wq7aFRnjbxPokcBKmPM+h94cnFJmdvHAt0=";
})
];
configurePhase = ''
sed -i s,/usr/local,$out, Makefile
'';

4
pkgs/tools/misc/fx-cast-bridge/default.nix
View File

@ -1,9 +1,11 @@
{ lib, buildNpmPackage, fetchFromGitHub, avahi-compat, nodejs, python3 }:
{ lib, buildNpmPackage, fetchFromGitHub, avahi-compat, nodejs_18, python3 }:
buildNpmPackage rec {
pname = "fx-cast-bridge";
version = "0.3.1";
nodejs = nodejs_18;
src = fetchFromGitHub {
owner = "hensm";
repo = "fx_cast";

4
pkgs/tools/security/sudo/default.nix
View File

@ -14,11 +14,11 @@
stdenv.mkDerivation rec {
pname = "sudo";
version = "1.9.15p2";
version = "1.9.15p3";
src = fetchurl {
url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz";
hash = "sha256-GZwM2/p+/P/6nIhoSo4vsgamK3CjFlB+SpHInIc7vMg=";
hash = "sha256-eMh6HM7EL3oJUAL+KxR4pRBgNjWeNiuGdTSo4AVqBJQ=";
};
prePatch = ''

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

@ -12199,9 +12199,7 @@ with pkgs;
pngoptimizer = callPackage ../tools/graphics/pngoptimizer { };
pngtoico = callPackage ../tools/graphics/pngtoico {
libpng = libpng12;
};
pngtoico = callPackage ../tools/graphics/pngtoico { };
pngpaste = callPackage ../os-specific/darwin/pngpaste {
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
@ -12774,7 +12772,7 @@ with pkgs;
restool = callPackage ../os-specific/linux/restool { };
reuse = callPackage ../tools/package-management/reuse { };
reuse = with python3.pkgs; toPythonApplication reuse;
reveal-md = callPackage ../tools/text/reveal-md { };
@ -13348,9 +13346,7 @@ with pkgs;
snet = callPackage ../tools/networking/snet { };
sng = callPackage ../tools/graphics/sng {
libpng = libpng12;
};
sng = callPackage ../tools/graphics/sng { };
snmpcheck = callPackage ../tools/networking/snmpcheck { };
@ -22666,6 +22662,8 @@ with pkgs;
libdex = callPackage ../development/libraries/libdex { };
libdicom = callPackage ../development/libraries/libdicom { };
libdigidocpp = callPackage ../development/libraries/libdigidocpp { };
libdiscid = callPackage ../development/libraries/libdiscid { };
@ -35116,6 +35114,8 @@ with pkgs;
retroshare = libsForQt5.callPackage ../applications/networking/p2p/retroshare { };
revanced-cli = callPackage ../applications/misc/revanced-cli { };
rgp = libsForQt5.callPackage ../development/tools/rgp { };
ricochet = libsForQt5.callPackage ../applications/networking/instant-messengers/ricochet {
@ -35486,9 +35486,7 @@ with pkgs;
skrooge = libsForQt5.callPackage ../applications/office/skrooge { };
smartgithg = callPackage ../applications/version-management/smartgithg {
jre = openjdk11;
};
smartgithg = callPackage ../applications/version-management/smartgithg { };
smartdeblur = libsForQt5.callPackage ../applications/graphics/smartdeblur { };
@ -38555,9 +38553,7 @@ with pkgs;
vms-empire = callPackage ../games/vms-empire { };
voxelands = callPackage ../games/voxelands {
libpng = libpng12;
};
voxelands = callPackage ../games/voxelands { };
vvvvvv = callPackage ../games/vvvvvv {
inherit (darwin.apple_sdk.frameworks) Foundation IOKit;

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

@ -4812,6 +4812,8 @@ self: super: with self; {
gradio-client = callPackage ../development/python-modules/gradio/client.nix { };
grafanalib = callPackage ../development/python-modules/grafanalib/default.nix { };
grammalecte = callPackage ../development/python-modules/grammalecte { };
grandalf = callPackage ../development/python-modules/grandalf { };
@ -12486,6 +12488,8 @@ self: super: with self; {
returns = callPackage ../development/python-modules/returns { };
reuse = callPackage ../development/python-modules/reuse { };
rfc3339 = callPackage ../development/python-modules/rfc3339 { };
rfc3339-validator = callPackage ../development/python-modules/rfc3339-validator { };
@ -15517,6 +15521,8 @@ self: super: with self; {
universal-silabs-flasher = callPackage ../development/python-modules/universal-silabs-flasher { };
unix-ar = callPackage ../development/python-modules/unix-ar { };
unpaddedbase64 = callPackage ../development/python-modules/unpaddedbase64 { };
unrardll = callPackage ../development/python-modules/unrardll { };