colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

This commit is contained in:
github-actions[bot] 2024-03-31 06:01:15 +00:00 committed by GitHub
parent ba060bffac 7848d6f048
commit 6b7b5776be
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
36 changed files with 510 additions and 261 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
maintainers/maintainer-list.nix
View File

@ -2544,6 +2544,12 @@
githubId = 34919100;
name = "Brendan Hall";
};
bhankas = {
email = "payas@relekar.org";
github = "bhankas";
githubId = 24254289;
name = "Payas Relekar";
};
bhipple = {
email = "bhipple@protonmail.com";
github = "bhipple";
@ -15116,12 +15122,6 @@
githubId = 116740;
name = "Paweł Pacana";
};
payas = {
email = "relekarpayas@gmail.com";
github = "bhankas";
githubId = 24254289;
name = "Payas Relekar";
};
pb- = {
email = "pbaecher@gmail.com";
github = "pb-";

2
nixos/doc/manual/release-notes/rl-2405.section.md
View File

@ -98,6 +98,8 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi
- [hebbot](https://github.com/haecker-felix/hebbot), a Matrix bot to generate "This Week in X" like blog posts. Available as [services.hebbot](#opt-services.hebbot.enable).
- [Workout-tracker](https://github.com/jovandeginste/workout-tracker), a workout tracking web application for personal use.
- [Python Matter Server](https://github.com/home-assistant-libs/python-matter-server), a
Matter Controller Server exposing websocket connections for use with other services, notably Home Assistant.
Available as [services.matter-server](#opt-services.matter-server.enable)

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

@ -800,6 +800,7 @@
./services/misc/tzupdate.nix
./services/misc/uhub.nix
./services/misc/weechat.nix
./services/misc/workout-tracker.nix
./services/misc/xmr-stak.nix
./services/misc/xmrig.nix
./services/misc/zoneminder.nix

83
nixos/modules/services/misc/workout-tracker.nix Normal file
View File

@ -0,0 +1,83 @@
{
config,
lib,
pkgs,
...
}:
let
inherit (lib) types;
cfg = config.services.workout-tracker;
stateDir = "workout-tracker";
in
{
options = {
services.workout-tracker = {
enable = lib.mkEnableOption "workout tracking web application for personal use (or family, friends), geared towards running and other GPX-based activities";
package = lib.mkPackageOption pkgs "workout-tracker" { };
address = lib.mkOption {
type = types.str;
default = "127.0.0.1";
description = "Web interface address.";
};
port = lib.mkOption {
type = types.port;
default = 8080;
description = "Web interface port.";
};
environmentFile = lib.mkOption {
type = types.nullOr types.path;
default = null;
example = "/run/keys/workout-tracker.env";
description = ''
An environment file as defined in {manpage}`systemd.exec(5)`.
Secrets like `WT_JWT_ENCRYPTION_KEY` may be passed to the service without adding them
to the world-readable Nix store.
'';
};
settings = lib.mkOption {
type = types.attrsOf types.str;
default = { };
description = ''
Extra config options.
'';
example = {
WT_LOGGING = "true";
WT_DEBUG = "false";
WT_DATABASE_DRIVER = "sqlite";
WT_DSN = "./database.db";
};
};
};
};
config = lib.mkIf cfg.enable {
systemd.services.workout-tracker = {
description = "A workout tracking web application for personal use (or family, friends), geared towards running and other GPX-based activities";
wantedBy = [ "multi-user.target" ];
environment = {
WT_BIND = "${cfg.address}:${toString cfg.port}";
WT_DATABASE_DRIVER = "sqlite";
WT_DSN = "./database.db";
} // cfg.settings;
serviceConfig = {
ExecStart = lib.getExe cfg.package;
DynamicUser = true;
StateDirectory = stateDir;
WorkingDirectory = "%S/${stateDir}";
Restart = "always";
EnvironmentFile = lib.optional (cfg.environmentFile != null) cfg.environmentFile;
};
};
};
meta.maintainers = with lib.maintainers; [ bhankas ];
}

1
nixos/tests/all-tests.nix
View File

@ -992,6 +992,7 @@ in {
wireguard = handleTest ./wireguard {};
without-nix = handleTest ./without-nix.nix {};
wmderland = handleTest ./wmderland.nix {};
workout-tracker = handleTest ./workout-tracker.nix {};
wpa_supplicant = handleTest ./wpa_supplicant.nix {};
wordpress = handleTest ./wordpress.nix {};
wrappers = handleTest ./wrappers.nix {};

29
nixos/tests/workout-tracker.nix Normal file
View File

@ -0,0 +1,29 @@
import ./make-test-python.nix (
{ lib, pkgs, ... }:
{
name = "workout-tracker";
meta.maintainers = with lib.maintainers; [ bhankas ];
nodes.machine =
{ config, ... }:
{
virtualisation.memorySize = 2048;
services.workout-tracker.enable = true;
};
testScript = ''
start_all()
machine.wait_for_unit("workout-tracker.service")
# wait for workout-tracker to fully come up
with subtest("workout-tracker service starts"):
machine.wait_until_succeeds(
"curl -sSfL http://localhost:8080/ > /dev/null",
timeout=30
)
'';
}
)

2
pkgs/applications/misc/go-org/default.nix
View File

@ -21,7 +21,7 @@ buildGoModule rec {
description = "Org-mode parser and static site generator in go";
homepage = "https://niklasfasching.github.io/go-org";
license = licenses.mit;
maintainers = with maintainers; [ payas ];
maintainers = with maintainers; [ bhankas ];
mainProgram = "go-org";
};
}

5
pkgs/applications/science/misc/snakemake/default.nix
View File

@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "snakemake";
version = "8.4.12";
version = "8.10.4";
format = "setuptools";
src = fetchFromGitHub {
owner = "snakemake";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-ehQIrTw1+klFW+Hu4WsWaCJ0YoN2hIqryqqaoNQb1us=";
hash = "sha256-SZf//Z1rLHyvW/f0U6kEBzV1NjDEDG1OcFl9/JR+i/g=";
# https://github.com/python-versioneer/python-versioneer/issues/217
postFetch = ''
sed -i "$out"/snakemake/_version.py -e 's#git_refnames = ".*"#git_refnames = " (tag: v${version})"#'
@ -48,6 +48,7 @@ python3.pkgs.buildPythonApplication rec {
snakemake-interface-executor-plugins
snakemake-interface-common
snakemake-interface-storage-plugins
snakemake-interface-report-plugins
stopit
tabulate
throttler

36
pkgs/by-name/cv/cvemap/package.nix Normal file
View File

@ -0,0 +1,36 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "cvemap";
version = "0.0.6";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "cvemap";
rev = "refs/tags/v${version}";
hash = "sha256-aeUYcgBTHWWLTuAXnnc73yXaC3yLZzruqvedUYCnht4=";
};
vendorHash = "sha256-VQGWi01mOP2N4oYsaDK7wn/+hSFEDHhSma9DOZ06Z3k=";
subPackages = [
"cmd/cvemap/"
];
ldflags = [
"-s"
"-w"
];
meta = with lib; {
description = "Tool to work with CVEs";
homepage = "https://github.com/projectdiscovery/cvemap";
changelog = "https://github.com/projectdiscovery/cvemap/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
mainProgram = "cvemap";
};
}

2
pkgs/by-name/gl/glas/package.nix
View File

@ -31,6 +31,6 @@ rustPlatform.buildRustPackage rec {
mit
];
mainProgram = "glas";
maintainers = with lib.maintainers; [ payas ];
maintainers = with lib.maintainers; [ bhankas ];
};
}

6
pkgs/by-name/la/labwc-menu-generator/package.nix
View File

@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "labwc-menu-generator";
version = "unstable-2024-03-12";
version = "unstable-2024-03-27";
src = fetchFromGitHub {
owner = "labwc";
repo = "labwc-menu-generator";
rev = "85a014db7214103c14c2bfbb5fc09a349ad64992";
hash = "sha256-nt/K00cr1dKEk547J/6w1j6O3WSgGqVt1+Jdw95K28s=";
rev = "7b62ce9c25db9ee21c9f93e536615569378bcb20";
hash = "sha256-CZ+p06D3/Ou29f2RRL9MBvzM+Qisdq0h8ySjzUqhGZM=";
};
nativeBuildInputs = [

371
pkgs/by-name/ni/niri/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

15
pkgs/by-name/ni/niri/package.nix
View File

@ -16,32 +16,23 @@
, libclang
, autoPatchelfHook
, clang
, fetchpatch
}:
rustPlatform.buildRustPackage rec {
pname = "niri";
version = "0.1.3";
version = "0.1.4";
src = fetchFromGitHub {
owner = "YaLTeR";
repo = "niri";
rev = "v${version}";
hash = "sha256-VTtXEfxc3OCdtdYiEdtftOQ7gDJNb679Yw8v1Lu3lhY=";
hash = "sha256-lkGIQIMWfg71UOkT/TST8O6hD0IfslENj6oFPevUGl4=";
};
patches = [
(fetchpatch {
name = "revert-viewporter.patch";
url = "https://github.com/YaLTeR/niri/commit/40cec34aa4a7f99ab12b30cba1a0ee83a706a413.patch";
hash = "sha256-3fg8v0eotfjUQY6EVFEPK5BBIBrr6vQpXbjDcsw2E8Q=";
})
];
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"smithay-0.3.0" = "sha256-sXdixfPLAUIIVK+PhqRuMZ7XKNJIGkWNlH8nBzXlxCU=";
"smithay-0.3.0" = "sha256-bWan2DCyMvEC8ZQPwM+XpuOGkOZ/RdDV+LmRCN8UAuc=";
};
};

8
pkgs/by-name/wa/warp-terminal/versions.json
View File

@ -1,10 +1,10 @@
{
"darwin": {
"hash": "sha256-aOw/c6Y+4x6kwxcwnajHh92ZZDeaM/Y1df76HgUjVn8=",
"version": "0.2024.03.19.08.01.stable_01"
"hash": "sha256-4eeu1JlChD9QvFSpuq5Wh8y+cUqpHYKgi3+SBTJqIwA=",
"version": "0.2024.03.26.08.02.stable_02"
},
"linux": {
"hash": "sha256-efnYh48xcLneeotH9iSY0xQRgMXI/erM6F2fIH38yjY=",
"version": "0.2024.03.19.08.01.stable_01"
"hash": "sha256-hBwLfxhdy4cru2xH3hY+mGbJpR47Qf3SqEIijIRDstU=",
"version": "0.2024.03.26.08.02.stable_02"
}
}

32
pkgs/by-name/wo/workout-tracker/package.nix Normal file
View File

@ -0,0 +1,32 @@
{
lib,
buildGoModule,
fetchFromGitHub,
nix-update-script,
...
}:
buildGoModule rec {
pname = "workout-tracker";
version = "0.10.5";
src = fetchFromGitHub {
owner = "jovandeginste";
repo = "workout-tracker";
rev = "refs/tags/v${version}";
hash = "sha256-ekGaNHysY0lXbB5w6AycnLR9/4dqUp0busCcPPvzSVI=";
};
vendorHash = null;
passthru.updateScript = nix-update-script { };
meta = {
changelog = "https://github.com/jovandeginste/workout-tracker/releases/tag/v${version}";
description = "A workout tracking web application for personal use";
homepage = "https://github.com/jovandeginste/workout-tracker";
license = lib.licenses.mit;
mainProgram = "workout-tracker";
maintainers = with lib.maintainers; [ bhankas ];
};
}

4
pkgs/by-name/x1/x16/package.nix
View File

@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "x16-emulator";
version = "46";
version = "47";
src = fetchFromGitHub {
owner = "X16Community";
repo = "x16-emulator";
rev = "r${finalAttrs.version}";
hash = "sha256-cYr6s69eua1hCFqNkcomZDK9akxBqMTIaGqOl/YX2kc=";
hash = "sha256-v7INa0Xpq7WlrSqc6VNBwLQPUoloqsGbv5rd/VTQtUg=";
};
postPatch = ''

4
pkgs/by-name/x1/x16/rom.nix
View File

@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "x16-rom";
version = "46";
version = "47";
src = fetchFromGitHub {
owner = "X16Community";
repo = "x16-rom";
rev = "r${finalAttrs.version}";
hash = "sha256-PcLHIT84NbH+ejq8SY/UN+TYtRFWtqQBHwHqToFUol8=";
hash = "sha256-+NvuCW8CIj5cnrGh+VQOExhAeXMElqdl9DVJjjGhNPk=";
};
nativeBuildInputs = [

6
pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
View File

@ -215,7 +215,11 @@ def _get_latest_version_pypi(attr_path, package, extension, current_version, tar
url = "{}/{}/json".format(INDEX, package)
json = _fetch_page(url)
versions = json["releases"].keys()
versions = {
version
for version, releases in json["releases"].items()
if not all(release["yanked"] for release in releases)
}
version = _determine_latest_version(current_version, target, versions)
try:

4
pkgs/development/libraries/pipewire/wireplumber.nix
View File

@ -24,7 +24,7 @@
stdenv.mkDerivation rec {
pname = "wireplumber";
version = "0.5.0";
version = "0.5.1";
outputs = [ "out" "dev" ] ++ lib.optional enableDocs "doc";
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
owner = "pipewire";
repo = "wireplumber";
rev = version;
hash = "sha256-zcYZvyGsGuiwuL9nOD5mW6RFwa9cPB9HvoQqdw2jlmY=";
hash = "sha256-l5s7GTKpqGvRs1o14QNXq3kyQsoPwwUmd0TKlBKTAKE=";
};
nativeBuildInputs = [

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

@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "apprise";
version = "1.7.4";
version = "1.7.5";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-716DAFEUDUIop1nFvC1oV7zH+GZN8+RPMPZGF84MenM=";
hash = "sha256-CsNLJwCdXGJeh9M+yF+ldwYrV/O87W1yI+F8Wvu0Dmg=";
};
nativeBuildInputs = [

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "boost-histogram";
version = "1.4.0";
version = "1.4.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -19,7 +19,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "boost_histogram";
inherit version;
hash = "sha256-z5gmz8/hAzUJa1emH2xlafZfAVklnusiUcW/MdhZ11M=";
hash = "sha256-lxRvc19GfVBpdqBH8/I3zlmECpUv0jH19DH4l/sAbN0=";
};
nativeBuildInputs = [

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

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "home-assistant-chip-clusters";
version = "2024.2.2";
version = "2024.3.2";
format = "wheel";
src = fetchPypi {
@ -15,7 +15,7 @@ buildPythonPackage rec {
pname = "home_assistant_chip_clusters";
dist = "py3";
python = "py3";
hash = "sha256-OWDOJfVQJSJFng5xAQqBNpqB0nXnYVCTq1MwyPtwfIM=";
hash = "sha256-Imdpqy7m81oxfkzj+82afSX9juK/SOCBIMoaPjK8G+Y=";
};
propagatedBuildInputs = [

6
pkgs/development/python-modules/home-assistant-chip-core/default.nix
View File

@ -28,7 +28,7 @@
buildPythonPackage rec {
pname = "home-assistant-chip-core";
version = "2024.2.2";
version = "2024.3.2";
format = "wheel";
disabled = pythonOlder "3.7";
@ -37,11 +37,11 @@ buildPythonPackage rec {
system = {
"aarch64-linux" = {
name = "aarch64";
hash = "sha256-lo6upkkZYQCtggNU+4/S/JTUqJnAWaWFA6NTt4C2gEM=";
hash = "sha256-li+fmEikVnTAkgQnoiWjoZaVRwGRadTYuQySR5s8VB4=";
};
"x86_64-linux" = {
name = "x86_64";
hash = "sha256-VwiIH/PK4fOQCc+KSHXP1VwHVK1gYnmBXTgKDT1Yt58=";
hash = "sha256-iUKtAz00qFklTW2ilUPGAWhpqDmnLb6D3Zdy1oHpQl0=";
};
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
in fetchPypi {

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

@ -55,7 +55,7 @@ in
buildPythonPackage rec {
pname = "python-matter-server";
version = "5.8.1";
version = "5.9.0";
format = "pyproject";
disabled = pythonOlder "3.10";
@ -64,7 +64,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = "python-matter-server";
rev = "refs/tags/${version}";
hash = "sha256-iisDEopaKklLvvGDTo2fv0Fpkhuhd+7KoNnQA+QmjB8=";
hash = "sha256-O3AJ7vBjuwRGa4AMwWIdxn5m2F45rLCjCHeff18b/5E=";
};
patches = [

25
pkgs/development/python-modules/python-matter-server/link-paa-root-certs.patch
View File

@ -1,22 +1,21 @@
diff --git a/matter_server/server/const.py b/matter_server/server/const.py
index 2a6140b..275353a 100644
index 8cca3cf..43f02f5 100644
--- a/matter_server/server/const.py
+++ b/matter_server/server/const.py
@@ -15,7 +15,8 @@ DATA_MODEL_SCHEMA_VERSION = 6
# and always uses the development subfolder
# regardless of anything you pass into instantiating the controller
# revisit this once matter 1.1 is released
-PAA_ROOT_CERTS_DIR: Final[pathlib.Path] = (
+PAA_ROOT_CERTS_DIR: Final[pathlib.Path] = pathlib.Path("@paacerts@")
@@ -14,6 +14,8 @@ DATA_MODEL_SCHEMA_VERSION = 6
# Keep default location inherited from early version of the Python
# bindings.
DEFAULT_PAA_ROOT_CERTS_DIR: Final[pathlib.Path] = (
+ pathlib.Path("@paacerts@"))
+(
pathlib.Path(__file__)
.parent.resolve()
.parent.resolve()
diff --git a/matter_server/server/helpers/paa_certificates.py b/matter_server/server/helpers/paa_certificates.py
index d186be1..d2cef54 100644
index e530838..fdd6025 100644
--- a/matter_server/server/helpers/paa_certificates.py
+++ b/matter_server/server/helpers/paa_certificates.py
@@ -62,6 +62,8 @@ async def fetch_dcl_certificates(
@@ -64,6 +64,8 @@ async def fetch_dcl_certificates(
fetch_production_certificates: bool = True,
) -> int:
"""Fetch DCL PAA Certificates."""
@ -25,16 +24,16 @@ index d186be1..d2cef54 100644
LOGGER.info("Fetching the latest PAA root certificates from DCL.")
fetch_count: int = 0
base_urls = set()
@@ -121,6 +123,8 @@ async def fetch_dcl_certificates(
@@ -124,6 +126,8 @@ async def fetch_dcl_certificates(
async def fetch_git_certificates() -> int:
async def fetch_git_certificates(paa_root_cert_dir: Path) -> int:
"""Fetch Git PAA Certificates."""
+ return 0
+
fetch_count = 0
LOGGER.info("Fetching the latest PAA root certificates from Git.")
@@ -162,6 +166,8 @@ async def fetch_certificates(
@@ -159,6 +163,8 @@ async def fetch_certificates(
fetch_production_certificates: bool = True,
) -> int:
"""Fetch PAA Certificates."""
@ -42,4 +41,4 @@ index d186be1..d2cef54 100644
+
loop = asyncio.get_running_loop()
if not PAA_ROOT_CERTS_DIR.is_dir():
if not paa_root_cert_dir.is_dir():

6
pkgs/development/python-modules/snakemake-executor-plugin-cluster-generic/default.nix
View File

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "snakemake-executor-plugin-cluster-generic";
version = "1.0.8";
version = "1.0.9";
format = "pyproject";
src = fetchFromGitHub {
owner = "snakemake";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-+aGd+E+VQb7MflsiUgFR98AyeetZxbc4gdvU1JWJNcM=";
hash = "sha256-RHMefoJOZb6TjRsFCORLFdHtI5ZpTsV6CHrjHKMat9o=";
};
nativeBuildInputs = [
@ -31,7 +31,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Generic cluster executor for Snakemake";
homepage = "https://github.com/snakemake/snakemake-executor-plugin-cluster-generic/tags";
homepage = "https://github.com/snakemake/snakemake-executor-plugin-cluster-generic";
license = licenses.mit;
maintainers = with maintainers; [ veprbl ];
};

4
pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix
View File

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "snakemake-interface-executor-plugins";
version = "8.2.0";
version = "9.1.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "snakemake";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-ZkhayXWy83/INRH7FYwFkhgHL+nSj7ReYC9I97SEeTM=";
hash = "sha256-DW8fxBBP6U7N0Hgk/enOzUz68L7pCjVl/8MFCy6PKxg=";
};
nativeBuildInputs = [

36
pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix Normal file
View File

@ -0,0 +1,36 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, poetry-core
, snakemake-interface-common
}:
buildPythonPackage rec {
pname = "snakemake-interface-report-plugins";
version = "1.0.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "snakemake";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-30x4avA3FrqZ4GoTl6Js5h3VG5LW7BNHOcNWxznXoT0=";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
snakemake-interface-common
];
pythonImportsCheck = [ "snakemake_interface_report_plugins" ];
meta = with lib; {
description = "The interface for Snakemake report plugins";
homepage = "https://github.com/snakemake/snakemake-interface-report-plugins";
license = licenses.mit;
maintainers = with maintainers; [ veprbl ];
};
}

6
pkgs/development/tools/language-servers/vhdl-ls/default.nix
View File

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "vhdl-ls";
version = "0.78.1";
version = "0.78.2";
src = fetchFromGitHub {
owner = "VHDL-LS";
repo = "rust_hdl";
rev = "v${version}";
hash = "sha256-LY9lFZe8MFuDwtNbi9D4JiYY+xKb5bGBHGnH951oRiQ=";
hash = "sha256-hg+OEB4V5kCpno7blMyE6jnDQPHds+BN+RZGG8oAoZU=";
};
cargoHash = "sha256-LcMAau6fJimcyf4Iru5AvrjsSV3nfLPvNqXtyzVHWgc=";
cargoHash = "sha256-jX2vJdFTx0ELXqwMvoCILGvYrfAtL72lfI3KqWCZLYg=";
postPatch = ''
substituteInPlace vhdl_lang/src/config.rs \

25
pkgs/development/tools/wails/default.nix
View File

@ -5,11 +5,11 @@
, pkg-config
, makeWrapper
, go
, gcc
, gtk3
, webkitgtk
, nodejs
, zlib
# Linux specific dependencies
, gtk3
, webkitgtk
}:
buildGoModule rec {
@ -44,10 +44,11 @@ buildGoModule rec {
propagatedBuildInputs = [
pkg-config
go
gcc
stdenv.cc
nodejs
] ++ lib.optionals stdenv.isLinux [
gtk3
webkitgtk
nodejs
];
ldflags = [
@ -58,18 +59,18 @@ buildGoModule rec {
# As Wails calls a compiler, certain apps and libraries need to be made available.
postFixup = ''
wrapProgram $out/bin/wails \
--prefix PATH : ${lib.makeBinPath [ pkg-config go gcc nodejs ]} \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gtk3 webkitgtk ]} \
--prefix PATH : ${lib.makeBinPath [ pkg-config go stdenv.cc nodejs ]} \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath (lib.optionals stdenv.isLinux [ gtk3 webkitgtk ])}" \
--set PKG_CONFIG_PATH "$PKG_CONFIG_PATH" \
--set CGO_LDFLAGS "-L${lib.makeLibraryPath [ zlib ]}"
'';
meta = with lib; {
meta = {
description = "Build applications using Go + HTML + CSS + JS";
mainProgram = "wails";
homepage = "https://wails.io";
license = licenses.mit;
maintainers = with maintainers; [ ianmjones ];
platforms = platforms.linux;
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ ianmjones ];
mainProgram = "wails";
platforms = lib.platforms.unix;
};
}

4
pkgs/servers/sql/postgresql/ext/plpgsql_check.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "plpgsql-check";
version = "2.7.4";
version = "2.7.5";
src = fetchFromGitHub {
owner = "okbob";
repo = "plpgsql_check";
rev = "v${version}";
hash = "sha256-qPYH6i8XJZVH+5zM/gozf+0Kts/Tzv6fRWkayGEe+5U=";
hash = "sha256-CD/G/wX6o+mC6gowlpFe1DdJWyh3cB9wxSsW2GXrENE=";
};
buildInputs = [ postgresql ];

6
pkgs/tools/misc/mise/default.nix
View File

@ -17,16 +17,16 @@
rustPlatform.buildRustPackage rec {
pname = "mise";
version = "2024.3.7";
version = "2024.3.10";
src = fetchFromGitHub {
owner = "jdx";
repo = "mise";
rev = "v${version}";
hash = "sha256-vwbg/OY7w9+5KvLp+BN2Ive9khVTUnWgnWD1T09iVR8=";
hash = "sha256-Vx6BI2GmnyvBlDGAkNDJaEMXBphbaIxB5npD/o5c48M=";
};
cargoHash = "sha256-su8kyq+H42cYcQcoDYaTKAhLSykYOTXdkDQeCgScnp0=";
cargoHash = "sha256-uhpF5jKWtwEx2HkkHd+88HIao4rqvnSQblinVc4ip44=";
nativeBuildInputs = [ installShellFiles pkg-config ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];

2
pkgs/tools/networking/xh/default.nix
View File

@ -59,6 +59,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/ducaale/xh";
changelog = "https://github.com/ducaale/xh/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ figsoda payas ];
maintainers = with maintainers; [ figsoda bhankas ];
};
}

6
pkgs/tools/security/cloudlist/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "cloudlist";
version = "1.0.7";
version = "1.0.8";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "cloudlist";
rev = "refs/tags/v${version}";
hash = "sha256-F1oiatNP4tSRWI25r1uoiLT9Et+PyqU0p2HVICMBUNA=";
hash = "sha256-UyZ9KSjFu/NKiz4AZoKwHiWzh+KOARDmveCWcFbOS7A=";
};
vendorHash = "sha256-3QS9YYypqEJhibfBFxFq1gxTVpTWBy35tXcO9+DBehY=";
vendorHash = "sha256-tMrTAbfD+ip/UxrGTaMswgqo94rJZ0lqqxPgYFhZoTY=";
ldflags = [
"-w"

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

@ -20074,7 +20074,9 @@ with pkgs;
vtable-dumper = callPackage ../development/tools/misc/vtable-dumper { };
wails = callPackage ../development/tools/wails { };
wails = callPackage ../development/tools/wails {
stdenv = gccStdenv;
};
wasmer-pack = callPackage ../development/tools/misc/wasmer-pack { };

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

@ -13846,6 +13846,8 @@ self: super: with self; {
snakemake-interface-executor-plugins = callPackage ../development/python-modules/snakemake-interface-executor-plugins { };
snakemake-interface-report-plugins = callPackage ../development/python-modules/snakemake-interface-report-plugins { };
snakemake-interface-storage-plugins = callPackage ../development/python-modules/snakemake-interface-storage-plugins { };
snakebite = callPackage ../development/python-modules/snakebite { };