Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
1214d57779
@ -903,8 +903,8 @@ with import <nixpkgs>
|
||||
};
|
||||
let
|
||||
rustPlatform = makeRustPlatform {
|
||||
cargo = rust-bin.stable.latest.minimal;
|
||||
rustc = rust-bin.stable.latest.minimal;
|
||||
cargo = rust-bin.selectLatestNightlyWith (toolchain: toolchain.default);
|
||||
rustc = rust-bin.selectLatestNightlyWith (toolchain: toolchain.default);
|
||||
};
|
||||
in
|
||||
|
||||
|
||||
@ -1,37 +1,58 @@
|
||||
{ config, lib, pkgs }: let
|
||||
{
|
||||
addDriverRunpath,
|
||||
glibc,
|
||||
jq,
|
||||
lib,
|
||||
nvidia-container-toolkit,
|
||||
nvidia-driver,
|
||||
runtimeShell,
|
||||
writeScriptBin,
|
||||
}:
|
||||
let
|
||||
mountOptions = { options = ["ro" "nosuid" "nodev" "bind"]; };
|
||||
mounts = [
|
||||
{ hostPath = "${lib.getBin config.hardware.nvidia.package}/bin/nvidia-cuda-mps-control";
|
||||
# FIXME: Making /usr mounts optional
|
||||
{ hostPath = lib.getExe' nvidia-driver "nvidia-cuda-mps-control";
|
||||
containerPath = "/usr/bin/nvidia-cuda-mps-control"; }
|
||||
{ hostPath = "${lib.getBin config.hardware.nvidia.package}/bin/nvidia-cuda-mps-server";
|
||||
{ hostPath = lib.getExe' nvidia-driver "nvidia-cuda-mps-server";
|
||||
containerPath = "/usr/bin/nvidia-cuda-mps-server"; }
|
||||
{ hostPath = "${lib.getBin config.hardware.nvidia.package}/bin/nvidia-debugdump";
|
||||
{ hostPath = lib.getExe' nvidia-driver "nvidia-debugdump";
|
||||
containerPath = "/usr/bin/nvidia-debugdump"; }
|
||||
{ hostPath = "${lib.getBin config.hardware.nvidia.package}/bin/nvidia-powerd";
|
||||
{ hostPath = lib.getExe' nvidia-driver "nvidia-powerd";
|
||||
containerPath = "/usr/bin/nvidia-powerd"; }
|
||||
{ hostPath = "${lib.getBin config.hardware.nvidia.package}/bin/nvidia-smi";
|
||||
{ hostPath = lib.getExe' nvidia-driver "nvidia-smi";
|
||||
containerPath = "/usr/bin/nvidia-smi"; }
|
||||
{ hostPath = "${pkgs.nvidia-container-toolkit}/bin/nvidia-ctk";
|
||||
{ hostPath = lib.getExe' nvidia-container-toolkit "nvidia-ctk";
|
||||
containerPath = "/usr/bin/nvidia-ctk"; }
|
||||
{ hostPath = "${pkgs.glibc}/lib";
|
||||
containerPath = "${pkgs.glibc}/lib"; }
|
||||
{ hostPath = "${pkgs.glibc}/lib64";
|
||||
containerPath = "${pkgs.glibc}/lib64"; }
|
||||
{ hostPath = "${lib.getLib glibc}/lib";
|
||||
containerPath = "${lib.getLib glibc}/lib"; }
|
||||
|
||||
# FIXME: use closureinfo
|
||||
{
|
||||
hostPath = addDriverRunpath.driverLink;
|
||||
containerPath = addDriverRunpath.driverLink;
|
||||
}
|
||||
{ hostPath = "${lib.getLib glibc}/lib";
|
||||
containerPath = "${lib.getLib glibc}/lib"; }
|
||||
{ hostPath = "${lib.getLib glibc}/lib64";
|
||||
containerPath = "${lib.getLib glibc}/lib64"; }
|
||||
];
|
||||
jqAddMountExpression = ".containerEdits.mounts[.containerEdits.mounts | length] |= . +";
|
||||
mountsToJq = lib.concatMap
|
||||
(mount:
|
||||
["${pkgs.jq}/bin/jq '${jqAddMountExpression} ${builtins.toJSON (mount // mountOptions)}'"])
|
||||
["${lib.getExe jq} '${jqAddMountExpression} ${builtins.toJSON (mount // mountOptions)}'"])
|
||||
mounts;
|
||||
in ''
|
||||
#! ${pkgs.runtimeShell}
|
||||
in
|
||||
writeScriptBin "nvidia-cdi-generator"
|
||||
''
|
||||
#! ${runtimeShell}
|
||||
|
||||
function cdiGenerate {
|
||||
${pkgs.nvidia-container-toolkit}/bin/nvidia-ctk cdi generate \
|
||||
${lib.getExe' nvidia-container-toolkit "nvidia-ctk"} cdi generate \
|
||||
--format json \
|
||||
--ldconfig-path ${pkgs.glibc.bin}/bin/ldconfig \
|
||||
--library-search-path ${config.hardware.nvidia.package}/lib \
|
||||
--nvidia-ctk-path ${pkgs.nvidia-container-toolkit}/bin/nvidia-ctk
|
||||
--ldconfig-path ${lib.getExe' glibc "ldconfig"} \
|
||||
--library-search-path ${lib.getLib nvidia-driver}/lib \
|
||||
--nvidia-ctk-path ${lib.getExe' nvidia-container-toolkit "nvidia-ctk"}
|
||||
}
|
||||
|
||||
cdiGenerate | \
|
||||
|
||||
@ -26,9 +26,11 @@
|
||||
serviceConfig = {
|
||||
RuntimeDirectory = "cdi";
|
||||
RemainAfterExit = true;
|
||||
ExecStart = let
|
||||
script = (pkgs.writeScriptBin "nvidia-cdi-generator"
|
||||
(import ./cdi-generate.nix { inherit config lib pkgs; })); in (lib.getExe script);
|
||||
ExecStart =
|
||||
let
|
||||
script = pkgs.callPackage ./cdi-generate.nix { nvidia-driver = config.hardware.nvidia.package; };
|
||||
in
|
||||
lib.getExe script;
|
||||
Type = "oneshot";
|
||||
};
|
||||
};
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fulcrum";
|
||||
version = "1.9.8";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cculianu";
|
||||
repo = "Fulcrum";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cWrhALYIjhOCKi/uPXD8Ty0wuN4WQq+8o97M6CtW+YE=";
|
||||
sha256 = "sha256-HTyOlbrmZHN2MbG70auGkuPPo3fTN/oCHi6Lwnq+gKk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config qmake ];
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "texstudio";
|
||||
version = "4.7.2";
|
||||
version = "4.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "texstudio-org";
|
||||
repo = "texstudio";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-Q4/aoLIxFssti3Dto1JwRRAQ+D3DHlH9JgDrHBVKg4M=";
|
||||
hash = "sha256-hAuNjlFr23l5ztfoa2RTHKZtH2aXF1EuWTd/ZyKuyHg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
spell checking and support of any compilation chain.
|
||||
'';
|
||||
homepage = "https://texstudio.org";
|
||||
changelog = "https://github.com/texstudio-org/texstudio/blob/${version}/utilities/manual/CHANGELOG.txt";
|
||||
changelog = "https://github.com/texstudio-org/texstudio/blob/${finalAttrs.version}/utilities/manual/CHANGELOG.txt";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ ajs124 cfouche ];
|
||||
|
||||
@ -6,19 +6,22 @@ stdenv.mkDerivation (finalAttrs: let
|
||||
in
|
||||
{
|
||||
pname = "remnote";
|
||||
version = "1.13.52";
|
||||
version = "1.14.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.remnote.io/remnote-desktop/RemNote-${version}.AppImage";
|
||||
hash = "sha256-4wN4lqeA9olo6igr1M1JhecPG/ruVivdOyWiRlDAzQQ=";
|
||||
hash = "sha256-WpNgdQGNz1Vv3MQe6tgnkzf+rvxMeoDQns5SqKNP7F8=";
|
||||
};
|
||||
|
||||
appexec = appimageTools.wrapType2 {
|
||||
inherit pname version src;
|
||||
};
|
||||
|
||||
icon = fetchurl {
|
||||
url = "https://www.remnote.io/icon.png";
|
||||
hash = "sha256-r5D7fNefKPdjtmV7f/88Gn3tqeEG8LGuD4nHI/sCk94=";
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
type = "Application";
|
||||
name = "remnote";
|
||||
@ -29,18 +32,21 @@ in
|
||||
categories = [ "Office" ];
|
||||
mimeTypes = [ "x-scheme-handler/remnote" "x-scheme-handler/rn" ];
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -D ${appexec}/bin/remnote-${version} $out/bin/remnote
|
||||
install -m 444 -D "${desktopItem}/share/applications/"* -t $out/share/applications/
|
||||
install -m 444 -D ${icon} $out/share/pixmaps/remnote.png
|
||||
install -Dm755 ${appexec}/bin/remnote-${version} $out/bin/remnote
|
||||
install -Dm444 "${desktopItem}/share/applications/"* -t $out/share/applications/
|
||||
install -Dm444 ${icon} $out/share/pixmaps/remnote.png
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A note-taking application focused on learning and productivity";
|
||||
homepage = "https://remnote.com/";
|
||||
|
||||
@ -77,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: rec {
|
||||
postPatch = ''
|
||||
chmod +x build-aux/meson/postinstall.py
|
||||
patchShebangs build-aux/meson/postinstall.py
|
||||
substituteInPlace src/functions.vala --replace "/usr/local/etc/xdg/swaync" "$out/etc/xdg/swaync"
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -25,13 +25,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "newsflash";
|
||||
version = "3.1.3";
|
||||
version = "3.1.5";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "news-flash";
|
||||
repo = "news_flash_gtk";
|
||||
rev = "refs/tags/v.${finalAttrs.version}";
|
||||
hash = "sha256-eaZkuFy+pDL09S8TQjpUUPIy+mFIwBScgc8hgbkRJDc=";
|
||||
hash = "sha256-6RkZdRQ/pNq6VkL9E2BaAWbKKGbCpEC+skGHPe3TwH8=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
|
||||
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hyprshade";
|
||||
version = "3.0.3";
|
||||
version = "3.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "loqusion";
|
||||
repo = "hyprshade";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-vX1Cc170ifevn1aji5s0MI7G0zktPuvSpAbYpGPMudA=";
|
||||
hash = "sha256-bH+QXvZ+Yaogcp/MYJopiAUvM/imNrSo+cotTzzdlV8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
40
pkgs/by-name/au/audiness/package.nix
Normal file
40
pkgs/by-name/au/audiness/package.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "audiness";
|
||||
version = "0.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "audiusGmbH";
|
||||
repo = "audiness";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-FSZ3EyLGtTCmeIRg2aHB/U14yPa5CpTLdqIZ6eyRtXQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
pytenable
|
||||
typer
|
||||
validators
|
||||
] ++ typer.optional-dependencies.all;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"audiness"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI tool to interact with Nessus";
|
||||
homepage = "https://github.com/audiusGmbH/audiness";
|
||||
changelog = "https://github.com/audiusGmbH/audiness/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "audiness";
|
||||
};
|
||||
}
|
||||
@ -7,6 +7,7 @@
|
||||
, fuse
|
||||
, installShellFiles
|
||||
, wrapGAppsHook
|
||||
, wrapperDir ? "/run/wrappers/bin"
|
||||
}:
|
||||
let
|
||||
pname = "onedriver";
|
||||
@ -40,6 +41,7 @@ buildGoModule {
|
||||
install -Dm644 ./pkg/resources/onedriver-128.png $out/share/icons/onedriver/onedriver-128.png
|
||||
|
||||
install -Dm644 ./pkg/resources/onedriver.desktop $out/share/applications/onedriver.desktop
|
||||
install -Dm644 ./pkg/resources/onedriver@.service $out/lib/systemd/user/onedriver@.service
|
||||
|
||||
mkdir -p $out/share/man/man1
|
||||
installManPage ./pkg/resources/onedriver.1
|
||||
@ -47,6 +49,10 @@ buildGoModule {
|
||||
substituteInPlace $out/share/applications/onedriver.desktop \
|
||||
--replace "/usr/bin/onedriver-launcher" "$out/bin/onedriver-launcher" \
|
||||
--replace "/usr/share/icons" "$out/share/icons"
|
||||
|
||||
substituteInPlace $out/lib/systemd/user/onedriver@.service \
|
||||
--replace "/usr/bin/onedriver" "$out/bin/onedriver" \
|
||||
--replace "/usr/bin/fusermount" "${wrapperDir}/fusermount"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,17 +1,20 @@
|
||||
{ lib, fetchFromGitHub, php }:
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, php
|
||||
}:
|
||||
|
||||
php.buildComposerProject (finalAttrs: {
|
||||
pname = "phpunit";
|
||||
version = "11.0.3";
|
||||
version = "11.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sebastianbergmann";
|
||||
repo = "phpunit";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-ASeALfqcDUoK2PSl88AJ3UgrLdesuH1o5UNq+ceGbxI=";
|
||||
hash = "sha256-ucUDeiqz8QkCsKM/SfHVjJSnfs0TRaV04CTKepSzyo0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-2rG0ERgI5oVW3MuU8yFwgssoWX6zwUwXpro2IVkX7ac=";
|
||||
vendorHash = "sha256-0jbSUIT4Eh1lWu11REgE4ilGlw1zuawXeKCPBHnoxdk=";
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/sebastianbergmann/phpunit/blob/${finalAttrs.version}/ChangeLog-${lib.versions.majorMinor finalAttrs.version}.md";
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "rectangle-pro";
|
||||
version = "3.0.11";
|
||||
version = "3.0.19";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://rectangleapp.com/pro/downloads/Rectangle%20Pro%20${finalAttrs.version}.dmg";
|
||||
hash = "sha256-Hs2eRO5DpYoY0rLfcmGZRHjmg+wddz/+LE0u4E9gCTk=";
|
||||
hash = "sha256-ZWIjxaxV90I42Stg7jFUItJBZLoXm8iLIeQzcssRQLA=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
53
pkgs/by-name/sc/scion/package.nix
Normal file
53
pkgs/by-name/sc/scion/package.nix
Normal file
@ -0,0 +1,53 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
let
|
||||
version = "0.10.0";
|
||||
|
||||
# Injects a `t.Skip()` into a given test since there's apparently no other way to skip tests here.
|
||||
# ref: https://github.com/NixOS/nixpkgs/blob/047bc33866bf7004d0ce9ed0af78dab5ceddaab0/pkgs/by-name/vi/vikunja/package.nix#L96
|
||||
skipTest = lineOffset: testCase: file:
|
||||
let
|
||||
jumpAndAppend = lib.concatStringsSep ";" (lib.replicate (lineOffset - 1) "n" ++ [ "a" ]);
|
||||
in
|
||||
''
|
||||
sed -i -e '/${testCase}/{
|
||||
${jumpAndAppend} t.Skip();
|
||||
}' ${file}
|
||||
'';
|
||||
in
|
||||
|
||||
buildGoModule {
|
||||
pname = "scion";
|
||||
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scionproto";
|
||||
repo = "scion";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8yXjEDo1k0+7O0gx2acAZMrG/r+iePfNCG+FolCSKwI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4nTp6vOyS7qDn8HmNO0NGCNU7wCb8ww8a15Yv3MPEq8=";
|
||||
|
||||
excludedPackages = [ "acceptance" "demo" "tools" "pkg/private/xtest/graphupdater" ];
|
||||
|
||||
# This can be removed in the next release of scion since its fixed upstream
|
||||
# https://github.com/scionproto/scion/pull/4476
|
||||
postConfigure = ''
|
||||
# This test needs docker, so lets skip it
|
||||
${skipTest 1 "TestOpensslCompatible" "scion-pki/trcs/sign_test.go"}
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A future Internet architecture utilizing path-aware networking";
|
||||
homepage = "https://scion-architecture.net/";
|
||||
platforms = platforms.unix;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ sarcasticadmin matthewcroughan ];
|
||||
};
|
||||
}
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "stats";
|
||||
version = "2.9.11";
|
||||
version = "2.10.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg";
|
||||
hash = "sha256-L7E3naVeFYxeS8OAEkXEgY7YB+6E+yrGfIAUr52EWvA=";
|
||||
hash = "sha256-PSRK9YihiIHKHade3XE/OnAleBhmu71CNFyzJ/Upx/A=";
|
||||
};
|
||||
sourceRoot = ".";
|
||||
|
||||
|
||||
21
pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix
Normal file
21
pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix
Normal file
@ -0,0 +1,21 @@
|
||||
{ lib, buildGoModule, fetchurl, pkg-config }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "zabbix-agent2-plugin-postgresql";
|
||||
version = "6.0.25";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cdn.zabbix.com/zabbix-agent2-plugins/sources/postgresql/zabbix-agent2-plugin-postgresql-${version}.tar.gz";
|
||||
hash = "sha256-NFohopyUFO2C1k5moM4qkXX0Q9zc8W0Z+WrvZ5lgr1I=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Required tool for Zabbix agent integrated PostgreSQL monitoring";
|
||||
homepage = "https://www.zabbix.com/integrations/postgresql";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ gador ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -25,9 +25,9 @@ in
|
||||
mkXfceDerivation {
|
||||
category = "apps";
|
||||
pname = "xfce4-screensaver";
|
||||
version = "4.18.2";
|
||||
version = "4.18.3";
|
||||
|
||||
sha256 = "sha256-j5K5i+hl/miyHste73akZL62K6YTxXmN8mmFK9BCecs=";
|
||||
sha256 = "sha256-hOhWJoiKoeRgkhXaR8rnDpcJpStMD4BBdll4nwSA+EQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
|
||||
@ -1,13 +1,6 @@
|
||||
From ef066db7f5cb7f551f88fb218c82fc947e464425 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= <muscaln@protonmail.com>
|
||||
Date: Sun, 3 Jul 2022 14:30:51 +0300
|
||||
Subject: [PATCH 1/3] Makefile
|
||||
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 60a5a574..904d2db5 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
diff --git a/GNUmakefile b/GNUmakefile
|
||||
--- a/GNUmakefile
|
||||
+++ b/GNUmakefile
|
||||
@@ -14,11 +14,6 @@ LLVM_VERSIONS = 14 13 12 11
|
||||
errifempty = $(if $(1),$(1),$(error $(2)))
|
||||
detect = $(shell which $(call errifempty,$(firstword $(foreach p,$(2),$(shell command -v $(p) 2> /dev/null && echo $(p)))),failed to locate $(1) at any of: $(2)))
|
||||
@ -1,25 +0,0 @@
|
||||
diff --git a/builder/library.go b/builder/library.go
|
||||
index 6517355b..b8de1894 100644
|
||||
--- a/builder/library.go
|
||||
+++ b/builder/library.go
|
||||
@@ -142,7 +142,7 @@ func (l *Library) load(config *compileopts.Config, tmpdir string) (job *compileJ
|
||||
// Note: -fdebug-prefix-map is necessary to make the output archive
|
||||
// reproducible. Otherwise the temporary directory is stored in the archive
|
||||
// itself, which varies each run.
|
||||
- args := append(l.cflags(target, headerPath), "-c", "-Oz", "-gdwarf-4", "-ffunction-sections", "-fdata-sections", "-Wno-macro-redefined", "--target="+target, "-fdebug-prefix-map="+dir+"="+remapDir)
|
||||
+ args := append(l.cflags(target, headerPath), "-c", "-Oz", "-gdwarf-4", "-ffunction-sections", "-fdata-sections", "-Wno-macro-redefined", "--target="+target, "-fdebug-prefix-map="+dir+"="+remapDir, "-isystem", "@clang_include@")
|
||||
cpu := config.CPU()
|
||||
if cpu != "" {
|
||||
// X86 has deprecated the -mcpu flag, so we need to use -march instead.
|
||||
diff --git a/compileopts/config.go b/compileopts/config.go
|
||||
index 39fc4f2a..8711b5a8 100644
|
||||
--- a/compileopts/config.go
|
||||
+++ b/compileopts/config.go
|
||||
@@ -264,6 +264,7 @@ func (c *Config) CFlags() []string {
|
||||
for _, flag := range c.Target.CFlags {
|
||||
cflags = append(cflags, strings.ReplaceAll(flag, "{root}", goenv.Get("TINYGOROOT")))
|
||||
}
|
||||
+ cflags = append([]string{"-isystem", "@clang_include@"}, cflags...)
|
||||
switch c.Target.Libc {
|
||||
case "darwin-libSystem":
|
||||
root := goenv.Get("TINYGOROOT")
|
||||
@ -1,56 +0,0 @@
|
||||
From e7357c383188dd735592bd9f2202d2afcfffa39d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= <muscaln@protonmail.com>
|
||||
Date: Sun, 11 Sep 2022 17:08:33 +0300
|
||||
Subject: [PATCH 3/3] Use out path as build id on darwin
|
||||
|
||||
|
||||
diff --git a/builder/buildid.go b/builder/buildid.go
|
||||
index e6527700..65cb08e8 100644
|
||||
--- a/builder/buildid.go
|
||||
+++ b/builder/buildid.go
|
||||
@@ -3,8 +3,6 @@ package builder
|
||||
import (
|
||||
"bytes"
|
||||
"debug/elf"
|
||||
- "debug/macho"
|
||||
- "encoding/binary"
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
@@ -53,30 +51,9 @@ func ReadBuildID() ([]byte, error) {
|
||||
return goID, nil
|
||||
}
|
||||
case "darwin":
|
||||
- // Read the LC_UUID load command, which contains the equivalent of a
|
||||
- // build ID.
|
||||
- file, err := macho.NewFile(f)
|
||||
- if err != nil {
|
||||
- return nil, err
|
||||
- }
|
||||
- for _, load := range file.Loads {
|
||||
- // Unfortunately, the debug/macho package doesn't support the
|
||||
- // LC_UUID command directly. So we have to read it from
|
||||
- // macho.LoadBytes.
|
||||
- load, ok := load.(macho.LoadBytes)
|
||||
- if !ok {
|
||||
- continue
|
||||
- }
|
||||
- raw := load.Raw()
|
||||
- command := binary.LittleEndian.Uint32(raw)
|
||||
- if command != 0x1b {
|
||||
- // Looking for the LC_UUID load command.
|
||||
- // LC_UUID is defined here as 0x1b:
|
||||
- // https://opensource.apple.com/source/xnu/xnu-4570.71.2/EXTERNAL_HEADERS/mach-o/loader.h.auto.html
|
||||
- continue
|
||||
- }
|
||||
- return raw[4:], nil
|
||||
- }
|
||||
+ // On darwin, os.Executable() returns broken path in nix build environment
|
||||
+ // So we are using $out path as build id since its also unique
|
||||
+ return []byte("OUT_PATH"), nil
|
||||
default:
|
||||
// On other platforms (such as Windows) there isn't such a convenient
|
||||
// build ID. Luckily, Go does have an equivalent of the build ID, which
|
||||
--
|
||||
2.37.2
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff --git a/compileopts/config.go b/compileopts/config.go
|
||||
index 39fc4f2a..fb5d4575 100644
|
||||
--- a/compileopts/config.go
|
||||
+++ b/compileopts/config.go
|
||||
@@ -269,6 +269,7 @@ func (c *Config) CFlags() []string {
|
||||
root := goenv.Get("TINYGOROOT")
|
||||
cflags = append(cflags,
|
||||
"--sysroot="+filepath.Join(root, "lib/macos-minimal-sdk/src"),
|
||||
+ "-isystem", filepath.Join(root, "lib/macos-minimal-sdk/src/usr/include"), // necessary for Nix
|
||||
)
|
||||
case "picolibc":
|
||||
root := goenv.Get("TINYGOROOT")
|
||||
@ -4,15 +4,9 @@
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, substituteAll
|
||||
, llvmPackages
|
||||
, go
|
||||
, libffi
|
||||
, zlib
|
||||
, ncurses
|
||||
, libxml2
|
||||
, xar
|
||||
, wasi-libc
|
||||
, binaryen
|
||||
, avrdude
|
||||
, gdb
|
||||
@ -30,104 +24,62 @@ let
|
||||
bootstrapTools = runCommand "tinygo-bootstap-tools" { } ''
|
||||
mkdir -p $out
|
||||
ln -s ${lib.getBin clang.cc}/bin/clang $out/clang-${llvmMajor}
|
||||
ln -s ${lib.getBin lld}/bin/ld.lld $out/ld.lld-${llvmMajor}
|
||||
ln -s ${lib.getBin lld}/bin/wasm-ld $out/wasm-ld-${llvmMajor}
|
||||
# GDB upstream does not support ARM darwin
|
||||
${lib.optionalString (!(stdenv.isDarwin && stdenv.isAarch64)) "ln -s ${gdb}/bin/gdb $out/gdb-multiarch" }
|
||||
'';
|
||||
in
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tinygo";
|
||||
version = "0.30.0";
|
||||
version = "0.31.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tinygo-org";
|
||||
repo = "tinygo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hOccfMKuvTKYKDRcEgTJ8k/c/H+qNDpvotWIqk6p2u8=";
|
||||
sha256 = "sha256-YocRTgGSyjnQsYd4a2nCQ0vdQi/z2gHPguix5xIkkgc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-2q3N6QhfRmwbs4CTWrFWr1wyhf2jPS2ECAn/wrrpXdM=";
|
||||
vendorHash = "sha256-HZiyAgsTEBQv+Qp0T9RXTV1lkxvIGh7Q45rd45cfvjo=";
|
||||
|
||||
patches = [
|
||||
./0001-Makefile.patch
|
||||
|
||||
# clang.cc does not have any paths in the include path.
|
||||
# For TinyGo, we want to have no include paths, _except_ for the built-in
|
||||
# Clang header files (things like stdint.h). That's why we use -nostdlibinc.
|
||||
# So to make Clang work like we want, we will have to manually add this one
|
||||
# include path.
|
||||
# We can't use a regular clang command (something like
|
||||
# llvmPackages.clangUseLLVM) because there are various bugs, see:
|
||||
# https://github.com/NixOS/nixpkgs/issues/259397
|
||||
# https://github.com/NixOS/nixpkgs/issues/259386
|
||||
(substituteAll {
|
||||
src = ./0002-Add-clang-header-path.patch;
|
||||
clang_include = "${clang.cc.lib}/lib/clang/${llvmMajor}/include";
|
||||
})
|
||||
|
||||
#TODO(muscaln): Find a better way to fix build ID on darwin
|
||||
./0003-Use-out-path-as-build-id-on-darwin.patch
|
||||
./0004-fix-darwin-build.patch
|
||||
./0001-GNUmakefile.patch
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ binaryen ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper lld ];
|
||||
buildInputs = [ llvm clang.cc ]
|
||||
++ lib.optionals stdenv.isDarwin [ zlib ncurses libffi libxml2 xar ];
|
||||
++ lib.optionals stdenv.isDarwin [ xar ];
|
||||
|
||||
doCheck = (stdenv.buildPlatform.canExecute stdenv.hostPlatform);
|
||||
inherit tinygoTests;
|
||||
|
||||
allowGoReference = true;
|
||||
tags = [ "llvm${llvmMajor}" ];
|
||||
ldflags = [ "-X github.com/tinygo-org/tinygo/goenv.TINYGOROOT=${placeholder "out"}/share/tinygo" ];
|
||||
ldflags = [
|
||||
"-X github.com/tinygo-org/tinygo/goenv.TINYGOROOT=${placeholder "out"}/share/tinygo"
|
||||
"-X github.com/tinygo-org/tinygo/goenv.clangResourceDir=${clang.cc.lib}/lib/clang/${llvmMajor}"
|
||||
];
|
||||
subPackages = [ "." ];
|
||||
|
||||
# Output contains static libraries for different arm cpus
|
||||
# and stripping could mess up these so only strip the compiler
|
||||
stripDebugList = [ "bin" ];
|
||||
|
||||
postConfigure = lib.optionalString stdenv.isDarwin ''
|
||||
for i in vendor/tinygo.org/x/go-llvm/llvm_config_darwin*; do
|
||||
substituteInPlace $i --replace "curses" "ncurses"
|
||||
done
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
# Copy wasi-libc, symlink seems not working
|
||||
rm -rf lib/wasi-libc/*
|
||||
mkdir -p lib/wasi-libc/sysroot/lib/wasm32-wasi lib/wasi-libc/sysroot/include
|
||||
cp -a ${wasi-libc}/lib/* lib/wasi-libc/sysroot/lib/wasm32-wasi/
|
||||
cp -a ${wasi-libc.dev}/include/* lib/wasi-libc/sysroot/include/
|
||||
|
||||
# Borrow compiler-rt builtins from our source
|
||||
# See https://github.com/tinygo-org/tinygo/pull/2471
|
||||
mkdir -p lib/compiler-rt-builtins
|
||||
cp -a ${compiler-rt.src}/compiler-rt/lib/builtins/* lib/compiler-rt-builtins/
|
||||
|
||||
substituteInPlace Makefile \
|
||||
--replace "\$(TINYGO)" "$(pwd)/build/tinygo" \
|
||||
--replace "@\$(MD5SUM)" "md5sum" \
|
||||
substituteInPlace GNUmakefile \
|
||||
--replace "build/release/tinygo/bin" "$out/bin" \
|
||||
--replace "build/release/" "$out/share/"
|
||||
|
||||
substituteInPlace builder/buildid.go \
|
||||
--replace "OUT_PATH" "$out"
|
||||
|
||||
# TODO: Fix mingw
|
||||
# Disable windows cross-compile tests
|
||||
sed -i "/GOOS=windows/d" Makefile
|
||||
'' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
|
||||
substituteInPlace Makefile \
|
||||
--replace "./build/tinygo" "${buildPackages.tinygo}/bin/tinygo"
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
export PATH=${bootstrapTools}:$PATH
|
||||
export HOME=$TMPDIR
|
||||
|
||||
ldflags=("''$ldflags[@]/\"-buildid=\"")
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
@ -135,28 +87,38 @@ buildGoModule rec {
|
||||
mkdir -p build
|
||||
mv $GOPATH/bin/tinygo build/tinygo
|
||||
|
||||
# Build our own custom wasi-libc.
|
||||
# This is necessary because we modify the build a bit for our needs (disable
|
||||
# heap, enable debug symbols, etc).
|
||||
make wasi-libc \
|
||||
CLANG="${lib.getBin clang.cc}/bin/clang -resource-dir ${clang.cc.lib}/lib/clang/${llvmMajor}" \
|
||||
LLVM_AR=${lib.getBin llvm}/bin/llvm-ar \
|
||||
LLVM_NM=${lib.getBin llvm}/bin/llvm-nm
|
||||
|
||||
make gen-device -j $NIX_BUILD_CORES
|
||||
|
||||
export TINYGOROOT=$(pwd)
|
||||
'';
|
||||
|
||||
checkPhase = lib.optionalString (tinygoTests != [ ] && tinygoTests != null) ''
|
||||
make ''${tinygoTests[@]} XTENSA=0
|
||||
make ''${tinygoTests[@]} TINYGO="$(pwd)/build/tinygo" MD5SUM=md5sum XTENSA=0
|
||||
'';
|
||||
|
||||
# GDB upstream does not support ARM darwin
|
||||
runtimeDeps = [ go clang.cc lld avrdude openocd binaryen ]
|
||||
++ lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) [ gdb ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
make build/release
|
||||
|
||||
wrapProgram $out/bin/tinygo \
|
||||
--prefix PATH : ${lib.makeBinPath [ go avrdude openocd binaryen ]}:${bootstrapTools}
|
||||
--prefix PATH : ${lib.makeBinPath runtimeDeps }
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
disallowedReferences = [ wasi-libc ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://tinygo.org/";
|
||||
description = "Go compiler for small places";
|
||||
|
||||
@ -5,24 +5,29 @@
|
||||
, fetchPypi
|
||||
, isodate
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-datafactory";
|
||||
version = "5.0.0";
|
||||
format = "setuptools";
|
||||
version = "6.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-WX/lFsU8qGg3Mg5bk+U0SBdR6cQpjtfmbX02Hr8uz7o=";
|
||||
hash = "sha256-0B+K8u9M/z3edwlc8LNR8DeqV9y6vIVCmevoUIWN0YM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
isodate
|
||||
azure-common
|
||||
azure-mgmt-core
|
||||
isodate
|
||||
];
|
||||
|
||||
# has no tests
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-modelcluster";
|
||||
version = "6.2.1";
|
||||
version = "6.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "wagtail";
|
||||
repo = "django-modelcluster";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-y2jGSZvTeSnpWDFJ+aNGofTEtMMlY9TrXZjQeET5OhY=";
|
||||
hash = "sha256-AUVl2aidjW7Uu//3HlAod7pxzj6Gs1Xd0uTt3NrrqAU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django";
|
||||
version = "3.2.24";
|
||||
version = "3.2.25";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Django";
|
||||
inherit version;
|
||||
hash = "sha256-qu6fsPtOvUMRUgiHrS4zMT02iEZgf4KpoO1GHNTDWxg=";
|
||||
hash = "sha256-fKOKeGVK7nI3hZTWPlFjbAS44oV09VBd/2MIlbVHJ3c=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -0,0 +1,55 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, flit-core
|
||||
, opentelemetry-api
|
||||
, opentelemetry-sdk
|
||||
, pytest-asyncio
|
||||
, pytest-mock
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, std-uritemplate
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "microsoft-kiota-abstractions";
|
||||
version = "1.2.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "kiota-abstractions-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ubDbpQhrqoyiBNne15nlO44lXg2wG+wrL8EJasMUocc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
flit-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
opentelemetry-api
|
||||
opentelemetry-sdk
|
||||
std-uritemplate
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-asyncio
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"kiota_abstractions"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Abstractions library for Kiota generated Python clients";
|
||||
homepage = "https://github.com/microsoft/kiota-abstractions-python";
|
||||
changelog = "https://github.com/microsoft/kiota-abstractions-python/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,59 @@
|
||||
{ lib
|
||||
, aiohttp
|
||||
, azure-core
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, flit-core
|
||||
, microsoft-kiota-abstractions
|
||||
, opentelemetry-api
|
||||
, opentelemetry-sdk
|
||||
, pytest-asyncio
|
||||
, pytest-mock
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "microsoft-kiota-authentication-azure";
|
||||
version = "1.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "kiota-authentication-azure-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-RA0BbIwDs3cXiH4tQsvCGUO1OAg+DWjEeWd7MEVIC8E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
flit-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
azure-core
|
||||
microsoft-kiota-abstractions
|
||||
opentelemetry-api
|
||||
opentelemetry-sdk
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-asyncio
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"kiota_authentication_azure"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Kiota Azure authentication provider";
|
||||
homepage = "https://github.com/microsoft/kiota-authentication-azure-python";
|
||||
changelog = "https://github.com/microsoft/kiota-authentication-azure-python/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,59 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, flit-core
|
||||
, httpx
|
||||
, microsoft-kiota-abstractions
|
||||
, opentelemetry-api
|
||||
, opentelemetry-sdk
|
||||
, pytest-asyncio
|
||||
, pytest-mock
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, urllib3
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "microsoft-kiota-http";
|
||||
version = "1.3.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "kiota-http-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-N3+oAH3yWgrl0v2fm4xdCxzj7u/0fbQI3xHFht39vzA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
flit-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
httpx
|
||||
microsoft-kiota-abstractions
|
||||
opentelemetry-api
|
||||
opentelemetry-sdk
|
||||
] ++ httpx.optional-dependencies.http2;
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-asyncio
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
urllib3
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"kiota_http"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "HTTP request adapter implementation for Kiota clients for Python";
|
||||
homepage = "https://github.com/microsoft/kiota-http-python";
|
||||
changelog = "https://github.com/microsoft/kiota-http-python/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,58 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, flit-core
|
||||
, microsoft-kiota-abstractions
|
||||
, pendulum
|
||||
, pytest-asyncio
|
||||
, pytest-mock
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "kiota-serialization-json";
|
||||
version = "1.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "kiota-serialization-json-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-DhuDIRTm6xATnXpQ+xLpMuaBcWxZHdr8dO1Rl8OvCKQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
flit-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
microsoft-kiota-abstractions
|
||||
pendulum
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-asyncio
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"kiota_serialization_json"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Test compare an output format
|
||||
"test_parse_union_type_complex_property1"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "JSON serialization implementation for Kiota clients in Python";
|
||||
homepage = "https://github.com/microsoft/kiota-serialization-json-python";
|
||||
changelog = "https://github.com/microsoft/kiota-serialization-json-python/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,53 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, flit-core
|
||||
, microsoft-kiota-abstractions
|
||||
, pytest-asyncio
|
||||
, pytest-mock
|
||||
, pytestCheckHook
|
||||
, python-dateutil
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "kiota-serialization-text";
|
||||
version = "1.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "kiota-serialization-text-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-jPuRfvqO4n5/PjSOS5NMCawaYRhXmrZtfg6LgYFCv7o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
flit-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
microsoft-kiota-abstractions
|
||||
python-dateutil
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-asyncio
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"kiota_serialization_text"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Text serialization implementation for Kiota generated clients in Python";
|
||||
homepage = "https://github.com/microsoft/kiota-serialization-text-python";
|
||||
changelog = "https://github.com/microsoft/kiota-serialization-text-python/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "snakemake-executor-plugin-cluster-generic";
|
||||
version = "1.0.7";
|
||||
version = "1.0.8";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "snakemake";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-1W/8jf+R1798cu3sWI0LTSyVawtmFfwlAqRHwfmIAzU=";
|
||||
hash = "sha256-+aGd+E+VQb7MflsiUgFR98AyeetZxbc4gdvU1JWJNcM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -517,6 +517,7 @@ let
|
||||
|
||||
packagesWithBuildInputs = {
|
||||
# sort -t '=' -k 2
|
||||
asciicast = with pkgs; [ lzma.dev bzip2.dev zlib.dev icu.dev ];
|
||||
svKomodo = [ pkgs.which ];
|
||||
nat = [ pkgs.which ];
|
||||
nat_templatebrains = [ pkgs.which ];
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, php
|
||||
}:
|
||||
|
||||
@ -16,6 +17,13 @@ php.buildComposerProject (finalAttrs: {
|
||||
|
||||
vendorHash = "sha256-0jvWbQubPXDhsXqEp8q5R0Y7rQX3UiccGDF3HDBeh7o=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd phpactor \
|
||||
--bash <($out/bin/phpactor completion bash)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/phpactor/phpactor/releases/tag/${finalAttrs.version}";
|
||||
description = "Mainly a PHP Language Server";
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, libusb1, xorg, libxml2
|
||||
{ stdenv, lib, fetchFromGitHub, fetchpatch
|
||||
, makeWrapper, curl, libusb1, xorg, libxml2
|
||||
, ncurses5, bluez, libmhash, gimxPdpGamepad ? false }:
|
||||
|
||||
let
|
||||
@ -21,7 +22,23 @@ in stdenv.mkDerivation rec {
|
||||
sha256 = "05kdv2qqr311c2p76hdlgvrq7b04vcpps5c80zn8b8l7p831ilgz";
|
||||
};
|
||||
|
||||
patches = [ ./conf.patch ];
|
||||
patches = [
|
||||
./conf.patch
|
||||
|
||||
# gcc-13 build fixes:
|
||||
# https://github.com/matlo/GIMX/pull/705
|
||||
(fetchpatch {
|
||||
name = "gcc-13-headers.patch";
|
||||
url = "https://github.com/matlo/GIMX/commit/4525dff4d9af672116d8c6c182707f2ad6295b2d.patch";
|
||||
hash = "sha256-LkswnFsxqADooa09yO7Yf0AbxTrGfjBObyv/6FQJvRs=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "gcc-13-protos.patch";
|
||||
url = "https://github.com/matlo/GIMX/commit/f11855fcb8bd9d0cb9c94871b4111ddfd5b610df.patch";
|
||||
hash = "sha256-JL67UUsEyPcOuaimJtMviiGLGghuq9665Lg1QuiaWUU=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [
|
||||
curl libusb1 bluez libxml2 ncurses5 libmhash
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "telegraf";
|
||||
version = "1.29.4";
|
||||
version = "1.29.5";
|
||||
|
||||
subPackages = [ "cmd/telegraf" ];
|
||||
|
||||
@ -16,10 +16,10 @@ buildGoModule rec {
|
||||
owner = "influxdata";
|
||||
repo = "telegraf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-XhGP5q0LbXaTgClZvRFV1Zjpi1mizoyFrzI7vobVaUo=";
|
||||
hash = "sha256-yVxpUKEmy7pllZQq6A0zIDekewh4BQX+/kaeLcZ2aLg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-DdE2r0M9/6aaq5c3m0AT82TNyIP2vBsaFCRP2um0hao=";
|
||||
vendorHash = "sha256-amcI5X/xLOjItraG+twsv7sn5ei3mkZsclEd4TGiXwM=";
|
||||
proxyVendor = true;
|
||||
|
||||
ldflags = [
|
||||
|
||||
58
pkgs/tools/networking/decode-spam-headers/default.nix
Normal file
58
pkgs/tools/networking/decode-spam-headers/default.nix
Normal file
@ -0,0 +1,58 @@
|
||||
{ lib, stdenv, fetchFromGitHub, python3Packages }:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "decode-spam-headers";
|
||||
version = "2022-09-22-unreleased";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mgeeky";
|
||||
repo = "decode-spam-headers";
|
||||
rev = "492b6e744475cd5d3dd68a8140bc3478244b7df1";
|
||||
sha256 = "sha256-gBDkvlZCndQjochn6TZtM/Lanza64LqMjNnLjn+pPR4=";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
installPhase = ''
|
||||
install -D decode-spam-headers.py $out/bin/decode-spam-headers
|
||||
|
||||
mkdir -p $doc/share/doc/${pname}
|
||||
mv \
|
||||
README.md \
|
||||
img/ \
|
||||
$doc/share/doc/${pname}
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
python3Packages.python-dateutil
|
||||
python3Packages.tldextract
|
||||
python3Packages.packaging
|
||||
python3Packages.dnspython
|
||||
python3Packages.requests
|
||||
python3Packages.colorama
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/mgeeky/decode-spam-headers/";
|
||||
description = "A script that helps you understand why your E-Mail ended up in Spam";
|
||||
longDescription = ''
|
||||
Whether you are trying to understand why a specific e-mail ended up in
|
||||
SPAM/Junk for your daily Administrative duties or for your Red-Team
|
||||
Phishing simulation purposes, this script is there for you to help!
|
||||
|
||||
This tool accepts on input an *.EML or *.txt file with all the SMTP
|
||||
headers. It will then extract a subset of interesting headers and using
|
||||
105+ tests will attempt to decode them as much as possible.
|
||||
|
||||
This script also extracts all IPv4 addresses and domain names and performs
|
||||
full DNS resolution of them.
|
||||
|
||||
Resulting output will contain useful information on why this e-mail might
|
||||
have been blocked.
|
||||
'';
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
@ -7373,6 +7373,8 @@ with pkgs;
|
||||
|
||||
debugedit = callPackage ../development/tools/misc/debugedit { };
|
||||
|
||||
decode-spam-headers = callPackage ../tools/networking/decode-spam-headers { };
|
||||
|
||||
deer = callPackage ../shells/zsh/zsh-deer { };
|
||||
|
||||
deno = callPackage ../development/web/deno { };
|
||||
@ -13695,7 +13697,9 @@ with pkgs;
|
||||
|
||||
teip = callPackage ../tools/text/teip { };
|
||||
|
||||
telegraf = callPackage ../servers/monitoring/telegraf { };
|
||||
telegraf = callPackage ../servers/monitoring/telegraf {
|
||||
buildGoModule = buildGo122Module;
|
||||
};
|
||||
|
||||
teleport_12 = callPackage ../servers/teleport/12 {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit;
|
||||
@ -17188,8 +17192,7 @@ with pkgs;
|
||||
tinycc = darwin.apple_sdk_11_0.callPackage ../development/compilers/tinycc { };
|
||||
|
||||
tinygo = callPackage ../development/compilers/tinygo {
|
||||
llvmPackages = llvmPackages_16;
|
||||
wasi-libc = pkgsCross.wasi32.wasilibc;
|
||||
llvmPackages = llvmPackages_17;
|
||||
};
|
||||
|
||||
tinyscheme = callPackage ../development/interpreters/tinyscheme { };
|
||||
@ -26509,7 +26512,7 @@ with pkgs;
|
||||
|
||||
outline = callPackage ../servers/web-apps/outline (lib.fix (super: {
|
||||
yarn = yarn.override { inherit (super) nodejs; };
|
||||
nodejs = nodejs_18;
|
||||
nodejs = nodejs_20;
|
||||
}));
|
||||
|
||||
openbgpd = callPackage ../servers/openbgpd { };
|
||||
|
||||
@ -7180,6 +7180,16 @@ self: super: with self; {
|
||||
|
||||
microdata = callPackage ../development/python-modules/microdata { };
|
||||
|
||||
microsoft-kiota-abstractions = callPackage ../development/python-modules/microsoft-kiota-abstractions { };
|
||||
|
||||
microsoft-kiota-authentication-azure = callPackage ../development/python-modules/microsoft-kiota-authentication-azure { };
|
||||
|
||||
microsoft-kiota-http = callPackage ../development/python-modules/microsoft-kiota-http { };
|
||||
|
||||
microsoft-kiota-serialization-json = callPackage ../development/python-modules/microsoft-kiota-serialization-json { };
|
||||
|
||||
microsoft-kiota-serialization-text = callPackage ../development/python-modules/microsoft-kiota-serialization-text { };
|
||||
|
||||
midiutil = callPackage ../development/python-modules/midiutil { };
|
||||
|
||||
mido = callPackage ../development/python-modules/mido { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user