mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-01 19:33:03 +00:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
b2a2212322
@ -20,14 +20,10 @@ let
|
||||
else toString value;
|
||||
|
||||
configFile = pkgs.writeText "davfs2.conf" (
|
||||
if (cfg.settings != { }) then
|
||||
(toINIWithGlobalSection {
|
||||
mkSectionName = escapeString;
|
||||
mkKeyValue = k: v: "${k} ${formatValue v}";
|
||||
} cfg.settings)
|
||||
else
|
||||
cfg.extraConfig
|
||||
);
|
||||
toINIWithGlobalSection {
|
||||
mkSectionName = escapeString;
|
||||
mkKeyValue = k: v: "${k} ${formatValue v}";
|
||||
} cfg.settings);
|
||||
in
|
||||
{
|
||||
|
||||
@ -53,29 +49,6 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
extraConfig = mkOption {
|
||||
type = lines;
|
||||
default = "";
|
||||
example = ''
|
||||
proxy foo.bar:8080
|
||||
use_locks 0
|
||||
|
||||
[/media/dav]
|
||||
use_locks 1
|
||||
|
||||
[/home/otto/mywebspace]
|
||||
gui_optimize 1
|
||||
'';
|
||||
description = ''
|
||||
Extra lines appended to the configuration of davfs2.
|
||||
See {manpage}`davfs2.conf(5)` for available settings.
|
||||
|
||||
**Note**: Please pass structured settings via
|
||||
{option}`settings` instead, this option
|
||||
will get deprecated in the future.
|
||||
'' ;
|
||||
};
|
||||
|
||||
settings = mkOption {
|
||||
type = submodule {
|
||||
freeformType = let
|
||||
@ -109,21 +82,6 @@ in
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
assertions = [
|
||||
{
|
||||
assertion = cfg.extraConfig != "" -> cfg.settings == { };
|
||||
message = ''
|
||||
services.davfs2.extraConfig and services.davfs2.settings cannot be used together.
|
||||
Please prefer using services.davfs2.settings.
|
||||
'';
|
||||
}
|
||||
];
|
||||
|
||||
warnings = optional (cfg.extraConfig != "") ''
|
||||
services.davfs2.extraConfig will be deprecated in future releases;
|
||||
please use services.davfs2.settings instead.
|
||||
'';
|
||||
|
||||
environment.systemPackages = [ pkgs.davfs2 ];
|
||||
environment.etc."davfs2/davfs2.conf".source = configFile;
|
||||
|
||||
|
||||
@ -120,12 +120,14 @@ in {
|
||||
{ type = "ed25519"; path = "/etc/ssh/ssh_host_ed25519_key"; }
|
||||
];
|
||||
settings = {
|
||||
# Must not specify the OpenSSL provided algorithms.
|
||||
Ciphers = [ "chacha20-poly1305@openssh.com" ];
|
||||
KexAlgorithms = [
|
||||
"curve25519-sha256"
|
||||
"curve25519-sha256@libssh.org"
|
||||
];
|
||||
# Since this test is against an OpenSSH-without-OpenSSL,
|
||||
# we have to override NixOS's defaults ciphers (which require OpenSSL)
|
||||
# and instead set these to null, which will mean OpenSSH uses its defaults.
|
||||
# Expectedly, OpenSSH's defaults don't require OpenSSL when it's compiled
|
||||
# without OpenSSL.
|
||||
Ciphers = null;
|
||||
KexAlgorithms = null;
|
||||
Macs = null;
|
||||
};
|
||||
};
|
||||
users.users.root.openssh.authorizedKeys.keys = [
|
||||
|
||||
@ -47,12 +47,12 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "retroarch-bare";
|
||||
version = "1.19.0";
|
||||
version = "1.19.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "RetroArch";
|
||||
hash = "sha256-xn6lFknL5y9WozGZtqiZVyVzOuNheGhwxWlfFOYVFzU=";
|
||||
hash = "sha256-NVe5dhH3w7RL1C7Z736L5fdi/+aO+Ah9Dpa4u4kn0JY=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
|
||||
@ -1,54 +0,0 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, wrapQtAppsHook
|
||||
, extra-cmake-modules
|
||||
, cmake
|
||||
, kio
|
||||
, ki18n
|
||||
, kxmlgui
|
||||
, kconfig
|
||||
, karchive
|
||||
, kcoreaddons
|
||||
, kconfigwidgets
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mangareader";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "g-fb";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-YZZcp+HS/P/GxWYyOpO35nByJSzv4HahzzrZSVRcCRs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
kio
|
||||
ki18n
|
||||
kxmlgui
|
||||
kconfig
|
||||
karchive
|
||||
kcoreaddons
|
||||
kconfigwidgets
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Qt manga reader for local files";
|
||||
homepage = "https://github.com/g-fb/mangareader";
|
||||
changelog = "https://github.com/g-fb/mangareader/releases/tag/${src.rev}";
|
||||
platforms = platforms.linux;
|
||||
license = with licenses; [ gpl3Plus cc-by-nc-sa-40 ];
|
||||
maintainers = with maintainers; [ zendo ];
|
||||
};
|
||||
}
|
||||
@ -1,12 +0,0 @@
|
||||
diff --git a/ion/src/simulator/linux/Makefile b/ion/src/simulator/linux/Makefile
|
||||
index ca7da03fa..b05bba115 100644
|
||||
--- a/ion/src/simulator/linux/Makefile
|
||||
+++ b/ion/src/simulator/linux/Makefile
|
||||
@@ -28,7 +28,6 @@ ion_src += $(addprefix ion/src/simulator/shared/, \
|
||||
collect_registers.cpp \
|
||||
haptics.cpp \
|
||||
journal.cpp \
|
||||
- platform_action_modifier_ctrl.cpp \
|
||||
state_file.cpp \
|
||||
)
|
||||
|
||||
@ -9,17 +9,18 @@
|
||||
, imagemagick
|
||||
, gcc-arm-embedded
|
||||
, pkg-config
|
||||
, python3Packages
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "numworks-epsilon";
|
||||
version = "15.5.0";
|
||||
version = "22.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "numworks";
|
||||
repo = "epsilon";
|
||||
rev = version;
|
||||
sha256 = "fPBO3FzZ4k5OxG+Ifc6R/au4Te974HNKAEdHz+aFdSg=";
|
||||
hash = "sha256-E2WaXTn8+Ky9kdZxvQmEt63Ggo6Ns0fZ0Za+rQGIMSg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
@ -31,18 +32,13 @@ stdenv.mkDerivation rec {
|
||||
python3
|
||||
imagemagick
|
||||
gcc-arm-embedded
|
||||
python3Packages.lz4
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"PLATFORM=simulator"
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Remove make rule Introduced in cba596dde7
|
||||
# which causes it to not build with nix
|
||||
./0001-ion-linux-makerules.patch
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "snakemake";
|
||||
version = "8.11.6";
|
||||
version = "8.13.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "snakemake";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-00Zh8NenBikdingmx34WYYH5SF+yazeAs+7h1/3UIJY=";
|
||||
hash = "sha256-Xd8mZ8tsemJ53hAMED2biRyDlEw/gG/Hh1iZSwSB1vY=";
|
||||
# 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})"#'
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "ananicy-rules-cachyos";
|
||||
version = "0-unstable-2024-05-28";
|
||||
version = "0-unstable-2024-06-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CachyOS";
|
||||
repo = "ananicy-rules";
|
||||
rev = "5718579addbd733a4ab190fb9355a78e8b19b0b4";
|
||||
hash = "sha256-SD15wFUWryL3sRBbREr94A8oKf8KXVBaiI2bmWxbMx4=";
|
||||
rev = "38b3e8c12801df68ba15c2d96ee96d7d2362b576";
|
||||
hash = "sha256-yVKzkASMzJDmgzS0CxEFky2Y4Bs4vlbRJgUI+uG3muY=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
25
pkgs/by-name/dn/dnss/package.nix
Normal file
25
pkgs/by-name/dn/dnss/package.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
}:
|
||||
|
||||
buildGoModule {
|
||||
pname = "dnss";
|
||||
version = "0-unstable-2024-03-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "albertito";
|
||||
repo = "dnss";
|
||||
rev = "da8986dd432870f5710e3e8652c92c95f34b830b";
|
||||
hash = "sha256-YjBt+22fc9yHcORRmd//rejNVvf6eK+FAYAcT0fABuI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-d9aGSBRblkvH5Ixw3jpbgC8lMW/qEYNJfLTVeUlos7A=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A daemon for using DNS over HTTPS";
|
||||
homepage = "https://blitiri.com.ar/git/r/dnss/";
|
||||
license = licenses.asl20;
|
||||
mainProgram = "dnss";
|
||||
maintainers = with maintainers; [ raspher ];
|
||||
};
|
||||
}
|
||||
@ -47,13 +47,13 @@ let
|
||||
in
|
||||
stdenv'.mkDerivation (finalAttrs: {
|
||||
pname = "fastfetch";
|
||||
version = "2.14.0";
|
||||
version = "2.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastfetch-cli";
|
||||
repo = "fastfetch";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-RJDRxH9VKNxBSfoFl1rDTeKKyLC3C09F0Z3ksJoMDRk=";
|
||||
hash = "sha256-0kReN7FKrcRhxUuwZoArLTW2F1q40Wbp9/hRoDjKZHs=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, godot3-server
|
||||
}:
|
||||
|
||||
let
|
||||
@ -23,15 +22,15 @@ let
|
||||
};
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "gdtoolkit";
|
||||
version = "3.3.1";
|
||||
pname = "gdtoolkit3";
|
||||
version = "3.5.0";
|
||||
|
||||
# If we try to get using fetchPypi it requires GeoIP (but the package dont has that dep!?)
|
||||
src = fetchFromGitHub {
|
||||
owner = "Scony";
|
||||
repo = "godot-gdscript-toolkit";
|
||||
rev = version;
|
||||
sha256 = "13nnpwy550jf5qnm9ixpxl1bwfnhhbiys8vqfd25g3aim4bm3gnn";
|
||||
hash = "sha256-cMGD5Xdf9ElS1NT7Q0NPB//EvUO0MI0VTtps5JRisZ4=";
|
||||
};
|
||||
|
||||
disabled = python.pythonOlder "3.7";
|
||||
@ -48,35 +47,18 @@ python.pkgs.buildPythonApplication rec {
|
||||
nativeCheckInputs = with python.pkgs; [
|
||||
pytestCheckHook
|
||||
hypothesis
|
||||
godot3-server
|
||||
];
|
||||
|
||||
preCheck =
|
||||
let
|
||||
godotServerMajorVersion = lib.versions.major godot3-server.version;
|
||||
gdtoolkitMajorVersion = lib.versions.major version;
|
||||
msg = ''
|
||||
gdtoolkit major version ${gdtoolkitMajorVersion} does not match godot-server major version ${godotServerMajorVersion}!
|
||||
gdtoolkit needs a matching godot-server for its tests.
|
||||
If you see this error, you can either:
|
||||
- disable doCheck for gdtoolkit, or
|
||||
- provide a compatible godot-server version to gdtoolkit"
|
||||
'';
|
||||
in lib.throwIf (godotServerMajorVersion != gdtoolkitMajorVersion) msg ''
|
||||
# The tests want to run the installed executables
|
||||
export PATH=$out/bin:$PATH
|
||||
preCheck = ''
|
||||
# The tests want to run the installed executables
|
||||
export PATH=$out/bin:$PATH
|
||||
|
||||
# gdtoolkit tries to write cache variables to $HOME/.cache
|
||||
export HOME=$TMP
|
||||
# gdtoolkit tries to write cache variables to $HOME/.cache
|
||||
export HOME=$TMP
|
||||
'';
|
||||
|
||||
# Work around https://github.com/godotengine/godot/issues/20503
|
||||
# Without this, Godot will complain about a missing project file
|
||||
touch project.godot
|
||||
|
||||
# Remove broken test case
|
||||
# (hard to skip via disabledTests since the test name contains an absolute path)
|
||||
rm tests/potential-godot-bugs/multiline-subscription-expression.gd
|
||||
'';
|
||||
# The tests are not working on NixOS
|
||||
disabledTests = [ "test_cc_on_empty_file_succeeds" "test_cc_on_file_with_single_function_succeeds" ];
|
||||
|
||||
pythonImportsCheck = [ "gdtoolkit" "gdtoolkit.formatter" "gdtoolkit.linter" "gdtoolkit.parser" ];
|
||||
|
||||
73
pkgs/by-name/gd/gdtoolkit_4/package.nix
Normal file
73
pkgs/by-name/gd/gdtoolkit_4/package.nix
Normal file
@ -0,0 +1,73 @@
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
lark = super.lark.overridePythonAttrs (old: rec {
|
||||
# gdtoolkit needs exactly this lark version
|
||||
version = "1.1.9";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lark-parser";
|
||||
repo = "lark";
|
||||
rev = version;
|
||||
hash = "sha256-vDu+VPAXONY8J+A6oS7EiMeOMgzGms0nWpE+DKI1MVU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
patches = [ ];
|
||||
});
|
||||
};
|
||||
};
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "gdtoolkit";
|
||||
version = "4.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Scony";
|
||||
repo = "godot-gdscript-toolkit";
|
||||
rev = version;
|
||||
hash = "sha256-SvEKKuDnfxV+5AArg5ssrQzgIwRITdek4KYEs3d0n4Y=";
|
||||
};
|
||||
|
||||
disabled = python.pythonOlder "3.7";
|
||||
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
docopt
|
||||
lark
|
||||
pyyaml
|
||||
setuptools
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
nativeCheckInputs = with python.pkgs; [
|
||||
pytestCheckHook
|
||||
hypothesis
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
# The tests want to run the installed executables
|
||||
export PATH=$out/bin:$PATH
|
||||
|
||||
# gdtoolkit tries to write cache variables to $HOME/.cache
|
||||
export HOME=$TMP
|
||||
'';
|
||||
|
||||
# The tests are not working on NixOS
|
||||
disabledTestPaths = [
|
||||
"tests/generated/test_expression_parsing.py"
|
||||
"tests/gdradon/test_executable.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "gdtoolkit" "gdtoolkit.formatter" "gdtoolkit.linter" "gdtoolkit.parser" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Independent set of tools for working with Godot's GDScript - parser, linter and formatter";
|
||||
homepage = "https://github.com/Scony/godot-gdscript-toolkit";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ squarepear ];
|
||||
};
|
||||
}
|
||||
@ -1,10 +1,17 @@
|
||||
{ lib, stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, libxml2
|
||||
, version, hashes }:
|
||||
{ lib, stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, libxml2 }:
|
||||
|
||||
let
|
||||
inherit (stdenv) hostPlatform;
|
||||
OS = if hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name;
|
||||
ARCH = if hostPlatform.isDarwin && hostPlatform.isAarch64 then "arm64" else hostPlatform.parsed.cpu.name;
|
||||
version = "1.30.0";
|
||||
hashes = {
|
||||
# Get these from `nix store prefetch-file https://github.com/ldc-developers/ldc/releases/download/v1.19.0/ldc2-1.19.0-osx-x86_64.tar.xz` etc..
|
||||
osx-x86_64 = "sha256-AAWZvxuZC82xvrW6fpYm783TY+H8k3DvqE94ZF1yjmk=";
|
||||
linux-x86_64 = "sha256-V4TUzEfQhFrwiX07dHOgjdAoGkzausCkhnQIQNAU/eE=";
|
||||
linux-aarch64 = "sha256-kTeglub75iv/jWWNPCn15aCGAbmck0RQl6L7bFOUu7Y=";
|
||||
osx-arm64 = "sha256-Nb/owBdIeroB9jLMDvwjo8bvsTC9vFyJPLMTOMsSAd4=";
|
||||
};
|
||||
in stdenv.mkDerivation {
|
||||
pname = "ldc-bootstrap";
|
||||
inherit version;
|
||||
@ -12,7 +19,7 @@ in stdenv.mkDerivation {
|
||||
src = fetchurl rec {
|
||||
name = "ldc2-${version}-${OS}-${ARCH}.tar.xz";
|
||||
url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/${name}";
|
||||
sha256 = hashes."${OS}-${ARCH}" or (throw "missing bootstrap sha256 for ${OS}-${ARCH}");
|
||||
hash = hashes."${OS}-${ARCH}" or (throw "missing bootstrap hash for ${OS}-${ARCH}");
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
@ -1,7 +1,22 @@
|
||||
{ version, sha256 }:
|
||||
{ lib, stdenv, fetchurl, cmake, ninja, llvm_17, curl, tzdata
|
||||
, libconfig, lit, gdb, unzip, darwin, bash
|
||||
, callPackage, makeWrapper, runCommand, targetPackages
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, ninja
|
||||
, llvm_17
|
||||
, curl
|
||||
, tzdata
|
||||
, libconfig
|
||||
, lit
|
||||
, gdb
|
||||
, unzip
|
||||
, darwin
|
||||
, bash
|
||||
, callPackage
|
||||
, makeWrapper
|
||||
, runCommand
|
||||
, targetPackages
|
||||
|
||||
, ldcBootstrap ? callPackage ./bootstrap.nix { }
|
||||
}:
|
||||
|
||||
@ -14,52 +29,44 @@ let
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ldc";
|
||||
inherit version;
|
||||
version = "1.38.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz";
|
||||
inherit sha256;
|
||||
src = fetchFromGitHub {
|
||||
owner = "ldc-developers";
|
||||
repo = "ldc";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-d/UREh+fHRRh0r3H60uPjHute+qspcm9TBFWZMbGDxk=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# https://issues.dlang.org/show_bug.cgi?id=19553
|
||||
hardeningDisable = [ "fortify" ];
|
||||
|
||||
postUnpack = ''
|
||||
patchShebangs .
|
||||
''
|
||||
+ ''
|
||||
rm ldc-${version}-src/tests/dmd/fail_compilation/mixin_gc.d
|
||||
rm ldc-${version}-src/tests/dmd/runnable/xtest46_gc.d
|
||||
rm ldc-${version}-src/tests/dmd/runnable/testptrref_gc.d
|
||||
|
||||
# test depends on current year
|
||||
rm ldc-${version}-src/tests/dmd/compilable/ddocYear.d
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
# https://github.com/NixOS/nixpkgs/issues/34817
|
||||
rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
# Setting SHELL=$SHELL when dmd testsuite is run doesn't work on Linux somehow
|
||||
substituteInPlace tests/dmd/Makefile --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash"
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
substituteInPlace runtime/phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" ""
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
substituteInPlace runtime/phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)"
|
||||
patchShebangs runtime tools tests
|
||||
|
||||
rm tests/dmd/fail_compilation/mixin_gc.d
|
||||
rm tests/dmd/runnable/xtest46_gc.d
|
||||
rm tests/dmd/runnable/testptrref_gc.d
|
||||
|
||||
# test depends on current year
|
||||
rm tests/dmd/compilable/ddocYear.d
|
||||
'' + lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
substituteInPlace runtime/phobos/std/socket.d --replace-fail "assert(ih.addrList[0] == 0x7F_00_00_01);" ""
|
||||
'' + lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
substituteInPlace runtime/phobos/std/socket.d --replace-fail "foreach (name; names)" "names = []; foreach (name; names)"
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/34817
|
||||
rm -r tests/plugins/addFuncEntryCall
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake ldcBootstrap lit lit.python llvm_17.dev makeWrapper ninja unzip
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Foundation
|
||||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
# https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818
|
||||
gdb
|
||||
];
|
||||
@ -76,7 +83,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
makeFlags = [ "DMD=$DMD" ];
|
||||
|
||||
fixNames = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
fixNames = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
fixDarwinDylibNames() {
|
||||
local flags=()
|
||||
|
||||
@ -103,7 +110,7 @@ stdenv.mkDerivation rec {
|
||||
# Build default lib test runners
|
||||
ninja -j$NIX_BUILD_CORES all-test-runners
|
||||
|
||||
${fixNames}
|
||||
${finalAttrs.fixNames}
|
||||
|
||||
# Run dmd testsuite
|
||||
export DMD_TESTSUITE_MAKE_ARGS="-j$NIX_BUILD_CORES DMD=$DMD"
|
||||
@ -116,22 +123,23 @@ stdenv.mkDerivation rec {
|
||||
ctest -V -R "lit-tests"
|
||||
|
||||
# Run default lib unittests
|
||||
ctest -j$NIX_BUILD_CORES --output-on-failure -E "ldc2-unittest|lit-tests|dmd-testsuite${additionalExceptions}"
|
||||
ctest -j$NIX_BUILD_CORES --output-on-failure -E "ldc2-unittest|lit-tests|dmd-testsuite${finalAttrs.additionalExceptions}"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/ldc2 \
|
||||
--prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \
|
||||
--set-default CC "${targetPackages.stdenv.cc}/bin/cc"
|
||||
'';
|
||||
--prefix PATH : ${targetPackages.stdenv.cc}/bin \
|
||||
--set-default CC ${targetPackages.stdenv.cc}/bin/cc
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "The LLVM-based D compiler";
|
||||
homepage = "https://github.com/ldc-developers/ldc";
|
||||
changelog = "https://github.com/ldc-developers/ldc/releases/tag/v${finalAttrs.version}";
|
||||
# from https://github.com/ldc-developers/ldc/blob/master/LICENSE
|
||||
license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ];
|
||||
mainProgram = "ldc2";
|
||||
maintainers = with maintainers; [ lionello jtbx ];
|
||||
platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
};
|
||||
}
|
||||
})
|
||||
52
pkgs/by-name/ma/mangareader/package.nix
Normal file
52
pkgs/by-name/ma/mangareader/package.nix
Normal file
@ -0,0 +1,52 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
kdePackages,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mangareader";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "g-fb";
|
||||
repo = "mangareader";
|
||||
rev = version;
|
||||
hash = "sha256-XX0VaXVYmAs5vmgwslflKIYx1peITp4VmReLkv1nV3I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
kdePackages.extra-cmake-modules
|
||||
kdePackages.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = with kdePackages; [
|
||||
qtbase
|
||||
kio
|
||||
ki18n
|
||||
kxmlgui
|
||||
kconfig
|
||||
karchive
|
||||
kcoreaddons
|
||||
kconfigwidgets
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Qt manga reader for local files";
|
||||
homepage = "https://github.com/g-fb/mangareader";
|
||||
changelog = "https://github.com/g-fb/mangareader/releases/tag/${src.rev}";
|
||||
mainProgram = "mangareader";
|
||||
platforms = lib.platforms.linux;
|
||||
license = with lib.licenses; [
|
||||
gpl3Plus
|
||||
cc-by-sa-40
|
||||
];
|
||||
maintainers = with lib.maintainers; [ zendo ];
|
||||
};
|
||||
}
|
||||
@ -2,7 +2,6 @@
|
||||
, fetchFromGitHub
|
||||
, openssh
|
||||
, gitMinimal
|
||||
, rsync
|
||||
, nix
|
||||
, coreutils
|
||||
, curl
|
||||
@ -13,6 +12,7 @@
|
||||
, lib
|
||||
, makeWrapper
|
||||
, sshpass
|
||||
, gnutar
|
||||
}:
|
||||
let
|
||||
runtimeDeps = [
|
||||
@ -25,17 +25,17 @@ let
|
||||
findutils
|
||||
gnused # needed by ssh-copy-id
|
||||
sshpass # used to provide password for ssh-copy-id
|
||||
rsync # used to upload extra-files
|
||||
gnutar # used to upload extra-files
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nixos-anywhere";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "numtide";
|
||||
repo = "nixos-anywhere";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-u3PFJup/XOz2MBhvqCzm94iH6Z4nrE0KmBgT/OnNDqU=";
|
||||
hash = "sha256-AdSrhQhJb9ObCgM1iXnoIBBl+6cjRbuTST4Lt02AP5Q=";
|
||||
};
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
installPhase = ''
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
{ callPackage }:
|
||||
callPackage ./binary.nix {
|
||||
version = "1.30.0";
|
||||
hashes = {
|
||||
# Get these from `nix store prefetch-file https://github.com/ldc-developers/ldc/releases/download/v1.19.0/ldc2-1.19.0-osx-x86_64.tar.xz` etc..
|
||||
osx-x86_64 = "sha256-AAWZvxuZC82xvrW6fpYm783TY+H8k3DvqE94ZF1yjmk=";
|
||||
linux-x86_64 = "sha256-V4TUzEfQhFrwiX07dHOgjdAoGkzausCkhnQIQNAU/eE=";
|
||||
linux-aarch64 = "sha256-kTeglub75iv/jWWNPCn15aCGAbmck0RQl6L7bFOUu7Y=";
|
||||
osx-arm64 = "sha256-Nb/owBdIeroB9jLMDvwjo8bvsTC9vFyJPLMTOMsSAd4=";
|
||||
};
|
||||
}
|
||||
@ -1,4 +0,0 @@
|
||||
import ./generic.nix {
|
||||
version = "1.36.0";
|
||||
sha256 = "sha256-oAx5BzEjqIfBf0Rsd4KklVajUSo9Natna31Trhu41u8=";
|
||||
}
|
||||
@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langfuse";
|
||||
version = "2.33.1";
|
||||
version = "2.35.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "langfuse";
|
||||
repo = "langfuse-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ZPCL3Xle4qEw2pNIcja252meep26W/RbVEk2suzywYI=";
|
||||
hash = "sha256-u1gnv2eDYhF0C4r88VMIedxUEk6WU88Q0mlweVKLaoc=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@ -0,0 +1,48 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchPypi
|
||||
, ptpython
|
||||
, ipython
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, setuptools-generate
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "repl-python-wakatime";
|
||||
version = "0.0.6";
|
||||
in
|
||||
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-s2UelniMn4+wWILbVIIKidRCFaOvo/nNNofA7yf2+9c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
setuptools-generate
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ptpython
|
||||
ipython
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"repl_python_wakatime"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python REPL plugin for automatic time tracking and metrics generated from your programming activity";
|
||||
homepage = "https://github.com/wakatime/repl-python-wakatime";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ jfvillablanca ];
|
||||
};
|
||||
}
|
||||
@ -29,8 +29,8 @@
|
||||
}:
|
||||
|
||||
let
|
||||
# FIXME: Compare revision with
|
||||
# https://github.com/radareorg/radare2/blob/master/libr/arch/p/arm/v35/Makefile#L26-L27
|
||||
# NOTE: Check these revision changes when updating the package.
|
||||
# https://github.com/radareorg/radare2/blob/master/libr/arch/p/arm/v35/Makefile#L25-L26
|
||||
arm64 = fetchFromGitHub {
|
||||
owner = "radareorg";
|
||||
repo = "vector35-arch-arm64";
|
||||
@ -44,15 +44,15 @@ let
|
||||
hash = "sha256-YhfgJ7M8ys53jh1clOzj0I2yfJshXQm5zP0L9kMYsmk=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "radare2";
|
||||
version = "5.9.0";
|
||||
version = "5.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "radare";
|
||||
repo = "radare2";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-h2IYOGr+yCgCJR1gB4jibcUt1A+8IuNVoTUcJ83lKHw=";
|
||||
rev = "refs/tags/${finalAttrs.version}";
|
||||
hash = "sha256-smsjGfTvSTVwd7nhWhptYpkus2fEQ2EVdT5bDt/rHZE=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
@ -66,30 +66,27 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString stdenv.isDarwin ''
|
||||
install_name_tool -add_rpath $out/lib $out/lib/libr_io.${version}.dylib
|
||||
install_name_tool -add_rpath $out/lib $out/lib/libr_io.${finalAttrs.version}.dylib
|
||||
'';
|
||||
|
||||
mesonFlags = [
|
||||
"-Dr2_gittap=${finalAttrs.version}"
|
||||
"-Duse_sys_capstone=true"
|
||||
"-Duse_sys_magic=true"
|
||||
"-Duse_sys_zip=true"
|
||||
"-Duse_sys_xxhash=true"
|
||||
"-Duse_sys_lz4=true"
|
||||
"-Dr2_gittap=${version}"
|
||||
"-Duse_sys_magic=true"
|
||||
"-Duse_sys_openssl=true"
|
||||
"-Duse_sys_xxhash=true"
|
||||
"-Duse_sys_zip=true"
|
||||
];
|
||||
|
||||
# TODO: remove when upstream fixes the issue
|
||||
# https://github.com/radareorg/radare2/issues/22793
|
||||
env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [
|
||||
"-DTHREAD_CONVERT_THREAD_STATE_TO_SELF=1"
|
||||
]);
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [ pkg-config meson ninja python3 ];
|
||||
|
||||
buildInputs = [
|
||||
capstone
|
||||
file
|
||||
@ -113,11 +110,27 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "UNIX-like reverse engineering framework and command-line tools";
|
||||
description = "UNIX-like reverse engineering framework and command-line toolset";
|
||||
longDescription = ''
|
||||
r2 is a complete rewrite of radare. It provides a set of libraries, tools
|
||||
and plugins to ease reverse engineering tasks. Distributed mostly under
|
||||
LGPLv3, each plugin can have different licenses.
|
||||
|
||||
The radare project started as a simple command-line hexadecimal editor
|
||||
focused on forensics. Today, r2 is a featureful low-level command-line
|
||||
tool with support for scripting with the embedded JavaScript interpreter
|
||||
or via r2pipe.
|
||||
|
||||
r2 can edit files on local hard drives, view kernel memory, and debug
|
||||
programs locally or via a remote gdb/windbg servers. r2's wide
|
||||
architecture support allows you to analyze, emulate, debug, modify, and
|
||||
disassemble any binary.
|
||||
'';
|
||||
homepage = "https://radare.org";
|
||||
changelog = "https://github.com/radareorg/radare2/releases/tag/${version}";
|
||||
license = licenses.gpl2Plus;
|
||||
changelog = "https://github.com/radareorg/radare2/releases/tag/${finalAttrs.version}";
|
||||
license = with licenses; [ gpl3Only lgpl3Only ];
|
||||
maintainers = with maintainers; [ azahi raskin makefu mic92 arkivm ];
|
||||
mainProgram = "radare2";
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
2
pkgs/development/web/edge-runtime/Cargo.lock
generated
2
pkgs/development/web/edge-runtime/Cargo.lock
generated
@ -1956,6 +1956,7 @@ dependencies = [
|
||||
"deno_core",
|
||||
"log",
|
||||
"serde",
|
||||
"strum",
|
||||
"tokio",
|
||||
"uuid",
|
||||
]
|
||||
@ -4795,6 +4796,7 @@ name = "sb_module_loader"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"base64 0.21.7",
|
||||
"deno_ast",
|
||||
"deno_core",
|
||||
"deno_fs",
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
let
|
||||
pname = "edge-runtime";
|
||||
version = "1.53.3";
|
||||
version = "1.53.4";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit pname version;
|
||||
@ -20,7 +20,7 @@ rustPlatform.buildRustPackage {
|
||||
owner = "supabase";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-eGFLwypLgoTKUapG3kbI9J9jSyR39JtKgM0dwtkR9zk=";
|
||||
hash = "sha256-sDgGfQiAUuI+JaF0BRB5lwvjbWWIoTV/k/tbQsBBc4E=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -13,13 +13,13 @@
|
||||
|
||||
let
|
||||
pname = "iaito";
|
||||
version = "5.9.0";
|
||||
version = "5.9.2";
|
||||
|
||||
main_src = fetchFromGitHub rec {
|
||||
owner = "radareorg";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-Ep3Cbi0qjY4PKG0urr12y0DgX/l/Tsq8w1qlyH0lu3s=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-bq4kaP3BmDprKAxMxO+OvTceEQFeAxJ7aGDnRFHjVDA=";
|
||||
name = repo;
|
||||
};
|
||||
|
||||
@ -31,8 +31,7 @@ let
|
||||
name = repo;
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
inherit pname version;
|
||||
|
||||
srcs = [ main_src translations_src ];
|
||||
@ -61,9 +60,6 @@ stdenv.mkDerivation rec {
|
||||
radare2
|
||||
];
|
||||
|
||||
# the radare2 binary package seems to not install all necessary headers.
|
||||
env.NIX_CFLAGS_COMPILE = toString [ "-I" "${radare2.src}/shlr/sdb/include/sdb" ];
|
||||
|
||||
postBuild = ''
|
||||
pushd ../../../${translations_src.name}
|
||||
make build -j$NIX_BUILD_CORES PREFIX=$out
|
||||
@ -86,16 +82,16 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "An official graphical interface of radare2";
|
||||
mainProgram = "iaito";
|
||||
description = "Official Qt frontend of radare2";
|
||||
longDescription = ''
|
||||
iaito is the official graphical interface of radare2. It's the
|
||||
continuation of Cutter for radare2 after the Rizin fork.
|
||||
iaito is the official graphical interface for radare2, a libre reverse
|
||||
engineering framework.
|
||||
'';
|
||||
homepage = "https://radare.org/n/iaito.html";
|
||||
changelog = "https://github.com/radareorg/iaito/releases/tag/${version}";
|
||||
license = licenses.gpl3Plus;
|
||||
changelog = "https://github.com/radareorg/iaito/releases/tag/${finalAttrs.version}";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ azahi ];
|
||||
mainProgram = "iaito";
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -493,6 +493,8 @@ mapAliases ({
|
||||
godot-headless = throw "godot-headless has been renamed to godot3-headless to distinguish from version 4"; # Added 2023-07-16
|
||||
godot-server = throw "godot-server has been renamed to godot3-server to distinguish from version 4"; # Added 2023-07-16
|
||||
|
||||
gdtoolkit = throw "gdtoolkit has been renamed to gdtoolkit_3 to distinguish from version 4"; # Added 2024-02-17
|
||||
|
||||
google-chrome-beta = throw "'google-chrome-beta' has been removed due to the lack of maintenance in nixpkgs. Consider using 'google-chrome' instead."; # Added 2023-10-18
|
||||
google-chrome-dev = throw "'google-chrome-dev' has been removed due to the lack of maintenance in nixpkgs. Consider using 'google-chrome' instead."; # Added 2023-10-18
|
||||
google-gflags = throw "'google-gflags' has been renamed to/replaced by 'gflags'"; # Converted to throw 2023-09-10
|
||||
|
||||
@ -8228,8 +8228,6 @@ with pkgs;
|
||||
|
||||
gdmap = callPackage ../tools/system/gdmap { };
|
||||
|
||||
gdtoolkit = callPackage ../development/tools/gdtoolkit { };
|
||||
|
||||
gef = callPackage ../development/tools/misc/gef { };
|
||||
|
||||
gelasio = callPackage ../data/fonts/gelasio { };
|
||||
@ -9620,8 +9618,6 @@ with pkgs;
|
||||
|
||||
last-resort = callPackage ../data/fonts/last-resort { };
|
||||
|
||||
ldc = callPackage ../development/compilers/ldc { };
|
||||
|
||||
ligo =
|
||||
let ocaml_p = ocaml-ng.ocamlPackages_4_14_janeStreet_0_15; in
|
||||
callPackage ../development/compilers/ligo {
|
||||
@ -10478,8 +10474,6 @@ with pkgs;
|
||||
|
||||
mandoc = callPackage ../tools/misc/mandoc { };
|
||||
|
||||
mangareader = libsForQt5.callPackage ../applications/graphics/mangareader { };
|
||||
|
||||
mangohud = callPackage ../tools/graphics/mangohud {
|
||||
libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
|
||||
mangohud32 = pkgsi686Linux.mangohud;
|
||||
|
||||
@ -13196,6 +13196,8 @@ self: super: with self; {
|
||||
|
||||
repeated-test = callPackage ../development/python-modules/repeated-test { };
|
||||
|
||||
repl-python-wakatime = callPackage ../development/python-modules/repl-python-wakatime { };
|
||||
|
||||
repocheck = callPackage ../development/python-modules/repocheck { };
|
||||
|
||||
reportengine = callPackage ../development/python-modules/reportengine { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user