Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2025-10-23 18:05:51 +00:00
committed by GitHub
98 changed files with 2292 additions and 2559 deletions
-329
View File
@@ -1,329 +0,0 @@
Setting up a cross compiler with Nix
"Cross compilation" means compiling a program on one machine for another
type of machine. A typical use of cross compilation is to compile programs
for embedded devices. These devices often don't have the computing power
and memory to compile programs natively.
For a fully working cross compiler the following are needed:
* cross binutils: assembler, archiver, linker, etcetera that understand
the format of the target system
* cross compiler: a compiler that can generate binary code and object files
for the target platform
* cross C library: a library to link object files with to create fully
functional programs
Cross compilers are difficult to set up. A lot of people report that they
cannot succeed in building a cross toolchain successfully. The answers
usually consist of "download this pre-built toolchain", which is equally
unhelpful.
A toolchain is set up in five steps:
1. build binutils to that can run on the host platform, but generate code
for the target platform
2. build Linux kernel headers for the target platform
3. build a minimal C only version of GCC, that can run on the host platform
and generate code for the target platform
4. build a C library for the target platform. This includes the dynamic
linker, C library, etc.
5. build a full GCC
****
NB:
Keep in mind that many programs are not very well suited for cross
compilation. Either they are not intended to run on other platforms,
because the code is highly platform specific, or the configuration process
is not written with cross compilation in mind.
Nix will not solve these problems for you!
***
This document describes to set up a cross compiler to generate code for
arm-linux with uClibc and runs on i686-linux. The "stdenv" used is the
default from the standard Nix packages collection.
Step 1: build binutils for arm-linux in the stdenv for i686-linux
---
{stdenv, fetchurl, noSysDirs}:
stdenv.mkDerivation {
name = "binutils-2.16.1-arm";
builder = ./builder.sh;
src = fetchurl {
url = "http://ftp.nluug.nl/gnu/binutils/binutils-2.16.1.tar.bz2";
hash = "sha256-14pv+YKrL3NyFwbnv9MoWsZHgEZk5+pHhuZtAfkcVsU=";
};
inherit noSysDirs;
configureFlags = [ "--target=arm-linux" ];
}
---
This will compile binutils that will run on i686-linux, but knows the
format used by arm-linux.
Step 2: build kernel headers for the target architecture
default.nix for kernel-headers-arm:
---
{stdenv, fetchurl}:
assert stdenv.buildPlatform.system == "i686-linux";
stdenv.mkDerivation {
name = "linux-headers-2.6.13.1-arm";
builder = ./builder.sh;
src = fetchurl {
url = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.1.tar.bz2";
hash = "sha256-qtICDjfiA1HxWBrHqtB5DCv9s9/HyznKV1C6IxCrHYs=";
};
}
---
builder.sh for kernel-headers-arm:
---
source $stdenv/setup
buildPhase() {
make include/linux/version.h
}
buildPhase=buildPhase
installPhase() {
mkdir $out
mkdir $out/include
#cd $out/include
#ln -s asm-arm asm
make include/asm ARCH=arm
cp -prvd include/linux include/asm include/asm-arm include/asm-generic $out/include
echo -n > $out/include/linux/autoconf.h
}
installPhase=installPhase
genericBuild
---
Step 3: build a minimal GCC
Extra/different parameters include the target platform and the kernel
headers argument (this needs a major cleanup, as well as the name, it
needs to be different!). Profiled compilers are disabled. The tarball
used here is just gcc-core. For some reason it doesn't install nicely
if the whole tarball is used (or is this some braino on my side? -- AH).
Only C is used, because for other languages (such as C++) extra libraries
need to be compiled, for which libraries compiled for the target system
are needed.
There is a bit of evilness going on. The cross compiled utilities need
to be either copied to or be linked from the output tree of the compiler.
(Is this really true? Back this up with arguments! -- AH)
Symbolic links are not something we want inside the Nix store.
---
{ stdenv, fetchurl, noSysDirs
, langC ? true, langCC ? true, langF77 ? false
, profiledCompiler ? false
, binutilsArm
, kernelHeadersArm
}:
assert langC;
stdenv.mkDerivation {
name = "gcc-4.0.2-arm";
builder = ./builder.sh;
src = fetchurl {
url = "ftp://ftp.nluug.nl/pub/gnu/gcc/gcc-4.0.2/gcc-core-4.0.2.tar.bz2";
hash = "sha256-LANmXRS7/fN2zF5JUJVd8OjNA5aCDsGLQKhSpxWA3Qk=";
};
# !!! apply only if noSysDirs is set
patches = [./no-sys-dirs.patch ./gcc-inhibit.patch];
inherit noSysDirs langC langCC langF77 profiledCompiler;
buildInputs = [binutilsArm];
inherit kernelHeadersArm binutilsArm;
platform = "arm-linux";
}
---
The builder.sh for a cross-compiler. Note that the binutils are prefixed
with the architecture name, so arm-linux-ld instead of ld, etc. This is
necessary because when we cross-compile a lot of programs look for these
tools with these specific names. The standard gcc-wrapper does not take this
into account yet.
---
source $stdenv/setup
export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy
mkdir $NIX_FIXINC_DUMMY
if test "$noSysDirs" = "1"; then
if test "$noSysDirs" = "1"; then
# Figure out what extra flags to pass to the gcc compilers
# being generated to make sure that they use our glibc.
if test -e $NIX_CC/nix-support/orig-glibc; then
glibc=$(cat $NIX_CC/nix-support/orig-glibc)
# Ugh. Copied from gcc-wrapper/builder.sh. We can't just
# source in $NIX_CC/nix-support/add-flags, since that
# would cause *this* GCC to be linked against the
# *previous* GCC. Need some more modularity there.
extraCFlags="-B$glibc/lib -isystem $glibc/include"
extraLDFlags="-B$glibc/lib -L$glibc/lib -Wl,-s \
-Wl,-dynamic-linker,$glibc/lib/ld-linux.so.2"
# Oh, what a hack. I should be shot for this.
# In stage 1, we should link against the previous GCC, but
# not afterwards. Otherwise we retain a dependency.
# However, ld-wrapper, which adds the linker flags for the
# previous GCC, is also used in stage 2/3. We can prevent
# it from adding them by NIX_GLIBC_FLAGS_SET, but then
# gcc-wrapper will also not add them, thereby causing
# stage 1 to fail. So we use a trick to only set the
# flags in gcc-wrapper.
hook=$(pwd)/ld-wrapper-hook
echo "NIX_GLIBC_FLAGS_SET=1" > $hook
export NIX_LD_WRAPPER_START_HOOK=$hook
fi
export NIX_EXTRA_CFLAGS=$extraCFlags
export NIX_EXTRA_LDFLAGS=$extraLDFlags
export CFLAGS=$extraCFlags
export CXXFLAGS=$extraCFlags
export LDFLAGS=$extraLDFlags
fi
else
patches=""
fi
preConfigure=preConfigure
preConfigure() {
# Determine the frontends to build.
langs="c"
if test -n "$langCC"; then
langs="$langs,c++"
fi
if test -n "$langF77"; then
langs="$langs,f77"
fi
# Cross compiler evilness
mkdir -p $out
mkdir -p $out/arm-linux
mkdir -p $out/arm-linux/bin
ln -s $binutilsArm/arm-linux/bin/as $out/arm-linux/bin/as
ln -s $binutilsArm/arm-linux/bin/ld $out/arm-linux/bin/ld
ln -s $binutilsArm/arm-linux/bin/ar $out/arm-linux/bin/ar
ln -s $binutilsArm/arm-linux/bin/ranlib $out/arm-linux/bin/ranlib
# Perform the build in a different directory.
mkdir ../build
cd ../build
configureScript=../$sourceRoot/configure
configureFlags="--enable-languages=$langs --target=$platform --disable-threads --disable-libmudflap --disable-shared --with-headers=$kernelHeadersArm/include --disable-multilib"
}
postInstall=postInstall
postInstall() {
# Remove precompiled headers for now. They are very big and
# probably not very useful yet.
find $out/include -name "*.gch" -exec rm -rf {} \; -prune
# Remove `fixincl' to prevent a retained dependency on the
# previous gcc.
rm -rf $out/libexec/gcc/*/*/install-tools
}
#if test -z "$profiledCompiler"; then
#makeFlags="bootstrap"
#else
#makeFlags="profiledbootstrap"
#fi
genericBuild
---
Step 4: build a C library for the target platform.
The previous steps are enough to compile a C library. In our case we take
uClibc. It's intended to be a small sized replacement for glibc. It is widely
used in embedded environments.
...
Step 5: Build a compiler to link with the newly built C library.
...
If we restrict the compiler to just C programs it is relatively easy,
since we only need to wrap the GCC we built in the previous step with all
the right tools and the right C library. Successfully compiled programs with
this compiler and verified to be working on a HP Jornada 820 running Linux
are "patch", "make" and "wget".
If we want to build C++ programs it gets a lot more difficult. GCC has a
three step compilation process. In the first step a simple compiler, called
xgcc, that can compile only C programs is built. With that compiler it
compiles itself two more times: one time to build a full compiler, and another
time to build a full compiler once again with the freshly built compiler from
step 2. In the second and third step support for C++ is compiled, if this
is configured.
One of the libraries that has to be built for C++ support step is libstdc++.
This library uses xgcc, even when cross compiling, since libstdc++ has to be
compiled for arm-linux.
One of the compiler flags that GCC uses for this compiler is called X_CFLAGS.
This is used by the Nix build process to set the dynamic linker, glibc
in the case of i686-linux using the default Nix packages collection.
Obviously, since we need to compile libstc++ for arm-linux with uClibc linking
will not be done correctly: you can't link object files built for arm-linux
with a glibc built for i686-linux.
Setting X_CFLAGS to use the uClibc libraries and dynamic linker will fail
too. Earlier on in the build process these flags are used to compile important
files like libgcc.a by the host system gcc, which does need to be linked
to glibc. To make this work correctly you will need to carefully juggle
with compilation flags. This is still work in progress for Nix.
---
After successfully completing the whole toolchain you can start building
packages with the newly built tools. To make everything build correctly
you will need a stdenv for your target platform. Setting up this platform
will take some effort. Right now there is a very experimental setup for
arm-linux, which needs to be cleaned up before it is production ready.
Please note that many packages are not well suited for cross-compilation.
Even though the package itself might be very well portable often the
buildscripts are not. One thing that we have seen that causes frequent
build failures is the use of the LD variable. This is often set to 'ld'
and not $(CROSS)-ld.
@@ -324,7 +324,7 @@ let
mapAttrsToList (
vhostName: vhost:
let
onlySSL = vhost.onlySSL || vhost.enableSSL;
onlySSL = vhost.onlySSL;
hasSSL = onlySSL || vhost.addSSL || vhost.forceSSL;
# First evaluation of defaultListen based on a set of listen lines.
@@ -1324,18 +1324,6 @@ in
];
config = mkIf cfg.enable {
warnings =
let
deprecatedSSL =
name: config:
optional config.enableSSL ''
config.services.nginx.virtualHosts.<name>.enableSSL is deprecated,
use config.services.nginx.virtualHosts.<name>.onlySSL instead.
'';
in
flatten (mapAttrsToList deprecatedSSL virtualHosts);
assertions =
let
hostOrAliasIsNull = l: l.root == null || l.alias == null;
@@ -1352,7 +1340,7 @@ in
with host;
count id [
addSSL
(onlySSL || enableSSL)
onlySSL
forceSSL
rejectSSL
] <= 1
@@ -170,12 +170,6 @@ with lib;
'';
};
enableSSL = mkOption {
type = types.bool;
visible = false;
default = false;
};
forceSSL = mkOption {
type = types.bool;
default = false;
@@ -145,6 +145,11 @@ let
in
{
meta = {
maintainers = with lib.maintainers; [ armelclo ];
};
options = {
services.xserver.desktopManager.phosh = {
enable = lib.mkOption {
@@ -183,8 +188,11 @@ in
config = lib.mkIf cfg.enable {
# Inspired by https://gitlab.gnome.org/World/Phosh/phosh/-/blob/main/data/phosh.service
# Parts taken from nixos/modules/services/wayland/cage.nix
systemd.services.phosh = {
wantedBy = [ "graphical.target" ];
after = [ "getty@tty1.service" ];
conflicts = [ "getty@tty1.service" ];
serviceConfig = {
ExecStart = "${cfg.package}/bin/phosh-session";
User = cfg.user;
@@ -193,7 +201,7 @@ in
WorkingDirectory = "~";
Restart = "always";
TTYPath = "/dev/tty7";
TTYPath = "/dev/tty1";
TTYReset = "yes";
TTYVHangup = "yes";
TTYVTDisallocate = "yes";
@@ -204,7 +212,7 @@ in
StandardError = "journal";
# Log this user with utmp, letting it show up with commands 'w' and 'who'.
UtmpIdentifier = "tty7";
UtmpIdentifier = "tty1";
UtmpMode = "user";
};
environment = {
@@ -224,6 +232,16 @@ in
};
};
xdg.portal = {
enable = true;
extraPortals = [
pkgs.xdg-desktop-portal-phosh
pkgs.xdg-desktop-portal-gnome
pkgs.xdg-desktop-portal-gtk
];
configPackages = lib.mkDefault [ pkgs.phosh ];
};
environment.systemPackages = [
pkgs.phoc
cfg.package
+1 -1
View File
@@ -18,7 +18,7 @@ in
virtualHosts.${name} = {
enableACME = false;
forceSSL = false;
enableSSL = false;
onlySSL = false;
locations."/_matrix" = {
proxyPass = "http://[::1]:6167";
@@ -18552,6 +18552,19 @@ final: prev: {
meta.hydraPlatforms = [ ];
};
vim-hy = buildVimPlugin {
pname = "vim-hy";
version = "2024-10-06";
src = fetchFromGitHub {
owner = "hylang";
repo = "vim-hy";
rev = "ab1699bfa636e7355ac0030189331251c49c7d61";
sha256 = "09v83a6ybj73043acpm2nps5s56sqg2pz456b4qgz2r7zjlgx5r9";
};
meta.homepage = "https://github.com/hylang/vim-hy/";
meta.hydraPlatforms = [ ];
};
vim-hybrid = buildVimPlugin {
pname = "vim-hybrid";
version = "2016-01-05";
@@ -1424,6 +1424,7 @@ https://github.com/ntk148v/vim-horizon/,,
https://github.com/jonsmithers/vim-html-template-literals/,,
https://github.com/humanoid-colors/vim-humanoid-colorscheme/,,
https://github.com/vim-utils/vim-husk/,,
https://github.com/hylang/vim-hy/,HEAD,
https://github.com/w0ng/vim-hybrid/,,
https://github.com/kristijanhusak/vim-hybrid-material/,,
https://github.com/noc7c9/vim-iced-coffee-script/,,
+4
View File
@@ -25,6 +25,10 @@ stdenv.mkDerivation rec {
hash = "sha256-B3RcYr/b8pZTJV35BWuqmWbq+C2WkkcwBR0oNaUXPRw=";
};
patches = [
./remove-Werror.patch
];
nativeBuildInputs = [
qmake
pkg-config
@@ -0,0 +1,12 @@
diff --git a/kiwix-desktop.pro b/kiwix-desktop.pro
index c1f4f93..bf10828 100644
--- a/kiwix-desktop.pro
+++ b/kiwix-desktop.pro
@@ -27,7 +27,6 @@ QMAKE_CXXFLAGS += -std=c++17
QMAKE_LFLAGS += -std=c++17
!win32 {
- QMAKE_CXXFLAGS += -Werror
equals(QT_MAJOR_VERSION, 6):equals(QT_MINOR_VERSION, 6) {
# Fail the build on errors, except for 'template-id-cdtor' due to a problem with Qt headers.
# This can be removed when the Ubuntu package is fixed.
@@ -37,7 +37,6 @@ let
plugins = lib.mergeAttrsList [
{ hy3 = import ./hy3.nix; }
{ hycov = import ./hycov.nix; }
{ hypr-dynamic-cursors = import ./hypr-dynamic-cursors.nix; }
{ hyprfocus = import ./hyprfocus.nix; }
{ hyprgrass = import ./hyprgrass.nix; }
@@ -45,6 +44,7 @@ let
{ hyprsplit = import ./hyprsplit.nix; }
(import ./hyprland-plugins.nix)
(lib.optionalAttrs config.allowAliases {
hycov = throw "hyprlandPlugins.hycov has been removed because it has been marked as broken since September 2024."; # Added 2025-10-12
hyprscroller = throw "hyprlandPlugins.hyprscroller has been removed as the upstream project is deprecated. Consider using `hyprlandPlugins.hyprscrolling`."; # Added 2025-05-09
})
];
@@ -1,32 +0,0 @@
{
lib,
mkHyprlandPlugin,
cmake,
fetchFromGitHub,
nix-update-script,
}:
mkHyprlandPlugin (finalAttrs: {
pluginName = "hycov";
version = "0.41.2.1";
src = fetchFromGitHub {
owner = "DreamMaoMao";
repo = "hycov";
tag = finalAttrs.version;
hash = "sha256-NRnxbkuiq1rQ+uauo7D+CEe73iGqxsWxTQa+1SEPnXQ=";
};
nativeBuildInputs = [ cmake ];
passthru.updateScript = nix-update-script { };
meta = {
description = "Clients overview for Hyprland plugin";
homepage = "https://github.com/DreamMaoMao/hycov";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ donovanglover ];
platforms = lib.platforms.linux;
broken = true; # Doesn't work after Hyprland v0.41.2 https://gitee.com/DreamMaoMao/hycov/issues/IANYC8#note_31512295_link
};
})
+3 -3
View File
@@ -8,13 +8,13 @@
}:
stdenv.mkDerivation {
pname = "airwindows";
version = "0-unstable-2025-10-05";
version = "0-unstable-2025-10-18";
src = fetchFromGitHub {
owner = "airwindows";
repo = "airwindows";
rev = "5889ed48beefd556adca76ed3e4b1b4982531dbd";
hash = "sha256-zpuzKpuYGe0xpUrBeWpaCYEBy9mGOX5R3LAeiWPCQ3s=";
rev = "1b0b4d56623e464db038e88cb87d1703b5aa0c63";
hash = "sha256-u83unbD3qf3OudMeOq20Iw2K3SOsKrGLekYCiVZTzF8=";
};
# we patch helpers because honestly im spooked out by where those variables
-52
View File
@@ -1,52 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
autoreconfHook,
gtk2,
gtk3,
pkg-config,
wrapGAppsHook3,
}:
stdenv.mkDerivation rec {
pname = "awf";
version = "1.4.0";
src = fetchFromGitHub {
owner = "valr";
repo = "awf";
rev = "v${version}";
sha256 = "0jl2kxwpvf2n8974zzyp69mqhsbjnjcqm39y0jvijvjb1iy8iman";
};
nativeBuildInputs = [
autoreconfHook
pkg-config
wrapGAppsHook3
];
buildInputs = [
gtk2
gtk3
];
autoreconfPhase = ''
patchShebangs ./autogen.sh
./autogen.sh
'';
meta = with lib; {
description = "Widget Factory";
longDescription = ''
A widget factory is a theme preview application for gtk2 and
gtk3. It displays the various widget types provided by gtk2/gtk3
in a single window allowing to see the visual effect of the
applied theme.
'';
homepage = "https://github.com/valr/awf";
license = licenses.gpl3;
platforms = platforms.all;
maintainers = with maintainers; [ michalrus ];
};
}
@@ -1,62 +0,0 @@
{
lib,
stdenv,
fetchurl,
cmake,
gfortran,
# Whether to build with ILP64 interface
blas64 ? false,
}:
stdenv.mkDerivation rec {
pname = "blas";
version = "3.12.0";
src = fetchurl {
url = "http://www.netlib.org/blas/${pname}-${version}.tgz";
sha256 = "sha256-zMQbXQiOUNsAMDF66bDJrzdXEME5KsrR/iCWAtpaWq0=";
};
passthru = { inherit blas64; };
nativeBuildInputs = [
cmake
gfortran
];
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ] ++ lib.optional blas64 "-DBUILD_INDEX64=ON";
# CMake 4 is no longer retro compatible with versions < 3.5
postPatch = ''
substituteInPlace CMakeLists.txt --replace-fail \
"cmake_minimum_required(VERSION 3.2)" \
"cmake_minimum_required(VERSION 3.5)"
'';
postInstall =
let
canonicalExtension =
if stdenv.hostPlatform.isLinux then
"${stdenv.hostPlatform.extensions.sharedLibrary}.${lib.versions.major version}"
else
stdenv.hostPlatform.extensions.sharedLibrary;
in
lib.optionalString blas64 ''
ln -s $out/lib/libblas64${canonicalExtension} $out/lib/libblas${canonicalExtension}
'';
preFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
for fn in $(find $out/lib -name "*.so*"); do
if [ -L "$fn" ]; then continue; fi
install_name_tool -id "$fn" "$fn"
done
'';
meta = with lib; {
description = "Basic Linear Algebra Subprograms";
license = licenses.publicDomain;
maintainers = [ maintainers.markuskowa ];
homepage = "http://www.netlib.org/blas/";
platforms = platforms.unix;
};
}
+3 -3
View File
@@ -8,13 +8,13 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "chhoto-url";
version = "6.3.2";
version = "6.4.0";
src = fetchFromGitHub {
owner = "SinTan1729";
repo = "chhoto-url";
tag = finalAttrs.version;
hash = "sha256-k5fxU3HWhlYlBjmHNsj4lin7LHdwswbwm5bCVmCMjg8=";
hash = "sha256-IghMhr1ksoTWPvuQ66XfXWrNgPAmS39OqjdhwpElD3U=";
};
sourceRoot = "${finalAttrs.src.name}/actix";
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
--replace-fail "./resources/" "${placeholder "out"}/share/chhoto-url/resources/"
'';
cargoHash = "sha256-oR1SCEbMMDfQyvhoUJzBiK4VHCZwx+o/PaZBfxPB2K8=";
cargoHash = "sha256-cxw0Gg80UHvkjBXGt7tKMEinfhS2aT4fZ7oDzNNHnX8=";
postInstall = ''
mkdir -p $out/share/chhoto-url
+2 -2
View File
@@ -1,6 +1,6 @@
import ./generic.nix {
version = "25.9.2.1-stable";
hash = "sha256-BygRxiDhhs91/UPWY7f3jAGyTtyAj98RdDXLwjs8Abo=";
version = "25.9.4.58-stable";
hash = "sha256-HRbqVSyDuvhkv0+PSgps9AXKdLlukrLA65OLx5gZ3c0=";
lts = false;
nixUpdateExtraArgs = [
"--version-regex"
+3 -3
View File
@@ -6,15 +6,15 @@
}:
rustPlatform.buildRustPackage rec {
pname = "firezone-gateway";
version = "1.4.16";
version = "1.4.17";
src = fetchFromGitHub {
owner = "firezone";
repo = "firezone";
tag = "gateway-${version}";
hash = "sha256-Tu0Bq/Axj05dCRCd1eB7CiOXQ5n4i8hnE3ZiGCQ5ZdY=";
hash = "sha256-dVqZs5Xie9lc3F6wVMdxRHeoM7y/e9TvwjzfikenQ6w=";
};
cargoHash = "sha256-wlf+TtrRG7hHNav7WqLn2DSX9QkKFVzyiKP5CRdXlNY=";
cargoHash = "sha256-J2IqqFBuoTkbO0nMJbY680G2HTAtC1To/nMra2PCopY=";
sourceRoot = "${src.name}/rust";
buildAndTestSubdir = "gateway";
RUSTFLAGS = "--cfg system_certs";
+9
View File
@@ -12,6 +12,7 @@
bash,
brotli,
buildGoModule,
fetchpatch,
forgejo,
git,
gzip,
@@ -83,6 +84,14 @@ buildGoModule rec {
patches = [
./static-root-path.patch
]
++ lib.optionals lts [
(fetchpatch {
# fix for go 1.25.2 stricter ipv6 parsing, remove for LTS > 11.0.6
name = "fix-test-ipv6-go125.patch";
url = "https://codeberg.org/forgejo/forgejo/commit/0d9a8e3fa2cf9228290ed1a9a5767e6ba204edd7.patch";
hash = "sha256-AM4/kgCXSU5Bj8aOObm6qyeL1SEpeFhmlT42lMJ2o08=";
})
];
postPatch = ''
+23 -20
View File
@@ -2,53 +2,56 @@
lib,
fetchFromGitHub,
buildGoModule,
oath-toolkit,
openldap,
versionCheckHook,
}:
buildGoModule rec {
buildGoModule (finalAttrs: {
pname = "glauth";
version = "2.3.2";
version = "2.4.0";
src = fetchFromGitHub {
owner = "glauth";
repo = "glauth";
rev = "v${version}";
hash = "sha256-FOhtL8nIm5kuKRxFtkrDyUU2z1K22ZdHaes3GY0KmfQ=";
tag = "v${finalAttrs.version}";
hash = "sha256-UUTL+ZnHRSYuD/TUYpsuo+Nu90kpA8ZL4XaGz6in3ME=";
};
vendorHash = "sha256-MfauZRufl3kxr1fqatxTmiIvLJ+5JhbpSnbTHiujME8=";
vendorHash = "sha256-Lijy0LFy0PgWogdzYRNPFOkLym6Gf9qG4R+Bm91eYJg=";
nativeCheckInputs = [
oath-toolkit
openldap
];
postPatch = ''
substituteInPlace v2/internal/version/const.go \
--replace-fail '"v2.3.1"' '"v${finalAttrs.version}"'
'';
modRoot = "v2";
# Builds without go workspace fail with mysterious errors
overrideModAttrs = _: {
buildPhase = ''
go work vendor -e -v
'';
};
# Disable go workspaces to fix build.
env.GOWORK = "off";
# Based on ldflags in <glauth>/Makefile.
ldflags = [
"-s"
"-w"
"-X main.GitClean=1"
"-X main.LastGitTag=v${version}"
"-X main.GitTagIsCommit=1"
];
# Tests fail in the sandbox.
doCheck = false;
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
versionCheckProgramArg = "--version";
meta = with lib; {
description = "Lightweight LDAP server for development, home use, or CI";
homepage = "https://github.com/glauth/glauth";
changelog = "https://github.com/glauth/glauth/releases/tag/v${finalAttrs.version}";
license = licenses.mit;
maintainers = with maintainers; [
bjornfor
christoph-heiss
xddxdd
];
mainProgram = "glauth";
};
}
})
+3 -2
View File
@@ -87,6 +87,9 @@ stdenv.mkDerivation rec {
./gsutil-disable-updates.patch
];
# Prevent Python from writing bytecode to ensure build determinism
PYTHONDONTWRITEBYTECODE = "1";
installPhase = ''
runHook preInstall
@@ -161,8 +164,6 @@ stdenv.mkDerivation rec {
installCheckPhase = ''
# Avoid trying to write logs to homeless-shelter
export HOME=$(mktemp -d)
# Prevent Python from writing bytecode to ensure build determinism
export PYTHONDONTWRITEBYTECODE=1
$out/bin/gcloud version --format json | jq '."Google Cloud SDK"' | grep "${version}"
$out/bin/gsutil version | grep -w "$(cat platform/gsutil/VERSION)"
'';
@@ -78,11 +78,12 @@ symlinkJoin {
]
++ comps;
# Prevent Python from writing bytecode to ensure build determinism
PYTHONDONTWRITEBYTECODE = "1";
postBuild = ''
sed -i ';' $out/google-cloud-sdk/bin/.gcloud-wrapped
sed -i -e "s#${google-cloud-sdk}#$out#" "$out/google-cloud-sdk/bin/gcloud"
# Prevent Python from writing bytecode to ensure build determinism
export PYTHONDONTWRITEBYTECODE=1
${installCheck}
'';
}
+1 -1
View File
@@ -170,7 +170,7 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://harelang.org/";
description = "Systems programming language designed to be simple, stable, and robust";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ onemoresuza ];
maintainers = [ ];
mainProgram = "hare";
inherit (harec.meta) platforms badPlatforms;
};
+1 -1
View File
@@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://harelang.org/";
description = "Bootstrapping Hare compiler written in C for POSIX systems";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ onemoresuza ];
maintainers = [ ];
mainProgram = "harec";
# The upstream developers do not like proprietary operating systems; see
# https://harelang.org/platforms/
+1 -1
View File
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
homepage = "https://harelang.org/";
description = "Hare's documentation tool";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ onemoresuza ];
maintainers = [ ];
mainProgram = "haredoc";
inherit (hareHook.meta) platforms badPlatforms;
};
-145
View File
@@ -1,145 +0,0 @@
{
lib,
fetchFromGitHub,
python3,
postgresql,
postgresqlTestHook,
}:
python3.pkgs.buildPythonApplication rec {
pname = "khoj";
version = "1.0.1";
pyproject = true;
src = fetchFromGitHub {
owner = "debanjum";
repo = "khoj";
tag = version;
hash = "sha256-lvOeYTrvW5MfhuJ3lj9n9TRlvpRwVP2vFeaEeJdqIec=";
};
env = {
DJANGO_SETTINGS_MODULE = "khoj.app.settings";
postgresqlEnableTCP = 1;
};
nativeBuildInputs = with python3.pkgs; [
hatch-vcs
hatchling
];
propagatedBuildInputs = with python3.pkgs; [
aiohttp
anyio
authlib
beautifulsoup4
dateparser
defusedxml
django
fastapi
google-auth
# gpt4all
gunicorn
httpx
itsdangerous
jinja2
langchain
lxml
openai
openai-whisper
pgvector
pillow
psycopg2
pydantic
pymupdf
python-multipart
pyyaml
# rapidocr-onnxruntime
requests
rich
schedule
sentence-transformers
stripe
tenacity
tiktoken
torch
transformers
tzdata
uvicorn
];
nativeCheckInputs =
with python3.pkgs;
[
freezegun
factory-boy
pytest-xdist
trio
psutil
pytest-django
pytestCheckHook
]
++ [
(postgresql.withPackages (p: with p; [ pgvector ]))
postgresqlTestHook
];
preCheck = ''
export HOME=$(mktemp -d)
'';
pythonImportsCheck = [
"khoj"
];
disabledTests = [
# Tests require network access
"test_different_user_data_not_accessed"
"test_get_api_config_types"
"test_get_configured_types_via_api"
"test_image_metadata"
"test_image_search"
"test_image_search_by_filepath"
"test_image_search_query_truncated"
"test_index_update"
"test_index_update_with_no_auth_key"
"test_notes_search"
"test_notes_search_with_exclude_filter"
"test_notes_search_with_include_filter"
"test_parse_html_plaintext_file"
"test_regenerate_index_with_new_entry"
"test_regenerate_with_github_fails_without_pat"
"test_regenerate_with_invalid_content_type"
"test_regenerate_with_valid_content_type"
"test_search_for_user2_returns_empty"
"test_search_with_invalid_auth_key"
"test_search_with_invalid_content_type"
"test_search_with_no_auth_key"
"test_search_with_valid_content_type"
"test_text_index_same_if_content_unchanged"
"test_text_indexer_deletes_embedding_before_regenerate"
"test_text_search"
"test_text_search_setup_batch_processes"
"test_update_with_invalid_content_type"
"test_user_no_data_returns_empty"
# Tests require rapidocr-onnxruntime
"test_multi_page_pdf_to_jsonl"
"test_single_page_pdf_to_jsonl"
"test_ocr_page_pdf_to_jsonl"
];
disabledTestPaths = [
# Tests require network access
"tests/test_conversation_utils.py"
];
meta = {
description = "Natural Language Search Assistant for your Org-Mode and Markdown notes, Beancount transactions and Photos";
homepage = "https://github.com/debanjum/khoj";
changelog = "https://github.com/debanjum/khoj/releases/tag/${version}";
license = lib.licenses.agpl3Plus;
maintainers = with lib.maintainers; [ dit7ya ];
broken = true; # last successful build 2024-01-10
};
}
+7 -7
View File
@@ -1,9 +1,9 @@
{
buildGo124Module,
buildGoModule,
cmake,
fetchFromGitHub,
git,
go_1_24,
go,
lib,
nlohmann_json,
stdenv,
@@ -11,21 +11,21 @@
}:
let
version = "0.21.2";
version = "0.21.3";
src = fetchFromGitHub {
owner = "f-koehler";
repo = "KTailctl";
rev = "v${version}";
hash = "sha256-CP5ivqhYVCotsL6e9eV9L1OGr2W+vNHJOq8hMYj7g/o=";
hash = "sha256-BKVq6d8CDmAOGULKoxXtlGbtgNu7wfsQnsyYV7PiFfc=";
};
goDeps =
(buildGo124Module {
(buildGoModule {
pname = "ktailctl-go-wrapper";
inherit src version;
modRoot = "src/wrapper";
vendorHash = "sha256-uZydTufEpGKbX3T3Zm4WTU2ZZNhC6oHSb/sHPM4ekmQ=";
vendorHash = "sha256-RhVZ1yXm+gJHM993Iw1XM/w/O1YiG6Mt4YMK+0JqRpg=";
}).goModules;
in
stdenv.mkDerivation {
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
cmake
extra-cmake-modules
git
go_1_24
go
wrapQtAppsHook
];
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "livekit";
version = "1.9.1";
version = "1.9.2";
src = fetchFromGitHub {
owner = "livekit";
repo = "livekit";
rev = "v${version}";
hash = "sha256-seh7LXxHGsdXZFy1I/XukvOS9XTO+OxGycPNxJmaIm0=";
hash = "sha256-a0WaF9myP0xjTjfum+K7Wk86HOZP00kvjOYLmeEQdxk=";
};
vendorHash = "sha256-EbxiiCpl/txIrnKpqP8EI4UZGZMyUt9bcTIAiUl64sk=";
vendorHash = "sha256-hYetTszLS/zYQ39wOv+sP8HlIiyBoKI3Z7XpOrffHa8=";
subPackages = [ "cmd/server" ];
-70
View File
@@ -1,70 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
makeWrapper,
python3,
db,
fuse,
asciidoc,
libxml2,
libxslt,
docbook_xml_dtd_412,
docbook_xsl,
boost,
pkg-config,
judy,
pam,
spdlog,
systemdMinimal,
zlib, # optional
}:
stdenv.mkDerivation rec {
pname = "lizardfs";
version = "3.13.0-rc3";
src = fetchFromGitHub {
owner = "lizardfs";
repo = "lizardfs";
rev = version;
sha256 = "sha256-rgaFhJvmA1RVDL4+vQLMC0GrdlgUlvJeZ5/JJ67C20Q=";
};
nativeBuildInputs = [
cmake
pkg-config
makeWrapper
];
buildInputs = [
db
fuse
asciidoc
libxml2
libxslt
docbook_xml_dtd_412
docbook_xsl
zlib
boost
judy
pam
spdlog
python3
systemdMinimal
];
meta = with lib; {
homepage = "https://lizardfs.com";
description = "Highly reliable, scalable and efficient distributed file system";
platforms = platforms.linux;
license = licenses.gpl3;
maintainers = with maintainers; [
rushmorem
shamilton
];
# 'fprintf' was not declared in this scope
broken = true;
};
}
-62
View File
@@ -1,62 +0,0 @@
{
lib,
python3,
fetchFromGitHub,
postgresql,
postgresqlTestHook,
}:
python3.pkgs.buildPythonApplication rec {
pname = "migra";
version = "3.0.1647431138";
format = "pyproject";
src = fetchFromGitHub {
owner = "djrobstep";
repo = "migra";
rev = version;
hash = "sha256-LSCJA5Ym1LuV3EZl6gnl9jTHGc8A1LXmR1fj0ZZc+po=";
};
nativeBuildInputs = [
python3.pkgs.poetry-core
];
propagatedBuildInputs = with python3.pkgs; [
schemainspect
six
sqlbag
];
nativeCheckInputs = with python3.pkgs; [
pytestCheckHook
postgresql
postgresqlTestHook
];
preCheck = ''
export PGUSER="nixbld";
'';
disabledTests = [
# These all fail with "List argument must consist only of tuples or dictionaries":
# See this issue: https://github.com/djrobstep/migra/issues/232
"test_excludeschema"
"test_fixtures"
"test_rls"
"test_singleschema"
];
pytestFlags = [
"-x"
"-svv"
];
enabledTestPaths = [
"tests"
];
meta = with lib; {
description = "Like diff but for PostgreSQL schemas";
homepage = "https://github.com/djrobstep/migra";
license = with licenses; [ unlicense ];
maintainers = with maintainers; [ bpeetz ];
};
}
+6
View File
@@ -48,6 +48,12 @@ stdenv.mkDerivation {
done
'';
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)" \
--replace-fail "CMAKE_POLICY(SET CMP0026 OLD)" "CMAKE_POLICY(SET CMP0026 NEW)"
'';
meta = {
homepage = "https://github.com/BIC-MNI/mni_autoreg";
description = "Tools for automated registration using the MINC image format";
@@ -0,0 +1,8 @@
--- a/CMakeLists.txt 2025-10-23 07:12:12.766221736 +0100
+++ b/CMakeLists.txt 2025-10-23 07:14:58.069499300 +0100
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.6...3.10)
include(GNUInstallDirs)
include(CheckCCompilerFlag)
+36 -25
View File
@@ -1,51 +1,62 @@
{
lib,
stdenv,
fetchurl,
fetchFromGitHub,
fetchurl,
cmake,
rapidjson,
replaceVars,
libb64,
versionCheckHook,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "msgpack-tools";
version = "0.6";
src = fetchFromGitHub {
owner = "ludocode";
repo = "msgpack-tools";
rev = "v${version}";
sha256 = "1ygjk25zlpqjckxgqmahnz999704zy2bd9id6hp5jych1szkjgs5";
};
libb64 = fetchurl {
url = "mirror://sourceforge/libb64/libb64-1.2.1.zip";
sha256 = "1chlcc8qggzxnbpy5wrda533xyz38dk20w9wl4srrzawm45ny410";
};
rapidjson = fetchurl {
url = "https://github.com/miloyip/rapidjson/archive/99ba17bd66a85ec64a2f322b68c2b9c3b77a4391.tar.gz";
sha256 = "0jxgyy5n0lf9w36dycwwgz2wici4z9dnxlsn0z6m23zaa47g3wyw";
rev = "v${finalAttrs.version}";
hash = "sha256-RT85vw6QeVkuNC2mtoT/BJyU0rdQVfz6ZBJf+ouY8vk=";
};
mpack = fetchurl {
url = "https://github.com/ludocode/mpack/archive/df17e83f0fa8571b9cd0d8ccf38144fa90e244d1.tar.gz";
sha256 = "1br8g3rf86h8z8wbqkd50aq40953862lgn0xk7cy68m07fhqc3pg";
hash = "sha256-hyiXygbAHnNgF4TIg+DemBvtdBnSgJ7fAhknVuL+T/c=";
};
nativeBuildInputs = [
cmake
];
buildInputs = [
rapidjson
libb64
];
patches = [
./cmake-v4.patch
(replaceVars ./use-nix-deps.patch {
rapidjson = "${rapidjson}";
libb64 = "${libb64}";
})
];
postUnpack = ''
mkdir $sourceRoot/contrib
cp ${rapidjson} $sourceRoot/contrib/rapidjson-99ba17bd66a85ec64a2f322b68c2b9c3b77a4391.tar.gz
cp ${libb64} $sourceRoot/contrib/libb64-1.2.1.zip
cp ${mpack} $sourceRoot/contrib/mpack-df17e83f0fa8571b9cd0d8ccf38144fa90e244d1.tar.gz
cp ${finalAttrs.mpack} $sourceRoot/contrib/mpack-df17e83f0fa8571b9cd0d8ccf38144fa90e244d1.tar.gz
'';
nativeBuildInputs = [ cmake ];
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgram = "${placeholder "out"}/bin/json2msgpack";
versionCheckProgramArg = "-v";
doInstallCheck = true;
meta = with lib; {
meta = {
description = "Command-line tools for converting between MessagePack and JSON";
homepage = "https://github.com/ludocode/msgpack-tools";
license = licenses.mit;
platforms = platforms.linux ++ platforms.darwin;
maintainers = [ ];
license = lib.licenses.mit;
platforms = lib.platforms.linux ++ lib.platforms.darwin;
maintainers = with lib.maintainers; [ deejayem ];
};
}
})
@@ -0,0 +1,67 @@
--- a/CMakeLists.txt 2017-01-22 19:51:41.000000000 +0000
+++ b/CMakeLists.txt 2025-10-04 14:08:24.934041902 +0100
@@ -83,57 +83,21 @@
# rapidjson
-set(RAPIDJSON_FILE "rapidjson-${RAPIDJSON_COMMIT}.tar.gz")
-set(RAPIDJSON_DIR "${CONTRIB_DIR}/rapidjson-${RAPIDJSON_COMMIT}")
-set(RAPIDJSON_URL "https://github.com/miloyip/rapidjson/archive/${RAPIDJSON_COMMIT}.tar.gz")
-
-if(EXISTS "${CMAKE_SOURCE_DIR}/contrib/${RAPIDJSON_FILE}")
- message(STATUS "Found package: ${RAPIDJSON_FILE}")
-else()
- message(STATUS "Downloading: ${RAPIDJSON_FILE}")
- file(DOWNLOAD ${RAPIDJSON_URL} "${CMAKE_SOURCE_DIR}/contrib/${RAPIDJSON_FILE}")
- if(NOT EXISTS "${CMAKE_SOURCE_DIR}/contrib/${RAPIDJSON_FILE}")
- message(FATAL_ERROR "\nFailed to download source file: ${RAPIDJSON_FILE}\nFrom: ${RAPIDJSON_URL}")
- endif()
-endif()
-
-execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzf ${CMAKE_SOURCE_DIR}/contrib/${RAPIDJSON_FILE} WORKING_DIRECTORY ${CONTRIB_DIR})
-
-include_directories(SYSTEM ${RAPIDJSON_DIR}/include)
+include_directories(SYSTEM @rapidjson@/include)
# libb64
-set(LIBB64_FILE "libb64-${LIBB64_VERSION}.zip")
-set(LIBB64_DIR "${CONTRIB_DIR}/libb64-${LIBB64_VERSION}")
-set(LIBB64_URL "http://downloads.sourceforge.net/project/libb64/libb64/libb64/${LIBB64_FILE}?use_mirror=autoselect")
-
-if(EXISTS "${CMAKE_SOURCE_DIR}/contrib/${LIBB64_FILE}")
- message(STATUS "Found package: ${LIBB64_FILE}")
-else()
- message(STATUS "Downloading: ${LIBB64_FILE}")
- file(DOWNLOAD ${LIBB64_URL} "${CMAKE_SOURCE_DIR}/contrib/${LIBB64_FILE}")
- if(NOT EXISTS "${CMAKE_SOURCE_DIR}/contrib/${LIBB64_FILE}")
- message(FATAL_ERROR "\nFailed to download source file: ${LIBB64_FILE}\nFrom: ${LIBB64_URL}")
- endif()
-endif()
-
-execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${CMAKE_SOURCE_DIR}/contrib/${LIBB64_FILE}" WORKING_DIRECTORY "${CONTRIB_DIR}")
-
-# Remove libb64's newlines
-set(LIBB64_CENCODE_FILE ${LIBB64_DIR}/src/cencode.c)
-file(READ ${LIBB64_CENCODE_FILE} LIBB64_CENCODE)
-string(REPLACE "*codechar++ = '\\n';" "/* *codechar++ = '\\n'; */" LIBB64_CENCODE "${LIBB64_CENCODE}")
-file(WRITE ${LIBB64_CENCODE_FILE} "${LIBB64_CENCODE}")
-
-file(GLOB_RECURSE LIBB64_SRCS ${LIBB64_DIR}/src/*.c)
-include_directories(SYSTEM ${LIBB64_DIR}/include)
+include_directories(SYSTEM @libb64@/include)
# executable targets
-add_executable(msgpack2json src/msgpack2json.cpp ${MPACK_SRCS} ${LIBB64_SRCS})
-add_executable(json2msgpack src/json2msgpack.cpp ${MPACK_SRCS} ${LIBB64_SRCS})
+add_executable(msgpack2json src/msgpack2json.cpp ${MPACK_SRCS})
+add_executable(json2msgpack src/json2msgpack.cpp ${MPACK_SRCS})
+
+target_link_libraries(msgpack2json b64)
+target_link_libraries(json2msgpack b64)
install(TARGETS msgpack2json json2msgpack DESTINATION bin)
+9
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchurl,
fetchpatch2,
ncurses,
pkg-config,
zig_0_15,
@@ -20,6 +21,14 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-v9EJThQA7onP1ZIA6rlA8CXM3AwjgGcQXJhKPEhXv34=";
};
patches = [
(fetchpatch2 {
# Fix infinite loop when reading config file on Zig 0.15.2
url = "https://code.blicky.net/yorhel/ncdu/commit/f45224457687a55aa885aca8e7300f1fbf0af59b.patch";
hash = "sha256-80Igx1MOINdeufCsNoisNo3dJ2iUTpZIxyXy/KzQ1Ng=";
})
];
nativeBuildInputs = [
zig_0_15.hook
installShellFiles
@@ -6,16 +6,16 @@
buildNpmPackage rec {
pname = "netbird-dashboard";
version = "2.19.2";
version = "2.20.1";
src = fetchFromGitHub {
owner = "netbirdio";
repo = "dashboard";
rev = "v${version}";
hash = "sha256-3rHNk/rc0j5mWF2jbrMOtFrDkosph1YWnFoh1lLHTPs=";
hash = "sha256-RvnoQRVJlZNqfmOa2c1s/ZuA0Ej7pZ7WcXM+31t22eY=";
};
npmDepsHash = "sha256-pC4Vvkb+NAGyhd090LAeGZTLVGufnC9LylJGQt8aEZg=";
npmDepsHash = "sha256-93w0ZWtrLfYRBa5Ps4duSRoiI4hu9AoK7GZRRH4zmL0=";
npmFlags = [ "--legacy-peer-deps" ];
installPhase = ''
+10 -6
View File
@@ -4,22 +4,26 @@
fetchFromGitHub,
cmake,
llvmPackages,
openblas,
enableAVX ? stdenv.hostPlatform.avxSupport,
}:
stdenv.mkDerivation {
stdenv.mkDerivation (finalAttrs: {
pname = "NGT";
version = "1.12.3-alpha";
version = "2.5.0";
src = fetchFromGitHub {
owner = "yahoojapan";
repo = "NGT";
rev = "29c88ff6cd5824d3196986d1f50b834565b6c9dd";
sha256 = "sha256-nu0MJNpaenOB4+evoSVLKmPIuZXVj1Rm9x53+TfhezY=";
rev = "v${finalAttrs.version}";
sha256 = "sha256-2cCuVeg7y3butTIAQaYIgx+DPqIFEA2qqVe3exAoAY8=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ llvmPackages.openmp ];
buildInputs = [
llvmPackages.openmp
openblas
];
NIX_ENFORCE_NO_NATIVE = !enableAVX;
__AVX2__ = if enableAVX then 1 else 0;
@@ -31,4 +35,4 @@ stdenv.mkDerivation {
license = licenses.asl20;
maintainers = with maintainers; [ tomberek ];
};
}
})
-67
View File
@@ -1,67 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
libuuid,
json_c,
doxygen,
perl,
python3,
}:
stdenv.mkDerivation rec {
pname = "opae";
version = "1.0.0";
# the tag has a silly name for some reason. drop this in the future if
# possible
tver = "${version}-5";
src = fetchFromGitHub {
owner = "opae";
repo = "opae-sdk";
tag = tver;
sha256 = "1dmkpnr9dqxwjhbdzx2r3fdfylvinda421yyg319am5gzlysxwi8";
};
doCheck = false;
env.NIX_CFLAGS_COMPILE = toString [
"-Wno-error=format-truncation"
"-Wno-error=address-of-packed-member"
"-Wno-array-bounds"
];
nativeBuildInputs = [
cmake
doxygen
perl
python3.pkgs.sphinx
];
buildInputs = [
libuuid
json_c
python3
];
# Set the Epoch to 1980; otherwise the Python wheel/zip code
# gets very angry
preConfigure = ''
find . -type f | while read file; do
touch -d @315532800 $file;
done
'';
cmakeFlags = [ "-DBUILD_ASE=1" ];
meta = with lib; {
description = "Open Programmable Acceleration Engine SDK";
homepage = "https://01.org/opae";
license = licenses.bsd3;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ thoughtpolice ];
# Needs a major update, not compatible with gcc-11.
broken = true;
};
}
+6 -6
View File
@@ -22,12 +22,12 @@ let
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "opencode";
version = "0.15.10";
version = "0.15.14";
src = fetchFromGitHub {
owner = "sst";
repo = "opencode";
tag = "v${finalAttrs.version}";
hash = "sha256-aP0CLHfuF21GXIvBTgs8RWpcCXOwy1oPW2P8jEU/4u4=";
hash = "sha256-K7TmsJm11uDNjN3fUaapM1A01FmHUSfXMiqOzhLzRI8=";
};
tui = buildGoModule {
@@ -111,10 +111,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
outputHash =
{
x86_64-linux = "sha256-iJbflfKwDwKrJQgy5jxrEhkyCie2hsEMmiLf2btE60E=";
aarch64-linux = "sha256-wQ+ToXRi+l24WM24PHGCw6acD9cvLDldOv9WvOzHYGU=";
x86_64-darwin = "sha256-DyvteSN+mEFZojH8mY4LNQE2C6lCWwrIVbJUFn4lAh0=";
aarch64-darwin = "sha256-oICPefgikykFWNDlxCXH4tILdjv4NytgQdejdQBeQ+A=";
x86_64-linux = "sha256-8pJBLNPuF7+wcUCNoI9z68q5Pl6Mvm1ZvIDianLPdHo=";
aarch64-linux = "sha256-zODR/4mcE4Hh3I6Yh8ExUi3WdBttrRBf00ItQ4TmVMU=";
x86_64-darwin = "sha256-ZJFT0qY82UK9jXVMQweXXjZ4ohZLKVJEf+CjfRkJB9E=";
aarch64-darwin = "sha256-0bjdbPXm2TkOEsSyqvPJnFLIzmBJt5SH40hwYutWYBY=";
}
.${stdenv.hostPlatform.system};
outputHashAlgo = "sha256";
@@ -1,26 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
}:
stdenv.mkDerivation rec {
pname = "opentracing-cpp";
version = "1.6.0";
src = fetchFromGitHub {
owner = "opentracing";
repo = "opentracing-cpp";
rev = "v${version}";
sha256 = "09wdwbz8gbjgyqi764cyb6aw72wng6hwk44xpl432gl7whrrysvi";
};
nativeBuildInputs = [ cmake ];
meta = {
description = "C++ implementation of the OpenTracing API";
homepage = "https://opentracing.io";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ rob ];
};
}
@@ -0,0 +1,13 @@
diff --git a/configure.ac b/configure.ac
index 66d92954..05e81c52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,6 +10,9 @@ AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([foreign subdir-objects 1.11])
AM_SILENT_RULES([yes])
+AM_GNU_GETTEXT_VERSION([0.25])
+AM_GNU_GETTEXT([external])
+
dnl Requires autoconf 2.60
AC_USE_SYSTEM_EXTENSIONS
+6 -2
View File
@@ -37,14 +37,14 @@
}:
stdenv.mkDerivation (finalAttrs: {
version = "28.12";
version = "29.0";
pname = "owntone";
src = fetchFromGitHub {
owner = "owntone";
repo = "owntone-server";
tag = finalAttrs.version;
hash = "sha256-Mj3G1+Hwa/zl0AM4SO6TcB4W3WJkpIDzrSPEFx0vaEk=";
hash = "sha256-Z9u5clC6m5gDAKkvyvrQs9muNK/P0ipHgQUmTHLRumE=";
};
nativeBuildInputs = [
@@ -83,6 +83,10 @@ stdenv.mkDerivation (finalAttrs: {
lib.optionals chromecastSupport [ "--enable-chromecast" ]
++ lib.optionals pulseSupport [ "--with-pulseaudio" ];
patches = [
./gettext-0.25.patch
];
passthru.updateScript = nix-update-script { };
meta = {
+2 -2
View File
@@ -28,13 +28,13 @@
xorg,
}:
let
version = "2.19.0";
version = "2.19.1";
src = fetchFromGitHub {
owner = "paperless-ngx";
repo = "paperless-ngx";
tag = "v${version}";
hash = "sha256-t2T42K+F3PaMfNDFa3NF/rAcG6izKTXMIzgD68WdVFE=";
hash = "sha256-J9e39c8AnEj+1lB+KrxsG3h4VjTo65an24IJ5mvACUE=";
};
python = python3.override {
+25
View File
@@ -0,0 +1,25 @@
diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
index 504b7a3..100a024 100644
--- a/cmake/SearchForStuff.cmake
+++ b/cmake/SearchForStuff.cmake
@@ -107,7 +107,7 @@ disable_compiler_warnings_for_target(cubeb)
disable_compiler_warnings_for_target(speex)
# Find the Qt components that we need.
-find_package(Qt6 6.7.3 COMPONENTS CoreTools Core GuiTools Gui WidgetsTools Widgets LinguistTools REQUIRED)
+find_package(Qt6 6.7.3 COMPONENTS CoreTools Core CorePrivate GuiTools Gui GuiPrivate WidgetsTools Widgets WidgetsPrivate LinguistTools REQUIRED)
if(WIN32)
add_subdirectory(3rdparty/rainterface EXCLUDE_FROM_ALL)
diff --git a/pcsx2-qt/CMakeLists.txt b/pcsx2-qt/CMakeLists.txt
index a62df95..4883c64 100644
--- a/pcsx2-qt/CMakeLists.txt
+++ b/pcsx2-qt/CMakeLists.txt
@@ -266,6 +266,7 @@ target_link_libraries(pcsx2-qt PRIVATE
Qt6::Core
Qt6::Gui
Qt6::Widgets
+ Qt6::GuiPrivate
KDAB::kddockwidgets
)
+3
View File
@@ -63,6 +63,9 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
./0000-define-rev.patch
./remove-cubeb-vendor.patch
# Based on https://github.com/PCSX2/pcsx2/commit/8dffc857079e942ca77b091486c20c3c6530e4ed which doesn't apply cleanly
./fix-qt-6.10.patch
];
cmakeFlags = [
+3 -3
View File
@@ -14,16 +14,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "pixi";
version = "0.57.0";
version = "0.58.0";
src = fetchFromGitHub {
owner = "prefix-dev";
repo = "pixi";
tag = "v${finalAttrs.version}";
hash = "sha256-nWN+SCxlDeSzbnJtSIVVYw5G2WULdzD5VQ+Jc1xnpwI=";
hash = "sha256-+Bhyt01gTNWVOL0WG6pdjzbRqIfm2MUEHnbTGg3nG2k=";
};
cargoHash = "sha256-YHLN6jPSsNxWQJI+uDYgfetQFnMk8v2ev/EPjSRrCJY=";
cargoHash = "sha256-b7/UiIkeLddo9hUipqd7zLGvFumAjFolf/jODZ0qOQw=";
nativeBuildInputs = [
pkg-config
+937
View File
@@ -0,0 +1,937 @@
[
{
"pname": "AsyncImageLoader.Avalonia",
"version": "3.3.0",
"hash": "sha256-blhfKI+vX+ojT2cOvSHu3Kp2CuxvhW/l+as88Dia4bA="
},
{
"pname": "Avalonia",
"version": "11.3.0",
"hash": "sha256-Hot4dWkrP5x+JzaP2/7E1QOOiXfPGhkvK1nzBacHvzg="
},
{
"pname": "Avalonia.Angle.Windows.Natives",
"version": "2.1.22045.20230930",
"hash": "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc="
},
{
"pname": "Avalonia.BuildServices",
"version": "0.0.31",
"hash": "sha256-wgtodGf644CsUZEBIpFKcUjYHTbnu7mZmlr8uHIxeKA="
},
{
"pname": "Avalonia.Controls.ColorPicker",
"version": "11.3.0",
"hash": "sha256-ee3iLrn8OdWH6Mg01p93wYMMCPXS25VM/uZeQWEr+k0="
},
{
"pname": "Avalonia.Desktop",
"version": "11.3.0",
"hash": "sha256-XZXmsKrYCOEWzFUbnwNKvEz5OCD/1lAPi+wM4BiMB7I="
},
{
"pname": "Avalonia.Diagnostics",
"version": "11.3.0",
"hash": "sha256-jO8Fs9kfNGsoZ87zQCxPdn0tyWHcEdgBRIpzkZ0ceM0="
},
{
"pname": "Avalonia.FreeDesktop",
"version": "11.3.0",
"hash": "sha256-nWIW3aDPI/00/k52BNU4n43sS3ymuw+e97EBSsjjtU4="
},
{
"pname": "Avalonia.Headless",
"version": "11.3.0",
"hash": "sha256-GMO3gnygbeHAwz21v9yIRGOq1Y8mRIPIQW0jeD0fNao="
},
{
"pname": "Avalonia.Labs.Lottie",
"version": "11.3.1",
"hash": "sha256-+f1jIirOw9DZSb2Y7ppXYBOuAkZ72MzD/+7rP4xaLAc="
},
{
"pname": "Avalonia.Native",
"version": "11.3.0",
"hash": "sha256-l6gcCeGd422mLQgVLp2sxh4/+vZxOPoMrxyfjGyhYLs="
},
{
"pname": "Avalonia.Remote.Protocol",
"version": "11.3.0",
"hash": "sha256-7ytabxzTbPLR3vBCCb7Z6dYRZZVvqiDpvxweOYAqi7I="
},
{
"pname": "Avalonia.Skia",
"version": "11.3.0",
"hash": "sha256-p+mWsyrYsC9PPhNjOxPZwarGuwmIjxaQ4Ml/2XiEuEc="
},
{
"pname": "Avalonia.Themes.Fluent",
"version": "11.3.0",
"hash": "sha256-o5scZcwaflLKXQD6VLGZYe4vvQ322Xzgh7F3IvriMfk="
},
{
"pname": "Avalonia.Themes.Simple",
"version": "11.3.0",
"hash": "sha256-F2DMHskmrJw/KqpYLHGEEuQMVP8T4fXgq5q3tfwFqG0="
},
{
"pname": "Avalonia.Win32",
"version": "11.3.0",
"hash": "sha256-Ltf6EuL6aIG+YSqOqD/ecdqUDsuwhNuh+XilIn7pmlE="
},
{
"pname": "Avalonia.X11",
"version": "11.3.0",
"hash": "sha256-QOprHb0HjsggEMWOW7/U8pqlD8M4m97FeTMWlriYHaU="
},
{
"pname": "Avalonia.Xaml.Behaviors",
"version": "11.0.5",
"hash": "sha256-wS0clXNKAG4uy539dUjbrRdzHrdHsloivpY5SEBCNtY="
},
{
"pname": "Avalonia.Xaml.Behaviors",
"version": "11.2.0",
"hash": "sha256-I9aELyXkzLGX6T4HUFbCQxn+eWqLLPK0xqEiF+6hi5k="
},
{
"pname": "Avalonia.Xaml.Behaviors",
"version": "11.2.0.14",
"hash": "sha256-Ep/IOiZyLDoIKrymqXtFPw2hrXQBpu8Dn+4YZ3/3Z4I="
},
{
"pname": "Avalonia.Xaml.Interactions",
"version": "11.0.5",
"hash": "sha256-s/o0416K/nZkVWcNPuKbqmwLKhWsMeEds/dT85QOp4c="
},
{
"pname": "Avalonia.Xaml.Interactions",
"version": "11.2.0",
"hash": "sha256-Wnt4xra+TPRiAJ5TIyefwkRxxA999THBstm8QuLXZlU="
},
{
"pname": "Avalonia.Xaml.Interactions",
"version": "11.2.0.14",
"hash": "sha256-7bk1zc2hZdTg+Y7LaDSb1CmL6yv0GeZAWKh3gf9bVm8="
},
{
"pname": "Avalonia.Xaml.Interactions.Custom",
"version": "11.0.5",
"hash": "sha256-0HVVQTHD+D4q4IYjMJ6H90mMefBLr5pSKDy7JMq10cE="
},
{
"pname": "Avalonia.Xaml.Interactions.Custom",
"version": "11.2.0",
"hash": "sha256-vLOTOHwy7RRrgrYFUetAIWSC+Pm6yxzb3Ko2BPtXGUo="
},
{
"pname": "Avalonia.Xaml.Interactions.Custom",
"version": "11.2.0.14",
"hash": "sha256-RSIczkm9V/fKoOavXJQd931b9r/GBvuz0hR4HD6Wgd4="
},
{
"pname": "Avalonia.Xaml.Interactions.DragAndDrop",
"version": "11.0.5",
"hash": "sha256-iwchyONRjTbSSNxaGROeM62RL964KCs0fWz6VIO4O/k="
},
{
"pname": "Avalonia.Xaml.Interactions.DragAndDrop",
"version": "11.2.0",
"hash": "sha256-rAHnjsMnaZCf+dMWe3fZAsnwY2LKFJuTVzsyNzWnh2Q="
},
{
"pname": "Avalonia.Xaml.Interactions.DragAndDrop",
"version": "11.2.0.14",
"hash": "sha256-kRx4GMzoHZULJoUUptt9Xa7+UFYoiirI+wE6JuBBklc="
},
{
"pname": "Avalonia.Xaml.Interactions.Draggable",
"version": "11.0.5",
"hash": "sha256-C8acIjqy8Akf1ZFVLBq+wKuGaP8YOlKEa+e2RaowKak="
},
{
"pname": "Avalonia.Xaml.Interactions.Draggable",
"version": "11.2.0",
"hash": "sha256-WI3JZm+IuKpdlhw1XpgPXJs+e9P97l0odSHPM8SSrqw="
},
{
"pname": "Avalonia.Xaml.Interactions.Draggable",
"version": "11.2.0.14",
"hash": "sha256-ywaaUhDqj+yHJjnRPCu3HXYr/sSPrrlwiqN30vYqRLk="
},
{
"pname": "Avalonia.Xaml.Interactions.Events",
"version": "11.0.5",
"hash": "sha256-NbG4wOT5d4z6OkGMLdB7pZrRcu0BOK5PBGZ098iE3IU="
},
{
"pname": "Avalonia.Xaml.Interactions.Events",
"version": "11.2.0",
"hash": "sha256-z1DGsetBjrzTP1pLWSqP748bl6tDWWOUlvuPc7WHb1k="
},
{
"pname": "Avalonia.Xaml.Interactions.Events",
"version": "11.2.0.14",
"hash": "sha256-CE7nh1ld747CGoPYiu4KlQxwP9yiG9/OMHwq8GpL0so="
},
{
"pname": "Avalonia.Xaml.Interactions.Reactive",
"version": "11.0.5",
"hash": "sha256-zrbr7MW+3LOyhIMi5VB8YRfr19vyWtcaxwqXjbkTDAA="
},
{
"pname": "Avalonia.Xaml.Interactions.Responsive",
"version": "11.0.5",
"hash": "sha256-TfcYEdLMxYffBcBzcyoKWESrQltozigJKx+CLNCMz08="
},
{
"pname": "Avalonia.Xaml.Interactions.Responsive",
"version": "11.2.0",
"hash": "sha256-V1YHBrPEKBgHYmEdhWmzz7NOSwExYMaz3J0N0s53Gl0="
},
{
"pname": "Avalonia.Xaml.Interactions.Responsive",
"version": "11.2.0.14",
"hash": "sha256-vyc/HXfDAEi1AbAwkphrlVpckrM5ykptXYp/l5ul8VQ="
},
{
"pname": "Avalonia.Xaml.Interactivity",
"version": "11.0.5",
"hash": "sha256-nNoI2rxJBFuYs1lg3O3rXeigJWoGjzGWdU8jsWGz7+4="
},
{
"pname": "Avalonia.Xaml.Interactivity",
"version": "11.2.0",
"hash": "sha256-N3maAwWG//4uHAEvux0/BwanQLviMm7uo6jxIj4kB8s="
},
{
"pname": "Avalonia.Xaml.Interactivity",
"version": "11.2.0.14",
"hash": "sha256-SZIVuXdT1PN3zBCpVv3F6Y5vaOp8CTsq0/HVHXrbc6Y="
},
{
"pname": "BmpSharp",
"version": "0.2.0",
"hash": "sha256-uUNpbOmeiOOkX5TQauqEF3yTo4puGh7/vgTTb7Eyg9s="
},
{
"pname": "ByteSize",
"version": "2.1.2",
"hash": "sha256-qAxJsWRRedraGr0VzvDEpzAWCZfwkMvcsC4WBEh+q6g="
},
{
"pname": "CLSEncoderDecoder",
"version": "1.0.0",
"hash": "sha256-RSfmfqUn+abzArefdWNT5pIS4hvMEa2abnrhnrKGiPk="
},
{
"pname": "CommunityToolkit.HighPerformance",
"version": "8.3.2",
"hash": "sha256-8wB8IwDi1u8WLxPHd+6cyAbhGUr1oSi1juULE1crSQc="
},
{
"pname": "CommunityToolkit.Mvvm",
"version": "8.4.0",
"hash": "sha256-a0D550q+ffreU9Z+kQPdzJYPNaj1UjgyPofLzUg02ZI="
},
{
"pname": "DeviceId",
"version": "6.9.0",
"hash": "sha256-TZjWLotGLchmhvESXa4A0eUqKCPT89aXmqY7smc952I="
},
{
"pname": "DeviceId.Linux",
"version": "6.9.0",
"hash": "sha256-MwPAPFD/gs9WZ8gB5BQMEwYswd3EEIpLlvMN5vmz1Wc="
},
{
"pname": "DiscordRichPresence",
"version": "1.3.0.28",
"hash": "sha256-KdwSl5ysunAbC21cXRrSROO2XN/ZscIVdq6+IH+5Fbs="
},
{
"pname": "ExCSS",
"version": "4.3.0",
"hash": "sha256-7QGbwOlT1EEkgUULKWSJO3H8BzvV4KP/mUZE/9/3r6M="
},
{
"pname": "ExCSS",
"version": "4.3.1",
"hash": "sha256-nNn5+YEaqKSULhtDsImNEyndU/MHna7VpZNUExmo80o="
},
{
"pname": "FFMpegCore",
"version": "5.1.0",
"hash": "sha256-k6AOQjAAWiZI0g7wr32z+0kb48gfcQ1n2XhK4TL53xA="
},
{
"pname": "Hardware.Info",
"version": "101.0.1.1",
"hash": "sha256-Bjztcg1xtZFL+3BafHAS1PWelDLc1XTQjeyr69pO7dA="
},
{
"pname": "HarfBuzzSharp",
"version": "7.3.0.3",
"hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM="
},
{
"pname": "HarfBuzzSharp",
"version": "8.3.0.1",
"hash": "sha256-ZQwyxpI6jB804Z3d1JAhLqyHIu42fo6mpmk5GVFbEzk="
},
{
"pname": "HarfBuzzSharp.NativeAssets.Linux",
"version": "7.3.0.3",
"hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM="
},
{
"pname": "HarfBuzzSharp.NativeAssets.macOS",
"version": "7.3.0.3",
"hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w="
},
{
"pname": "HarfBuzzSharp.NativeAssets.macOS",
"version": "8.3.0.1",
"hash": "sha256-bpow26ydfzv9w6XCtZOcsGqMUVcfmvnIo5qPqtl9NQo="
},
{
"pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
"version": "7.3.0.3",
"hash": "sha256-jHrU70rOADAcsVfVfozU33t/5B5Tk0CurRTf4fVQe3I="
},
{
"pname": "HarfBuzzSharp.NativeAssets.Win32",
"version": "7.3.0.3",
"hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I="
},
{
"pname": "HarfBuzzSharp.NativeAssets.Win32",
"version": "8.3.0.1",
"hash": "sha256-2+FA4EfAQ68q1nJlXUuqDcETwIA+6OvD0DB/lMnbKVY="
},
{
"pname": "Humanizer.Core",
"version": "2.14.1",
"hash": "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o="
},
{
"pname": "Instances",
"version": "3.0.0",
"hash": "sha256-tqIbgABsgi8JgT5h+WkCehANUmCzK5/p0UZH5xjOy2Y="
},
{
"pname": "MessagePack",
"version": "2.5.192",
"hash": "sha256-M9QUEAIeSoSgO3whVkOou0F8kbKCNJ7HHAvTZgytkPU="
},
{
"pname": "MessagePack.Annotations",
"version": "2.5.192",
"hash": "sha256-DLtncnaQ9Sp5YmWm89+2w3InhdU1ZQxnJgbonAq/1aM="
},
{
"pname": "MessagePackAnalyzer",
"version": "2.5.192",
"hash": "sha256-4JU8K72WUCW26IcrustOCBotEGqjspnjgEZcJF3ZCl4="
},
{
"pname": "MicroCom.Runtime",
"version": "0.11.0",
"hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="
},
{
"pname": "Microsoft.Bcl.AsyncInterfaces",
"version": "6.0.0",
"hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="
},
{
"pname": "Microsoft.Bcl.AsyncInterfaces",
"version": "8.0.0",
"hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw="
},
{
"pname": "Microsoft.Bcl.HashCode",
"version": "6.0.0",
"hash": "sha256-87myurC/jMcX1f32167j7FTjbZ6FvUE0esrhYTGcvWs="
},
{
"pname": "Microsoft.CodeAnalysis.Analyzers",
"version": "3.11.0",
"hash": "sha256-hQ2l6E6PO4m7i+ZsfFlEx+93UsLPo4IY3wDkNG11/Sw="
},
{
"pname": "Microsoft.CodeAnalysis.Analyzers",
"version": "3.3.4",
"hash": "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE="
},
{
"pname": "Microsoft.CodeAnalysis.AnalyzerUtilities",
"version": "3.3.0",
"hash": "sha256-nzFs+H0FFEgZzjl/bcmWyQQVKS2PncS6kMYHOqrxXSw="
},
{
"pname": "Microsoft.CodeAnalysis.Common",
"version": "4.11.0",
"hash": "sha256-cX/xgM0VmS+Bsu63KZk2ofjFOOy1mzI+CCVEY6kI+Qk="
},
{
"pname": "Microsoft.CodeAnalysis.Common",
"version": "4.14.0",
"hash": "sha256-ne/zxH3GqoGB4OemnE8oJElG5mai+/67ASaKqwmL2BE="
},
{
"pname": "Microsoft.CodeAnalysis.CSharp",
"version": "4.11.0",
"hash": "sha256-E9jEOjp9g/CFecsc5/QfRKOPXMRpSw0Tf79XsRgL+Mk="
},
{
"pname": "Microsoft.CodeAnalysis.CSharp",
"version": "4.14.0",
"hash": "sha256-5Mzj3XkYYLkwDWh17r1NEXSbXwwWYQPiOmkSMlgo1JY="
},
{
"pname": "Microsoft.CodeAnalysis.CSharp.Features",
"version": "4.11.0",
"hash": "sha256-/rQzc9HHR6h02Dm9rPsBlQyztgt4itmbTFOMV8rgWfc="
},
{
"pname": "Microsoft.CodeAnalysis.CSharp.Workspaces",
"version": "4.11.0",
"hash": "sha256-A3hmUJzaqRcWndwGKCHXt3in9T5GeV6ypl/ka8dDQr0="
},
{
"pname": "Microsoft.CodeAnalysis.Elfie",
"version": "1.0.0",
"hash": "sha256-E/+PlegvWZ59e5Ti3TvKJBLa3qCnDKmi7+DcnOo1ufg="
},
{
"pname": "Microsoft.CodeAnalysis.Features",
"version": "4.11.0",
"hash": "sha256-W/R3JVuWfTTcW/GZjJzdTyxZVZpk1dAgaJPz+UGcgyU="
},
{
"pname": "Microsoft.CodeAnalysis.Scripting.Common",
"version": "4.11.0",
"hash": "sha256-2JC9TipfoAQ1ug4i+PexZemJHFhjnFNv/FqjBIsV6J0="
},
{
"pname": "Microsoft.CodeAnalysis.Workspaces.Common",
"version": "4.11.0",
"hash": "sha256-8+HxGPWrxOsvqFBnx4rrNQRDfeLbPU7DGcQYyNMq/pE="
},
{
"pname": "Microsoft.CSharp",
"version": "4.7.0",
"hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="
},
{
"pname": "Microsoft.DiaSymReader",
"version": "2.0.0",
"hash": "sha256-8hotZmh8Rb6Q6oD9Meb74SvAdbDo39Y/1m8h43HHjjw="
},
{
"pname": "Microsoft.DotNet.PlatformAbstractions",
"version": "3.1.6",
"hash": "sha256-RfM2qXiqdiamPkXr4IDkNc0IZSF9iTZv4uou/E7zNS0="
},
{
"pname": "Microsoft.Extensions.DependencyInjection",
"version": "9.0.0",
"hash": "sha256-dAH52PPlTLn7X+1aI/7npdrDzMEFPMXRv4isV1a+14k="
},
{
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
"version": "9.0.0",
"hash": "sha256-CncVwkKZ5CsIG2O0+OM9qXuYXh3p6UGyueTHSLDVL+c="
},
{
"pname": "Microsoft.Extensions.DependencyModel",
"version": "8.0.0",
"hash": "sha256-qkCdwemqdZY/yIW5Xmh7Exv74XuE39T8aHGHCofoVgo="
},
{
"pname": "Microsoft.NET.StringTools",
"version": "17.6.3",
"hash": "sha256-H2Qw8x47WyFOd/VmgRmGMc+uXySgUv68UISgK8Frsjw="
},
{
"pname": "Microsoft.NETCore.Platforms",
"version": "1.1.0",
"hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
},
{
"pname": "Microsoft.NETCore.Platforms",
"version": "2.0.0",
"hash": "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro="
},
{
"pname": "Microsoft.NETCore.Platforms",
"version": "5.0.0",
"hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="
},
{
"pname": "Microsoft.Win32.Registry",
"version": "4.5.0",
"hash": "sha256-WMBXsIb0DgPFPaFkNVxY9b9vcMxPqtgFgijKYMJfV/0="
},
{
"pname": "Microsoft.Win32.Registry",
"version": "5.0.0",
"hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="
},
{
"pname": "NETStandard.Library",
"version": "2.0.3",
"hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="
},
{
"pname": "Newtonsoft.Json",
"version": "13.0.3",
"hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="
},
{
"pname": "OneOf",
"version": "3.0.271",
"hash": "sha256-tFWy8Jg/XVJfVOddjXeCAizq/AUljJrq6J8PF6ArYSU="
},
{
"pname": "protobuf-net",
"version": "3.2.52",
"hash": "sha256-phXeroBt5KbHYkApkkMa0mRCVkDY+dtOOXXNY+i50Ek="
},
{
"pname": "protobuf-net.Core",
"version": "3.2.52",
"hash": "sha256-/9Jj26tuSKeYJb9udwew5i5EVvaoeNu/vBCKS0VhSQQ="
},
{
"pname": "Qoi.NetStandard",
"version": "1.0.0",
"hash": "sha256-pjJUeRSKaU7NdFwi0gHfmRJUodzgUB4Amz8ERQso+nY="
},
{
"pname": "ShimSkiaSharp",
"version": "3.0.3",
"hash": "sha256-Nngzb1buTzSYvNBS5TUOiJcN71ySM8i6HrPskLEQttM="
},
{
"pname": "ShimSkiaSharp",
"version": "3.0.5",
"hash": "sha256-sjVmij064B96wC00JfTW9wsrK0/Uh1ewwvcw1qXxFMo="
},
{
"pname": "Silk.NET.Core",
"version": "2.22.0",
"hash": "sha256-1aBiBwifLel9aaGI97gxbvID/XKbFm1dpVv2zm0NSEc="
},
{
"pname": "Silk.NET.Maths",
"version": "2.22.0",
"hash": "sha256-wBydHf4R69A3dm8SnD82zjBd5QgwXbmipRqXtk+AjpE="
},
{
"pname": "Silk.NET.OpenGL",
"version": "2.22.0",
"hash": "sha256-1XWABfBzsSg1nJzbDJ/FH140WLzjpuNTxDHNZfV85xo="
},
{
"pname": "Silk.NET.Vulkan",
"version": "2.22.0",
"hash": "sha256-TxCjv6Q35PrJTs0SkiE1srJNZf1yh9k98Gfx8DWSWjY="
},
{
"pname": "Silk.NET.Vulkan.Extensions.EXT",
"version": "2.22.0",
"hash": "sha256-spbTFm5wHbVZqMNvAih6wexeZs61B8kbX4sKYSe5Syk="
},
{
"pname": "Silk.NET.Vulkan.Extensions.KHR",
"version": "2.22.0",
"hash": "sha256-aXgS8UxYlfBIrxmoAOuy6Z3NZuV+ruSibQPvLO1wL/U="
},
{
"pname": "SkiaSharp",
"version": "2.88.8",
"hash": "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A="
},
{
"pname": "SkiaSharp",
"version": "2.88.9",
"hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24="
},
{
"pname": "SkiaSharp",
"version": "3.116.1",
"hash": "sha256-EQW/zjk+GsJbpJ3zqyGARh3oHep8XgneWXcSTNnYwuk="
},
{
"pname": "SkiaSharp",
"version": "3.118.0-preview.1.2",
"hash": "sha256-3vy6mQ11MqelRv6j1eGJKkNgLkr/geT99m75xiYrVbM="
},
{
"pname": "SkiaSharp",
"version": "3.119.0",
"hash": "sha256-G6T0E4Wl9NW9m/9HW1Rppuxs5icp04uvqkY+Ju/vvzM="
},
{
"pname": "SkiaSharp.HarfBuzz",
"version": "3.116.1",
"hash": "sha256-GYu9itkxAJUmj7Z4etHGUvPLdtdNr+y0mcUauArRnhE="
},
{
"pname": "SkiaSharp.NativeAssets.Linux",
"version": "2.88.9",
"hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A="
},
{
"pname": "SkiaSharp.NativeAssets.Linux",
"version": "3.119.0",
"hash": "sha256-ysHXGJeui4uji6bSBIzpqMRfKJXqj/08Zd0MIBeQH3s="
},
{
"pname": "SkiaSharp.NativeAssets.macOS",
"version": "2.88.8",
"hash": "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI="
},
{
"pname": "SkiaSharp.NativeAssets.macOS",
"version": "2.88.9",
"hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g="
},
{
"pname": "SkiaSharp.NativeAssets.macOS",
"version": "3.116.1",
"hash": "sha256-GntlOA+Blrh43l97gHP7sZl4HY0+Hx84xId3+YTXLCE="
},
{
"pname": "SkiaSharp.NativeAssets.macOS",
"version": "3.118.0-preview.1.2",
"hash": "sha256-Cgf2xL9Zmib61u+IBDSivMiTr0QjB6t6nZp9npNS5f8="
},
{
"pname": "SkiaSharp.NativeAssets.macOS",
"version": "3.119.0",
"hash": "sha256-BPkQ5hSDK4Nal36+31AAApEbDH+FdwZik5W22vYmVDI="
},
{
"pname": "SkiaSharp.NativeAssets.WebAssembly",
"version": "2.88.9",
"hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY="
},
{
"pname": "SkiaSharp.NativeAssets.WebAssembly",
"version": "3.119.0",
"hash": "sha256-bEWnEJJZ9E0MD688vOvEusJJRJbgpMCiG9u5Tj/BIkQ="
},
{
"pname": "SkiaSharp.NativeAssets.Win32",
"version": "2.88.8",
"hash": "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM="
},
{
"pname": "SkiaSharp.NativeAssets.Win32",
"version": "2.88.9",
"hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="
},
{
"pname": "SkiaSharp.NativeAssets.Win32",
"version": "3.116.1",
"hash": "sha256-oraulwAja3vee2T2n9sEveSTVI8/Kvku7r09yXLENI4="
},
{
"pname": "SkiaSharp.NativeAssets.Win32",
"version": "3.118.0-preview.1.2",
"hash": "sha256-UWMf4l1D0Q+RkTIQ0Aslf4zsL3XrsbZ15cy4ou42+34="
},
{
"pname": "SkiaSharp.NativeAssets.Win32",
"version": "3.119.0",
"hash": "sha256-YltsBRADV7b3qL3/YrgG2GTwJr8PL1STeaimQagSADo="
},
{
"pname": "SkiaSharp.Skottie",
"version": "2.88.8",
"hash": "sha256-+ldOojWMQi51wK88msauHBnzNqyRW6RRokF6+yn4nwo="
},
{
"pname": "Svg.Controls.Skia.Avalonia",
"version": "11.3.0.1",
"hash": "sha256-e+GW+mFWFvw/Dzhf7xVQnZMCCn1e9Po6XKtHCd11GfY="
},
{
"pname": "Svg.Controls.Skia.Avalonia",
"version": "11.3.0.3",
"hash": "sha256-X0Plwm75PMMjlSLV+qr25ye5g9jc93Dv1J7bcNW1m+g="
},
{
"pname": "Svg.Custom",
"version": "3.0.3",
"hash": "sha256-faH73+8y0A7p+koyd3Y4CcYI8U/cAbH1X566bMd3dI4="
},
{
"pname": "Svg.Custom",
"version": "3.0.5",
"hash": "sha256-OY5wMjwk++n41cRDJIBvsfSjLqLCqU5lwkCWNbqrm9w="
},
{
"pname": "Svg.Model",
"version": "3.0.3",
"hash": "sha256-ncQwRRi51A12bpZKjG2ZhaLUJ7MD9ny1lwKUYwr63LE="
},
{
"pname": "Svg.Model",
"version": "3.0.5",
"hash": "sha256-QLghW+2QFzAzCLE52oqt+NT/M3LxWFX7GVG6t84Ilw8="
},
{
"pname": "Svg.Skia",
"version": "3.0.3",
"hash": "sha256-tQ8a1Gt92IPAXhEY9osBZXUZk2sXM19CWf4zt71mwk8="
},
{
"pname": "Svg.Skia",
"version": "3.0.5",
"hash": "sha256-zfmwCIfDJKfFuXAR/fdmdK3xsficRFTIMoaeaBKF2hU="
},
{
"pname": "System.Buffers",
"version": "4.5.1",
"hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="
},
{
"pname": "System.Buffers",
"version": "4.6.0",
"hash": "sha256-c2QlgFB16IlfBms5YLsTCFQ/QeKoS6ph1a9mdRkq/Jc="
},
{
"pname": "System.CodeDom",
"version": "8.0.0",
"hash": "sha256-uwVhi3xcvX7eiOGQi7dRETk3Qx1EfHsUfchZsEto338="
},
{
"pname": "System.Collections.Immutable",
"version": "6.0.0",
"hash": "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs="
},
{
"pname": "System.Collections.Immutable",
"version": "8.0.0",
"hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w="
},
{
"pname": "System.Collections.Immutable",
"version": "9.0.0",
"hash": "sha256-+6q5VMeoc5bm4WFsoV6nBXA9dV5pa/O4yW+gOdi8yac="
},
{
"pname": "System.Composition",
"version": "8.0.0",
"hash": "sha256-rA118MFj6soKN++BvD3y9gXAJf0lZJAtGARuznG5+Xg="
},
{
"pname": "System.Composition.AttributedModel",
"version": "8.0.0",
"hash": "sha256-n3aXiBAFIlQicSRLiNtLh++URSUxRBLggsjJ8OMNRpo="
},
{
"pname": "System.Composition.Convention",
"version": "8.0.0",
"hash": "sha256-Z9HOAnH1lt1qc38P3Y0qCf5gwBwiLXQD994okcy53IE="
},
{
"pname": "System.Composition.Hosting",
"version": "8.0.0",
"hash": "sha256-axKJC71oKiNWKy66TVF/c3yoC81k03XHAWab3mGNbr0="
},
{
"pname": "System.Composition.Runtime",
"version": "8.0.0",
"hash": "sha256-AxwZ29+GY0E35Pa255q8AcMnJU52Txr5pBy86t6V1Go="
},
{
"pname": "System.Composition.TypedParts",
"version": "8.0.0",
"hash": "sha256-+ZJawThmiYEUNJ+cB9uJK+u/sCAVZarGd5ShZoSifGo="
},
{
"pname": "System.Configuration.ConfigurationManager",
"version": "8.0.0",
"hash": "sha256-xhljqSkNQk8DMkEOBSYnn9lzCSEDDq4yO910itptqiE="
},
{
"pname": "System.Data.DataSetExtensions",
"version": "4.5.0",
"hash": "sha256-qppO0L8BpI7cgaStqBhn6YJYFjFdSwpXlRih0XFsaT4="
},
{
"pname": "System.Diagnostics.EventLog",
"version": "8.0.0",
"hash": "sha256-rt8xc3kddpQY4HEdghlBeOK4gdw5yIj4mcZhAVtk2/Y="
},
{
"pname": "System.Diagnostics.PerformanceCounter",
"version": "8.0.0",
"hash": "sha256-CbTL+orc5YcEJfKbBtr/9p/0rNVVOQPz/fOEaA6Pu5k="
},
{
"pname": "System.IO.Pipelines",
"version": "8.0.0",
"hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="
},
{
"pname": "System.IO.Pipelines",
"version": "9.0.3",
"hash": "sha256-JV50VXnofGfL8lB/vNIpJstoBJper9tsXcjNFwGqL68="
},
{
"pname": "System.Management",
"version": "8.0.0",
"hash": "sha256-HwpfDb++q7/vxR6q57mGFgl5U0vxy+oRJ6orFKORfP0="
},
{
"pname": "System.Memory",
"version": "4.5.5",
"hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="
},
{
"pname": "System.Numerics.Vectors",
"version": "4.4.0",
"hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="
},
{
"pname": "System.Numerics.Vectors",
"version": "4.5.0",
"hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="
},
{
"pname": "System.Reactive",
"version": "5.0.0",
"hash": "sha256-M5Z8pw8rVb8ilbnTdaOptzk5VFd5DlKa7zzCpuytTtE="
},
{
"pname": "System.Reactive",
"version": "6.0.0",
"hash": "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y="
},
{
"pname": "System.Reactive",
"version": "6.0.1",
"hash": "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q="
},
{
"pname": "System.Reflection.Emit",
"version": "4.7.0",
"hash": "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg="
},
{
"pname": "System.Reflection.Emit.ILGeneration",
"version": "4.7.0",
"hash": "sha256-GUnQeGo/DtvZVQpFnESGq7lJcjB30/KnDY7Kd2G/ElE="
},
{
"pname": "System.Reflection.Emit.Lightweight",
"version": "4.7.0",
"hash": "sha256-V0Wz/UUoNIHdTGS9e1TR89u58zJjo/wPUWw6VaVyclU="
},
{
"pname": "System.Reflection.Metadata",
"version": "8.0.0",
"hash": "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE="
},
{
"pname": "System.Reflection.Metadata",
"version": "9.0.0",
"hash": "sha256-avEWbcCh7XgpsSesnR3/SgxWi/6C5OxjR89Jf/SfRjQ="
},
{
"pname": "System.Runtime.CompilerServices.Unsafe",
"version": "4.5.3",
"hash": "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak="
},
{
"pname": "System.Runtime.CompilerServices.Unsafe",
"version": "6.0.0",
"hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="
},
{
"pname": "System.Security.AccessControl",
"version": "4.5.0",
"hash": "sha256-AFsKPb/nTk2/mqH/PYpaoI8PLsiKKimaXf+7Mb5VfPM="
},
{
"pname": "System.Security.AccessControl",
"version": "5.0.0",
"hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="
},
{
"pname": "System.Security.Cryptography.ProtectedData",
"version": "8.0.0",
"hash": "sha256-fb0pa9sQxN+mr0vnXg1Igbx49CaOqS+GDkTfWNboUvs="
},
{
"pname": "System.Security.Principal.Windows",
"version": "4.5.0",
"hash": "sha256-BkUYNguz0e4NJp1kkW7aJBn3dyH9STwB5N8XqnlCsmY="
},
{
"pname": "System.Security.Principal.Windows",
"version": "5.0.0",
"hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="
},
{
"pname": "System.Text.Encoding.CodePages",
"version": "7.0.0",
"hash": "sha256-eCKTVwumD051ZEcoJcDVRGnIGAsEvKpfH3ydKluHxmo="
},
{
"pname": "System.Text.Encodings.Web",
"version": "7.0.0",
"hash": "sha256-tF8qt9GZh/nPy0mEnj6nKLG4Lldpoi/D8xM5lv2CoYQ="
},
{
"pname": "System.Text.Encodings.Web",
"version": "8.0.0",
"hash": "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="
},
{
"pname": "System.Text.Encodings.Web",
"version": "9.0.3",
"hash": "sha256-ZGRcKnblIdt1fHZ4AehyyWCgM+/1FcZyxoGJFe4K3JE="
},
{
"pname": "System.Text.Json",
"version": "7.0.2",
"hash": "sha256-bkfxuc3XPxtYcOJTGRMc/AkJiyIU+fTLK7PxtbuN3sQ="
},
{
"pname": "System.Text.Json",
"version": "8.0.0",
"hash": "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow="
},
{
"pname": "System.Text.Json",
"version": "9.0.3",
"hash": "sha256-I7z6sRb2XbbXNZ2MyNbn2wysh1P2cnk4v6BM0zucj1w="
},
{
"pname": "System.Threading.Channels",
"version": "7.0.0",
"hash": "sha256-Cu0gjQsLIR8Yvh0B4cOPJSYVq10a+3F9pVz/C43CNeM="
},
{
"pname": "System.Threading.Tasks.Extensions",
"version": "4.5.4",
"hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="
},
{
"pname": "Tmds.DBus.Protocol",
"version": "0.21.2",
"hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI="
},
{
"pname": "Wasmtime",
"version": "22.0.0",
"hash": "sha256-Q6NWraxWlVz5p/2rY6d9XZBv/VM6tRG2eCNRpMLAp6A="
}
]
+7
View File
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
<mime-type type="application/x-pixieditor">
<comment>PixiEditor project file</comment>
<glob pattern="*.pixi" />
</mime-type>
</mime-info>
+182
View File
@@ -0,0 +1,182 @@
{
lib,
stdenv,
writeText,
fetchFromGitHub,
dotnetCorePackages,
buildDotnetModule,
ffmpeg-headless,
vulkan-loader,
openssl,
libGL,
libX11,
libICE,
libSM,
libXi,
libXcursor,
libXext,
libXrandr,
makeDesktopItem,
copyDesktopItems,
}:
let
inherit (dotnetCorePackages) fetchNupkg;
buildInfo = {
id = "NixOS";
name = "for NixOS";
};
appSettings = writeText "appsettings.json" (
lib.strings.toJSON {
PixiEditorApiUrl = "https://auth.pixieditor.net";
PixiEditorApiKey = "waIvElX0fPqaxnyD7Rh1SSEvdq8qfKUs";
AnalyticsUrl = "https://api.pixieditor.net/analytics/";
}
);
in
buildDotnetModule (finalAttrs: {
pname = "pixieditor";
version = "2.0.1.14";
src = fetchFromGitHub {
owner = "PixiEditor";
repo = "PixiEditor";
tag = finalAttrs.version;
hash = "sha256-wyqt5mpT4xmaTk7RidQOOZAgkgMfcKiz5/7Nle0/Tkg=";
fetchSubmodules = true;
};
postPatch = ''
substituteInPlace ./src/PixiEditor/Helpers/VersionHelpers.cs \
--replace-fail 'builder.Append(" Release Build");' 'builder.Append(" ${buildInfo.name}");' \
--replace-fail 'return "Release";' 'return "${buildInfo.id}";';
substituteInPlace ./src/PixiEditor/Models/ExceptionHandling/CrashReport.cs \
--replace-fail 'ShellExecute(fileName,' 'ShellExecute("${placeholder "out"}/bin/pixieditor",';
rm -rf ./src/PixiEditor.AnimationRenderer.FFmpeg/ThirdParty/{Linux,Macos,Windows}/*
substituteInPlace ./src/PixiEditor.AnimationRenderer.FFmpeg/FFMpegRenderer.cs \
--replace-fail 'new FFOptions() { BinaryFolder = binaryPath }' 'new FFOptions() { BinaryFolder = "${ffmpeg-headless}/bin" }' \
--replace-fail 'MakeExecutableIfNeeded(binaryPath);' ' ';
'';
nativeBuildInputs = [
copyDesktopItems
];
buildInputs = [
(fetchNupkg {
pname = "protobuf-net.protogen";
version = "3.2.52";
hash = "sha256-sKVCXtd5qD86D2FOgjMXh37P6IrcmqmaoJregAhLFGY=";
})
];
nugetDeps = ./deps.json;
linkNugetPackages = true;
dotnet-sdk = dotnetCorePackages.sdk_8_0;
dotnet-runtime = dotnetCorePackages.runtime_8_0;
dotnetFlags =
lib.optionals stdenv.hostPlatform.isx86_64 [ "-p:Runtimeidentifier=linux-x64" ]
++ lib.optionals stdenv.hostPlatform.isAarch64 [ "-p:Runtimeidentifier=linux-arm64" ];
buildType = "ReleaseNoUpdate";
projectFile = [
"src/PixiEditor.Desktop/PixiEditor.Desktop.csproj"
"src/PixiEditor/PixiEditor.csproj"
"src/PixiEditor.Linux/PixiEditor.Linux.csproj"
"src/PixiEditor.Platform.Standalone/PixiEditor.Platform.Standalone.csproj"
];
executables = [ "PixiEditor.Desktop" ];
runtimeDeps = [
vulkan-loader
openssl
libGL
libX11
libICE
libSM
libXi
libXcursor
libXext
libXrandr
];
desktopItems = [
(makeDesktopItem {
name = "pixieditor";
type = "Application";
desktopName = "PixiEditor";
genericName = "2D Editor";
comment = finalAttrs.meta.description;
icon = "pixieditor";
exec = "pixieditor %f";
tryExec = "pixieditor";
startupWMClass = "pixieditor";
terminal = false;
categories = [
"Graphics"
"2DGraphics"
"RasterGraphics"
"VectorGraphics"
];
keywords = [
"editor"
"image"
"2d"
"graphics"
"design"
"vector"
"raster"
];
mimeTypes = [
"application/x-pixieditor"
];
extraConfig.SingleMainWindow = "true";
})
];
postConfigure = ''
dotnet build -t:InstallProtogen \
src/PixiEditor.Extensions.CommonApi/PixiEditor.Extensions.CommonApi.csproj
'';
postInstall = ''
install -Dm644 ${appSettings} $out/lib/pixieditor/appsettings.json;
install -Dm644 ${./mimeinfo.xml} $out/share/mime/packages/pixieditor.xml;
install -Dm644 src/PixiEditor/Images/PixiEditorLogo.svg \
$out/share/icons/hicolor/scalable/apps/pixieditor.svg;
'';
postFixup = ''
mv $out/bin/PixiEditor.Desktop $out/bin/pixieditor
'';
meta = {
description = "Universal editor for all your 2D needs";
longDescription = ''
PixiEditor is a universal 2D platform that aims to provide you with tools and features for all your 2D needs.
Create beautiful sprites for your games, animations, edit images, create logos. All packed in an eye-friendly dark theme
'';
homepage = "https://pixieditor.com";
changelog = "https://github.com/PixiEditor/PixiEditor/releases/tag/${finalAttrs.version}";
mainProgram = "pixieditor";
license = lib.licenses.lgpl3Only;
maintainers = with lib.maintainers; [
griffi-gh
];
platforms = [
"x86_64-linux"
"aarch64-linux"
];
};
})
-37
View File
@@ -1,37 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
libphonenumber,
icu,
protobuf,
}:
stdenv.mkDerivation rec {
pname = "pn";
version = "0.9.0";
src = fetchFromGitHub {
owner = "Orange-OpenSource";
repo = "pn";
rev = "v${version}";
sha256 = "sha256-vRF9MPcw/hCreHVLD6QB7g1r0wQiZv1xrfzIHj1Yf9M=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [
libphonenumber
icu
protobuf
];
meta = with lib; {
description = "Libphonenumber command-line wrapper";
mainProgram = "pn";
homepage = "https://github.com/Orange-OpenSource/pn";
license = licenses.asl20;
platforms = platforms.unix;
maintainers = [ maintainers.McSinyx ];
};
}
+2 -2
View File
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "polylith";
version = "0.2.22";
version = "0.3.30";
src = fetchurl {
url = "https://github.com/polyfy/polylith/releases/download/v${version}/poly-${version}.jar";
sha256 = "sha256-DKJ669TeDFK/USi7UxraAqgqnSCkG/nSIGphvpsmUv8=";
sha256 = "sha256-G64sbV671fY+k/tYy8Kq/cAGXLzbZY1g+HyzOw29D24=";
};
dontUnpack = true;
@@ -0,0 +1,9 @@
{
python3,
}:
python3.pkgs.toPythonApplication (
python3.pkgs.pyglossary.override {
enableGui = true;
}
)
+5
View File
@@ -0,0 +1,5 @@
{
python3,
}:
python3.pkgs.toPythonApplication python3.pkgs.pyglossary
+1
View File
@@ -37,6 +37,7 @@ let
pname = "qq";
inherit (source) version src;
passthru = {
# nixpkgs-update: no auto update
updateScript = ./update.sh;
};
meta = {
@@ -1,13 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 55eb05c..18f7fc3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -234,7 +234,7 @@ endif()
set(BINARY_INST_DESTINATION "bin")
set(RESOURCE_INST_DESTINATION "share/shadered")
-install(PROGRAMS bin/SHADERed DESTINATION "${BINARY_INST_DESTINATION}" RENAME shadered)
+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/bin/SHADERed DESTINATION "${BINARY_INST_DESTINATION}" RENAME shadered)
install(DIRECTORY bin/data bin/templates bin/themes bin/plugins DESTINATION "${RESOURCE_INST_DESTINATION}")
if (UNIX AND NOT APPLE)
-52
View File
@@ -1,52 +0,0 @@
{
stdenv,
lib,
fetchFromGitHub,
cmake,
sfml,
glm,
python3,
glew,
pkg-config,
SDL2,
}:
stdenv.mkDerivation rec {
pname = "SHADERed";
version = "1.5.6";
src = fetchFromGitHub {
owner = "dfranx";
repo = "SHADERed";
tag = "v${version}";
fetchSubmodules = true;
sha256 = "0drf8wwx0gcmi22jq2yyjy7ppxynfq172wqakchscm313j248fjr";
};
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
SDL2
glew
glm
python3
sfml
];
patches = [
./install_path_fix.patch
];
env.NIX_CFLAGS_COMPILE = "-Wno-error=format-security";
meta = with lib; {
description = "Lightweight, cross-platform & full-featured shader IDE";
homepage = "https://github.com/dfranx/SHADERed";
license = with licenses; [ mit ];
maintainers = with maintainers; [ Scriptkiddi ];
broken = true;
};
}
+3 -3
View File
@@ -18,16 +18,16 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "shh";
version = "2025.9.22";
version = "2025.10.22";
src = fetchFromGitHub {
owner = "desbma";
repo = "shh";
tag = "v${finalAttrs.version}";
hash = "sha256-Esb6IR49YtGWvLmGLtviAyMLjoWZLQka2igC6yKJ3A0=";
hash = "sha256-OxiQOwoWytZvPVVurSckPSWcb88pyDHRdUV/87Dbb9Q=";
};
cargoHash = "sha256-CB0jhVDR40lZaYqNq43V/af1v3Ph+6Z9swSrrsNgA8k=";
cargoHash = "sha256-KRRBqRm6/TedzjGRTcbj0q4R9xOgj0PmKEm9rY2f4PM=";
patches = [
./fix_run_checks.patch
+3 -3
View File
@@ -22,16 +22,16 @@ let
in
buildNpmPackage (finalAttrs: {
pname = "shogihome";
version = "1.25.0";
version = "1.25.1";
src = fetchFromGitHub {
owner = "sunfish-shogi";
repo = "shogihome";
tag = "v${finalAttrs.version}";
hash = "sha256-Qa8ykN514Moc/PpBhD/X+mzfclQPp3yiriwTJCtmMA8=";
hash = "sha256-CRPZmycYaKtqjjiISKVGLf2jUvM6Xk6cUryKZcFX3tc=";
};
npmDepsHash = "sha256-rcrj3dG96oNbmp3cXw1qRJPi1SZdBcG9paAShSfb/0E=";
npmDepsHash = "sha256-8v6r3DAUzNeMQqLl99mp5rUytbUe7wFj3jkHb6lbwFI=";
postPatch = ''
substituteInPlace package.json \
@@ -1,68 +1,72 @@
{
"@biomejs/cli-darwin-arm64@npm:2.1.4": "11ec854dec62d9ba34df3ce240a6baca6ff78d41d2bbcfed47741f3c13566007a93f60290eb043d6e4bc4b5f7997ebcbd843781d6cdadb74368bad788e7f8d86",
"@biomejs/cli-darwin-x64@npm:2.1.4": "e35434896cb45410cd2565d1c476526c6ac0421368d27624a84b12993ccb8afdd5b8b45eaec9b4fe92497a0718ecb6d0ff26de4d8d2647ac821906e8d77bdbea",
"@biomejs/cli-linux-arm64-musl@npm:2.1.4": "42f9e3ca494471875fd404c79d5fa19c01626aee48fde619861ebe695d40fd5ecca3a6d211eb165058ba2091e3e0df317e16e4c887794198291144de0d3742b3",
"@biomejs/cli-linux-arm64@npm:2.1.4": "49896343090353fdd1b5f1bdd109bcd2f93ce43a73d3d58bafbd58b5dfda2b1cde288adcd9d58603a9b34c2c83ba0471ee2bde06724b4388af940df9fb4ae4a0",
"@biomejs/cli-linux-x64-musl@npm:2.1.4": "11f30c976bd395e7cdaac88858055c06327bd20a4f7d499a799286c05c653d025ce2783b1ed741e07afb2757803dd324a8f217fc804d04859ab6f9650c050811",
"@biomejs/cli-linux-x64@npm:2.1.4": "3e9831d10f9113be37ecdd293a3fb54645e63edc3acae9d810a37e028ebe2061d71ba6e8589f6a2e41c31533fa011403366cadff7d1606765dd7363e1bf7cd14",
"@biomejs/cli-win32-arm64@npm:2.1.4": "44a1400a476e76c48d4522a723af594afb1c2d837b3bebcb084ce84fedd3cf58c7c848cff72c788ee7e428ff40954baefb54b754632cd41a3649e1dc5f027284",
"@biomejs/cli-win32-x64@npm:2.1.4": "2414e6b01d637739c851b08393a3298cfc6a6912037042f58ec63d789cdd6ccd2ad634d44613b09daa21ade9d880a0575d67486c0ed37668dab4746fb9ae519b",
"@esbuild/aix-ppc64@npm:0.25.8": "37fc14b17214c1f6bf41175029b62a43664a6a5a5b802614fe1d837bbf7abf5eaf2f6b735b6a446ebcfabb632e038c8ad9cccd87a259c45a1846689f8527874a",
"@esbuild/android-arm64@npm:0.25.8": "e367e989238292ccee72013511dde1aef2d2160d8d5d669a12272f693cf9a0970fac9d7835178b3c46ed6936a0c4b29d21d58ed11851a3697bf98b4320be4b74",
"@esbuild/android-arm@npm:0.25.8": "cbfa2c802d8931e5f4d06582f20573cb34774ab713b4712c37eb15bfab6f90b693878b661de2a3bb9c81eecf45b37e0ddf2e9c79ef4ff932bbc37da588c40183",
"@esbuild/android-x64@npm:0.25.8": "1d4b900dd2f43790415745d20ae6cadb53e9412911578aaf43462277169c22800eca1f49a9f8ce9c37236e1691279494f91967d28310720707911910ec765013",
"@esbuild/darwin-arm64@npm:0.25.8": "a8a50e303056e668e99370a88d1744de4a83e62e2f3f7fcf2ff611142346505229568b0ec5edda93ec96e33e842a585880a312790553202750f123d9636fa97d",
"@esbuild/darwin-x64@npm:0.25.8": "9806fe9d54f3228a01f535e7c51aea26bd1bab3c5d64d5f77f4606de44f361f049222776d32bfd262d45991b7aecca645ed576ea338edbf4f8044b22b3e331ad",
"@esbuild/freebsd-arm64@npm:0.25.8": "8e6cbdd45819390ecdb62a70a4f119a9269a90895f3e1237788b36a512248a756233ef59f55f9033658af372a196f0edc3567f078f1387e150238d2bd51f733b",
"@esbuild/freebsd-x64@npm:0.25.8": "3f920c686037f825859a2fe82104085f4b254b77821cc71a71db512ef0679dd01481c136c3f7057ba7250daff2458aa3ffd101cc28cb5fff2d55270ba5930ec8",
"@esbuild/linux-arm64@npm:0.25.8": "234edc9f815cdc74d21c6a90a3542c941deeaf3a24b408c74a4651616bd270383ba5a15eaef837ab347a374032c7028fc29e4f1da0becb33f0b8dd8f744934d7",
"@esbuild/linux-arm@npm:0.25.8": "dc6dc225ae278cb3383e11d9829d22f301e1b79f2ed4efde1a01896ae67e45efde98caa61f10cb425a809e9b61e9a4651b60d2b6a3e9ad6174519e8ce74bc02a",
"@esbuild/linux-ia32@npm:0.25.8": "1c780012035552e27adea34d11f959a3ddd4a4d576cddd03d320b1db18110e777c1adca2c6d10affd587a4454900d3ffcad9371956855e56739babdc2e4edcd3",
"@esbuild/linux-loong64@npm:0.25.8": "d3d39691d301d144c7d61f52163a2fe64caaf928f4117d906707dc1456f3d88d1a7a3b16fb988ccfc0b0bc203f4bcd56665a9c7405dc380b3165a26ab195b9ec",
"@esbuild/linux-mips64el@npm:0.25.8": "437e51b2be977cf7774114e04c141e3c0f1ceb7f12b961b7b3ac7f99c4e203afdd74c41e072ecdc4bab3cde4f14feedd78653727d1b2013ed3611bd89117ee8c",
"@esbuild/linux-ppc64@npm:0.25.8": "29d2e344b1c8b767518d25b23eb9e98d85deae1f2def2e01c1939536ac7d1fc9e92749a8d29b29277b3340d3613e4b0f96213c6aa2de7e06885a19d3d269870a",
"@esbuild/linux-riscv64@npm:0.25.8": "82b2ef7fd5a00b465da97bd797246269d7460ed710c0533517a1f8ad8e32527f405509b2ce27e29f8f3df1affa04e45cf5d1a71205f69dab5c1a27118cf10fb8",
"@esbuild/linux-s390x@npm:0.25.8": "74168a6e8927d12c883dba56006f5277f8888c7b1b5e4d132a3c235b8629c3015b4715968ba128a79ff55c9f08a23df84fe44047e8cda4366b9699c5c45f27a4",
"@esbuild/linux-x64@npm:0.25.8": "d531002ac2ead0bdb293ec1a4eceea687d37815e298196af2471107cdd4c1f76ef7d12417052b51852b80f66111abfb5ad8375c58b97da92306b975e9a8f0649",
"@esbuild/netbsd-arm64@npm:0.25.8": "55626924ae946a6225707062648aabb79c70d61e7e094b067338ea1adf72493b502e99e59440fe0d3abfe20eb36c33f78115815d63e72fa99f5e90146c2ee5d9",
"@esbuild/netbsd-x64@npm:0.25.8": "d03122aaa3e9a8bda686bc4120820805b5d9701099458a2c928ee1a292fabcc47df0cb178c8c428edb78a058e75cf7c0d80fa25b71fb91db43d73fe6e4062c41",
"@esbuild/openbsd-arm64@npm:0.25.8": "113ed8722788986b5b703c791bb9c954e80a861b92f453c66c79318d71cc6eac509c1dc79d20671b4af92165eee05a28eb7b3122537d8701447d30f58c428942",
"@esbuild/openbsd-x64@npm:0.25.8": "dfa68d80d68ae825de85aeccc118724ced6b232dcf25da6d862ba03abda2f55e75483dccbf8cb3a7338e7882a05e5425fcf5a902b7dced72c9f1a9c2650912bd",
"@esbuild/openharmony-arm64@npm:0.25.8": "8dab5710d93ad4a78a34a0016f6ea0bf2e16489845f9895ecaf354c1c3db209bed8f05a31309b95c358bfeaea53829605f4e315e9a53dae4d9fdb58e31ca4688",
"@esbuild/sunos-x64@npm:0.25.8": "ccc940bd687d1f6d320d2538ac594b7fe5e291e194380a8b392dd2348d738cf8d322f9f62bcea82b3809f98796a0a004cd02ba9c4d563e5e336665e1ec8e1e1d",
"@esbuild/win32-arm64@npm:0.25.8": "b0a9a86548d4a62e68b12a89e21aaadda3d6d3e96541a2714b74df370cc344e1a2d91604998a26951da28c2f932bd2ee033adc9346bb232622c3ac419107136a",
"@esbuild/win32-ia32@npm:0.25.8": "5880e933c8fb8dc1de1225128c171ea64f4b27fe52fc11ed9cfe6b0ca8ae091c2703d4cb629f08c06731810c46f48cf881516d0d54b3ac408dec34586ea84d27",
"@esbuild/win32-x64@npm:0.25.8": "9e98fe0e7eef7a0e774ab761c59d520ea1c997a7a6e4c7f9cbc967471a4a7ffb14bc27c60d2aa10796c4e945c3da2613fcc297054566fe3f5191e1250691d622",
"@rolldown/binding-darwin-arm64@npm:1.0.0-beta.9-commit.d91dfb5": "a4636b96d36bfaccc655f9de258cef17daedd025463309657ed213b63b4226aeb6901eaa05d00d577e486bfb4d4ef99ee1457d8d7a8b5170afe07c86d2a5c18d",
"@rolldown/binding-darwin-x64@npm:1.0.0-beta.9-commit.d91dfb5": "a7b89d92f33ad9a718de70c56452dc481962e5396b32d66cbc08e588f45fa090ed6e3b7d8fc2ec641acf3de2a550b6d05416b14179ed4fcc8d336fdbd697d40b",
"@rolldown/binding-freebsd-x64@npm:1.0.0-beta.9-commit.d91dfb5": "7da382e43eeada73dec31bb63680432f129fa17efed7ed211da0c9915a89c9dfa2e8ec35aa7f07a4be99a36eb14df67059a375ac4bc5e6a5cdc16e02f7a9bd3c",
"@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-beta.9-commit.d91dfb5": "cb5a7635fc2c39049c1fba8376d3b23f58240dbe2cbdc127d0dc8f2b8900537298bb8b52abde5b6e941cf22d8f69466433048db573c683947bf797f92f28baee",
"@rolldown/binding-linux-arm64-gnu@npm:1.0.0-beta.9-commit.d91dfb5": "8ff267e66b1f59e9317d5b9d89e00a3e11172ae5b5cca17985e92cd52672ef59cd2d6292263700ff8edb02b53420865f655e6ed7f4b4ad8680e4ee0d99dcf5a7",
"@rolldown/binding-linux-arm64-musl@npm:1.0.0-beta.9-commit.d91dfb5": "7b320fbdc870cb7f2f75e89058ac50a675c05236df12739b98ce287ad07cce53474699bf19b729577c3de62d80c2fbd988cbbb8bc29e06c88fc42a8ece176b19",
"@rolldown/binding-linux-x64-gnu@npm:1.0.0-beta.9-commit.d91dfb5": "99679e1c7e290c7d747d6deb420357522fb0fab1fd022cf79f84534243af2eac15988c8ef5d1b50c679fdc915788360bf744c4e0c9e47952aa0985f23ee58e80",
"@rolldown/binding-linux-x64-musl@npm:1.0.0-beta.9-commit.d91dfb5": "2ce172ea44980ca6b86636a13cce7d70104e25f75caaa0c4d6d9199721825a896a74b11bc32fecbc2756aa829d7e10f4701b2f3544b77cfa4da3c2cea0d72e1c",
"@rolldown/binding-wasm32-wasi@npm:1.0.0-beta.9-commit.d91dfb5": "3516b21ab1982990435d550a23c153393ce1a2c9308b6df6614438c14ef1206d50c5e7dd214c403a42c9f4e695b574122abc8009df5171ebb79e685da14e7562",
"@rolldown/binding-win32-arm64-msvc@npm:1.0.0-beta.9-commit.d91dfb5": "17086030865bbfb6668d04f882926035fc1f72db81c3415a8f81e6196b9f849eabd6f2a62066e83f87255fcec106fe274353c8f5ff9c782417b6eddc664a129c",
"@rolldown/binding-win32-ia32-msvc@npm:1.0.0-beta.9-commit.d91dfb5": "ecd226ec05f9f863d97de98ca4d7cb9026bcb0cd2fff12e325209664eaca1fa131744ad72d1352b522567adfe4967ca73e50987f96ab475b50e9b96456dd50cf",
"@rolldown/binding-win32-x64-msvc@npm:1.0.0-beta.9-commit.d91dfb5": "9e50f65fb7ad451a6eb4f9305650605e7a4efdd6873ad9412520edb8fd4c7f0bb67aa9922dbf1bad055c01a0de677eace73abf4285409cb9defae93956a83b24",
"@rollup/rollup-android-arm-eabi@npm:4.45.1": "c8f4939edd5bdac2d846307e7accddd8d777accbc900757386feeb26b609813b1e6cb1860464700b8f724f0175701a52cfe35aaab40193e471d72967d2580cea",
"@rollup/rollup-android-arm64@npm:4.45.1": "f4a842bbd8ec08eea0a3d76381bf7441e0bd9cca34b83519044c9d30514639d6c9125234253705b14dcade1faef603829892627f3e5b3fb79ca2fffdb7f0a1dc",
"@rollup/rollup-darwin-arm64@npm:4.45.1": "9cd3c451dd4727ea97d67f7a1d19c16cd91b53509c2b7f0e123ca2ecfa5a542ac9e0d7ed5d4a2fc6e0e2636b2d783a5ea94d3d9b079e58094807f46af2d3b1f5",
"@rollup/rollup-darwin-x64@npm:4.45.1": "beff80194e9aa470f233783230e607c16c3180c479c630b1affb792ea94517305c7736f5bcc50bf7485532179713258b8688904ffd1a39b4cedbbd37a60fc676",
"@rollup/rollup-freebsd-arm64@npm:4.45.1": "92a873121ff3828a904ae5c073ac11206749cffaa2f0f717a0261318cda8992d951993ae57aae519ffd840fe74b8e4cb41a419996e4b7114007e163dafd24d28",
"@rollup/rollup-freebsd-x64@npm:4.45.1": "919ff2d364ddeb2c4ed717c772b9f9e4b616dbcb8db25123a9f48468b1777e0db0ab2a80a48674e0dad7036cbf5407de83532123b09986226ad3759806fe369e",
"@rollup/rollup-linux-arm-gnueabihf@npm:4.45.1": "f519dc61d585495502a81f10898eed4a1d7d3d3d7675c0e9082924622a68212d586dcc31ad6fff4562eacdf0420c3017e66c9960fc972b4c3605d2f7bc3d6581",
"@rollup/rollup-linux-arm-musleabihf@npm:4.45.1": "aad10aefd9142278a87f9d6489d1f14666ca4c9345b099942dee8e30fb5e1cc6bee630c8de48d4b11302315e8341bdc0664560388792db248823532eb81eee4a",
"@rollup/rollup-linux-arm64-gnu@npm:4.45.1": "2822750ecd8f9566095c3a51e2666c9e35d307fb322f730303259d035b3d2f3960441d9647cc3fd15b3bc5e37bc8190461c318a05c189dc95ff636024b0b4169",
"@rollup/rollup-linux-arm64-musl@npm:4.45.1": "372430e2ae57007b64358eb4c26720b1dcdd80fd2ee24688ceb4d6031158790039f9d1a48f60df7a57e17e82395609428eca90e5e467766d867a60104c73eed5",
"@rollup/rollup-linux-loongarch64-gnu@npm:4.45.1": "fb0063b86d3308eea4940798ea711867a8de1a7494070b55bbf86a03b401b41b75cb88868e13f45148653699a18b1d2363351801a5b0c0b653867e4e662daa98",
"@rollup/rollup-linux-powerpc64le-gnu@npm:4.45.1": "bc9f4c68939f98562864b5100a78a6f6e3d9597db2f459b99fa114e498c14f06171647be3d7a560781483ee1971122a7e3b3ab58e2584b960447994ba444eb4e",
"@rollup/rollup-linux-riscv64-gnu@npm:4.45.1": "bc0a285841a777e14836be0102d58ecaf064d0373fde1aae730844d27c7f2982ccdfc0cab41d3c689b1472258fdc93568ca71660423ed670d938e3583570f69b",
"@rollup/rollup-linux-riscv64-musl@npm:4.45.1": "2150cb74acb44af2a2ead9068006efc76201b651f0ee09061aebd4e6e22b75254b3e64a8e1684c422ef72ea4001049379110199126dac288602464c4432dbdb6",
"@rollup/rollup-linux-s390x-gnu@npm:4.45.1": "a11dad7ddd921104d33d1d5aed05beef4ac8d6e79b69e5afc3612d424a2e12e67c6cd67d916b4f0f981bdb5738fe7c59a5e342fe265bc989a2acc9c981d3e212",
"@rollup/rollup-linux-x64-gnu@npm:4.45.1": "baf9081b367a5f557cfcd17ae60b196c00a933e87c5b16045efa312cb142518c91706ae3e6a4be1d09f7fbf2b133d386fc4ff3f6dd2d5b7149ac139af4a63391",
"@rollup/rollup-linux-x64-musl@npm:4.45.1": "dd53812371c9e7c68d4a4d6d96993c3d2def5c91c7bd9f264d832263f5fb0b7601789cb394b4ee835ff5c828a02da7421bef43e31131c44eccb548cca576d886",
"@rollup/rollup-win32-arm64-msvc@npm:4.45.1": "5d336c675befca41c76b0529e194e30eca93465512db3a95afcb626cf3fe56664d9e1e9b124a29c02383f43fe8638c5a1652171bdd341d8ea65ebc8462050e3f",
"@rollup/rollup-win32-ia32-msvc@npm:4.45.1": "53e1aea2fb90f3704b272d3f89009a04891ce318d7cdf5dea85092b1f039499a8f916065e9775ddebaa1af411bf8213d656bd540eabfcd7f764eaf0d21c33b98",
"@rollup/rollup-win32-x64-msvc@npm:4.45.1": "801641e0ecef2e8fd0e616ba443b029adb9a2ed5303b8f7ad8caf23a6615ba5e221dbefb138d17ef77039e6a240c0ba1ea022cf1e116a5545ea518a6063c1e63"
"@biomejs/cli-darwin-arm64@npm:2.2.6": "38ade81bfc2cf3c981fc6c06f15d41faefec1eed3be7a9c856304db9d0010700769479e2df16f7f421bf335a910b72fa1bf5185f30dd8372d416972a623c7841",
"@biomejs/cli-darwin-x64@npm:2.2.6": "42d5a3ca874969d3e1d72a7151f1ef3a40cb887f8c6c315a1898cf53f8a825eeb1419fbc691adf1551ec06355cf4c11f5400ecb42720e63a44c5c5b0db6f1cbc",
"@biomejs/cli-linux-arm64-musl@npm:2.2.6": "866839019a2a5ad2e731a4f04c1effdeb41a2559e04639ecc33bbc119c0d217175dd8e972ec54d34f84edea8db00ee75fda7bca44bbdcba5495ebffbaf3dc709",
"@biomejs/cli-linux-arm64@npm:2.2.6": "18db4d7c04347b2095584b9ed851234aeb31599a112176418d8b29d3dcc73f6e2b4a759e3c20b3a0440d57b6656056c418f8b9f52aad5e1bbb02385f97792bee",
"@biomejs/cli-linux-x64-musl@npm:2.2.6": "b43573c8cda9b9026d911931b8fd517a0e1f661ff6529ad718852cc8716a68632361d06f1c14bcc73fd600c69aeb7542680ac66a46a2461f6a4a645e7cef1d9b",
"@biomejs/cli-linux-x64@npm:2.2.6": "06f32d1d001eb09d9783587318f94fa52c3055826c0b835f48c18fc480aecfd311bcc0ddac678c709949f3b99b1283450cb073bbcc8b1631c39877d7264ac62e",
"@biomejs/cli-win32-arm64@npm:2.2.6": "fbdbb024198c027edc2043e1f6416592263624a4534768a98a46b359bfa813e9b919e2bb89f10114b7bfd7e78d29b298773262a255c924555096b39df9d35323",
"@biomejs/cli-win32-x64@npm:2.2.6": "7ceac86065c5e7c765993d4b300fd29c710678d2c65ea4394ed68ccf6ae1fa5133730829a7db8915dfb2877792093b8d5fe6eaea3ed727826ee5e2ac11530274",
"@esbuild/aix-ppc64@npm:0.25.11": "46c2697b0e5bf6a1d1d57e80358ee04fcb0d59a1c6648759ec94e12a83af50d35ecf2469cf7c5643f85a9b2c5b2f91173bc6485ebec9bb9add4a6b30b5dab95c",
"@esbuild/android-arm64@npm:0.25.11": "cc45d931e813767a15ad6e7fd6071c97865a2e9aaa0d3a78374da452d303dbea71a4f13c63426b01f71ce3c10dd208f9382e6387505111adaf631e39749aa404",
"@esbuild/android-arm@npm:0.25.11": "b8ee90079d3d6c02b732529b04d2e6c017d12b2c401f2f8d6e60ec5fb1060d819edde5429acfbc7471b2224b4457de8cb99b97bea4164e94a3da2cbf121e60a4",
"@esbuild/android-x64@npm:0.25.11": "c03182ed17c50ab29973b19814cbdee85ff67ba00e13f001fafabcf7538d061fd737a783fc4131f96e22b2e7bed26936e5e730b717bb88ffb0b8c429fadd6536",
"@esbuild/darwin-arm64@npm:0.25.11": "67114421780e01c947d3a646d9737d5965e2bf39ea75a2440d614971b7b2565a8cc91c39780f5b86adc25cdc466bbf1ade79a05cef71827e3f3a2be00435d868",
"@esbuild/darwin-x64@npm:0.25.11": "da5612584d5fc2e714efc0876826fa45a48fa3b881be4a728516f2394c6aeb72f6ca8ce08272106c24ea6a9b040513afd847b4ea9bfcc5a6637e427a1634acd7",
"@esbuild/freebsd-arm64@npm:0.25.11": "8ad357e0b7605a320d428b10ab704a2f34383786bb43e663ebb62ded22297343c72149ab126257629308195cd18b4828f9b90579b224c26d2ca56f416dcb3e48",
"@esbuild/freebsd-x64@npm:0.25.11": "a42ea4c6801eb2ff09b0f1e67a04b2d4a00da9dc08233a8dc227b25468efa954ea13478bd2f2dad46bf78e8d1ec3cf11b1edbc1b50af7e61da05e715f0ea0fc7",
"@esbuild/linux-arm64@npm:0.25.11": "c8f87df1d15ff5c835d782e26213bb28653eed9388351e42c073431ffa8e3606fa8e0670ccb0df325f56a9695782b34c98af2fe30756953a883f9da63d1eb42a",
"@esbuild/linux-arm@npm:0.25.11": "122d069ed8332d3eb6e3f0d99c7f25d8920d6aff3655013d6bc2f3666fcba85ae074402b54f3a2ca9a3a3a9cd54350fac1f56252d84d466daefca7a8dc82975b",
"@esbuild/linux-ia32@npm:0.25.11": "dbd90c3efbbb33b920abb3f3def4a61fcff258b8a60289c61c0ba6d5210fae8fd569af991ff9aaebe03b3c24a0c67a5fd74d8e32e8fd7c5a0dbf1898aeeb2bf3",
"@esbuild/linux-loong64@npm:0.25.11": "c58d14d84cf4f024f5cc585efd759b161ec4122767d94500578cf32f9649542ab7e7b5e2b88389d774d4544d50a39ba1e0d791793170643645ec6a2eb8836ffe",
"@esbuild/linux-mips64el@npm:0.25.11": "5a3f4ccefe0d8ed30806a6984b7b6cee17e2f2a14d3f6d64c37f05f78f6dddd04821fd5ff4d61044ce23c0206a8fd4f1535a90d534e26cb5e90c8c04d1203a0a",
"@esbuild/linux-ppc64@npm:0.25.11": "e35d0a4e54f7d48aa931abe6211b7fc374291b26cd59849fff938499114b5b34e3da15b71e67b76f83c1d712d6f78a50255d8b96bacaad8df233771126544ebe",
"@esbuild/linux-riscv64@npm:0.25.11": "4e932cf5950d97aec76aa5c52d7d15e7135f2b865414c97cd4410adc3f8b26e1588cda7a09222b92f54fff8c888180219e822b9a633c833098bb876b1e66ac02",
"@esbuild/linux-s390x@npm:0.25.11": "af2b8a5c0a6147985b1d194a7c1323b4693b72ad5884de1292f045882b41436cf4e64828c18cdbf7b85763060404279cc070fbf74c00f9f82d8f35469b8c0073",
"@esbuild/linux-x64@npm:0.25.11": "1e1fe2d9c8ae8ed76f3090ff2e4d3d084d581cc9298e349daf8addd398ae9b466a1817d9640202956d72479a82e602979ca364035d10e8cb6e2c2baf6e850081",
"@esbuild/netbsd-arm64@npm:0.25.11": "03e86862f25a9d3ed05383031ab3430ba73b80e5a1617cf0b9f91ce2a4d5700125398722a4a6145299d6f3626caca556d30604bd24f88af1a289794822322814",
"@esbuild/netbsd-x64@npm:0.25.11": "af848a8e720c5ba4fb63a748c657e366770e4f00a249dd4a0eb996bdafa0fcad7f04c88df3ed29cb1b488f76c4f7c3355e192ff71392c81d641dd52bc453355c",
"@esbuild/openbsd-arm64@npm:0.25.11": "40d46a15da7643aa57ba7a61aa8174cc7ead37f67b3438eaeb407f6527712b848327a025484a57ce936debced507a2d405614e790491aa181f8178c09b8f2ad2",
"@esbuild/openbsd-x64@npm:0.25.11": "8ee73b8cfe0b5d24433400bddcb20c3ceb2cab3d11112ba01c5ee799e3629d24267f6dcfcb2f3aef89726ddc5d10592e35ec46b9725cc9e297af3d8d35a3122b",
"@esbuild/openharmony-arm64@npm:0.25.11": "bf2fa9985a1aaba0a4376657e72e73c7d5368d0a1972e12788ec276384e6a20637904c5d07b52a9f10306735898730dbebd55a6234cc0cd30962ee130c7b9a8b",
"@esbuild/sunos-x64@npm:0.25.11": "7ac357650fadc4ad44a0615a184920734ab5f4432ddd913bef2cf4e4ef7855f7ffd1995cfabb323c10cb9b876f252cf3f7938b4450cfa9ce3b1488e47d91b6cf",
"@esbuild/win32-arm64@npm:0.25.11": "01a7db317fecb784cd273ddfb0f3eb35871709904cc879adfbeca139cb33fbe8db6d33ee53ae4eb3b4185ef9fb6d6f140d9ac0fcbbe61518cf546487d7430dcb",
"@esbuild/win32-ia32@npm:0.25.11": "cdb90fcd780022685374b762b2f6fdd19501ff43c4b4b63b9b875cdb56d4c79b4747f36f4893ce57d3f0c520aaf30b0f31309e606bae14738300b22bbb30b1df",
"@esbuild/win32-x64@npm:0.25.11": "a7b6080abc4d575c0572e880cefcb24faf89f7e48057652d6ab11e2e5b3fbd4555d27246ee281d5a1ac1f744a29ff90573e7075310e171ade9e2838665caefce",
"@rolldown/binding-android-arm64@npm:1.0.0-beta.44": "3584478753a119db5c345c314b7a80a122fe1f4aa868773d5103942f62e81493f922f440c040af86902296b8343a418f8ff325f0336ca477c58a3f00a5fe92cd",
"@rolldown/binding-darwin-arm64@npm:1.0.0-beta.44": "b3ffe5e3e54d7db2aa77ea24399016c934b68e3c4e7d5124ea90e85a7814e74ef933e07fd640ca0608fbf4a46f6db21087fa301ebf209883db8d0f43b97b5081",
"@rolldown/binding-darwin-x64@npm:1.0.0-beta.44": "ecad93425fde8cbc0ab451592887f068fbd3b2e6e7c6a54c12e4f02dceb499ec584a5ebd854b94691e78ad1a097846e0328485adc7c8f69a66531001dfd3afa0",
"@rolldown/binding-freebsd-x64@npm:1.0.0-beta.44": "4b397b3e5bf3ba2b3f4af648921bd027fbaf9859041b92aa36c9a60d4e25eb7f67da8812d61b80078957ffd2836d3a9618dfa6c4d1141e2c4eb1dd6d4b7a051c",
"@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-beta.44": "0d2be4daa7358490a081769efc6bf5a7ef8007706bf8a54d354950214b4eff91b367f21f4cb4d05d0e0a3dc759528bf8d7eab7e482754c74321d66d612997f43",
"@rolldown/binding-linux-arm64-gnu@npm:1.0.0-beta.44": "4a0d9d0e06fae39dcd984e5dcb858aa38d34d412e8472290593f3b907aac6e8c1e60b7659020b71063d469faa904dee78fb6678979292ddc7060e765cf0258a7",
"@rolldown/binding-linux-arm64-musl@npm:1.0.0-beta.44": "3dfb95b4663bc950d1ed5f93162ed1b7a2cb02281f1ee82901844a9e22e34369dece54d5a9bbf9d3d2381407ca363b8536d236421a793dbd72350dc65d7bfc46",
"@rolldown/binding-linux-x64-gnu@npm:1.0.0-beta.44": "d6329c568d9ccd363b215ebffff7b86df0a102d0dcf2b56e32a81e2d1961d052691d8a90e9df5dff3c819a0965635b3b5beb71e125fb7f385aebdf458b3f53a8",
"@rolldown/binding-linux-x64-musl@npm:1.0.0-beta.44": "b0fd15a216b02ff03cb927e84802bc9d8454d5cafcc3561cb9f642997fd5869c6611bdbb5e3391d9d6866ea8b764876db8dcbab6a52017025f4f349c83c6a51f",
"@rolldown/binding-openharmony-arm64@npm:1.0.0-beta.44": "e367f21610a6daf111f337824334474213172f4050d67bf4c7a29f69ba43e35733911cf4c44906b3170cdcaf9fb96ba6386eff29e02650109e11130da46dc53a",
"@rolldown/binding-wasm32-wasi@npm:1.0.0-beta.44": "a53092c1338dfc25fc0447a223748ef5048058ee420fefda15e846131b31c3c8fc6d3f2e975467190905f91abccf8de570653aed77a147513d3dae7ff0004931",
"@rolldown/binding-win32-arm64-msvc@npm:1.0.0-beta.44": "d985908536816c176699b21626ad57106af36a99d665437cf58f827f54491200763f2b47870c218ac3022d4a43c6ff5bb38438f81a18a1fc88fc837d9e53a459",
"@rolldown/binding-win32-ia32-msvc@npm:1.0.0-beta.44": "f247d3a00caa1238fed18d6d7f884d02291e3fd570d987f50bf77b0886e767529dae2586093bfd820320eb0548cbdba6784f5b49afd49032a883bfc3f1ea19b4",
"@rolldown/binding-win32-x64-msvc@npm:1.0.0-beta.44": "9f13f6cd9f6ba17c79a7c398c1931cd2e8321703d30aea0de56e5c6175e4979d96988ca941576d0d424e928e873625c5802d081498e8111e52382ada737656f2",
"@rollup/rollup-android-arm-eabi@npm:4.52.5": "62451748fde2f4a8e8423b2e7f83fd0342e57433fa0f71d378ea38ed3f85dc6a0706ef9feae21d79428f4e274da45c07bc49eb1b3a82c08f6b98d8cf20de83f7",
"@rollup/rollup-android-arm64@npm:4.52.5": "d050880ec4e14c0d1ab7e32e6a843c3f39b4161ddd574532482807e6e559e34dee8bfe3862bf06a62e79e46a410afaa3dafedc5e0db41db5cf39c10bbcf32330",
"@rollup/rollup-darwin-arm64@npm:4.52.5": "4c7a2994ec5bb915b5b455a507b296c892c914ed0c0c3e8e1958d7e021dc47627a27c756f1628aca2e2ace8487dc93dd801483f0ec40f92603b6a788322e66ed",
"@rollup/rollup-darwin-x64@npm:4.52.5": "fcdc3b7954afea6dc191a6244e793a32e8373e1798020d1cfcaf5da48bd23c533b661763d2dbfb87412bf5b1a59377ec06560f64da869126ab8c995391de9047",
"@rollup/rollup-freebsd-arm64@npm:4.52.5": "f52788b616f5bc4c5edbc41ca2ac4fde7fbed678a0d2c3249111f4322a76550e682037563d07a0f07eb21f82289e9c5616c41797f3d9caa6d5b4261b8e1ce642",
"@rollup/rollup-freebsd-x64@npm:4.52.5": "8fcb45fd9b7ec02848230cefac866bca73f38071e2e85e1217627007df211e814743e3e2525b236dc410acea7f7c4484050e2338391bda509bac34e7e0bc9ca4",
"@rollup/rollup-linux-arm-gnueabihf@npm:4.52.5": "ff055f9efd2f8d1e1ced74a0defa0d089b54789f2b3d3d8f9261180059d6cd45fb895399c938c87467419ce1b37f7c50eaec333d5f140e7d8b53874cfba7bad9",
"@rollup/rollup-linux-arm-musleabihf@npm:4.52.5": "2932799d8e79831d1f79032d2bced666503466a5d3b87e98a12f577400bad80dfb5ce2883318059c038d061319ed51ed58213bc9b253b3c60a1ac5ca3807ba46",
"@rollup/rollup-linux-arm64-gnu@npm:4.52.5": "f2bf47b114856efd75e23baa3c3954fc2a8b864d678610fec5c2ecdab5736d1068fe3c813d29592a9de3f54c0de4055190670ef842333f5bc9e34e1221fb403e",
"@rollup/rollup-linux-arm64-musl@npm:4.52.5": "26c8ded405da1a31c414677de84c261d1139cd7bf568e979036d39c613a2783bff559ba9cd4ebeda06c517d709050fea97ed65ca482316322984a1bad51ccc05",
"@rollup/rollup-linux-loong64-gnu@npm:4.52.5": "3fec9dbb69d304495c40c26d49e736ae98ac173368ed0f0115fdf90b464e8bdd716b5a10f0458438a8ee31d5b13cb219ceff2ea0773537a87b597a3aaf6c0fbd",
"@rollup/rollup-linux-ppc64-gnu@npm:4.52.5": "542b1171f910f3298a1f326ca6dfb41463ac8a9291f21502830a75217d91c38a0701517c4424c1d114b7fcba06b5fdc1ac95b9814ff542fc1c5741c965a12fc0",
"@rollup/rollup-linux-riscv64-gnu@npm:4.52.5": "3f8a728b372d5cd2964281bdfe6184cd6dcff579681ea3a9bcb240d2fdaa0181a763f6f34930eae206d00c687cbecfa3d3b18b49bfdef0b772809fac80e007d8",
"@rollup/rollup-linux-riscv64-musl@npm:4.52.5": "26b5a6d0983aeea544421d697787a540de653a84f948389280cfde0add366fa0fb7af4a5e67ca490a63a8fabca801f04b23a70bb948cbe06d48aa0ab0b3fff73",
"@rollup/rollup-linux-s390x-gnu@npm:4.52.5": "6f4b1605d9cb191ec404ad2418f5fbc43d5585a83eeb33f8a8de6d2393e4ec85fb42a4e55da7d100bdd708e830e89b815d4e444f34b3002096370b1e1e80bee7",
"@rollup/rollup-linux-x64-gnu@npm:4.52.5": "70fdee240db9c56c9a2a202450f4fb2b8cad059bb001c10cfc37b8ba1a333f1ad61b4a9bc01df005d9d0eb9c7ae57103c70c4ba58ef89942e11b0eb449cb3fd8",
"@rollup/rollup-linux-x64-musl@npm:4.52.5": "871865574e0a5f79af49151685b1e243d43f0eb11100cffb9d835c4aa3423a471dfbb56ba7d16928eb11df7956e307c74d0b5cd872db711cd382bc36e487be9a",
"@rollup/rollup-openharmony-arm64@npm:4.52.5": "15150989aa46138a5675962f1bfb01640a212e26976e799be4b0029c2e6f0e7a21b32754457b13dac05d02aa04814b6d0a6ee43dbf3473dc9fce00c7d8c0155f",
"@rollup/rollup-win32-arm64-msvc@npm:4.52.5": "6433d349de33e71bb1cd11192ac58827630ef1b4eef79af40708cd7a8375922bfdcde69ed9e31309ae9b9224e3d9237ac00191a1c8406c7e3bbfa99d57baae00",
"@rollup/rollup-win32-ia32-msvc@npm:4.52.5": "0da2d66ad1bc046a601b9de5a1266ba61a08e211df670d056451a58ee92a1a1de3739cfae853bf133c4204802ec7c72d2fae607f7ef31789e6124c23441f3f07",
"@rollup/rollup-win32-x64-gnu@npm:4.52.5": "a7d3489e79f1cd8e4d34e784f3e32e9681170e4fc7d568cf43b31511c6b9c0e03db722c76baa595799c85ebd96a7e6ce66670ec00ed253e674d7e732a244c554",
"@rollup/rollup-win32-x64-msvc@npm:4.52.5": "eb1c823b1e13f27b49321ae56f4c35710194d674034820f6c0b66a2309cbefaff7bc4a58e6c3fbb2453f8913f4aa1cc173cf9f6e9085df47f1922626630260da"
}
@@ -8,7 +8,7 @@
}:
let
pname = "swagger-typescript-api";
version = "13.2.8";
version = "13.2.16";
yarn-berry = yarn-berry_4;
in
stdenv.mkDerivation (finalAttrs: {
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "acacode";
repo = "swagger-typescript-api";
rev = version;
hash = "sha256-3IPap3Ln8UheYD3/PE4y1ga1KXMNihm36bkMCKy6WuQ=";
hash = "sha256-SPvOCoxtf7x8MLPV8kylyaNXHaNtsHvs6liagd7iyF8=";
};
nativeBuildInputs = [
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
missingHashes = ./missing-hashes.json;
offlineCache = yarn-berry.fetchYarnBerryDeps {
inherit (finalAttrs) src missingHashes;
hash = "sha256-3vVaW9beLNuudq7RB8pnw6aMJ8nJ1YBFaYr1d9K/k5U=";
hash = "sha256-ZIF+sA/Wp2Rbu9CeERZo1X1oC00SjE64Mk5verb8IxU=";
};
buildPhase = ''
-77
View File
@@ -1,77 +0,0 @@
{
lib,
python3,
fetchFromGitHub,
}:
python3.pkgs.buildPythonApplication rec {
pname = "syncall";
version = "1.8.5";
format = "pyproject";
src = fetchFromGitHub {
owner = "bergercookie";
repo = "syncall";
rev = "v${version}";
hash = "sha256-f9WVZ1gpVG0wvIqoAkeaYBE4QsGXSqrYS4KyHy6S+0Q=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail 'loguru = "^0.5.3"' 'loguru = "^0.7"' \
--replace-fail 'PyYAML = "~5.3.1"' 'PyYAML = "^6.0"' \
--replace-fail 'bidict = "^0.21.2"' 'bidict = "^0.23"' \
--replace-fail 'typing = "^3.7.4"' '''
'';
nativeBuildInputs = [
python3.pkgs.poetry-core
python3.pkgs.poetry-dynamic-versioning
];
propagatedBuildInputs = with python3.pkgs; [
bidict
bubop
click
item-synchronizer
loguru
python-dateutil
pyyaml
rfc3339
typing
# asana optional-dep
asana
# caldav optional-dep
caldav
icalendar
# fs optional-dep
xattr
# gkeep optional-dep
# gkeepapi is unavailable in nixpkgs
# google optional-dep
google-api-python-client
google-auth-oauthlib
# notion optional-dep
# FIXME: notion-client -- broken, doesn't build.
# taskwarrior optional-dep
taskw-ng
];
postInstall = ''
# We do not support gkeep
rm $out/bin/tw_gkeep_sync
'';
pythonImportsCheck = [ "syncall" ];
meta = with lib; {
description = "Bi-directional synchronization between services such as Taskwarrior, Google Calendar, Notion, Asana, and more";
homepage = "https://github.com/bergercookie/syncall";
license = licenses.mit;
maintainers = with maintainers; [ raitobezarius ];
# Upstream issue making it practically unusable:
# https://github.com/bergercookie/syncall/issues/99
broken = true;
};
}
+5 -5
View File
@@ -7,7 +7,7 @@
makeWrapper,
}:
let
version = "4.1.14";
version = "4.1.16";
inherit (stdenv.hostPlatform) system;
throwSystem = throw "tailwindcss has not been packaged for ${system} yet.";
@@ -22,10 +22,10 @@ let
hash =
{
aarch64-darwin = "sha256-5yK3UvUd74bULohrTBFx8tCaS+GnSHoKUeSv+OdgPOM=";
aarch64-linux = "sha256-MUlB9fbhQ+dOdAxYetH7qu3lRiVy3TMLvgk35hHpZts=";
x86_64-darwin = "sha256-Z7JbYQP6dndjflpd4zJ/7DM12jFtkNP9saTNcr2kHAo=";
x86_64-linux = "sha256-vDTDAbCAtua5jtJBGEGYM/lm9vNH5VaUXWVX02pEpW4=";
aarch64-darwin = "sha256-5s1EuBZ/V0bKMuVPahQR3RpsDdFdJqnCc7Oy7Z2H330=";
aarch64-linux = "sha256-ln60NPTWocDf2hBt7MZGy3QuBNdFqkhHJgI83Ua6jto=";
x86_64-darwin = "sha256-/eKu0JvyScq5+Yb9byCJ486anOHHhi/dv6gHxBfg9dM=";
x86_64-linux = "sha256-CeaHamPOsJzNflhn49uystxlw6Ly4v4hDWjqO8BDIFA=";
}
.${system} or throwSystem;
in
+297 -312
View File
@@ -55,11 +55,6 @@
libvaSupport ? mediaSupport,
libva,
# Hardening
graphene-hardened-malloc,
# Whether to use graphene-hardened-malloc
useHardenedMalloc ? null,
# Whether to use IPC for communicating with Tor
useIPCTorService ? false,
# Whether to disable multiprocess support
@@ -69,317 +64,307 @@
extraPrefs ? "",
}:
lib.warnIf (useHardenedMalloc != null)
"tor-browser: useHardenedMalloc is deprecated and enabling it can cause issues"
let
libPath = lib.makeLibraryPath (
[
alsa-lib
atk
cairo
dbus
dbus-glib
fontconfig
freetype
gdk-pixbuf
glib
gtk3
libxcb
libX11
libXext
libXrender
libXt
libXtst
libgbm
pango
pciutils
stdenv.cc.cc
stdenv.cc.libc
zlib
]
++ lib.optionals libnotifySupport [ libnotify ]
++ lib.optionals waylandSupport [
libxkbcommon
libdrm
libGL
]
++ lib.optionals pipewireSupport [ pipewire ]
++ lib.optionals pulseaudioSupport [ libpulseaudio ]
++ lib.optionals libvaSupport [ libva ]
++ lib.optionals mediaSupport [ ffmpeg ]
);
(
let
libPath = lib.makeLibraryPath (
[
alsa-lib
atk
cairo
dbus
dbus-glib
fontconfig
freetype
gdk-pixbuf
glib
gtk3
libxcb
libX11
libXext
libXrender
libXt
libXtst
libgbm
pango
pciutils
stdenv.cc.cc
stdenv.cc.libc
zlib
]
++ lib.optionals libnotifySupport [ libnotify ]
++ lib.optionals waylandSupport [
libxkbcommon
libdrm
libGL
]
++ lib.optionals pipewireSupport [ pipewire ]
++ lib.optionals pulseaudioSupport [ libpulseaudio ]
++ lib.optionals libvaSupport [ libva ]
++ lib.optionals mediaSupport [ ffmpeg ]
);
version = "14.5.8";
version = "14.5.8";
sources = {
x86_64-linux = fetchurl {
urls = [
"https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
];
hash = "sha256-hf3pkl+J9Hs28XSyNoXCZM0B9A7g4/n6F7WFkD/hl/o=";
};
i686-linux = fetchurl {
urls = [
"https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
];
hash = "sha256-iSHeHCyBg66pbGw8glmViTFMvys3EArOkXVpqJBXEfc=";
};
};
distributionIni = writeText "distribution.ini" (
lib.generators.toINI { } {
# Some light branding indicating this build uses our distro preferences
Global = {
id = "nixos";
version = "1.0";
about = "Tor Browser for NixOS";
};
}
);
policiesJson = writeText "policies.json" (
builtins.toJSON {
policies.DisableAppUpdate = true;
}
);
in
stdenv.mkDerivation rec {
pname = "tor-browser";
inherit version;
src =
sources.${stdenv.hostPlatform.system}
or (throw "unsupported system: ${stdenv.hostPlatform.system}");
nativeBuildInputs = [
autoPatchelfHook
patchelfUnstable
copyDesktopItems
makeWrapper
wrapGAppsHook3
sources = {
x86_64-linux = fetchurl {
urls = [
"https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
];
buildInputs = [
gtk3
alsa-lib
dbus-glib
libXtst
hash = "sha256-hf3pkl+J9Hs28XSyNoXCZM0B9A7g4/n6F7WFkD/hl/o=";
};
i686-linux = fetchurl {
urls = [
"https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
];
hash = "sha256-iSHeHCyBg66pbGw8glmViTFMvys3EArOkXVpqJBXEfc=";
};
};
# Firefox uses "relrhack" to manually process relocations from a fixed offset
patchelfFlags = [ "--no-clobber-old-sections" ];
preferLocalBuild = true;
allowSubstitutes = false;
desktopItems = [
(makeDesktopItem {
name = "torbrowser";
exec = "tor-browser %U";
icon = "tor-browser";
desktopName = "Tor Browser";
genericName = "Web Browser";
comment = meta.description;
categories = [
"Network"
"WebBrowser"
"Security"
];
mimeTypes = [
"text/html"
"text/xml"
"application/xhtml+xml"
"application/vnd.mozilla.xul+xml"
"x-scheme-handler/http"
"x-scheme-handler/https"
];
startupWMClass = "Tor Browser";
})
];
buildPhase = ''
runHook preBuild
# For convenience ...
TBB_IN_STORE=$out/share/tor-browser
# Unpack & enter
mkdir -p "$TBB_IN_STORE"
tar xf "$src" -C "$TBB_IN_STORE" --strip-components=2
pushd "$TBB_IN_STORE"
# Set ELF interpreter
autoPatchelf firefox.real TorBrowser/Tor
# firefox is a wrapper that checks for a more recent libstdc++ & appends it to the ld path
mv firefox.real firefox
# store state at `~/.tor browser` instead of relative to executable
touch "$TBB_IN_STORE/system-install"
# The final libPath. Note, we could split this into firefoxLibPath
# and torLibPath for accuracy, but this is more convenient ...
libPath=${libPath}:$TBB_IN_STORE:$TBB_IN_STORE/TorBrowser/Tor
# apulse uses a non-standard library path. For now special-case it.
${lib.optionalString (audioSupport && !pulseaudioSupport) ''
libPath=${apulse}/lib/apulse:$libPath
''}
# Fixup paths to pluggable transports.
substituteInPlace TorBrowser/Data/Tor/torrc-defaults \
--replace-fail './TorBrowser' "$TBB_IN_STORE/TorBrowser"
# Prepare for autoconfig.
#
# See https://developer.mozilla.org/en-US/Firefox/Enterprise_deployment
cat >defaults/pref/autoconfig.js <<EOF
//
pref("general.config.filename", "mozilla.cfg");
pref("general.config.obscure_value", 0);
EOF
# Hard-coded Firefox preferences.
cat >mozilla.cfg <<EOF
// First line must be a comment
// Reset pref that captures store paths.
clearPref("extensions.xpiState");
// Stop obnoxious first-run redirection.
lockPref("noscript.firstRunRedirection", false);
// User should never change these. Locking prevents these
// values from being written to prefs.js, avoiding Store
// path capture.
lockPref("extensions.torlauncher.torrc-defaults_path", "$TBB_IN_STORE/TorBrowser/Data/Tor/torrc-defaults");
lockPref("extensions.torlauncher.tor_path", "$TBB_IN_STORE/TorBrowser/Tor/tor");
// Optionally use IPC for communicating with Tor
//
// Sockets are created at \$XDG_RUNTIME_DIR/Tor/{socks,control}.socket
${lib.optionalString useIPCTorService ''
lockPref("extensions.torlauncher.control_port_use_ipc", true);
lockPref("extensions.torlauncher.socks_port_use_ipc", true);
''}
// Optionally disable multiprocess support. We always set this to ensure that
// toggling the pref takes effect.
lockPref("browser.tabs.remote.autostart.2", ${if disableContentSandbox then "false" else "true"});
// Allow sandbox access to sound devices if using ALSA directly
${
if (audioSupport && !pulseaudioSupport) then
''
pref("security.sandbox.content.write_path_whitelist", "/dev/snd/");
''
else
''
clearPref("security.sandbox.content.write_path_whitelist");
''
}
${lib.optionalString (extraPrefs != "") ''
${extraPrefs}
''}
EOF
# FONTCONFIG_FILE is required to make fontconfig read the TBB
# fonts.conf; upstream uses FONTCONFIG_PATH, but FC_DEBUG=1024
# indicates the system fonts.conf being used instead.
FONTCONFIG_FILE=$TBB_IN_STORE/fonts/fonts.conf
substituteInPlace "$FONTCONFIG_FILE" \
--replace-fail '<dir prefix="cwd">fonts</dir>' "<dir>$TBB_IN_STORE/fonts</dir>"
# Hard-code paths to geoip data files. TBB resolves the geoip files
# relative to torrc-defaults_path but if we do not hard-code them
# here, these paths end up being written to the torrc in the user's
# state dir.
cat >>TorBrowser/Data/Tor/torrc-defaults <<EOF
GeoIPFile $TBB_IN_STORE/TorBrowser/Data/Tor/geoip
GeoIPv6File $TBB_IN_STORE/TorBrowser/Data/Tor/geoip6
EOF
mkdir -p $out/bin
makeWrapper "$TBB_IN_STORE/firefox" "$out/bin/tor-browser" \
--prefix LD_PRELOAD : "${
lib.optionalString (
useHardenedMalloc == true
) "${graphene-hardened-malloc}/lib/libhardened_malloc.so"
}" \
--prefix LD_LIBRARY_PATH : "$libPath" \
--set FONTCONFIG_FILE "$FONTCONFIG_FILE" \
--set-default MOZ_ENABLE_WAYLAND 1
# Easier access to docs
mkdir -p $out/share/doc
ln -s $TBB_IN_STORE/TorBrowser/Docs $out/share/doc/tor-browser
# Install icons
for i in 16 32 48 64 128; do
mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps/
ln -s $out/share/tor-browser/browser/chrome/icons/default/default$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/tor-browser.png
done
# Check installed apps
echo "Checking bundled Tor ..."
LD_LIBRARY_PATH=$libPath $TBB_IN_STORE/TorBrowser/Tor/tor --version >/dev/null
echo "Checking tor-browser wrapper ..."
$out/bin/tor-browser --version >/dev/null
runHook postBuild
'';
installPhase = ''
runHook preInstall
# Install distribution customizations
install -Dvm644 ${distributionIni} $out/share/tor-browser/distribution/distribution.ini
install -Dvm644 ${policiesJson} $out/share/tor-browser/distribution/policies.json
runHook postInstall
'';
passthru = {
inherit sources;
updateScript = callPackage ./update.nix {
inherit pname version meta;
};
};
meta = {
description = "Privacy-focused browser routing traffic through the Tor network";
mainProgram = "tor-browser";
homepage = "https://www.torproject.org/";
changelog = "https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=maint-${version}";
platforms = lib.attrNames sources;
maintainers = with lib.maintainers; [
c4patino
felschr
hax404
joachifm
panicgh
];
# MPL2.0+, GPL+, &c. While it's not entirely clear whether
# the compound is "libre" in a strict sense (some components place certain
# restrictions on redistribution), it's free enough for our purposes.
license = with lib.licenses; [
mpl20
lgpl21Plus
lgpl3Plus
free
];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
distributionIni = writeText "distribution.ini" (
lib.generators.toINI { } {
# Some light branding indicating this build uses our distro preferences
Global = {
id = "nixos";
version = "1.0";
about = "Tor Browser for NixOS";
};
}
)
);
policiesJson = writeText "policies.json" (
builtins.toJSON {
policies.DisableAppUpdate = true;
}
);
in
stdenv.mkDerivation rec {
pname = "tor-browser";
inherit version;
src =
sources.${stdenv.hostPlatform.system}
or (throw "unsupported system: ${stdenv.hostPlatform.system}");
nativeBuildInputs = [
autoPatchelfHook
patchelfUnstable
copyDesktopItems
makeWrapper
wrapGAppsHook3
];
buildInputs = [
gtk3
alsa-lib
dbus-glib
libXtst
];
# Firefox uses "relrhack" to manually process relocations from a fixed offset
patchelfFlags = [ "--no-clobber-old-sections" ];
preferLocalBuild = true;
allowSubstitutes = false;
desktopItems = [
(makeDesktopItem {
name = "torbrowser";
exec = "tor-browser %U";
icon = "tor-browser";
desktopName = "Tor Browser";
genericName = "Web Browser";
comment = meta.description;
categories = [
"Network"
"WebBrowser"
"Security"
];
mimeTypes = [
"text/html"
"text/xml"
"application/xhtml+xml"
"application/vnd.mozilla.xul+xml"
"x-scheme-handler/http"
"x-scheme-handler/https"
];
startupWMClass = "Tor Browser";
})
];
buildPhase = ''
runHook preBuild
# For convenience ...
TBB_IN_STORE=$out/share/tor-browser
# Unpack & enter
mkdir -p "$TBB_IN_STORE"
tar xf "$src" -C "$TBB_IN_STORE" --strip-components=2
pushd "$TBB_IN_STORE"
# Set ELF interpreter
autoPatchelf firefox.real TorBrowser/Tor
# firefox is a wrapper that checks for a more recent libstdc++ & appends it to the ld path
mv firefox.real firefox
# store state at `~/.tor browser` instead of relative to executable
touch "$TBB_IN_STORE/system-install"
# The final libPath. Note, we could split this into firefoxLibPath
# and torLibPath for accuracy, but this is more convenient ...
libPath=${libPath}:$TBB_IN_STORE:$TBB_IN_STORE/TorBrowser/Tor
# apulse uses a non-standard library path. For now special-case it.
${lib.optionalString (audioSupport && !pulseaudioSupport) ''
libPath=${apulse}/lib/apulse:$libPath
''}
# Fixup paths to pluggable transports.
substituteInPlace TorBrowser/Data/Tor/torrc-defaults \
--replace-fail './TorBrowser' "$TBB_IN_STORE/TorBrowser"
# Prepare for autoconfig.
#
# See https://developer.mozilla.org/en-US/Firefox/Enterprise_deployment
cat >defaults/pref/autoconfig.js <<EOF
//
pref("general.config.filename", "mozilla.cfg");
pref("general.config.obscure_value", 0);
EOF
# Hard-coded Firefox preferences.
cat >mozilla.cfg <<EOF
// First line must be a comment
// Reset pref that captures store paths.
clearPref("extensions.xpiState");
// Stop obnoxious first-run redirection.
lockPref("noscript.firstRunRedirection", false);
// User should never change these. Locking prevents these
// values from being written to prefs.js, avoiding Store
// path capture.
lockPref("extensions.torlauncher.torrc-defaults_path", "$TBB_IN_STORE/TorBrowser/Data/Tor/torrc-defaults");
lockPref("extensions.torlauncher.tor_path", "$TBB_IN_STORE/TorBrowser/Tor/tor");
// Optionally use IPC for communicating with Tor
//
// Sockets are created at \$XDG_RUNTIME_DIR/Tor/{socks,control}.socket
${lib.optionalString useIPCTorService ''
lockPref("extensions.torlauncher.control_port_use_ipc", true);
lockPref("extensions.torlauncher.socks_port_use_ipc", true);
''}
// Optionally disable multiprocess support. We always set this to ensure that
// toggling the pref takes effect.
lockPref("browser.tabs.remote.autostart.2", ${if disableContentSandbox then "false" else "true"});
// Allow sandbox access to sound devices if using ALSA directly
${
if (audioSupport && !pulseaudioSupport) then
''
pref("security.sandbox.content.write_path_whitelist", "/dev/snd/");
''
else
''
clearPref("security.sandbox.content.write_path_whitelist");
''
}
${lib.optionalString (extraPrefs != "") ''
${extraPrefs}
''}
EOF
# FONTCONFIG_FILE is required to make fontconfig read the TBB
# fonts.conf; upstream uses FONTCONFIG_PATH, but FC_DEBUG=1024
# indicates the system fonts.conf being used instead.
FONTCONFIG_FILE=$TBB_IN_STORE/fonts/fonts.conf
substituteInPlace "$FONTCONFIG_FILE" \
--replace-fail '<dir prefix="cwd">fonts</dir>' "<dir>$TBB_IN_STORE/fonts</dir>"
# Hard-code paths to geoip data files. TBB resolves the geoip files
# relative to torrc-defaults_path but if we do not hard-code them
# here, these paths end up being written to the torrc in the user's
# state dir.
cat >>TorBrowser/Data/Tor/torrc-defaults <<EOF
GeoIPFile $TBB_IN_STORE/TorBrowser/Data/Tor/geoip
GeoIPv6File $TBB_IN_STORE/TorBrowser/Data/Tor/geoip6
EOF
mkdir -p $out/bin
makeWrapper "$TBB_IN_STORE/firefox" "$out/bin/tor-browser" \
--prefix LD_LIBRARY_PATH : "$libPath" \
--set FONTCONFIG_FILE "$FONTCONFIG_FILE" \
--set-default MOZ_ENABLE_WAYLAND 1
# Easier access to docs
mkdir -p $out/share/doc
ln -s $TBB_IN_STORE/TorBrowser/Docs $out/share/doc/tor-browser
# Install icons
for i in 16 32 48 64 128; do
mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps/
ln -s $out/share/tor-browser/browser/chrome/icons/default/default$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/tor-browser.png
done
# Check installed apps
echo "Checking bundled Tor ..."
LD_LIBRARY_PATH=$libPath $TBB_IN_STORE/TorBrowser/Tor/tor --version >/dev/null
echo "Checking tor-browser wrapper ..."
$out/bin/tor-browser --version >/dev/null
runHook postBuild
'';
installPhase = ''
runHook preInstall
# Install distribution customizations
install -Dvm644 ${distributionIni} $out/share/tor-browser/distribution/distribution.ini
install -Dvm644 ${policiesJson} $out/share/tor-browser/distribution/policies.json
runHook postInstall
'';
passthru = {
inherit sources;
updateScript = callPackage ./update.nix {
inherit pname version meta;
};
};
meta = {
description = "Privacy-focused browser routing traffic through the Tor network";
mainProgram = "tor-browser";
homepage = "https://www.torproject.org/";
changelog = "https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=maint-${version}";
platforms = lib.attrNames sources;
maintainers = with lib.maintainers; [
c4patino
felschr
hax404
joachifm
panicgh
];
# MPL2.0+, GPL+, &c. While it's not entirely clear whether
# the compound is "libre" in a strict sense (some components place certain
# restrictions on redistribution), it's free enough for our purposes.
license = with lib.licenses; [
mpl20
lgpl21Plus
lgpl3Plus
free
];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
};
}
+2 -2
View File
@@ -6,13 +6,13 @@
}:
buildGoModule (finalAttrs: {
pname = "trdl-client";
version = "0.12.1";
version = "0.12.2";
src = fetchFromGitHub {
owner = "werf";
repo = "trdl";
tag = "v${finalAttrs.version}";
hash = "sha256-Wu4PRFJDT6SvWPHOaOmBBVX1wvkDrjigxah5ZCq8NsY=";
hash = "sha256-0hyo32LjPG/Zu0n1WHg7O3f9blxiGUkfUD1i/80UIRE=";
};
sourceRoot = "${finalAttrs.src.name}/client";
+14 -11
View File
@@ -1,7 +1,8 @@
{
lib,
stdenv,
fetchurl,
fetchzip,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -10,19 +11,21 @@ stdenv.mkDerivation (finalAttrs: {
# We fetch the prebuilt font because building it takes 1.5 hours on hydra.
# Relevant issue: https://github.com/NixOS/nixpkgs/issues/97871
src = fetchurl {
url = "https://github.com/eosrei/twemoji-color-font/releases/download/v${finalAttrs.version}/TwitterColorEmoji-SVGinOT-Linux-${finalAttrs.version}.tar.gz";
sha256 = "sha256-yKUwLuTkwhiM54Xt2ExQxhagf26Z/huRrsuk4ds0EpU=";
src = fetchzip {
url = "https://github.com/13rac1/twemoji-color-font/releases/download/v${finalAttrs.version}/TwitterColorEmoji-SVGinOT-Linux-${finalAttrs.version}.tar.gz";
hash = "sha256-Xy6Lkm340ldm9ssQWn/eRFIJ5kyhYaXPNy/Y/9vUt40=";
};
dontBuild = true;
installPhase = ''
runHook preInstall
install -Dm755 TwitterColorEmoji-SVGinOT.ttf $out/share/fonts/truetype/TwitterColorEmoji-SVGinOT.ttf
install -Dm644 fontconfig/46-twemoji-color.conf $out/etc/fonts/conf.d/46-twemoji-color.conf
runHook postInstall
'';
meta = with lib; {
passthru.updateScript = nix-update-script { };
meta = {
description = "Color emoji SVGinOT font using Twitter Unicode 10 emoji with diversity and country flags";
longDescription = ''
A color and B&W emoji SVGinOT font built from the Twitter Emoji for
@@ -35,12 +38,12 @@ stdenv.mkDerivation (finalAttrs: {
systems and applications. Regular B&W outline emoji are included for
backwards/fallback compatibility.
'';
homepage = "https://github.com/eosrei/twemoji-color-font";
downloadPage = "https://github.com/eosrei/twemoji-color-font/releases";
license = with licenses; [
homepage = "https://github.com/13rac1/twemoji-color-font";
downloadPage = "https://github.com/13rac1/twemoji-color-font/releases";
license = with lib.licenses; [
cc-by-40
mit
];
maintainers = [ maintainers.fgaz ];
maintainers = [ lib.maintainers.fgaz ];
};
})
+3 -3
View File
@@ -10,13 +10,13 @@ let
in
buildGoModule {
pname = "typescript-go";
version = "0-unstable-2025-10-17";
version = "0-unstable-2025-10-22";
src = fetchFromGitHub {
owner = "microsoft";
repo = "typescript-go";
rev = "20b1482ea8b55d51fc21c60718dc934d763c918b";
hash = "sha256-+sfewMFnvq4zJO6KCvii9qF8LdAd+5Rqk2GJcJrJAeI=";
rev = "42241ec50d438ce9ef1f2b90a7b2cdd1bfa5f51d";
hash = "sha256-5vm9ht3nZ3ELODN+J5PfAOWrxIUCyvsIxbf29geSYrA=";
fetchSubmodules = false;
};
+2 -2
View File
@@ -30,14 +30,14 @@ let
# https://dldir1.qq.com/weixin/mac/mac-release.xml
any-darwin =
let
version = "4.1.0.19-29668";
version = "4.1.0.34-29721";
version' = lib.replaceString "-" "_" version;
in
{
inherit version;
src = fetchurl {
url = "https://dldir1v6.qq.com/weixin/Universal/Mac/xWeChatMac_universal_${version'}.dmg";
hash = "sha256-EAKfskB3zY4C05MVCoyxzW6wuRw8b2nXIynyEjx8Rvw=";
hash = "sha256-UwQrU4uVCKnAYXFSnlIfXQbBxyR3KNn6f1Mp4bCSAZI=";
};
};
in
+1 -5
View File
@@ -24,11 +24,6 @@ stdenv.mkDerivation rec {
hash = "sha256-RfZbPAaf8UB4scUZ9XSL12QZ4UkYMzXqfmNt9ObOgQ0=";
};
postPatch = ''
substituteInPlace Makefile \
--replace-fail "pkg-config" "$PKG_CONFIG"
'';
nativeBuildInputs = [
pkg-config
scdoc
@@ -52,5 +47,6 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
license = licenses.gpl3Plus;
mainProgram = "wvkbd-mobintl";
maintainers = with lib.maintainers; [ colinsane ];
};
}
@@ -0,0 +1,30 @@
diff --git a/subprojects/pfs/Cargo.lock b/subprojects/pfs/Cargo.lock
index efe74be..9b5f48e 100644
--- a/subprojects/pfs/Cargo.lock
+++ b/subprojects/pfs/Cargo.lock
@@ -458,9 +458,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
[[package]]
name = "libadwaita"
-version = "0.7.1"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8611ee9fb85e7606c362b513afcaf5b59853f79e4d98caaaf581d99465014247"
+checksum = "500135d29c16aabf67baafd3e7741d48e8b8978ca98bac39e589165c8dc78191"
dependencies = [
"gdk4",
"gio",
diff --git a/subprojects/pfs/Cargo.toml b/subprojects/pfs/Cargo.toml
index ae3b519..6cf25dd 100644
--- a/subprojects/pfs/Cargo.toml
+++ b/subprojects/pfs/Cargo.toml
@@ -18,7 +18,7 @@ path = "src/examples/open/pfs_open.rs"
[dependencies]
gettext-rs = { version = "0.7", features = ["gettext-system"] }
-glib-macros = "0.20.5"
+glib-macros = "0.20.12"
gtk = { version = "0.9", package = "gtk4", features = ["gnome_47"] }
[dependencies.adw]
@@ -0,0 +1,87 @@
{
stdenv,
lib,
fetchFromGitLab,
gnome-desktop,
libadwaita,
meson,
ninja,
pkg-config,
xdg-desktop-portal,
rustc,
desktop-file-utils,
cargo,
rustPlatform,
gettext,
}:
let
# Derived from subprojects/pfs.wrap
pfs = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "guidog";
repo = "pfs";
tag = "v0.0.4";
hash = "sha256-b0S/jNE03h26bGA76fb/qlyJ8/MifZeltTc16UX2h9w=";
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "xdg-desktop-portal-phosh";
version = "0.49.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "guidog";
repo = "xdg-desktop-portal-phosh";
tag = "v${finalAttrs.version}";
hash = "sha256-VF+ZNUP5Y2xm2nlNN3QsLJh8yNRJH7d3k+kLJ+4eu9s=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-h+VQqtirReLIHlVByKSb6DpqR1FtCxSwQpjowHX1mcg=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
rustc
desktop-file-utils
cargo
rustPlatform.cargoSetupHook
gettext
];
buildInputs = [
libadwaita
gnome-desktop
xdg-desktop-portal
];
strictDeps = true;
prePatch = ''
cp -r ${pfs} subprojects/pfs
chmod +w -R subprojects/pfs # Allow patches for subprojects to work
'';
patches = [
# Patch that fixes the issue with two Rust package versions.
# For reasons that I don't understand, rustPlatform.fetchCargoVendor seems to not fetch the version inside the Cargo.lock file.
# Like with libadwaita, fetchCargoVendor download the version 0.7.2 but in the lock file specified 0.7.1 and in the toml file specified 0.7.
./cargo_lock_deps_version.patch
];
passthru = {
updateScript = lib.updateScript { };
};
meta = with lib; {
description = "A backend implementation for xdg-desktop-portal that is using GTK/GNOME/Phosh to provide interfaces that aren't provided by the GTK portal";
homepage = "https://gitlab.gnome.org/guidog/xdg-desktop-portal-phosh";
changelog = "https://gitlab.gnome.org/guidog/xdg-desktop-portal-phosh/-/blob/main/NEWS";
maintainers = with maintainers; [ armelclo ];
platforms = platforms.linux;
license = licenses.gpl3Only;
};
})
-11
View File
@@ -1,11 +0,0 @@
import ./generic.nix rec {
version = "0.24";
urls = [
"mirror://sourceforge/libisl/isl-${version}.tar.xz"
"https://libisl.sourceforge.io/isl-${version}.tar.xz"
];
sha256 = "1bgbk6n93qqn7w8v21kxf4x6dc3z0ypqrzvgfd46nhagak60ac84";
configureFlags = [
"--with-gcc-arch=generic" # don't guess -march=/mtune=
];
}
+6 -3
View File
@@ -8,17 +8,18 @@
cunit,
ncurses,
knot-dns,
curlWithGnuTls,
}:
stdenv.mkDerivation rec {
pname = "ngtcp2";
version = "1.16.0";
version = "1.17.0";
src = fetchFromGitHub {
owner = "ngtcp2";
repo = "ngtcp2";
rev = "v${version}";
hash = "sha256-01Z2PyQDY0L38jsTjIIMcghALMyL/it0lAweKTZ5e0k=";
hash = "sha256-+mSVhUF1ZZJqm2HEp99BevY1yKm2jPIkkTcx7akyfro=";
};
outputs = [
@@ -38,7 +39,9 @@ stdenv.mkDerivation rec {
doCheck = true;
nativeCheckInputs = [ cunit ] ++ lib.optional stdenv.hostPlatform.isDarwin ncurses;
passthru.tests = knot-dns.passthru.tests; # the only consumer so far
passthru.tests = knot-dns.passthru.tests // {
inherit curlWithGnuTls;
};
meta = with lib; {
homepage = "https://github.com/ngtcp2/ngtcp2";
@@ -2,7 +2,6 @@
stdenv,
lib,
fetchFromGitHub,
fetchpatch2,
bash,
cmake,
cfitsio,
@@ -30,18 +29,9 @@ stdenv.mkDerivation (finalAttrs: {
owner = "indilib";
repo = "indi";
rev = "v${finalAttrs.version}";
hash = "sha256-0+ZC9NoanBDojYz/ufZUpUQB++vnMcUYtG1UmmVGbTg=";
hash = "sha256-WfVC5CLzwyO40Kpv/SZaYiPGDvWLUydQaA8FvTVhHqg=";
};
# fixes version number. This commit is directly after the tagged commit in master
# should be removed with the next release
patches = [
(fetchpatch2 {
url = "https://github.com/indilib/indi/commit/91e3e35250126887a856e90b6a0a30697fb01545.patch?full_index=1";
hash = "sha256-ho1S+A6gTQ9ELy/QE14S6daXyMN+vASFbXa2vMWdqR8=";
})
];
nativeBuildInputs = [
cmake
];
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "aioshutil";
version = "1.6.a1";
version = "1.6";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "kumaraditya303";
repo = "aioshutil";
tag = "v${version}";
hash = "sha256-KoKIlliWSbU8KY92SgFm4Wams87O22KVlE41q18Sk3I=";
hash = "sha256-+8BpL9CVH0X/9H7vL4xuV5CdA3A10a2A1q4wt1x1sSM=";
};
build-system = [ setuptools-scm ];
@@ -1,50 +0,0 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
fetchpatch,
setuptools,
mock,
boto3,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "amazon-kclpy";
version = "3.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "awslabs";
repo = "amazon-kinesis-client-python";
tag = "v${version}";
hash = "sha256-nboEZwRlhbr176H4b6ESm3LfVZCoKz3yKrQptERsLgg=";
};
patches = [
(fetchpatch {
name = "remove-deprecated-boto.patch";
url = "https://github.com/awslabs/amazon-kinesis-client-python/commit/bd2c442cdd1b0e2c99d3471c1d3ffcc9161a7c42.patch";
hash = "sha256-5W0qItDGjx1F6IllzLH57XCpToKrAu9mTbzv/1wMXuY=";
})
];
build-system = [ setuptools ];
dependencies = [
mock
boto3
];
pythonImportsCheck = [ "amazon_kclpy" ];
nativeCheckInputs = [ pytestCheckHook ];
meta = with lib; {
description = "Amazon Kinesis Client Library for Python";
homepage = "https://github.com/awslabs/amazon-kinesis-client-python";
license = licenses.asl20;
maintainers = with maintainers; [ psyanticy ];
broken = true;
};
}
@@ -1,100 +0,0 @@
{
lib,
buildPythonPackage,
cloudpickle,
deepdish,
deepmerge,
dm-haiku,
fetchFromGitHub,
fetchpatch,
jaxlib,
poetry-core,
pytestCheckHook,
pythonOlder,
pyyaml,
sh,
tables,
tabulate,
tensorboardx,
tensorflow,
toolz,
torch,
treex,
typing-extensions,
}:
buildPythonPackage rec {
pname = "elegy";
version = "0.8.6";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "poets-ai";
repo = "elegy";
tag = version;
hash = "sha256-FZmLriYhsX+zyQKCtCjbOy6MH+AvjzHRNUyaDSXGlLI=";
};
patches = [
(fetchpatch {
name = "use-poetry-core.patch";
url = "https://github.com/poets-ai/elegy/commit/0ed472882f470ed9eb7a63b8a537ffabe7e19aa7.patch";
hash = "sha256-nO/imHo7tEsiZh+64CF/M4eXQ1so3IunVhv8CvYP1ks=";
})
];
# The cloudpickle constraint is too strict. wandb is marked as an optional
# dependency but `buildPythonPackage` doesn't seem to respect that setting.
# Python constraint: https://github.com/poets-ai/elegy/issues/244
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'python = ">=3.7,<3.10"' 'python = ">=3.7"' \
--replace 'cloudpickle = "^1.5.0"' 'cloudpickle = "*"' \
--replace 'wandb = { version = "^0.12.10", optional = true }' ""
'';
nativeBuildInputs = [ poetry-core ];
buildInputs = [ jaxlib ];
propagatedBuildInputs = [
cloudpickle
deepdish
deepmerge
dm-haiku
pyyaml
tables
tabulate
tensorboardx
toolz
treex
typing-extensions
];
pythonImportsCheck = [ "elegy" ];
nativeCheckInputs = [
pytestCheckHook
sh
tensorflow
torch
];
disabledTests = [
# Fails with `Could not find compiler for platform Host: NOT_FOUND: could not find registered compiler for platform Host -- check target linkage`.
# Runs fine in docker with Ubuntu 22.04. I suspect the issue is the sandboxing in `nixpkgs` but not sure.
"test_saved_model_poly"
# AttributeError: module 'jax' has no attribute 'tree_multimap'
"DataLoaderTestCase"
];
meta = with lib; {
description = "Neural Networks framework based on Jax inspired by Keras and Haiku";
homepage = "https://github.com/poets-ai/elegy";
changelog = "https://github.com/poets-ai/elegy/releases/tag/${version}";
license = licenses.asl20;
maintainers = with maintainers; [ ndl ];
};
}
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "livekit-api";
version = "1.0.6";
version = "1.0.7";
pyproject = true;
src = fetchFromGitHub {
owner = "livekit";
repo = "python-sdks";
tag = "api-v${version}";
hash = "sha256-AsTJC0j8dztua7B6JvAYQlHGsE1RCIGoCzfGgbHSnGU=";
hash = "sha256-yS7Nzzrgyo3Q/O4z9acIfPXzS/SRv27BEiO4cMP11Z0=";
};
pypaBuildFlags = [ "livekit-api" ];
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "livekit-protocol";
version = "1.0.6";
version = "1.0.8";
pyproject = true;
src = fetchFromGitHub {
owner = "livekit";
repo = "python-sdks";
tag = "protocol-v${version}";
hash = "sha256-Sl/pAwiCS7sAY8VHJzSqm/Mj92NsO5NLuxQ/Y5GnaAw=";
hash = "sha256-3RdUvxGOopgakwkoWc+IMW2QUZuZLF908KtFo1f0Nqo=";
};
pypaBuildFlags = [ "livekit-protocol" ];
@@ -0,0 +1,91 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
fetchpatch,
# build-system
setuptools,
# tests
versionCheckHook,
# nativeBuildInputs for GUI
gobject-introspection,
wrapGAppsHook3,
# dependencies (required for most functionality)
pyicu,
lxml,
enableGui ? false,
# for GUI only
pygobject3,
gtk3,
}:
buildPythonPackage rec {
pname = "pyglossary";
version = "5.1.1";
pyproject = true;
src = fetchFromGitHub {
owner = "ilius";
repo = "pyglossary";
tag = version;
hash = "sha256-OrySbbStVSz+WF8D+ODK++lKfYJOm9KCfOxDP3snuKY=";
};
patches = [
# Fixes a few install issues, can be removed in the next release. See:
# https://github.com/ilius/pyglossary/pull/684
(fetchpatch {
url = "https://github.com/ilius/pyglossary/commit/f86c91ed987579cd8a1c7f7f278452901ce725ac.patch";
hash = "sha256-ewYeNwD3/aSsNbMazgW/3tBpYAPBZdnVu9LCh7tQZjg=";
})
];
build-system = [
setuptools
]
++ lib.optionals enableGui [
gobject-introspection
wrapGAppsHook3
];
dependencies = [
pyicu
lxml
]
++ lib.optionals enableGui [
pygobject3
];
buildInputs = lib.optionals enableGui [
gtk3
];
# Many issues with the tests: They require `cd tests` in `preCheck`; Some of
# them depend upon files in `tests/deprecated`; Even with workarounds to
# these 2 issues, many tests require network access. We don't enable the
# tests by not adding pytestCheckHook to this list.
nativeCheckInputs = [
versionCheckHook
];
env = {
# The default --help creates permission errors that may be confusing when
# observed in the build log.
versionCheckProgramArg = "--version";
};
pythonImportsCheck = [
"pyglossary"
];
meta = {
description = "Tool for converting dictionary files aka glossaries. Mainly to help use our offline glossaries in any Open Source dictionary we like on any operating system / device";
homepage = "https://github.com/ilius/pyglossary";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ doronbehar ];
mainProgram = "pyglossary";
};
}
@@ -0,0 +1,93 @@
diff --git c/pyproject.toml w/pyproject.toml
index abfb59ac..8f9c2121 100644
--- c/pyproject.toml
+++ w/pyproject.toml
@@ -416,11 +416,10 @@ version = "5.1.1"
description = "A tool for converting dictionary files aka glossaries."
readme = "README.md"
authors = [{ name = "Saeed Rasooli", email = "saeed.gnu@gmail.com" }]
-license = { text = "GPLv3+" }
+license = "GPL-3.0-or-later"
keywords = ["dictionary", "glossary"]
classifiers = [
"Development Status :: 5 - Production/Stable",
- "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
"Operating System :: OS Independent",
"Typing :: Typed",
"Programming Language :: Python :: 3.11",
@@ -430,6 +429,9 @@ classifiers = [
requires-python = ">= 3.11"
dependencies = []
+[project.scripts]
+pyglossary = "pyglossary.ui.main:main"
+
[project.optional-dependencies]
all = ["PyICU", "lxml", "beautifulsoup4"]
diff --git c/setup.py w/setup.py
index fd38a060..19df9ee3 100755
--- c/setup.py
+++ w/setup.py
@@ -8,8 +8,7 @@ import sys
from glob import glob
from os.path import dirname, exists, isdir, join
-from setuptools import setup
-from setuptools.command.install import install
+from setuptools import setup, find_packages
VERSION = "5.1.1"
log = logging.getLogger("root")
@@ -46,29 +45,6 @@ def getPipSafeVersion() -> str:
return VERSION
-class my_install(install):
- def run(self) -> None:
- install.run(self)
- if os.sep == "/":
- binPath = join(self.install_scripts, "pyglossary")
- log.info(f"creating script file {binPath!r}")
- if not exists(self.install_scripts):
- os.makedirs(self.install_scripts)
- # let it fail on wrong permissions.
- elif not isdir(self.install_scripts):
- raise OSError(
- "installation path already exists "
- f"but is not a directory: {self.install_scripts}",
- )
- open(binPath, "w", encoding="ascii").write("""#!/usr/bin/env -S python3 -O
-import sys
-from os.path import dirname
-sys.path.insert(0, dirname(__file__))
-from pyglossary.ui.main import main
-main()""")
- os.chmod(binPath, 0o755)
-
-
root_data_file_names = [
"about",
"LICENSE",
@@ -146,19 +122,14 @@ setup(
name="pyglossary",
version=getPipSafeVersion(),
python_requires=">=3.10.0",
- cmdclass={
- "install": my_install,
- },
description="A tool for converting dictionary files aka glossaries.",
long_description_content_type="text/markdown",
long_description=long_description,
author="Saeed Rasooli",
author_email="saeed.gnu@gmail.com",
- license="GPLv3+",
+ license="GPL-3.0-or-later",
url="https://github.com/ilius/pyglossary",
- packages=[
- "pyglossary",
- ],
+ packages=find_packages(),
entry_points={
"console_scripts": [
"pyglossary = pyglossary.ui.main:main",
@@ -1,36 +0,0 @@
{
lib,
buildPythonPackage,
fetchPypi,
}:
buildPythonPackage rec {
version = "1.3.2";
format = "setuptools";
pname = "pyvoro";
src = fetchPypi {
inherit pname version;
sha256 = "f31c047f6e4fc5f66eb0ab43afd046ba82ce247e18071141791364c4998716fc";
};
# No tests in package
doCheck = false;
meta = with lib; {
homepage = "https://github.com/joe-jordan/pyvoro";
description = "2D and 3D Voronoi tessellations: a python entry point for the voro++ library";
license = licenses.mit;
maintainers = [ ];
# Cython generated code is vendored directly and no longer compatible with
# newer versions of the CPython C API.
#
# Upstream explicitly removed the Cython source files from the source
# distribution, making it impossible for us to force-compile them:
# https://github.com/joe-jordan/pyvoro/commit/922bba6db32d44c2e1825228627a25aa891f9bc1
#
# No upstream activity since 2014.
broken = true;
};
}
@@ -1,117 +0,0 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
fetchpatch,
pythonOlder,
sqlalchemy,
sqlbag,
setuptools,
poetry-core,
pytestCheckHook,
pytest-xdist,
pytest-sugar,
postgresql,
postgresqlTestHook,
}:
buildPythonPackage {
pname = "schemainspect";
version = "3.1.1663587362";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "djrobstep";
repo = "schemainspect";
# no tags on github, version patch number is unix time.
rev = "066262d6fb4668f874925305a0b7dbb3ac866882";
hash = "sha256-SYpQQhlvexNc/xEgSIk8L8J+Ta+3OZycGLeZGQ6DWzk=";
};
patches = [
# https://github.com/djrobstep/schemainspect/pull/87
(fetchpatch {
name = "specify_poetry.patch";
url = "https://github.com/djrobstep/schemainspect/commit/bdcd001ef7798236fe0ff35cef52f34f388bfe68.patch";
hash = "sha256-/SEmcV9GjjvzfbszeGPkfd2DvYenl7bZyWdC0aI3M4M=";
})
];
nativeBuildInputs = [ poetry-core ];
propagatedBuildInputs = [
setuptools # needed for 'pkg_resources'
sqlalchemy
];
nativeCheckInputs = [
pytestCheckHook
pytest-xdist
pytest-sugar
postgresql
postgresqlTestHook
sqlbag
];
preCheck = ''
export PGUSER="nixbld";
export postgresqlEnableTCP=1;
'';
disabledTests = [
# These all fail with "List argument must consist only of tuples or dictionaries":
# Related issue: https://github.com/djrobstep/schemainspect/issues/88
"test_can_replace"
"test_collations"
"test_constraints"
"test_dep_order"
"test_enum_deps"
"test_exclusion_constraint"
"test_fk_col_order"
"test_fk_info"
"test_generated_columns"
"test_identity_columns"
"test_indexes"
"test_inherit"
"test_kinds"
"test_lineendings"
"test_long_identifiers"
"test_partitions"
"test_postgres_inspect"
"test_postgres_inspect_excludeschema"
"test_postgres_inspect_sigleschema"
"test_raw_connection"
"test_relationship"
"test_replica_trigger"
"test_rls"
"test_separate_validate"
"test_sequences"
"test_table_dependency_order"
"test_types_and_domains"
"test_view_trigger"
"test_weird_names"
];
pytestFlags = [
"-x"
"-svv"
];
enabledTestPaths = [
"tests"
];
pythonImportsCheck = [ "schemainspect" ];
postUnpack = ''
# this dir is used to bump the version number, having it here fails the build
rm -r ./source/deploy
'';
meta = with lib; {
description = "Schema inspection for PostgreSQL, and potentially others";
homepage = "https://github.com/djrobstep/schemainspect";
license = with licenses; [ unlicense ];
maintainers = with maintainers; [ bpeetz ];
};
}
@@ -1,92 +0,0 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
psycopg2,
pymysql,
sqlalchemy,
six,
flask,
pendulum,
packaging,
setuptools,
poetry-core,
pytestCheckHook,
pytest-xdist,
pytest-sugar,
postgresql,
postgresqlTestHook,
}:
buildPythonPackage {
pname = "sqlbag";
version = "0.1.1617247075";
format = "pyproject";
src = fetchFromGitHub {
owner = "djrobstep";
repo = "sqlbag";
# no tags on github, version patch number is unix time.
rev = "eaaeec4158ffa139fba1ec30d7887f4d836f4120";
hash = "sha256-lipgnkqrzjzqwbhtVcWDQypBNzq6Dct/qoM8y/FNiNs=";
};
nativeBuildInputs = [ poetry-core ];
propagatedBuildInputs = [
sqlalchemy
six
packaging
psycopg2
pymysql
setuptools # needed for 'pkg_resources'
];
nativeCheckInputs = [
pytestCheckHook
pytest-xdist
pytest-sugar
postgresql
postgresqlTestHook
flask
pendulum
];
preCheck = ''
export PGUSER="nixbld";
'';
enabledTestPaths = [
"tests"
];
disabledTests = [
# These all fail with "List argument must consist only of tuples or dictionaries":
# Related issue: https://github.com/djrobstep/sqlbag/issues/14
"test_basic"
"test_createdrop"
"test_errors_and_messages"
"test_flask_integration"
"test_orm_stuff"
"test_pendulum_for_time_types"
"test_transaction_separation"
];
pytestFlags = [
"-x"
"-svv"
];
pythonImportsCheck = [ "sqlbag" ];
meta = with lib; {
description = "Handy python code for doing database things";
homepage = "https://github.com/djrobstep/sqlbag";
license = with licenses; [ unlicense ];
maintainers = with maintainers; [ bpeetz ];
broken = true; # Fails to build against the current flask version
};
}
@@ -1,54 +0,0 @@
{
buildPythonPackage,
fetchFromGitHub,
fetchpatch,
jax,
jaxlib,
lib,
poetry-core,
}:
buildPythonPackage rec {
pname = "treeo";
# Note that there is a version 0.4.0, but it was released in error. At the
# time of writing (2022-03-29), v0.0.11 is the latest as reported on GitHub
# and PyPI.
version = "0.4.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "cgarciae";
repo = "treeo";
tag = version;
hash = "sha256-0py7sKjq6WqdsZwTq61jqaIbULTfwtpz29TTpt8M2Zw=";
};
# See https://github.com/cgarciae/treex/issues/68.
patches = [
(fetchpatch {
url = "https://github.com/cgarciae/treeo/pull/14/commits/022915da2b3bf76406a7c79d1b4593bee7956f16.patch";
hash = "sha256-WGxJqqrf2g0yZe30RyG1xxbloiqj1awuf1Y4eh5y+z0=";
})
(fetchpatch {
url = "https://github.com/cgarciae/treeo/pull/14/commits/99f9488bd0c977780844fd79743167b0010d359b.patch";
hash = "sha256-oKDYs+Ah0QXkhiJysIudQ6VLIiUiIcnQisxYp6GJuTc=";
})
];
nativeBuildInputs = [ poetry-core ];
# jax is not declared in the dependencies, but is necessary.
propagatedBuildInputs = [ jax ];
nativeCheckInputs = [ jaxlib ];
pythonImportsCheck = [ "treeo" ];
meta = with lib; {
description = "Small library for creating and manipulating custom JAX Pytree classes";
homepage = "https://github.com/cgarciae/treeo";
license = licenses.mit;
maintainers = with maintainers; [ ndl ];
# obsolete as of 2023-02-27 and not updated for more than a year as of 2023-08
broken = true;
};
}
@@ -1,77 +0,0 @@
{
buildPythonPackage,
cloudpickle,
dm-haiku,
einops,
fetchFromGitHub,
flax,
hypothesis,
jaxlib,
keras,
lib,
poetry-core,
pytestCheckHook,
pyyaml,
rich,
tensorflow,
treeo,
torchmetrics,
torch,
}:
buildPythonPackage rec {
pname = "treex";
version = "0.6.11";
format = "pyproject";
src = fetchFromGitHub {
owner = "cgarciae";
repo = "treex";
tag = version;
hash = "sha256-ObOnbtAT4SlrwOms1jtn7/XKZorGISGY6VuhQlC3DaQ=";
};
# At the time of writing (2022-03-29), rich is currently at version 11.0.0.
# The treeo dependency is compatible with a patch, but not marked as such in
# treex. See https://github.com/cgarciae/treex/issues/68.
pythonRelaxDeps = [
"certifi"
"flax"
"rich"
"treeo"
];
nativeBuildInputs = [
poetry-core
];
buildInputs = [ jaxlib ];
propagatedBuildInputs = [
einops
flax
pyyaml
rich
treeo
torch
];
nativeCheckInputs = [
cloudpickle
dm-haiku
hypothesis
keras
pytestCheckHook
tensorflow
torchmetrics
];
pythonImportsCheck = [ "treex" ];
meta = with lib; {
description = "Pytree Module system for Deep Learning in JAX";
homepage = "https://github.com/cgarciae/treex";
license = licenses.mit;
maintainers = with maintainers; [ ndl ];
};
}
@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "weblate-language-data";
version = "2025.8";
version = "2025.9";
pyproject = true;
src = fetchPypi {
pname = "weblate_language_data";
inherit version;
hash = "sha256-buZNp7iWF7Ppx5RcTRs2kawwmzCPmwXSqarRbmgP0i8=";
hash = "sha256-sk53eGLPSfYoe4+BExIxINkFt/vcvkIIO5611hwx9uU=";
};
build-system = [ setuptools ];
@@ -1,77 +0,0 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
gdal,
h5py,
noise,
numpy,
protobuf,
purepng,
pyplatec,
six,
isPy27,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "worldengine";
version = "0.19.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "Mindwerks";
repo = "worldengine";
rev = "v${version}";
sha256 = "1xrckb0dn2841gvp32n18gib14bpi77hmjw3r9jiyhg402iip7ry";
};
src-data = fetchFromGitHub {
owner = "Mindwerks";
repo = "worldengine-data";
rev = "029051e707f4702cb2af1a23b8222cca7dc88930";
sha256 = "06xbf8gj3ljgr11v1n8jbs2q8pdf9wz53xdgkhpm8hdnjahgdxdm";
};
postUnpack = ''
ln -s ${src-data} worldengine-data
'';
propagatedBuildInputs = [
gdal
h5py
noise
numpy
protobuf
purepng
pyplatec
six
];
prePatch = ''
substituteInPlace setup.py \
--replace pypng>=0.0.18 purepng \
--replace 'numpy>=1.9.2, <= 1.10.0.post2' 'numpy' \
--replace 'argparse==1.2.1' "" \
--replace 'protobuf==3.0.0a3' 'protobuf' \
--replace 'noise==1.2.2' 'noise' \
--replace 'PyPlatec==1.4.0' 'PyPlatec' \
substituteInPlace \
worldengine/{draw.py,hdf5_serialization.py} \
--replace numpy.float float
'';
doCheck = !isPy27; # google namespace clash
nativeCheckInputs = [ pytestCheckHook ];
disabledTests = [ "TestSerialization" ];
meta = with lib; {
broken = true;
homepage = "https://github.com/mindwerks/worldengine";
description = "World generator using simulation of plates, rain shadow, erosion, etc";
license = licenses.mit;
maintainers = with maintainers; [ rardiol ];
};
}
+72 -81
View File
@@ -14,92 +14,83 @@
legacy ? false,
}:
if lib.versionOlder ocaml.version "4.02" then
throw "camlp5 is not available for OCaml ${ocaml.version}"
else
stdenv.mkDerivation (
finalAttrs:
let
params =
if lib.versionAtLeast ocaml.version "4.12" && !legacy then
rec {
version = "8.03.02";
src = fetchFromGitHub {
owner = "camlp5";
repo = "camlp5";
rev = version;
hash = "sha256-nz+VfGR/6FdBvMzPPpVpviAXXBWNqM3Ora96Yzx964o=";
};
nativeBuildInputs = [
makeWrapper
ocaml
findlib
perl
];
buildInputs = [
bos
pcre2
re
rresult
];
propagatedBuildInputs = [ camlp-streams ];
postInstall = ''
for prog in camlp5 camlp5o camlp5r camlp5sch mkcamlp5 ocpp5
do
wrapProgram $out/bin/$prog \
--prefix CAML_LD_LIBRARY_PATH : "$CAML_LD_LIBRARY_PATH"
done
'';
}
else
rec {
version = "7.14";
src = fetchFromGitHub {
owner = "camlp5";
repo = "camlp5";
rev = "rel${builtins.replaceStrings [ "." ] [ "" ] version}";
sha256 = "1dd68bisbpqn5lq2pslm582hxglcxnbkgfkwhdz67z4w9d5nvr7w";
};
nativeBuildInputs = [
ocaml
perl
];
};
recent = lib.versionAtLeast (lib.versions.major finalAttrs.version) "8";
in
{
stdenv.mkDerivation (
params
// {
version = if lib.versionAtLeast ocaml.version "4.12" && !legacy then "8.04.00" else "7.14";
pname = "ocaml${ocaml.version}-camlp5";
pname = "ocaml${ocaml.version}-camlp5";
strictDeps = true;
src = fetchFromGitHub {
owner = "camlp5";
repo = "camlp5";
tag =
if recent then
finalAttrs.version
else
"rel${builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version}";
hash =
{
"8.04.00" = "sha256-5IQVGm/tqEzXmZmSYGbGqX+KN9nQLQgw+sBP+F2keXo=";
"8.03.2" = "sha256-nz+VfGR/6FdBvMzPPpVpviAXXBWNqM3Ora96Yzx964o=";
"7.14" = "sha256-/ORtS0uc/GN+g3y6N5ftjL4OBSqV6iswLRbfpeNCprU=";
}
."${finalAttrs.version}";
};
nativeBuildInputs = [
ocaml
perl
]
++ lib.optionals recent [
makeWrapper
findlib
];
prefixKey = "-prefix ";
buildInputs = lib.optionals recent [
bos
pcre2
re
rresult
];
preConfigure = ''
configureFlagsArray=(--strict --libdir $out/lib/ocaml/${ocaml.version}/site-lib)
patchShebangs ./config/find_stuffversion.pl etc/META.pl
propagatedBuildInputs = lib.optional recent camlp-streams;
strictDeps = true;
prefixKey = "-prefix ";
preConfigure = ''
configureFlagsArray=(--strict --libdir $out/lib/ocaml/${ocaml.version}/site-lib)
patchShebangs ./config/find_stuffversion.pl etc/META.pl tools/ ocaml_src/tools/
'';
buildFlags = [ "world.opt" ];
postInstall = lib.optionalString recent ''
for prog in camlp5 camlp5o camlp5r camlp5sch mkcamlp5 ocpp5
do
wrapProgram $out/bin/$prog \
--prefix CAML_LD_LIBRARY_PATH : "$CAML_LD_LIBRARY_PATH"
done
'';
dontStrip = true;
meta = {
broken =
lib.versionAtLeast ocaml.version "5.04" && !lib.versionAtLeast finalAttrs.version "8.04.00";
description = "Preprocessor-pretty-printer for OCaml";
longDescription = ''
Camlp5 is a preprocessor and pretty-printer for OCaml programs.
It also provides parsing and printing tools.
'';
buildFlags = [ "world.opt" ];
dontStrip = true;
meta = with lib; {
description = "Preprocessor-pretty-printer for OCaml";
longDescription = ''
Camlp5 is a preprocessor and pretty-printer for OCaml programs.
It also provides parsing and printing tools.
'';
homepage = "https://camlp5.github.io/";
license = licenses.bsd3;
platforms = ocaml.meta.platforms or [ ];
maintainers = with maintainers; [
vbgl
];
};
}
)
homepage = "https://camlp5.github.io/";
license = lib.licenses.bsd3;
platforms = ocaml.meta.platforms or [ ];
maintainers = [ lib.maintainers.vbgl ];
};
}
)
@@ -2,6 +2,7 @@
stdenv,
lib,
fetchurl,
fetchpatch,
cmake,
pkg-config,
ninja,
@@ -39,6 +40,14 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-sOEY+fuJvnF2KLP5JRwpX6bfQfqLfYEhbi6tg1XlWhM=";
};
patches = [
# QmlDesigner: Compile fixes for Qt 6.10 private API changes
(fetchpatch {
url = "https://github.com/qt-creator/qt-creator/commit/5a4c700ccefc76c7c531c834734e6fefa14b5364.patch";
hash = "sha256-BnS0HOqP5b7ZsVtuRpCK+TtoJj0yhodDuVtp+C3btIA=";
})
];
nativeBuildInputs = [
cmake
pkg-config
@@ -1,15 +0,0 @@
diff -r 89bccf7127ba src/gitinfo.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gitinfo.h Fri Dec 01 10:18:23 2023 -0300
@@ -0,0 +1,11 @@
+// 89bccf7127ba1ebe92558f674be69549bf2c4bd4
+//
+// This file was automatically generated by the
+// updaterevision tool. Do not edit by hand.
+
+#define GIT_DESCRIPTION "ZA_3.1-404-89bccf7127ba"
+#define GIT_HASH "89bccf7127ba1ebe92558f674be69549bf2c4bd4"
+#define GIT_TIME "2023-07-09 15:14:38 -0400"
+#define HG_REVISION_NUMBER 1688930078
+#define HG_REVISION_HASH_STRING "89bccf7127ba"
+#define HG_TIME "230709-1914"
@@ -1,127 +0,0 @@
{
stdenv,
lib,
fetchhg,
cmake,
pkg-config,
makeWrapper,
callPackage,
soundfont-fluid,
SDL_compat,
libGL,
glew,
bzip2,
zlib,
libjpeg,
fluidsynth,
fmodex,
openssl,
gtk2,
python3,
game-music-emu,
serverOnly ? false,
}:
let
suffix = lib.optionalString serverOnly "-server";
fmod = fmodex; # fmodex is on nixpkgs now
sqlite = callPackage ../sqlite.nix { };
clientLibPath = lib.makeLibraryPath [ fluidsynth ];
in
stdenv.mkDerivation {
pname = "zandronum-alpha${suffix}";
version = "3.2-230709-1914";
src = fetchhg {
# expired ssl certificate
url = "http://hg.osdn.net/view/zandronum/zandronum-stable";
rev = "89bccf7127ba";
hash = "sha256-waD9hKk0A0zMPyqEvAKxaz2e2TBG2G0MJRrzjx1LyB0=";
};
# zandronum tries to download sqlite now when running cmake, don't let it
# it also needs the current mercurial revision info embedded in gitinfo.h
# otherwise, the client will fail to connect to servers because the
# protocol version doesn't match.
patches = [
./zan_configure_impurity.patch
./dont_update_gitinfo.patch
./add_gitinfo.patch
];
# I have no idea why would SDL and libjpeg be needed for the server part!
# But they are.
buildInputs = [
openssl
bzip2
zlib
SDL_compat
libjpeg
sqlite
game-music-emu
]
++ lib.optionals (!serverOnly) [
libGL
glew
fmod
fluidsynth
gtk2
];
nativeBuildInputs = [
cmake
pkg-config
makeWrapper
python3
];
preConfigure = ''
ln -s ${sqlite}/* sqlite/
sed -i -e 's| restrict| _restrict|g' dumb/include/dumb.h \
dumb/src/it/*.c
''
+ lib.optionalString (!serverOnly) ''
sed -i \
-e "s@/usr/share/sounds/sf2/@${soundfont-fluid}/share/soundfonts/@g" \
-e "s@FluidR3_GM.sf2@FluidR3_GM2-2.sf2@g" \
src/sound/music_fluidsynth_mididevice.cpp
'';
cmakeFlags = [
"-DFORCE_INTERNAL_GME=OFF"
]
++ (if serverOnly then [ "-DSERVERONLY=ON" ] else [ "-DFMOD_LIBRARY=${fmod}/lib/libfmodex.so" ]);
hardeningDisable = [ "format" ];
# Won't work well without C or en_US. Setting LANG might not be enough if the user is making use of LC_* so wrap with LC_ALL instead
installPhase = ''
mkdir -p $out/bin
mkdir -p $out/lib/zandronum
cp zandronum${suffix} \
*.pk3 \
${lib.optionalString (!serverOnly) "liboutput_sdl.so"} \
$out/lib/zandronum
makeWrapper $out/lib/zandronum/zandronum${suffix} $out/bin/zandronum-alpha${suffix}
wrapProgram $out/bin/zandronum-alpha${suffix} \
--set LC_ALL="C"
'';
postFixup = lib.optionalString (!serverOnly) ''
patchelf --set-rpath $(patchelf --print-rpath $out/lib/zandronum/zandronum):$out/lib/zandronum:${clientLibPath} \
$out/lib/zandronum/zandronum
'';
passthru = {
inherit fmod sqlite;
};
meta = with lib; {
homepage = "https://zandronum.com/";
description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software";
maintainers = with maintainers; [ lassulus ];
license = licenses.sleepycat;
platforms = platforms.linux;
};
}
@@ -1,19 +0,0 @@
diff -r 89bccf7127ba src/CMakeLists.txt
--- a/src/CMakeLists.txt Sun Jul 09 15:14:38 2023 -0400
+++ b/src/CMakeLists.txt Fri Dec 01 10:16:26 2023 -0300
@@ -642,15 +642,6 @@
add_definitions( -DBACKPATCH )
endif( BACKPATCH )
-# Update gitinfo.h
-
-get_target_property( UPDATEREVISION_EXE updaterevision LOCATION )
-
-add_custom_target( revision_check ALL
- COMMAND ${UPDATEREVISION_EXE} src/gitinfo.h
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
- DEPENDS updaterevision )
-
# Libraries ZDoom needs
message( STATUS "Fluid synth libs: ${FLUIDSYNTH_LIBRARIES}" )
@@ -1,69 +0,0 @@
diff -r 89bccf7127ba sqlite/CMakeLists.txt
--- a/sqlite/CMakeLists.txt Sun Jul 09 15:14:38 2023 -0400
+++ b/sqlite/CMakeLists.txt Fri Dec 01 10:10:35 2023 -0300
@@ -1,65 +1,5 @@
cmake_minimum_required( VERSION 2.4 )
-# [BB/EP] Download SQLite archive and extract the sources if necessary.
-set( ZAN_SQLITE_VERSION 3360000 ) # SQL version 3.36.0
-set( ZAN_SQLITE_YEAR 2021 )
-set( ZAN_SQLITE_SHA1 "a4bcf9e951bfb9745214241ba08476299fc2dc1e" )
-set( ZAN_SQLITE_DOWNLOAD_NAME "sqlite-autoconf-${ZAN_SQLITE_VERSION}" )
-set( ZAN_SQLITE_TEMP_ARCHIVE "${CMAKE_CURRENT_SOURCE_DIR}/${ZAN_SQLITE_DOWNLOAD_NAME}.tar.gz" )
-set( ZAN_SQLITE_HASHED_ARCHIVE "${CMAKE_CURRENT_SOURCE_DIR}/sqlite-${ZAN_SQLITE_SHA1}.tar.gz" )
-
-if( IS_DIRECTORY ${ZAN_SQLITE_HASHED_ARCHIVE} OR IS_SYMLINK ${ZAN_SQLITE_HASHED_ARCHIVE} )
- message( FATAL_ERROR "SQLite: ${ZAN_SQLITE_HASHED_ARCHIVE} must be a valid file.\n"
- "SQLite: Please remove it and try again." )
-elseif( ( NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/sqlite3.c ) OR ( NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/sqlite3.h ) OR ( NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/sqlite3ext.h ) )
-
- if( NOT EXISTS ${ZAN_SQLITE_HASHED_ARCHIVE} )
- if( IS_DIRECTORY ${ZAN_SQLITE_TEMP_ARCHIVE} OR IS_SYMLINK ${ZAN_SQLITE_TEMP_ARCHIVE} )
- message( FATAL_ERROR "SQLite: ${ZAN_SQLITE_TEMP_ARCHIVE} must be a valid file.\n"
- "SQLite: Please remove it and try again." )
- endif()
-
- message( STATUS "SQLite: downloading the archive..." )
-
- file( DOWNLOAD https://www.sqlite.org/${ZAN_SQLITE_YEAR}/${ZAN_SQLITE_DOWNLOAD_NAME}.tar.gz ${ZAN_SQLITE_TEMP_ARCHIVE}
- SHOW_PROGRESS
- STATUS ZAN_SQLITE_DOWNLOAD_STATUS )
-
- # Report any problem if present and abort immediately.
- list( GET ZAN_SQLITE_DOWNLOAD_STATUS 0 ZAN_SQLITE_DOWNLOAD_ERROR_CODE )
- if( ZAN_SQLITE_DOWNLOAD_ERROR_CODE )
- list( GET ZAN_SQLITE_DOWNLOAD_STATUS 1 ZAN_SQLITE_DOWNLOAD_ERROR_MESSAGE )
- message( FATAL_ERROR "SQLite: download failed. Reason: ${ZAN_SQLITE_DOWNLOAD_ERROR_MESSAGE}" )
- endif()
-
- # Check the hash. Abort immediately if it's not valid (something is wrong with the download)
- file( SHA1 ${ZAN_SQLITE_TEMP_ARCHIVE} ZAN_SQLITE_CURRENT_SHA1 )
- if( NOT ZAN_SQLITE_CURRENT_SHA1 STREQUAL ZAN_SQLITE_SHA1 )
- message( FATAL_ERROR "SQLite: download failed. The downloaded file has a different hash:\n"
- "SQLite: valid: ${ZAN_SQLITE_SHA1}\n"
- "SQLite: downloaded: ${ZAN_SQLITE_CURRENT_SHA1}" )
- endif()
-
- # Rename the archive.
- execute_process( COMMAND ${CMAKE_COMMAND} -E rename ${ZAN_SQLITE_TEMP_ARCHIVE} ${ZAN_SQLITE_HASHED_ARCHIVE} )
- endif()
-
- message( STATUS "SQLite: saving the source files into the 'sqlite' directory." )
-
- # Extract the archive.
- execute_process( COMMAND ${CMAKE_COMMAND} -E tar xzf ${ZAN_SQLITE_HASHED_ARCHIVE} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
-
- # Copy the required files.
- execute_process( COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/${ZAN_SQLITE_DOWNLOAD_NAME}/sqlite3.c ${CMAKE_CURRENT_SOURCE_DIR} )
- execute_process( COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/${ZAN_SQLITE_DOWNLOAD_NAME}/sqlite3.h ${CMAKE_CURRENT_SOURCE_DIR} )
- execute_process( COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/${ZAN_SQLITE_DOWNLOAD_NAME}/sqlite3ext.h ${CMAKE_CURRENT_SOURCE_DIR} )
-
- # Remove the extracted folder.
- execute_process( COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_CURRENT_SOURCE_DIR}/${ZAN_SQLITE_DOWNLOAD_NAME} )
-
- message( STATUS "SQLite: done." )
-endif()
-
# [BB] Silence all GCC warnings
IF ( CMAKE_COMPILER_IS_GNUCXX )
ADD_DEFINITIONS ( -w )
+1 -25
View File
@@ -28,7 +28,6 @@
luajit_openresty,
msgpuck,
openssl,
opentracing-cpp,
pam,
psol,
which,
@@ -559,30 +558,6 @@ let
};
};
opentracing = {
name = "opentracing";
src =
let
src' = fetchFromGitHub {
name = "opentracing";
owner = "opentracing-contrib";
repo = "nginx-opentracing";
rev = "v0.10.0";
sha256 = "1q234s3p55xv820207dnh4fcxkqikjcq5rs02ai31ylpmfsf0kkb";
};
in
"${src'}/opentracing";
inputs = [ opentracing-cpp ];
meta = with lib; {
description = "Enable requests served by nginx for distributed tracing via The OpenTracing Project";
homepage = "https://github.com/opentracing-contrib/nginx-opentracing";
license = with licenses; [ asl20 ];
maintainers = [ ];
};
};
pagespeed = {
name = "pagespeed";
src =
@@ -1115,4 +1090,5 @@ self
modsecurity-nginx = self.modsecurity;
fastcgi-cache-purge = throw "fastcgi-cache-purge was renamed to cache-purge";
ngx_aws_auth = throw "ngx_aws_auth was renamed to aws-auth";
opentracing = throw "opentracing-cpp was removed because opentracing as been archived upstream"; # Added 2025-10-19
}
+16
View File
@@ -502,6 +502,7 @@ mapAliases {
avr-sim = throw "'avr-sim' has been removed as it was broken and unmaintained. Possible alternatives are 'simavr', SimulAVR and AVRStudio."; # Added 2025-05-31
axmldec = throw "'axmldec' has been removed as it was broken and unmaintained for 8 years"; # Added 2025-05-17
awesome-4-0 = awesome; # Added 2022-05-05
awf = throw "'awf' has been removed as the upstream project was archived in 2021"; # Added 2025-10-03
aws-env = throw "aws-env has been removed as the upstream project was unmaintained"; # Added 2024-06-11
aws-google-auth = throw "aws-google-auth has been removed as the upstream project was unmaintained"; # Added 2024-07-31
@@ -545,6 +546,7 @@ mapAliases {
bisq-desktop = throw "bisq-desktop has been removed because OpenJFX 11 was removed"; # Added 2024-11-17
bitmeter = throw "bitmeter has been removed, use `x42-meter 18` from the x42-plugins pkg instead."; # Added 2025-10-03
bitwarden = bitwarden-desktop; # Added 2024-02-25
blas-reference = throw "blas-reference has been removed since it has been discontinued as free-standing package. It is now contained within lapack-reference."; # Added 2025-10-21
blender-with-packages =
args:
lib.warnOnInstantiate
@@ -1244,6 +1246,7 @@ mapAliases {
isl_0_11 = throw "isl_0_11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
isl_0_14 = throw "isl_0_14 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
isl_0_17 = throw "isl_0_17 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20
isl_0_24 = throw "isl_0_24 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-10-18
istatmenus = throw "istatmenus has beend renamed to istat-menus"; # Added 2025-05-05
iso-flags-png-320x420 = lib.warnOnInstantiate "iso-flags-png-320x420 has been renamed to iso-flags-png-320x240" iso-flags-png-320x240; # Added 2024-07-17
itktcl = tclPackages.itktcl; # Added 2024-10-02
@@ -1300,6 +1303,7 @@ mapAliases {
keyfinger = throw "keyfinder has been removed as it was abandoned upstream and did not build; consider using mixxx or keyfinder-cli"; # Addd 2024-08-25
keysmith = throw "'keysmith' has been renamed to/replaced by 'libsForQt5.kdeGear.keysmith'"; # Converted to throw 2024-10-17
kgx = gnome-console; # Added 2022-02-19
khoj = throw "khoj has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-11
kibana7 = throw "Kibana 7.x has been removed from nixpkgs as it depends on an end of life Node.js version and received no maintenance in time."; # Added 2023-10-30
kibana = kibana7; # Added 2023-10-30
kio-admin = makePlasma5Throw "kio-admin"; # Added 2023-03-18
@@ -1555,6 +1559,8 @@ mapAliases {
lixVersions = lixPackageSets.renamedDeprecatedLixVersions; # Added 2025-03-20, warning in ../tools/package-management/lix/default.nix
lizardfs = throw "lizardfs has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
llvmPackages_git = (callPackages ../development/compilers/llvm { }).git; # Added 2024-08-02
llvmPackages_9 = throw "llvmPackages_9 has been removed from nixpkgs"; # Added 2024-04-08
@@ -1753,6 +1759,7 @@ mapAliases {
midori = throw "'midori' original project has been abandonned upstream and the package was broken for a while in nixpkgs"; # Added 2025-05-19
midori-unwrapped = midori; # Added 2025-05-19
MIDIVisualizer = midivisualizer; # Added 2024-06-12
migra = throw "migra has been removed because it has transitively been marked as broken since May 2024, and is unmaintained upstream."; # Added 2025-10-11
mihomo-party = throw "'mihomo-party' has been removed due to upstream license violation"; # Added 2025-08-20
mikutter = throw "'mikutter' has been removed because the package was broken and had no maintainers"; # Added 2024-10-01
mime-types = mailcap; # Added 2022-01-21
@@ -1961,6 +1968,7 @@ mapAliases {
onevpl-intel-gpu = lib.warnOnInstantiate "onevpl-intel-gpu has been renamed to vpl-gpu-rt" vpl-gpu-rt; # Added 2024-06-04
onscripter-en = throw "onscripter-en has been removed due to lack of maintenance in both upstream and Nixpkgs; onscripter is available instead"; # Added 2025-10-17
onthespot = throw "onethespot has been removed due to lack of upstream maintenance"; # Added 2025-09-26
opae = throw "opae has been removed because it has been marked as broken since June 2023."; # Added 2025-10-11
openai-triton-llvm = triton-llvm; # added 2024-07-18
openai-whisper-cpp = whisper-cpp; # Added 2024-12-13
openbabel2 = throw "openbabel2 has been removed, as it was unused and unmaintained upstream; please use openbabel"; # Added 2025-09-17
@@ -2012,6 +2020,7 @@ mapAliases {
opensyclWithRocm = lib.warnOnInstantiate "'opensyclWithRocm' has been renamed to 'adaptivecppWithRocm'" adaptivecppWithRocm; # Added 2024-12-04
open-timeline-io = lib.warnOnInstantiate "'open-timeline-io' has been renamed to 'opentimelineio'" opentimelineio; # Added 2025-08-10
opentofu-ls = lib.warnOnInstantiate "'opentofu-ls' has been renamed to 'tofu-ls'" tofu-ls; # Added 2025-06-10
opentracing-cpp = throw "'opentracingc-cpp' has been removed as it was archived upstream in 2024"; # Added 2025-10-19
openvdb_11 = throw "'openvdb_11' has been removed in favor of the latest version'"; # Added 2025-05-03
opera = throw "'opera' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-05-19
orchis = throw "'orchis' has been renamed to/replaced by 'orchis-theme'"; # Converted to throw 2024-10-17
@@ -2109,6 +2118,7 @@ mapAliases {
platypus = throw "platypus is unmaintained and has not merged Python3 support"; # Added 2025-03-20
pleroma-otp = throw "'pleroma-otp' has been renamed to/replaced by 'pleroma'"; # Converted to throw 2024-10-17
plex-media-player = throw "'plex-media-player' has been discontinued, the new official client is available as 'plex-desktop'"; # Added 2025-05-28
pn = throw "'pn' has been removed as upstream was archived in 2020"; # Added 2025-10-17
plots = throw "'plots' has been replaced by 'gnome-graphs'"; # Added 2025-02-05
pltScheme = racket; # Added 2013-02-24
poac = cabinpkg; # Added 2025-01-22
@@ -2412,6 +2422,7 @@ mapAliases {
siproxd = throw "'siproxd' has been removed as it was unmaintained and incompatible with newer libosip versions"; # Added 2025-05-18
sisco.lv2 = throw "'sisco.lv2' has been removed as it was unmaintained and broken"; # Added 2025-08-26
sipwitch = throw "'sipwitch' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
shadered = throw "shadered has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
sheesy-cli = throw "'sheesy-cli' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
shout = nodePackages.shout; # Added unknown; moved 2024-10-19
sky = throw "'sky' has been removed because its upstream website disappeared"; # Added 2024-07-21
@@ -2478,6 +2489,7 @@ mapAliases {
spring = throw "spring has been removed, as it had been broken since 2023 (it was a game; maybe youre thinking of spring-boot-cli?)"; # Added 2025-09-16
springLobby = throw "springLobby has been removed, as it had been broken since 2023"; # Added 2025-09-16
spring-boot = throw "'spring-boot' has been renamed to/replaced by 'spring-boot-cli'"; # Converted to throw 2024-10-17
sqlbag = throw "sqlbag has been removed because it has been marked as broken since May 2024."; # Added 2025-10-11
sqldeveloper = throw "sqldeveloper was dropped due to being severely out-of-date and having a dependency on JavaFX for Java 8, which we do not support"; # Added 2024-11-02
srvc = throw "'srvc' has been removed, as it was broken and unmaintained"; # Added 2024-09-09
ssm-agent = amazon-ssm-agent; # Added 2023-10-17
@@ -2527,6 +2539,7 @@ mapAliases {
symbiyosys = sby; # Added 2024-08-18
syn2mas = throw "'syn2mas' has been removed. It has been integrated into the main matrix-authentication-service CLI as a subcommand: 'mas-cli syn2mas'."; # Added 2025-07-07
sync = taler-sync; # Added 2024-09-04
syncall = "'syncall' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
syncthing-cli = throw "'syncthing-cli' has been renamed to/replaced by 'syncthing'"; # Converted to throw 2024-10-17
syncthingtray-qt6 = syncthingtray; # Added 2024-03-06
syncthing-tray = throw "syncthing-tray has been removed because it is broken and unmaintained"; # Added 2025-05-18
@@ -2788,6 +2801,7 @@ mapAliases {
wordpress6_5 = wordpress_6_5; # Added 2024-08-03
wordpress_6_5 = throw "'wordpress_6_5' has been removed in favor of the latest version"; # Added 2024-11-11
wordpress_6_6 = throw "'wordpress_6_6' has been removed in favor of the latest version"; # Added 2024-11-17
worldengine-cli = throw "'worldengine-cli' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04
wormhole-rs = magic-wormhole-rs; # Added 2022-05-30. preserve, reason: Arch package name, main binary name
wpa_supplicant_ro_ssids = lib.warnOnInstantiate "Deprecated package: Please use wpa_supplicant instead. Read-only SSID patches are now upstream!" wpa_supplicant;
wrapLisp_old = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
@@ -2873,6 +2887,8 @@ mapAliases {
z3_4_8 = throw "'z3_4_8' has been removed in favour of the latest version. Use 'z3'."; # Added 2025-05-18
zabbix50 = throw "'zabbix50' has been removed, it would have reached its End of Life a few days after the release of NixOS 25.05. Consider upgrading to 'zabbix60' or 'zabbix70'."; # Added 2025-04-22
zabbix64 = throw "'zabbix64' has been removed because it reached its End of Life. Consider upgrading to 'zabbix70'."; # Added 2025-04-22
zandronum-alpha = throw "'zandronum-alpha' has been removed as it was broken and the stable version has caught up"; # Added 2025-10-19
zandronum-alpha-server = throw "'zandronum-alpha-server' has been removed as it was broken and the stable version has caught up"; # Added 2025-10-19
zbackup = throw "'zbackup' has been removed due to being unmaintained upstream"; # Added 2025-08-22
zeal-qt5 = lib.warnOnInstantiate "'zeal-qt5' has been removed from nixpkgs. Please use 'zeal' instead" zeal; # Added 2025-08-31
zeal-qt6 = lib.warnOnInstantiate "'zeal-qt6' has been renamed to 'zeal'" zeal; # Added 2025-08-31
-10
View File
@@ -3115,13 +3115,11 @@ with pkgs;
isl = isl_0_20;
isl_0_20 = callPackage ../development/libraries/isl/0.20.0.nix { };
isl_0_23 = callPackage ../development/libraries/isl/0.23.0.nix { };
isl_0_24 = callPackage ../development/libraries/isl/0.24.0.nix { };
isl_0_27 = callPackage ../development/libraries/isl/0.27.0.nix { };
})
isl
isl_0_20
isl_0_23
isl_0_24
isl_0_27
;
@@ -12832,8 +12830,6 @@ with pkgs;
wofi-pass = callPackage ../../pkgs/tools/security/pass/wofi-pass.nix { };
worldengine-cli = python3Packages.worldengine;
wrapFirefox = callPackage ../applications/networking/browsers/firefox/wrapper.nix { };
wrapThunderbird = callPackage ../applications/networking/mailreaders/thunderbird/wrapper.nix { };
@@ -13095,12 +13091,6 @@ with pkgs;
serverOnly = true;
};
zandronum-alpha = callPackage ../games/doom-ports/zandronum/alpha { };
zandronum-alpha-server = zandronum-alpha.override {
serverOnly = true;
};
fmodex = callPackage ../games/doom-ports/zandronum/fmod.nix { };
pro-office-calculator = libsForQt5.callPackage ../games/pro-office-calculator { };
+10 -1
View File
@@ -2245,7 +2245,16 @@ let
google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { };
hol_light = callPackage ../applications/science/logic/hol_light { };
hol_light = callPackage ../applications/science/logic/hol_light {
camlp5 =
if lib.versionAtLeast camlp5.version "8.04.00" then
camlp5.overrideAttrs {
version = "8.03.2";
__intentionallyOverridingVersion = true;
}
else
camlp5;
};
### End ###
+7
View File
@@ -74,6 +74,7 @@ mapAliases {
aioquic-mitmproxy = throw "aioquic-mitmproxy has been removed because mitmproxy no longer uses it"; # Added 2024-01-16
ansiwrap = throw "ansiwrap has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03
amazon_kclpy = amazon-kclpy; # added 2023-08-08
amazon-kclpy = throw "amazon-kclpy has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03
ambiclimate = throw "ambiclimate has been removed, because the service has been terminated after 2024-03-31."; # Added 2024-06-07
ambee = throw "ambee has been removed because the upstream repository was archived in 2022"; # Added 2024-10-04
amiibo-py = throw "amiibo-py has been removed because the upstream repository was removed"; # Added 2025-01-13
@@ -249,6 +250,7 @@ mapAliases {
enhancements = throw "enhancements is unmaintained upstream and has therefore been removed"; # added 2023-10-27
enum-compat = throw "enum-compat is a virtual package providing enum34, which does not do anything since Python 3.4"; # added 2025-02-15
enum34 = throw "enum34 is no longer needed since Python 3.4"; # added 2025-03-06
elegy = throw "elegy has been removed because it has transitively been marked as broken since 2023."; # Added 2025-10-11
eris = throw "eris has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
et_xmlfile = et-xmlfile; # added 2023-10-16
etebase-server = throw "pkgs.python3.etebase-server has been removed, use pkgs.etebase-server"; # added 2024-07-16
@@ -710,6 +712,7 @@ mapAliases {
pyvicare-neo = pyvicare; # Added 2024-11-06
pyvcf = throw "pyvcf has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2023-05-19
PyVirtualDisplay = pyvirtualdisplay; # added 2023-02-19
pyvoro = throw "pyvoro has been removed because it is unmaintained upstream and has been marked as broken since 2023."; # Added 2025-10-11
pywick = throw "pywick has been removed, since it is no longer maintained"; # added 2023-07-01
pyxb = throw "pyxb has been removed, its last release was in 2017 and it has finally been archived in April 2023."; # added 2024-01-05
pyzufall = throw "pyzufall was removed, because it is no longer maintained"; # added 2024-05-14
@@ -766,6 +769,7 @@ mapAliases {
sabyenc = throw "sabyenc has been removed, due to no updates since June 2019 and being superseded by sabyenc3"; # added 2025-05-03
sampledata = throw "sampledata has been removed, it was unmaintained since 2017"; # added 2024-07-27
sapi-python-client = kbcstorage; # added 2022-04-20
schemainspect = throw "schemainspect has been removed because it has transitively been marked broken since May 2024, and is unmaintained upstream."; # Added 2025-10-11
scikitimage = scikit-image; # added 2023-05-14
scikitlearn = scikit-learn; # added 2021-07-21
scikit-optimize = throw "scikit-optimize has been removed because it is abandoned"; # added 2024-09-30
@@ -842,6 +846,8 @@ mapAliases {
transip = throw "transip has been removed because it is no longer maintained. TransIP SOAP V5 API was marked as deprecated"; # added 2023-02-27
py-tree-sitter = throw "Was merged with tree-sitter."; # added 2024-03-20
transmissionrpc = throw "transmissionrpc has been removed because it no longer builds and is unmaintained"; # added 2024-10-12
treeo = throw "treeo has been removed because it has been marked as broken since 2023."; # Added 2025-10-11
treex = throw "treex has been removed because it has transitively been marked as broken since 2023."; # Added 2025-10-11
trezor_agent = trezor-agent; # Added 2024-01-07
tumpa = throw "tumpa was promoted to a top-level attribute"; # added 2022-11-19
tvdb_api = tvdb-api; # added 2023-10-20
@@ -885,6 +891,7 @@ mapAliases {
webhelpers = throw "webhelpers has been removed because it is unmaintained and upstream is gone"; # added 2024-07-27
websocket_client = websocket-client; # added 2021-06-15
word2vec = throw "word2vec has been removed because it is abandoned"; # added 2023-05-22
worldengine = throw "worldengine has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04
wsnsimpy = throw "wsnsimpy has been removed, it was unmaintained and no more compatible with Python 3.12"; # added 2025-04-01
wxPython_4_0 = throw "wxPython_4_0 has been removed, use wxpython instead"; # added 2023-03-19
wxPython_4_1 = throw "wxPython_4_1 has been removed, use wxpython instead"; # added 2023-03-19
+2 -16
View File
@@ -646,8 +646,6 @@ self: super: with self; {
amazon-ion = callPackage ../development/python-modules/amazon-ion { };
amazon-kclpy = callPackage ../development/python-modules/amazon-kclpy { };
amberelectric = callPackage ../development/python-modules/amberelectric { };
amcrest = callPackage ../development/python-modules/amcrest { };
@@ -4672,8 +4670,6 @@ self: super: with self; {
electrum-ecc = callPackage ../development/python-modules/electrum-ecc { };
elegy = callPackage ../development/python-modules/elegy { };
elementpath = callPackage ../development/python-modules/elementpath { };
elevate = callPackage ../development/python-modules/elevate { };
@@ -13130,6 +13126,8 @@ self: super: with self; {
pyglm = callPackage ../development/python-modules/pyglm { };
pyglossary = callPackage ../development/python-modules/pyglossary { };
pygls = callPackage ../development/python-modules/pygls { };
pygltflib = callPackage ../development/python-modules/pygltflib { };
@@ -15416,8 +15414,6 @@ self: super: with self; {
pyvolumio = callPackage ../development/python-modules/pyvolumio { };
pyvoro = callPackage ../development/python-modules/pyvoro { };
pyvows = callPackage ../development/python-modules/pyvows { };
pyw215 = callPackage ../development/python-modules/pyw215 { };
@@ -16446,8 +16442,6 @@ self: super: with self; {
schema-salad = callPackage ../development/python-modules/schema-salad { };
schemainspect = callPackage ../development/python-modules/schemainspect { };
schemdraw = callPackage ../development/python-modules/schemdraw { };
schiene = callPackage ../development/python-modules/schiene { };
@@ -17530,8 +17524,6 @@ self: super: with self; {
sqlalchemy_1_4 = callPackage ../development/python-modules/sqlalchemy/1_4.nix { };
sqlbag = callPackage ../development/python-modules/sqlbag { };
sqlcipher3 = callPackage ../development/python-modules/sqlcipher3 { };
sqlcipher3-binary = callPackage ../development/python-modules/sqlcipher3-binary { };
@@ -18780,12 +18772,8 @@ self: super: with self; {
treelog = callPackage ../development/python-modules/treelog { };
treeo = callPackage ../development/python-modules/treeo { };
treescope = callPackage ../development/python-modules/treescope { };
treex = callPackage ../development/python-modules/treex { };
treq = callPackage ../development/python-modules/treq { };
trevorproxy = callPackage ../development/python-modules/trevorproxy { };
@@ -20210,8 +20198,6 @@ self: super: with self; {
world-bank-data = callPackage ../development/python-modules/world-bank-data { };
worldengine = callPackage ../development/python-modules/worldengine { };
wrapcco = callPackage ../development/python-modules/wrapcco { };
wrapio = callPackage ../development/python-modules/wrapio { };