mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-29 07:32:58 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
8c2ba7797a
@ -7432,6 +7432,12 @@
|
||||
githubId = 1401179;
|
||||
name = "Guanpeng Xu";
|
||||
};
|
||||
herbetom = {
|
||||
email = "nixos@tomherbers.de";
|
||||
github = "herbetom";
|
||||
githubId = 15121114;
|
||||
name = "Tom Herbers";
|
||||
};
|
||||
hexa = {
|
||||
email = "hexa@darmstadt.ccc.de";
|
||||
matrix = "@hexa:lossy.network";
|
||||
|
||||
@ -14,20 +14,20 @@ JWE files have to be created through the clevis command line. 3 types of policie
|
||||
|
||||
Secrets are pinned against the presence of a TPM2 device, for example:
|
||||
```
|
||||
echo hi | clevis encrypt tpm2 '{}' > hi.jwe
|
||||
echo -n hi | clevis encrypt tpm2 '{}' > hi.jwe
|
||||
```
|
||||
2) Tang policies
|
||||
|
||||
Secrets are pinned against the presence of a Tang server, for example:
|
||||
```
|
||||
echo hi | clevis encrypt tang '{"url": "http://tang.local"}' > hi.jwe
|
||||
echo -n hi | clevis encrypt tang '{"url": "http://tang.local"}' > hi.jwe
|
||||
```
|
||||
|
||||
3) Shamir Secret Sharing
|
||||
|
||||
Using Shamir's Secret Sharing ([sss](https://en.wikipedia.org/wiki/Shamir%27s_secret_sharing)), secrets are pinned using a combination of the two preceding policies. For example:
|
||||
```
|
||||
echo hi | clevis encrypt sss \
|
||||
echo -n hi | clevis encrypt sss \
|
||||
'{"t": 2, "pins": {"tpm2": {"pcr_ids": "0"}, "tang": {"url": "http://tang.local"}}}' \
|
||||
> hi.jwe
|
||||
```
|
||||
|
||||
@ -48,13 +48,13 @@ let
|
||||
} else portaudio;
|
||||
in stdenv'.mkDerivation (finalAttrs: {
|
||||
pname = "musescore";
|
||||
version = "4.2.0";
|
||||
version = "4.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "musescore";
|
||||
repo = "MuseScore";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-vNA1VPCHLt5kuhIix8kgeq1VlbuIX1lOY3nJaufvuyc=";
|
||||
sha256 = "sha256-YCeO/ijxA+tZxNviqmlIBkAdjPTrKoOoo1QyMIOqhWU=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@ -102,7 +102,7 @@ let
|
||||
--replace 'Name=Neovim' 'Name=Neovim wrapper'
|
||||
''
|
||||
+ lib.optionalString finalAttrs.withPython3 ''
|
||||
makeWrapper ${python3Env.interpreter} $out/bin/nvim-python3 --unset PYTHONPATH
|
||||
makeWrapper ${python3Env.interpreter} $out/bin/nvim-python3 --unset PYTHONPATH --unset PYTHONSAFEPATH
|
||||
''
|
||||
+ lib.optionalString (finalAttrs.rubyEnv != null) ''
|
||||
ln -s ${finalAttrs.rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby
|
||||
|
||||
@ -63,7 +63,7 @@ stdenv.mkDerivation ({
|
||||
|
||||
install -Dt ${coreDir} ${coreFilename}
|
||||
makeWrapper ${retroarch}/bin/retroarch $out/bin/${mainProgram} \
|
||||
--add-flags "-L ${coreDir}/${coreFilename} $@"
|
||||
--add-flags "-L ${coreDir}/${coreFilename}"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
bison, flex, fontforge, makeWrapper, pkg-config,
|
||||
nixosTests,
|
||||
supportFlags,
|
||||
wineRelease,
|
||||
patches,
|
||||
moltenvk,
|
||||
buildScript ? null, configureFlags ? [], mainProgram ? "wine"
|
||||
@ -46,7 +47,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
|
||||
}) // rec {
|
||||
inherit version src;
|
||||
|
||||
pname = prevName + lib.optionalString supportFlags.waylandSupport "-wayland";
|
||||
pname = prevName + lib.optionalString (wineRelease == "wayland") "-wayland";
|
||||
|
||||
# Fixes "Compiler cannot create executables" building wineWow with mingwSupport
|
||||
strictDeps = true;
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
sdlSupport ? false,
|
||||
usbSupport ? false,
|
||||
mingwSupport ? wineRelease != "stable",
|
||||
waylandSupport ? wineRelease == "wayland",
|
||||
waylandSupport ? stdenv.isLinux,
|
||||
x11Support ? stdenv.isLinux,
|
||||
embedInstallers ? false, # The Mono and Gecko MSI installers
|
||||
moltenvk ? darwin.moltenvk # Allow users to override MoltenVK easily
|
||||
|
||||
@ -8,7 +8,7 @@ let
|
||||
in with src; {
|
||||
wine32 = pkgsi686Linux.callPackage ./base.nix {
|
||||
pname = "wine";
|
||||
inherit src version supportFlags patches moltenvk;
|
||||
inherit src version supportFlags patches moltenvk wineRelease;
|
||||
pkgArches = [ pkgsi686Linux ];
|
||||
geckos = [ gecko32 ];
|
||||
mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc ];
|
||||
@ -17,7 +17,7 @@ in with src; {
|
||||
};
|
||||
wine64 = callPackage ./base.nix {
|
||||
pname = "wine64";
|
||||
inherit src version supportFlags patches moltenvk;
|
||||
inherit src version supportFlags patches moltenvk wineRelease;
|
||||
pkgArches = [ pkgs ];
|
||||
mingwGccs = with pkgsCross; [ mingwW64.buildPackages.gcc ];
|
||||
geckos = [ gecko64 ];
|
||||
@ -28,7 +28,7 @@ in with src; {
|
||||
};
|
||||
wineWow = callPackage ./base.nix {
|
||||
pname = "wine-wow";
|
||||
inherit src version supportFlags patches moltenvk;
|
||||
inherit src version supportFlags patches moltenvk wineRelease;
|
||||
stdenv = stdenv_32bit;
|
||||
pkgArches = [ pkgs pkgsi686Linux ];
|
||||
geckos = [ gecko32 gecko64 ];
|
||||
@ -44,7 +44,8 @@ in with src; {
|
||||
};
|
||||
wineWow64 = callPackage ./base.nix {
|
||||
pname = "wine-wow64";
|
||||
inherit src version supportFlags patches moltenvk;
|
||||
inherit src version patches moltenvk wineRelease;
|
||||
supportFlags = supportFlags // { mingwSupport = true; }; # Required because we request "--enable-archs=x86_64"
|
||||
pkgArches = [ pkgs ];
|
||||
mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc mingwW64.buildPackages.gcc ];
|
||||
geckos = [ gecko64 ];
|
||||
|
||||
@ -24,27 +24,27 @@ let fetchurl = args@{url, hash, ...}:
|
||||
in rec {
|
||||
|
||||
stable = fetchurl rec {
|
||||
version = "8.0.2";
|
||||
url = "https://dl.winehq.org/wine/source/8.0/wine-${version}.tar.xz";
|
||||
hash = "sha256-bsj7byxy1XbLEfUrL41Zr2RASAIVRlHRIrmEZtkdyEc=";
|
||||
version = "9.0";
|
||||
url = "https://dl.winehq.org/wine/source/9.0/wine-${version}.tar.xz";
|
||||
hash = "sha256-fP0JClOV9bdtlbtd76yKMSyN5MBwwRY7i1jaODMMpu4=";
|
||||
|
||||
## see http://wiki.winehq.org/Gecko
|
||||
gecko32 = fetchurl rec {
|
||||
version = "2.47.3";
|
||||
version = "2.47.4";
|
||||
url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86.msi";
|
||||
hash = "sha256-5bmwbTzjVWRqjS5y4ETjfh4MjRhGTrGYWtzRh6f0jgE=";
|
||||
hash = "sha256-Js7MR3BrCRkI9/gUvdsHTGG+uAYzGOnvxaf3iYV3k9Y=";
|
||||
};
|
||||
gecko64 = fetchurl rec {
|
||||
version = "2.47.3";
|
||||
version = "2.47.4";
|
||||
url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86_64.msi";
|
||||
hash = "sha256-pT7pVDkrbR/j1oVF9uTiqXr7yNyLA6i0QzSVRc4TlnU=";
|
||||
hash = "sha256-5ZC32YijLWqkzx2Ko6o9M3Zv3Uz0yJwtzCCV7LKNBm8=";
|
||||
};
|
||||
|
||||
## see http://wiki.winehq.org/Mono
|
||||
mono = fetchurl rec {
|
||||
version = "7.4.0";
|
||||
version = "8.1.0";
|
||||
url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
|
||||
hash = "sha256-ZBP/Mo679+x2icZI/rNUbYEC3thlB50fvwMxsUs6sOw=";
|
||||
hash = "sha256-DtPsUzrvebLzEhVZMc97EIAAmsDFtMK8/rZ4rJSOCBA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -69,9 +69,9 @@ in rec {
|
||||
|
||||
unstable = fetchurl rec {
|
||||
# NOTE: Don't forget to change the hash for staging as well.
|
||||
version = "9.0-rc1";
|
||||
version = "9.0";
|
||||
url = "https://dl.winehq.org/wine/source/9.0/wine-${version}.tar.xz";
|
||||
hash = "sha256-GDd3V74ffxeGzopWqET2ZXKIH/z3RcC0yjTwmmDi8zA=";
|
||||
hash = "sha256-fP0JClOV9bdtlbtd76yKMSyN5MBwwRY7i1jaODMMpu4=";
|
||||
inherit (stable) patches;
|
||||
|
||||
## see http://wiki.winehq.org/Gecko
|
||||
@ -117,7 +117,7 @@ in rec {
|
||||
staging = fetchFromGitHub rec {
|
||||
# https://github.com/wine-staging/wine-staging/releases
|
||||
inherit (unstable) version;
|
||||
hash = "sha256-jjy4r9VEJsU7FJ7RmE8+cgHTAkZVGruNUD5hzmGSB8c=";
|
||||
hash = "sha256-lE/95OZigifreaRRCPkvA+Z0FqsBmm018jD6leSysXU=";
|
||||
owner = "wine-staging";
|
||||
repo = "wine-staging";
|
||||
rev = "v${version}";
|
||||
@ -157,8 +157,8 @@ in rec {
|
||||
|
||||
winetricks = fetchFromGitHub rec {
|
||||
# https://github.com/Winetricks/winetricks/releases
|
||||
version = "20230212";
|
||||
hash = "sha256-pd37QTcqY5ZaVBssGecuqziOIq1p0JH0ZDB+oLmp9JU=";
|
||||
version = "20240105";
|
||||
hash = "sha256-YTEgb19aoM54KK8/IjrspoChzVnWAEItDlTxpfpS52w=";
|
||||
owner = "Winetricks";
|
||||
repo = "winetricks";
|
||||
rev = version;
|
||||
|
||||
@ -1,14 +1,9 @@
|
||||
{ lib
|
||||
, fetchurl
|
||||
, gnustep
|
||||
, llvmPackages_9
|
||||
}:
|
||||
|
||||
let
|
||||
# Earlier llvm than 9 segfaults
|
||||
gnustep' = gnustep.override { llvmPackages = llvmPackages_9; };
|
||||
|
||||
in gnustep'.gsmakeDerivation rec {
|
||||
gnustep.gsmakeDerivation rec {
|
||||
pname = "pikopixel";
|
||||
version = "1.0-b10";
|
||||
|
||||
@ -20,9 +15,9 @@ in gnustep'.gsmakeDerivation rec {
|
||||
sourceRoot = "PikoPixel.Sources.${version}/PikoPixel";
|
||||
|
||||
buildInputs = [
|
||||
gnustep'.base
|
||||
gnustep'.gui
|
||||
gnustep'.back
|
||||
gnustep.base
|
||||
gnustep.gui
|
||||
gnustep.back
|
||||
];
|
||||
|
||||
# Fix the Exec and Icon paths in the .desktop file, and save the file in the
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
{
|
||||
"packageVersion": "121.0.1-1",
|
||||
"packageVersion": "122.0-1",
|
||||
"source": {
|
||||
"rev": "121.0.1-1",
|
||||
"sha256": "15zcrl47w6ib00wai63kks5ykcpfh5wfa0ixxj62v06v50bnd78x"
|
||||
"rev": "122.0-1",
|
||||
"sha256": "18b2pfh61cxkl7ww0fi5wjv580ca7i5sshviqym8w0w38lhp7rsv"
|
||||
},
|
||||
"settings": {
|
||||
"rev": "41623492f2b6970972014f6ce196015d3d7f1b59",
|
||||
"sha256": "0ayyyw44q0gh668bzlv6cfl7baa0818bnz83g53l5j2f10xd52by"
|
||||
},
|
||||
"firefox": {
|
||||
"version": "121.0.1",
|
||||
"sha512": "7810850a922cb4a274ced6556e14256d3ff518a96f10a0f86d1f8e40daa0a8b1a5cfcc9cbf1391029d920944e94a9149951ee107a0e718a294954bb50b6ced2e"
|
||||
"version": "122.0",
|
||||
"sha512": "619b735c16970207f3f8fb31dd2350a5e665a802c30501c89aee4817b8b0f7f466da93c66ab238e94967587e538e6858934b18164ff312dbdbfbc3b2bf8bd824"
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dnscontrol";
|
||||
version = "4.8.1";
|
||||
version = "4.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StackExchange";
|
||||
repo = "dnscontrol";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vH+BHTDQNFZTZjTvxV8ItGkTDj6G5q1t2YC/1LVYXUs=";
|
||||
hash = "sha256-9myo073/yl9CWwmVb3Gkihf6I/60kSOl0Pk8+dE39KM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-InLafJxxOVKGW0bhithJV7qYFjsgDEDGeTBwGvPVG4E=";
|
||||
vendorHash = "sha256-jOLFqCeBxQLXgUAdDbk/QnPBAtMBQi5VR+oKjgZLb28=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
{ lib, stdenv, fetchurl, dpkg, makeWrapper, coreutils, gawk, gnugrep, gnused, jre }:
|
||||
{ lib, stdenv, fetchurl, dpkg, makeWrapper, coreutils, gawk, gnugrep, gnused, openjdk17 }:
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "marvin";
|
||||
version = "23.12.0";
|
||||
version = "23.17.0";
|
||||
|
||||
src = fetchurl {
|
||||
name = "marvin-${version}.deb";
|
||||
url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb";
|
||||
hash = "sha256-5ycOteXcdgZaeDl3WQ95H2lD0OnnobCbmnVlfYwVdeI=";
|
||||
hash = "sha256-zE/9EaOsNJwzE4Doasm9N8QG4t7wDOxqpV/Nhc4p7Ws=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg makeWrapper ];
|
||||
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
installPhase = ''
|
||||
wrapBin() {
|
||||
makeWrapper $1 $out/bin/$(basename $1) \
|
||||
--set INSTALL4J_JAVA_HOME "${jre}" \
|
||||
--set INSTALL4J_JAVA_HOME "${openjdk17}" \
|
||||
--prefix PATH : ${makeBinPath [ coreutils gawk gnugrep gnused ]}
|
||||
}
|
||||
cp -r opt $out
|
||||
|
||||
@ -31,7 +31,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
|
||||
})
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [ "attrs" ];
|
||||
pythonRelaxDeps = [ "attrs" "ruamel.yaml" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapQtAppsHook
|
||||
|
||||
39
pkgs/by-name/ya/yanic/package.nix
Normal file
39
pkgs/by-name/ya/yanic/package.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "yanic";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FreifunkBremen";
|
||||
repo = "yanic";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-++tF6nTFIDeqWSqlBDXw/zEfl5YYa4ufzVZaUG2c8Zo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-D9V53/+C/+iv1U4kVrYWzJ8iD0MA1QcR8f5ifejFhLo=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd yanic \
|
||||
--bash <($out/bin/yanic completion bash) \
|
||||
--fish <($out/bin/yanic completion fish) \
|
||||
--zsh <($out/bin/yanic completion zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool to collect and aggregate respondd data";
|
||||
homepage = "https://github.com/FreifunkBremen/yanic";
|
||||
changelog = "https://github.com/FreifunkBremen/yanic/releases/tag/${src.rev}";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ herbetom ];
|
||||
mainProgram = "yanic";
|
||||
};
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/docs/users_guide/ghc_config.py.in b/docs/users_guide/ghc_config.py.in
|
||||
index 2670ad3cf1..d2f9d85c31 100644
|
||||
--- a/docs/users_guide/ghc_config.py.in
|
||||
+++ b/docs/users_guide/ghc_config.py.in
|
||||
@@ -1,6 +1,6 @@
|
||||
extlinks = {
|
||||
- 'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/issues/%s', 'Issue #'),
|
||||
- 'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/wikis/%s', 'GHC Wiki'),
|
||||
+ 'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/issues/%s', 'Issue %s'),
|
||||
+ 'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/wikis/%s', 'GHC Wiki %s'),
|
||||
}
|
||||
|
||||
libs_base_uri = '../libraries'
|
||||
@ -1,32 +0,0 @@
|
||||
diff --git a/rts/win32/OSMem.c b/rts/win32/OSMem.c
|
||||
--- a/rts/win32/OSMem.c
|
||||
+++ b/rts/win32/OSMem.c
|
||||
@@ -41,7 +41,7 @@ static block_rec* free_blocks = NULL;
|
||||
typedef LPVOID(WINAPI *VirtualAllocExNumaProc)(HANDLE, LPVOID, SIZE_T, DWORD, DWORD, DWORD);
|
||||
|
||||
/* Cache NUMA API call. */
|
||||
-VirtualAllocExNumaProc VirtualAllocExNuma;
|
||||
+VirtualAllocExNumaProc _VirtualAllocExNuma;
|
||||
|
||||
void
|
||||
osMemInit(void)
|
||||
@@ -52,8 +52,8 @@ osMemInit(void)
|
||||
/* Resolve and cache VirtualAllocExNuma. */
|
||||
if (osNumaAvailable() && RtsFlags.GcFlags.numa)
|
||||
{
|
||||
- VirtualAllocExNuma = (VirtualAllocExNumaProc)GetProcAddress(GetModuleHandleW(L"kernel32"), "VirtualAllocExNuma");
|
||||
- if (!VirtualAllocExNuma)
|
||||
+ _VirtualAllocExNuma = (VirtualAllocExNumaProc)(void*)GetProcAddress(GetModuleHandleW(L"kernel32"), "VirtualAllocExNuma");
|
||||
+ if (!_VirtualAllocExNuma)
|
||||
{
|
||||
sysErrorBelch(
|
||||
"osBindMBlocksToNode: VirtualAllocExNuma does not exist. How did you get this far?");
|
||||
@@ -569,7 +569,7 @@ void osBindMBlocksToNode(
|
||||
On windows also -xb is broken, it does nothing so that can't
|
||||
be used to tweak it (see #12577). So for now, just let the OS decide.
|
||||
*/
|
||||
- temp = VirtualAllocExNuma(
|
||||
+ temp = _VirtualAllocExNuma(
|
||||
GetCurrentProcess(),
|
||||
NULL, // addr? See base memory
|
||||
size,
|
||||
@ -1,11 +0,0 @@
|
||||
--- ghc-8.10.4/docs/users_guide/conf.py.orig 2021-06-21 13:46:34.196383559 +0200
|
||||
+++ ghc-8.10.4/docs/users_guide/conf.py 2021-06-21 13:46:54.839349941 +0200
|
||||
@@ -100,7 +100,7 @@
|
||||
latex_elements = {
|
||||
'inputenc': '',
|
||||
'utf8extra': '',
|
||||
- 'preamble': '''
|
||||
+ 'preamble': r'''
|
||||
\usepackage{fontspec}
|
||||
\usepackage{makeidx}
|
||||
\setsansfont{DejaVu Sans}
|
||||
@ -1,92 +0,0 @@
|
||||
From 8c747d3157df2830eed9205e7caf1203b345de17 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 4 Feb 2023 13:54:41 -0800
|
||||
Subject: [PATCH] cmake: Enable 64bit off_t on 32bit glibc systems
|
||||
|
||||
Pass -D_FILE_OFFSET_BITS=64 to compiler flags on 32bit glibc based
|
||||
systems. This will make sure that 64bit versions of LFS functions are
|
||||
used e.g. seek will behave same as lseek64. Also revert [1] partially
|
||||
because this added a cmake test to detect lseek64 but then forgot to
|
||||
pass the needed macro to actual compile, this test was incomplete too
|
||||
since libc implementations like musl has 64bit off_t by default on 32bit
|
||||
systems and does not bundle[2] -D_LARGEFILE64_SOURCE under -D_GNU_SOURCE
|
||||
like glibc, which means the compile now fails on musl because the cmake
|
||||
check passes but we do not have _LARGEFILE64_SOURCE defined. Using the
|
||||
*64 function was transitional anyways so use -D_FILE_OFFSET_BITS=64
|
||||
instead
|
||||
|
||||
[1] https://github.com/llvm/llvm-project/commit/8db7e5e4eed4c4e697dc3164f2c9351d8c3e942b
|
||||
[2] https://git.musl-libc.org/cgit/musl/commit/?id=25e6fee27f4a293728dd15b659170e7b9c7db9bc
|
||||
|
||||
Reviewed By: MaskRay
|
||||
|
||||
Differential Revision: https://reviews.llvm.org/D139752
|
||||
|
||||
(cherry picked from commit 5cd554303ead0f8891eee3cd6d25cb07f5a7bf67)
|
||||
---
|
||||
cmake/config-ix.cmake | 13 ++++++++++---
|
||||
include/llvm/Config/config.h.cmake | 3 ---
|
||||
lib/Support/raw_ostream.cpp | 2 --
|
||||
3 files changed, 10 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake
|
||||
index 18977d9950ff..b558aa83fa62 100644
|
||||
--- a/cmake/config-ix.cmake
|
||||
+++ b/cmake/config-ix.cmake
|
||||
@@ -197,9 +197,6 @@ check_symbol_exists(posix_fallocate fcntl.h HAVE_POSIX_FALLOCATE)
|
||||
if( HAVE_SIGNAL_H AND NOT LLVM_USE_SANITIZER MATCHES ".*Address.*" AND NOT APPLE )
|
||||
check_symbol_exists(sigaltstack signal.h HAVE_SIGALTSTACK)
|
||||
endif()
|
||||
-set(CMAKE_REQUIRED_DEFINITIONS "-D_LARGEFILE64_SOURCE")
|
||||
-check_symbol_exists(lseek64 "sys/types.h;unistd.h" HAVE_LSEEK64)
|
||||
-set(CMAKE_REQUIRED_DEFINITIONS "")
|
||||
check_symbol_exists(mallctl malloc_np.h HAVE_MALLCTL)
|
||||
check_symbol_exists(mallinfo malloc.h HAVE_MALLINFO)
|
||||
check_symbol_exists(malloc_zone_statistics malloc/malloc.h
|
||||
@@ -237,6 +234,16 @@ if( PURE_WINDOWS )
|
||||
check_function_exists(__main HAVE___MAIN)
|
||||
check_function_exists(__cmpdi2 HAVE___CMPDI2)
|
||||
endif()
|
||||
+
|
||||
+check_symbol_exists(__GLIBC__ stdio.h LLVM_USING_GLIBC)
|
||||
+if( LLVM_USING_GLIBC )
|
||||
+# enable 64bit off_t on 32bit systems using glibc
|
||||
+ if (CMAKE_SIZEOF_VOID_P EQUAL 4)
|
||||
+ add_compile_definitions(_FILE_OFFSET_BITS=64)
|
||||
+ list(APPEND CMAKE_REQUIRED_DEFINITIONS "-D_FILE_OFFSET_BITS=64")
|
||||
+ endif()
|
||||
+endif()
|
||||
+
|
||||
if( HAVE_DLFCN_H )
|
||||
if( HAVE_LIBDL )
|
||||
list(APPEND CMAKE_REQUIRED_LIBRARIES dl)
|
||||
diff --git a/include/llvm/Config/config.h.cmake b/include/llvm/Config/config.h.cmake
|
||||
index e934617d7ec7..3c39c373b3c1 100644
|
||||
--- a/include/llvm/Config/config.h.cmake
|
||||
+++ b/include/llvm/Config/config.h.cmake
|
||||
@@ -112,9 +112,6 @@
|
||||
/* Define to 1 if you have the <link.h> header file. */
|
||||
#cmakedefine HAVE_LINK_H ${HAVE_LINK_H}
|
||||
|
||||
-/* Define to 1 if you have the `lseek64' function. */
|
||||
-#cmakedefine HAVE_LSEEK64 ${HAVE_LSEEK64}
|
||||
-
|
||||
/* Define to 1 if you have the <mach/mach.h> header file. */
|
||||
#cmakedefine HAVE_MACH_MACH_H ${HAVE_MACH_MACH_H}
|
||||
|
||||
diff --git a/lib/Support/raw_ostream.cpp b/lib/Support/raw_ostream.cpp
|
||||
index 038ad00bd608..921ab8409008 100644
|
||||
--- a/lib/Support/raw_ostream.cpp
|
||||
+++ b/lib/Support/raw_ostream.cpp
|
||||
@@ -677,8 +677,6 @@ uint64_t raw_fd_ostream::seek(uint64_t off) {
|
||||
flush();
|
||||
#ifdef _WIN32
|
||||
pos = ::_lseeki64(FD, off, SEEK_SET);
|
||||
-#elif defined(HAVE_LSEEK64)
|
||||
- pos = ::lseek64(FD, off, SEEK_SET);
|
||||
#else
|
||||
pos = ::lseek(FD, off, SEEK_SET);
|
||||
#endif
|
||||
--
|
||||
2.37.1
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
stdenv.mkDerivation rec
|
||||
{
|
||||
pname = "openvdb";
|
||||
version = "10.0.1";
|
||||
version = "11.0.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec
|
||||
owner = "AcademySoftwareFoundation";
|
||||
repo = "openvdb";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kaf5gpGYVWinmnRwR/IafE1SJcwmP2psfe/UZdtH1Og=";
|
||||
sha256 = "sha256-wDDjX0nKZ4/DIbEX33PoxR43dJDj2NF3fm+Egug62GQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -142,6 +142,8 @@ stdenv.mkDerivation {
|
||||
] ++ lists.optionals rocmSupport [
|
||||
"-DCMAKE_C_COMPILER=${rocmPackages.clr}/bin/hipcc"
|
||||
"-DCMAKE_CXX_COMPILER=${rocmPackages.clr}/bin/hipcc"
|
||||
] ++ lists.optionals (cudaPackages.cudaAtLeast "12.0.0") [
|
||||
(lib.cmakeBool "USE_FORTRAN" false)
|
||||
];
|
||||
|
||||
buildFlags = [
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ buildPecl, lib, rabbitmq-c, fetchFromGitHub }:
|
||||
|
||||
let
|
||||
version = "2.1.1";
|
||||
version = "2.1.2";
|
||||
in buildPecl {
|
||||
inherit version;
|
||||
pname = "amqp";
|
||||
@ -10,7 +10,7 @@ in buildPecl {
|
||||
owner = "php-amqp";
|
||||
repo = "php-amqp";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-QHiQL3INd0zQpmCOcJx7HhN770m9ql0Cs63OTOLOrNQ=";
|
||||
sha256 = "sha256-jVD5dq2kgFnprj190W9hnLG+9yPLWm19AjoGBBz6v8c=";
|
||||
};
|
||||
|
||||
buildInputs = [ rabbitmq-c ];
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiocomelit";
|
||||
version = "0.7.3";
|
||||
version = "0.7.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "chemelli74";
|
||||
repo = "aiocomelit";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-rtMR3j/DwHVgf4RYXx1Y+W/N8U5pSaLnRwnRmuLbFEY=";
|
||||
hash = "sha256-F/blKd+6n/mTeqgmA5rVGz8DFJA+317T6sjYfsAAf2E=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, SDL2
|
||||
, cmake
|
||||
, fetchFromGitHub
|
||||
, git
|
||||
, fetchpatch
|
||||
, gym
|
||||
, importlib-metadata
|
||||
, importlib-resources
|
||||
@ -11,7 +11,6 @@
|
||||
, numpy
|
||||
, pybind11
|
||||
, pytestCheckHook
|
||||
, python
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, stdenv
|
||||
@ -23,10 +22,10 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "ale-py";
|
||||
version = "0.8.1";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mgbellemare";
|
||||
owner = "Farama-Foundation";
|
||||
repo = "Arcade-Learning-Environment";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-B2AxhlzvBy1lJ3JttJjImgTjMtEUyZBv+xHU2IC7BVE=";
|
||||
@ -35,6 +34,20 @@ buildPythonPackage rec {
|
||||
patches = [
|
||||
# don't download pybind11, use local pybind11
|
||||
./cmake-pybind11.patch
|
||||
./patch-sha-check-in-setup.patch
|
||||
|
||||
# The following two patches add the required `include <cstdint>` for compilation to work with GCC 13.
|
||||
# See https://github.com/Farama-Foundation/Arcade-Learning-Environment/pull/503
|
||||
(fetchpatch {
|
||||
name = "fix-gcc13-compilation-1";
|
||||
url = "https://github.com/Farama-Foundation/Arcade-Learning-Environment/commit/ebd64c03cdaa3d8df7da7c62ec3ae5795105e27a.patch";
|
||||
hash = "sha256-NMz0hw8USOj88WryHRkMQNWznnP6+5aWovEYNuocQ2c=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix-gcc13-compilation-2";
|
||||
url = "https://github.com/Farama-Foundation/Arcade-Learning-Environment/commit/4c99c7034f17810f3ff6c27436bfc3b40d08da21.patch";
|
||||
hash = "sha256-66/bDCyMr1RsKk63T9GnFZGloLlkdr/bf5WHtWbX6VY=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -67,7 +80,7 @@ buildPythonPackage rec {
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'dynamic = ["version"]' 'version = "${version}"'
|
||||
substituteInPlace setup.py \
|
||||
--replace 'subprocess.check_output(["git", "rev-parse", "--short", "HEAD"], cwd=here)' 'b"${src.rev}"'
|
||||
--replace '@sha@' '"${version}"'
|
||||
'';
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
@ -0,0 +1,17 @@
|
||||
diff --git a/setup.py b/setup.py
|
||||
index ff1b1c5..ce40df0 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -141,11 +141,7 @@ def parse_version(version_file):
|
||||
|
||||
version = ci_version
|
||||
else:
|
||||
- sha = (
|
||||
- subprocess.check_output(["git", "rev-parse", "--short", "HEAD"], cwd=here)
|
||||
- .decode("ascii")
|
||||
- .strip()
|
||||
- )
|
||||
+ sha = @sha@
|
||||
version += f"+{sha}"
|
||||
|
||||
return version
|
||||
@ -5,25 +5,27 @@
|
||||
, pytestCheckHook
|
||||
, xorgserver
|
||||
, imagemagick
|
||||
, gobject-introspection
|
||||
, pulseaudio
|
||||
, pytest-asyncio
|
||||
, pytest-lazy-fixture
|
||||
, qtile
|
||||
, keyring
|
||||
, requests
|
||||
, stravalib
|
||||
, librsvg
|
||||
, gtk3
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "qtile-extras";
|
||||
version = "0.23.0";
|
||||
version = "0.24.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elParaguayo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WI1z8vrbZiJw6fDHK27mKA+1FyZEQTMttIDNzSIX+PU=";
|
||||
hash = "sha256-DJmnJcqhfCfl39SF3Ypv0PGtI4r8heaVv9JmpiCBGJo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
@ -32,6 +34,7 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
xorgserver
|
||||
imagemagick
|
||||
gobject-introspection
|
||||
];
|
||||
checkInputs = [
|
||||
pytest-asyncio
|
||||
@ -40,59 +43,41 @@ buildPythonPackage rec {
|
||||
pulseaudio
|
||||
keyring
|
||||
requests
|
||||
stravalib
|
||||
# stravalib # marked as broken due to https://github.com/stravalib/stravalib/issues/379
|
||||
];
|
||||
disabledTests = [
|
||||
# AttributeError: 'ImgMask' object has no attribute '_default_size'. Did you mean: 'default_size'?
|
||||
# cairocffi.pixbuf.ImageLoadingError: Pixbuf error: Unrecognized image file format
|
||||
"test_draw"
|
||||
"test_icons"
|
||||
"1-x11-GithubNotifications-kwargs3"
|
||||
"1-x11-SnapCast-kwargs8"
|
||||
"1-x11-TVHWidget-kwargs10"
|
||||
"test_tvh_widget_not_recording"
|
||||
"test_tvh_widget_recording"
|
||||
"test_tvh_widget_popup"
|
||||
"test_snapcast_options"
|
||||
"test_snapcast_icon"
|
||||
"test_snapcast_icon_colour"
|
||||
"test_snapcast_http_error"
|
||||
"test_syncthing_not_syncing"
|
||||
"test_syncthing_is_syncing"
|
||||
"test_syncthing_http_error"
|
||||
"test_githubnotifications_colours"
|
||||
"test_githubnotifications_logging"
|
||||
"test_githubnotifications_icon"
|
||||
"test_githubnotifications_reload_token"
|
||||
"test_image_size_horizontal"
|
||||
"test_image_size_vertical"
|
||||
"test_image_size_mask"
|
||||
# ValueError: Namespace Gdk not available
|
||||
# AssertionError: Window never appeared...
|
||||
"test_statusnotifier_menu"
|
||||
# AttributeError: 'str' object has no attribute 'canonical'
|
||||
"test_strava_widget_display"
|
||||
"test_strava_widget_popup"
|
||||
# Needs a running DBUS
|
||||
"test_brightness_power_saving"
|
||||
"test_upower_all_batteries"
|
||||
"test_upower_named_battery"
|
||||
"test_upower_low_battery"
|
||||
"test_upower_critical_battery"
|
||||
"test_upower_charging"
|
||||
"test_upower_show_text"
|
||||
"test_global_menu"
|
||||
"test_mpris2_popup"
|
||||
"test_statusnotifier_menu"
|
||||
# No network connection
|
||||
"test_wifiicon_internet_check"
|
||||
# AssertionErrors
|
||||
"test_widget_init_config"
|
||||
# Image difference is outside tolerance
|
||||
"test_decoration_output"
|
||||
# Needs github token
|
||||
"test_githubnotifications_reload_token"
|
||||
# AttributeError: 'NoneType' object has no attribute 'theta'
|
||||
"test_image_size_horizontal"
|
||||
"test_image_size_vertical"
|
||||
];
|
||||
disabledTestPaths = [
|
||||
# Needs a running DBUS
|
||||
"test/widget/test_iwd.py"
|
||||
"test/widget/test_upower.py"
|
||||
# Marked as broken due to https://github.com/stravalib/stravalib/issues/379
|
||||
"test/widget/test_strava.py"
|
||||
];
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
export GDK_PIXBUF_MODULE_FILE=${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
|
||||
sed -i 's#/usr/bin/sleep#sleep#' test/widget/test_snapcast.py
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
gtk3
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "qtile_extras" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
63
pkgs/development/python-modules/tensordict/default.nix
Normal file
63
pkgs/development/python-modules/tensordict/default.nix
Normal file
@ -0,0 +1,63 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, setuptools
|
||||
, torch
|
||||
, wheel
|
||||
, which
|
||||
, cloudpickle
|
||||
, numpy
|
||||
, h5py
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tensordict";
|
||||
version = "0.2.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pytorch";
|
||||
repo = "tensordict";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+Osoz1632F/dEkG/o8RUqCIDok2Qc9Qdak+CCr9m26g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
torch
|
||||
wheel
|
||||
which
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cloudpickle
|
||||
numpy
|
||||
torch
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"tensordict"
|
||||
];
|
||||
|
||||
# We have to delete the source because otherwise it is used instead of the installed package.
|
||||
preCheck = ''
|
||||
rm -rf tensordict
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
h5py
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A pytorch dedicated tensor container";
|
||||
changelog = "https://github.com/pytorch/tensordict/releases/tag/v${version}";
|
||||
homepage = "https://github.com/pytorch/tensordict";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ GaetanLepage ];
|
||||
};
|
||||
}
|
||||
154
pkgs/development/python-modules/torchrl/default.nix
Normal file
154
pkgs/development/python-modules/torchrl/default.nix
Normal file
@ -0,0 +1,154 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, ninja
|
||||
, setuptools
|
||||
, wheel
|
||||
, which
|
||||
, cloudpickle
|
||||
, numpy
|
||||
, torch
|
||||
, ale-py
|
||||
, gym
|
||||
, pygame
|
||||
, gymnasium
|
||||
, mujoco
|
||||
, moviepy
|
||||
, git
|
||||
, hydra-core
|
||||
, tensorboard
|
||||
, tqdm
|
||||
, wandb
|
||||
, packaging
|
||||
, tensordict
|
||||
, imageio
|
||||
, pytest-rerunfailures
|
||||
, pytestCheckHook
|
||||
, pyyaml
|
||||
, scipy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "torchrl";
|
||||
version = "0.2.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pytorch";
|
||||
repo = "rl";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Y3WbSMGXS6fb4RyXk2SAKHT6RencGTZXM3tc65AQx74=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch { # https://github.com/pytorch/rl/pull/1828
|
||||
name = "pyproject.toml-remove-unknown-properties";
|
||||
url = "https://github.com/pytorch/rl/commit/c390cf602fc79cb37d5f7bda6e44b5e9546ecda0.patch";
|
||||
hash = "sha256-cUBBvKJ8vIHprcGzMojkUxcOrrmNPIoIBfLwHXWkjOc=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
ninja
|
||||
setuptools
|
||||
wheel
|
||||
which
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cloudpickle
|
||||
numpy
|
||||
packaging
|
||||
tensordict
|
||||
torch
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
atari = [
|
||||
ale-py
|
||||
gym
|
||||
pygame
|
||||
];
|
||||
gym-continuous = [
|
||||
gymnasium
|
||||
mujoco
|
||||
];
|
||||
rendering = [
|
||||
moviepy
|
||||
];
|
||||
utils = [
|
||||
git
|
||||
hydra-core
|
||||
tensorboard
|
||||
tqdm
|
||||
wandb
|
||||
];
|
||||
};
|
||||
|
||||
# torchrl needs to create a folder to store datasets
|
||||
preBuild = ''
|
||||
export D4RL_DATASET_DIR=$(mktemp -d)
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"torchrl"
|
||||
];
|
||||
|
||||
# We have to delete the source because otherwise it is used instead of the installed package.
|
||||
preCheck = ''
|
||||
rm -rf torchrl
|
||||
|
||||
export XDG_RUNTIME_DIR=$(mktemp -d)
|
||||
''
|
||||
# Otherwise, tochrl will try to use unpackaged torchsnapshot.
|
||||
# TODO: This should be the default from next release so remove when updating from 0.2.1
|
||||
+ ''
|
||||
export CKPT_BACKEND="torch"
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
gymnasium
|
||||
imageio
|
||||
pytest-rerunfailures
|
||||
pytestCheckHook
|
||||
pyyaml
|
||||
scipy
|
||||
]
|
||||
++ passthru.optional-dependencies.atari
|
||||
++ passthru.optional-dependencies.gym-continuous
|
||||
++ passthru.optional-dependencies.rendering;
|
||||
|
||||
disabledTests = [
|
||||
# mujoco.FatalError: an OpenGL platform library has not been loaded into this process, this most likely means that a valid OpenGL context has not been created before mjr_makeContext was called
|
||||
"test_vecenvs_env"
|
||||
|
||||
# ValueError: Can't write images with one color channel.
|
||||
"test_log_video"
|
||||
|
||||
# Those tests require the ALE environments (provided by unpackaged shimmy)
|
||||
"test_collector_env_reset"
|
||||
"test_gym"
|
||||
"test_gym_fake_td"
|
||||
"test_recorder"
|
||||
"test_recorder_load"
|
||||
"test_rollout"
|
||||
"test_parallel_trans_env_check"
|
||||
"test_serial_trans_env_check"
|
||||
"test_single_trans_env_check"
|
||||
"test_td_creation_from_spec"
|
||||
"test_trans_parallel_env_check"
|
||||
"test_trans_serial_env_check"
|
||||
"test_transform_env"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A modular, primitive-first, python-first PyTorch library for Reinforcement Learning";
|
||||
homepage = "https://github.com/pytorch/rl";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ GaetanLepage ];
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
let
|
||||
data = stdenv.mkDerivation(finalAttrs: {
|
||||
pname = "path-of-building-data";
|
||||
version = "2.39.0";
|
||||
version = "2.39.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PathOfBuildingCommunity";
|
||||
repo = "PathOfBuilding";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-EoywWavbCuoWeA5wknteRb8NH0T6Ef8h6zQhkXb9bL4=";
|
||||
hash = "sha256-whCCGV0hMKR5kpmS6jefvzvAQaa65B4V4bYkP4HQkIQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 84f8699..dce9033 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -192,9 +192,9 @@ if test "x$enable_doc" = "xyes" -o "x$enable_doc" = "xauto"; then
|
||||
AC_SUBST(db2xman)
|
||||
fi
|
||||
AM_CONDITIONAL([ENABLE_DOCBOOK], [test "x$db2xman" != "x"])
|
||||
-AM_CONDITIONAL([USE_DOCBOOK2X], [test "x$db2xman" != "xdocbook2man"])
|
||||
+AM_CONDITIONAL([USE_DOCBOOK2X], [test "x$db2xman" != "no-no-no"])
|
||||
|
||||
-if test "x$db2xman" = "xdocbook2man"; then
|
||||
+if test "x$db2xman" = "no-no-no"; then
|
||||
docdtd="\"-//Davenport//DTD DocBook V3.0//EN\""
|
||||
else
|
||||
docdtd="\"-//OASIS//DTD DocBook XML\" \"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd\""
|
||||
@ -1,10 +0,0 @@
|
||||
--- ./vendor/modules/code-oss-dev/node_modules/playwright/install.js
|
||||
+++ ./vendor/modules/code-oss-dev/node_modules/playwright/install.js
|
||||
@@ -14,6 +14,4 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
-const { installDefaultBrowsersForNpmInstall } = require('playwright-core/lib/utils/registry');
|
||||
-
|
||||
-installDefaultBrowsersForNpmInstall();
|
||||
+process.stdout.write('Browser install disabled by Nix build script\n');
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "wander";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "robinovitch61";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MriFrYE8d4m6RgeaErunyAfKna8xhtUAnHyIwsVvK/o=";
|
||||
sha256 = "sha256-7/5NcrS5VR3APhv5LEpd4U0+E4PwM9cU9bb1q6UDfoI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-0S8tzP5yNUrH6fp+v7nbUPTMWzYXyGw+ZNcXkSN+tWY=";
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ lib, stdenvNoCC, fetchFromGitHub, makeWrapper, imagemagick }:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "lsix";
|
||||
version = "1.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hackerb9";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
repo = "lsix";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-xlOlAfZonSo/RERt5WxPqMvppVrY5/Yhh7SgCCsYDQE=";
|
||||
};
|
||||
|
||||
@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/lsix \
|
||||
--prefix PATH : ${lib.makeBinPath [ imagemagick ]}
|
||||
--prefix PATH : ${lib.makeBinPath [ (imagemagick.override { ghostscriptSupport = true;}) ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
homepage = "https://github.com/hackerb9/lsix";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ kidonng ];
|
||||
maintainers = with maintainers; [ justinlime kidonng ];
|
||||
mainProgram = "lsix";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "trueseeing";
|
||||
version = "2.1.9";
|
||||
version = "2.1.10";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alterakey";
|
||||
repo = "trueseeing";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-g5OqdnPtGGV4wBwPRAjH3lweguwlfVcgpNLlq54OHKA=";
|
||||
hash = "sha256-q7hUsBmTRPizmNWueFtFDc5t7rd1evMrBj3oX1Q2VfM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
||||
@ -14144,6 +14144,8 @@ self: super: with self; {
|
||||
|
||||
tensorboardx = callPackage ../development/python-modules/tensorboardx { };
|
||||
|
||||
tensordict = callPackage ../development/python-modules/tensordict { };
|
||||
|
||||
tensorflow-bin = callPackage ../development/python-modules/tensorflow/bin.nix {
|
||||
inherit (pkgs.config) cudaSupport;
|
||||
};
|
||||
@ -14548,6 +14550,8 @@ self: super: with self; {
|
||||
|
||||
torchlibrosa = callPackage ../development/python-modules/torchlibrosa { };
|
||||
|
||||
torchrl = callPackage ../development/python-modules/torchrl { };
|
||||
|
||||
torchsde = callPackage ../development/python-modules/torchsde { };
|
||||
|
||||
torchvision = callPackage ../development/python-modules/torchvision { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user