Merge branch 'master' into staging-next
This commit is contained in:
Weijia Wang
@@ -33,8 +33,6 @@ jobs:
|
||||
max-parallel: 1
|
||||
matrix:
|
||||
pairs:
|
||||
- from: master
|
||||
into: haskell-updates
|
||||
- from: release-24.11
|
||||
into: staging-next-24.11
|
||||
- from: staging-next-24.11
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
# This action periodically merges a merge base of master and staging into haskell-updates.
|
||||
#
|
||||
# haskell-updates is based on master (so there are little unrelated failures and the cache
|
||||
# is already prepopulated), but needs to target staging due to the high amount of rebuilds
|
||||
# it typically causes. To prevent unrelated commits clattering the GitHub UI, we need to
|
||||
# take care to only merge the merge-base of master and staging into haskell-updates.
|
||||
#
|
||||
# See also https://github.com/NixOS/nixpkgs/issues/361143.
|
||||
|
||||
name: "Periodic Merges (haskell-updates)"
|
||||
|
||||
|
||||
on:
|
||||
schedule:
|
||||
# * is a special character in YAML so you have to quote this string
|
||||
# Merge every 24 hours
|
||||
- cron: '0 0 * * *'
|
||||
workflow_dispatch:
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
periodic-merge:
|
||||
permissions:
|
||||
contents: write # for devmasx/merge-branch to merge branches
|
||||
pull-requests: write # for peter-evans/create-or-update-comment to create or update comment
|
||||
if: github.repository_owner == 'NixOS'
|
||||
runs-on: ubuntu-latest
|
||||
name: git merge-base master staging → haskell-updates
|
||||
steps:
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
# Note: If we want to do something similar for more branches, we can move this into a
|
||||
# separate job, so we can use the matrix strategy again.
|
||||
- name: Find merge base of master and staging
|
||||
id: find_merge_base_step
|
||||
run: |
|
||||
merge_base="$(git merge-base refs/remotes/origin/master refs/remotes/origin/staging)"
|
||||
echo "Found merge base: $merge_base" >&2
|
||||
echo "merge_base=$merge_base" >> "$GITHUB_OUTPUT"
|
||||
|
||||
- name: git merge-base master staging → haskell-updates
|
||||
uses: devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f # 1.4.0
|
||||
with:
|
||||
type: now
|
||||
head_to_merge: ${{ steps.find_merge_base_step.outputs.merge_base }}
|
||||
target_branch: haskell-updates
|
||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Comment on failure
|
||||
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
|
||||
if: ${{ failure() }}
|
||||
with:
|
||||
issue-number: 367709
|
||||
body: |
|
||||
Periodic merge from `${{ steps.find_merge_base_step.outputs.merge_base }}` into `haskell-updates` has [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}).
|
||||
@@ -5892,6 +5892,11 @@
|
||||
githubId = 283316;
|
||||
name = "Dane Lipscombe";
|
||||
};
|
||||
dlurak = {
|
||||
github = "dlurak";
|
||||
githubId = 84224239;
|
||||
name = "dlurak";
|
||||
};
|
||||
dmadisetti = {
|
||||
email = "nix@madisetti.me";
|
||||
github = "dmadisetti";
|
||||
@@ -9224,6 +9229,13 @@
|
||||
githubId = 287215;
|
||||
keys = [ { fingerprint = "D618 7A03 A40A 3D56 62F5 4B46 03EF BF83 9A5F DC15"; } ];
|
||||
};
|
||||
hlad = {
|
||||
email = "hlad+nix@hlad.org";
|
||||
name = "Marek Hladky";
|
||||
matrix = "@hlad:hlad.org";
|
||||
github = "hlad";
|
||||
githubId = 6285728;
|
||||
};
|
||||
hleboulanger = {
|
||||
email = "hleboulanger@protonmail.com";
|
||||
name = "Harold Leboulanger";
|
||||
@@ -12517,6 +12529,12 @@
|
||||
githubId = 168301;
|
||||
name = "Victor Engmark";
|
||||
};
|
||||
l1npengtul = {
|
||||
email = "l1npengtul@l1npengtul.lol";
|
||||
github = "l1npengtul";
|
||||
githubId = 35755164;
|
||||
name = "l1npengtul";
|
||||
};
|
||||
l33tname = {
|
||||
name = "l33tname";
|
||||
email = "hi@l33t.name";
|
||||
@@ -13738,6 +13756,17 @@
|
||||
githubId = 24735185;
|
||||
name = "Mahmoud Ayman";
|
||||
};
|
||||
mahtaran = {
|
||||
email = "luka.leer@gmail.com";
|
||||
github = "mahtaran";
|
||||
githubId = 22727323;
|
||||
name = "Luka Leer";
|
||||
keys = [
|
||||
{
|
||||
fingerprint = "C7FF B72E 0527 423A D470 E132 AA82 C4EB CB16 82E0";
|
||||
}
|
||||
];
|
||||
};
|
||||
majesticmullet = {
|
||||
email = "hoccthomas@gmail.com.au";
|
||||
github = "MajesticMullet";
|
||||
@@ -15306,6 +15335,12 @@
|
||||
githubId = 44561540;
|
||||
name = "Synth Morxemplum";
|
||||
};
|
||||
MostafaKhaled = {
|
||||
email = "mostafa.khaled.5422@gmail.com";
|
||||
github = "mostafa-khaled775";
|
||||
githubId = 112074172;
|
||||
name = "Mostafa Khaled";
|
||||
};
|
||||
MostAwesomeDude = {
|
||||
email = "cds@corbinsimpson.com";
|
||||
github = "MostAwesomeDude";
|
||||
@@ -16578,6 +16613,13 @@
|
||||
githubId = 22592293;
|
||||
name = "Kartik Gokte";
|
||||
};
|
||||
nullcube = {
|
||||
email = "nullcub3@gmail.com";
|
||||
name = "NullCube";
|
||||
github = "nullcub3";
|
||||
githubId = 51034487;
|
||||
matrix = "@nullcube:matrix.org";
|
||||
};
|
||||
nullishamy = {
|
||||
email = "spam@amyerskine.me";
|
||||
name = "nullishamy";
|
||||
@@ -21762,6 +21804,13 @@
|
||||
githubId = 853468;
|
||||
name = "Steven Roose";
|
||||
};
|
||||
stevestreza = {
|
||||
email = "nixpkgs@stevestreza.com";
|
||||
github = "stevestreza";
|
||||
githubId = 28552;
|
||||
name = "Steve Streza";
|
||||
keys = [ { fingerprint = "DFED 4E42 34E7 348C 57D4 6568 C4DC 30F8 5ABC 6FA1"; } ];
|
||||
};
|
||||
stianlagstad = {
|
||||
email = "stianlagstad@gmail.com";
|
||||
github = "stianlagstad";
|
||||
|
||||
@@ -152,7 +152,7 @@ in
|
||||
WorkingDirectory = cfg.stateDir;
|
||||
ExecStart = ''${cfg.package}/bin/galene \
|
||||
${optionalString (cfg.insecure) "-insecure"} \
|
||||
-http ${cfg.httpAddress}:${cfg.httpPort} \
|
||||
-http ${cfg.httpAddress}:${toString cfg.httpPort} \
|
||||
-turn ${cfg.turnAddress} \
|
||||
-data ${cfg.dataDir} \
|
||||
-groups ${cfg.groupsDir} \
|
||||
|
||||
@@ -32,7 +32,6 @@
|
||||
qtnetworkauth,
|
||||
qttools,
|
||||
nixosTests,
|
||||
apple-sdk_11,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -127,9 +126,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
alsa-lib
|
||||
qtwayland
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
apple-sdk_11
|
||||
];
|
||||
|
||||
postInstall =
|
||||
|
||||
@@ -19,7 +19,6 @@
|
||||
wayland,
|
||||
gobject-introspection,
|
||||
xorg,
|
||||
apple-sdk_11,
|
||||
}:
|
||||
let
|
||||
rpathLibs = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
@@ -94,7 +93,6 @@ rustPlatform.buildRustPackage rec {
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
libobjc
|
||||
apple-sdk_11
|
||||
];
|
||||
|
||||
postInstall =
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
{
|
||||
stdenv,
|
||||
apple-sdk_11,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
@@ -90,8 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isLinux alsa-lib
|
||||
++ lib.optional enableWayland wayland
|
||||
++ lib.optional enableVncRenderer libvncserver
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
|
||||
++ lib.optional enableVncRenderer libvncserver;
|
||||
|
||||
cmakeFlags =
|
||||
lib.optional stdenv.hostPlatform.isDarwin "-DCMAKE_MACOSX_BUNDLE=OFF"
|
||||
|
||||
@@ -39,14 +39,14 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mame";
|
||||
version = "0.272";
|
||||
version = "0.273";
|
||||
srcVersion = builtins.replaceStrings [ "." ] [ "" ] version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mamedev";
|
||||
repo = "mame";
|
||||
rev = "mame${srcVersion}";
|
||||
hash = "sha256-qD9xWP4KtPJWqje9QVb5wozgLTc+hE84kkEFM6Re+Sk=";
|
||||
hash = "sha256-aOBYnkdcFKDkw/KFiv0IRgpOChn8NRKD2xmbfExYGKY=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "bitwarden-menu";
|
||||
version = "0.4.3";
|
||||
version = "0.4.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "bitwarden_menu";
|
||||
inherit version;
|
||||
hash = "sha256-tuIolWvQ/vKSJr6oUTL7ZLPgdkYsIZods5yQNNfWbWY=";
|
||||
hash = "sha256-vUlNqSVdGhfN5WjDjf1ub32Y2WoBndIdFzfCNwo5+Vg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnunet";
|
||||
version = "0.22.1";
|
||||
version = "0.23.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gnunet/gnunet-${version}.tar.gz";
|
||||
hash = "sha256-gWsgufvA4tLWosnpAYPdAIs4yJOWfjYj4E11/Ezgr6o=";
|
||||
hash = "sha256-b9BbaQdrOxqOfiCyVOBE/dTG2lMTGWMX894Ij30CXPI=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -15,11 +15,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnunet-gtk";
|
||||
version = "0.22.0";
|
||||
version = "0.23.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gnunet/gnunet-gtk-${version}.tar.gz";
|
||||
hash = "sha256-bpSEdymFT7q5OQKshD8lGwwMF26yXp0RyUAvNVzua6U=";
|
||||
hash = "sha256-bmU3799pZVUyrsJ92MKgn5NIqCW76ml4N42Ewi+VWvI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
docbook_xml_dtd_45,
|
||||
docbook_xsl,
|
||||
libxslt,
|
||||
apple-sdk_11,
|
||||
apple-sdk,
|
||||
}:
|
||||
|
||||
let
|
||||
xnu = apple-sdk_11.sourceRelease "xnu";
|
||||
xnu = apple-sdk.sourceRelease "xnu";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lsyncd";
|
||||
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
|
||||
docbook_xml_dtd_45
|
||||
docbook_xsl
|
||||
libxslt
|
||||
] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/axkibe/lsyncd";
|
||||
|
||||
-95
@@ -1,95 +0,0 @@
|
||||
From b9bf46966dd7931f9f33c30ed608a21d0e71e923 Mon Sep 17 00:00:00 2001
|
||||
From: rewine <lhongxu@outlook.com>
|
||||
Date: Tue, 19 Jul 2022 13:19:10 +0800
|
||||
Subject: [PATCH 1/2] remove dependency on vendored library
|
||||
|
||||
---
|
||||
CuteMarkEd.pro | 4 +---
|
||||
app-static/app-static.pro | 11 ++---------
|
||||
app/app.pro | 2 --
|
||||
app/cutemarkdownhighlighter.h | 2 +-
|
||||
4 files changed, 4 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/CuteMarkEd.pro b/CuteMarkEd.pro
|
||||
index 4ee92e3..0d247a4 100644
|
||||
--- a/CuteMarkEd.pro
|
||||
+++ b/CuteMarkEd.pro
|
||||
@@ -9,12 +9,10 @@ TEMPLATE = subdirs
|
||||
CONFIG += c++14
|
||||
|
||||
SUBDIRS = \
|
||||
- 3rdparty \
|
||||
libs \
|
||||
app-static \
|
||||
app \
|
||||
- fontawesomeicon \
|
||||
- test
|
||||
+ fontawesomeicon
|
||||
|
||||
# build order: 3rdparty -> libs -> app-static -> app & test
|
||||
#libs.depends = 3rdparty
|
||||
diff --git a/app-static/app-static.pro b/app-static/app-static.pro
|
||||
index cd3c292..560b4fc 100644
|
||||
--- a/app-static/app-static.pro
|
||||
+++ b/app-static/app-static.pro
|
||||
@@ -13,7 +13,6 @@ CONFIG += c++11
|
||||
|
||||
INCLUDEPATH += $$PWD
|
||||
# MD4C library
|
||||
-INCLUDEPATH += $$PWD/../3rdparty/md4c/src
|
||||
|
||||
SOURCES += \
|
||||
snippets/jsonsnippettranslator.cpp \
|
||||
@@ -34,10 +33,7 @@ SOURCES += \
|
||||
revealviewsynchronizer.cpp \
|
||||
htmlpreviewcontroller.cpp \
|
||||
htmlviewsynchronizer.cpp \
|
||||
- yamlheaderchecker.cpp \
|
||||
- $$PWD/../3rdparty/md4c/src/md4c.c \
|
||||
- $$PWD/../3rdparty/md4c/src/entity.c \
|
||||
- $$PWD/../3rdparty/md4c/src/md4c-html.c
|
||||
+ yamlheaderchecker.cpp
|
||||
|
||||
HEADERS += \
|
||||
snippets/snippet.h \
|
||||
@@ -64,10 +60,7 @@ HEADERS += \
|
||||
revealviewsynchronizer.h \
|
||||
htmlpreviewcontroller.h \
|
||||
htmlviewsynchronizer.h \
|
||||
- yamlheaderchecker.h \
|
||||
- $$PWD/../3rdparty/md4c/src/md4c.h \
|
||||
- $$PWD/../3rdparty/md4c/src/entity.h \
|
||||
- $$PWD/../3rdparty/md4c/src/md4c-html.h
|
||||
+ yamlheaderchecker.h
|
||||
|
||||
|
||||
#unix:!symbian {
|
||||
diff --git a/app/app.pro b/app/app.pro
|
||||
index 4827673..ab961cf 100644
|
||||
--- a/app/app.pro
|
||||
+++ b/app/app.pro
|
||||
@@ -40,8 +40,6 @@ macx {
|
||||
}
|
||||
|
||||
#qmarkdowntextedit
|
||||
-include(../3rdparty/qmarkdowntextedit/qmarkdowntextedit.pri)
|
||||
-include(../3rdparty/hunspell/hunspell.pri)
|
||||
INCLUDEPATH += $$PWD
|
||||
|
||||
SOURCES += \
|
||||
diff --git a/app/cutemarkdownhighlighter.h b/app/cutemarkdownhighlighter.h
|
||||
index c99ab56..78f2be6 100644
|
||||
--- a/app/cutemarkdownhighlighter.h
|
||||
+++ b/app/cutemarkdownhighlighter.h
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
#include <QSyntaxHighlighter>
|
||||
|
||||
-#include "../3rdparty/qmarkdowntextedit/markdownhighlighter.h"
|
||||
+#include <QMarkdownTextedit/markdownhighlighter.h>
|
||||
|
||||
namespace hunspell {
|
||||
class SpellChecker;
|
||||
--
|
||||
2.36.1
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
From bdc66eace846edc8a7b435f7ca9f324427243ce4 Mon Sep 17 00:00:00 2001
|
||||
From: rewine <lhongxu@outlook.com>
|
||||
Date: Thu, 21 Jul 2022 17:30:22 +0800
|
||||
Subject: [PATCH 2/2] use pkgcofig to find libraries
|
||||
|
||||
---
|
||||
app/app.pro | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/app/app.pro b/app/app.pro
|
||||
index ab961cf..475487d 100644
|
||||
--- a/app/app.pro
|
||||
+++ b/app/app.pro
|
||||
@@ -13,6 +13,8 @@ win32: QT += winextras
|
||||
TARGET = cutemarked
|
||||
TEMPLATE = app
|
||||
CONFIG += c++11
|
||||
+CONFIG += link_pkgconfig
|
||||
+PKGCONFIG += QMarkdownTextedit hunspell md4c-html
|
||||
|
||||
unix:!macx {
|
||||
CONFIG += link_pkgconfig
|
||||
--
|
||||
2.36.1
|
||||
|
||||
@@ -1,58 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
qmake,
|
||||
pkg-config,
|
||||
qttools,
|
||||
qtwebengine,
|
||||
wrapQtAppsHook,
|
||||
qmarkdowntextedit,
|
||||
md4c,
|
||||
hunspell,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "CuteMarkEd-NG";
|
||||
version = "unstable-2021-07-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Waqar144";
|
||||
repo = pname;
|
||||
rev = "9431ac603cef23d6f29e51e18f1eeee156f5bfb3";
|
||||
sha256 = "sha256-w/D4C2ZYgI/7ZCDamTQlhrJ9vtvAMThgM/fopkdKWYc";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0001-remove-dependency-on-vendored-library.patch
|
||||
./0002-use-pkgcofig-to-find-libraries.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace app/app.pro \
|
||||
--replace '$$[QT_INSTALL_BINS]/lrelease' "lrelease"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
qttools
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
md4c
|
||||
qtwebengine
|
||||
qmarkdowntextedit
|
||||
hunspell.dev
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Qt-based, free and open source markdown editor";
|
||||
mainProgram = "cutemarked";
|
||||
homepage = "https://github.com/Waqar144/CuteMarkEd-NG";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ rewine ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -1,5 +1,3 @@
|
||||
diff --git a/src/odb/src/swig/python/dbtypes.i b/src/odb/src/swig/python/dbtypes.i
|
||||
index 37305d55e..d85f2915e 100644
|
||||
--- a/src/odb/src/swig/python/dbtypes.i
|
||||
+++ b/src/odb/src/swig/python/dbtypes.i
|
||||
@@ -271,7 +271,7 @@ WRAP_OBJECT_RETURN_REF(odb::dbViaParams, params_return)
|
||||
@@ -7,7 +5,7 @@ index 37305d55e..d85f2915e 100644
|
||||
for(std::vector<odb::dbShape>::iterator it = $1->begin(); it != $1->end(); it++) {
|
||||
PyObject *o = SWIG_NewInstanceObj(&(*it), tf, 0);
|
||||
- $result = SWIG_Python_AppendOutput($result, o);
|
||||
+ $result = SWIG_Python_AppendOutput($result, o, 0);
|
||||
+ $result = SWIG_AppendOutput($result, o);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,7 +14,7 @@ index 37305d55e..d85f2915e 100644
|
||||
PyObject *layer_swig = SWIG_NewInstanceObj(layer, tf, 0);
|
||||
PyObject *tuple = PyTuple_Pack(2, PyFloat_FromDouble(value), layer_swig);
|
||||
- $result = SWIG_Python_AppendOutput($result, tuple);
|
||||
+ $result = SWIG_Python_AppendOutput($result, tuple, 0);
|
||||
+ $result = SWIG_AppendOutput($result, tuple);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,7 +22,7 @@ index 37305d55e..d85f2915e 100644
|
||||
for(auto it = $1->begin(); it != $1->end(); it++) {
|
||||
PyObject *obj = PyInt_FromLong((long)*it);
|
||||
- $result = SWIG_Python_AppendOutput($result, obj);
|
||||
+ $result = SWIG_Python_AppendOutput($result, obj, 0);
|
||||
+ $result = SWIG_AppendOutput($result, obj);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -5,8 +5,6 @@
|
||||
zlib,
|
||||
ncurses,
|
||||
libiconv,
|
||||
apple-sdk_11,
|
||||
darwinMinVersionHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -22,8 +20,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libiconv
|
||||
ncurses
|
||||
zlib
|
||||
apple-sdk_11
|
||||
(darwinMinVersionHook "11.0")
|
||||
];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
@@ -36,7 +36,10 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://github.com/tummychow/git-absorb";
|
||||
description = "git commit --fixup, but automatic";
|
||||
license = [ licenses.bsd3 ];
|
||||
maintainers = with maintainers; [ tomfitzhenry ];
|
||||
maintainers = with maintainers; [
|
||||
tomfitzhenry
|
||||
matthiasbeyer
|
||||
];
|
||||
mainProgram = "git-absorb";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -37,7 +37,10 @@ buildPythonApplication rec {
|
||||
homepage = "https://github.com/alpernebbi/git-annex-metadata-gui";
|
||||
description = "Graphical interface for git-annex metadata commands";
|
||||
mainProgram = "git-annex-metadata-gui";
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
maintainers = with maintainers; [
|
||||
dotlambda
|
||||
matthiasbeyer
|
||||
];
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
|
||||
@@ -27,5 +27,6 @@ buildPythonApplication rec {
|
||||
homepage = "https://pypi.org/project/git-annex-remote-dbx/";
|
||||
license = licenses.mit;
|
||||
mainProgram = "git-annex-remote-dbx";
|
||||
maintainers = with maintainers; [ matthiasbeyer ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -43,7 +43,10 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://github.com/orhun/git-cliff";
|
||||
changelog = "https://github.com/orhun/git-cliff/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ siraben ];
|
||||
maintainers = with maintainers; [
|
||||
siraben
|
||||
matthiasbeyer
|
||||
];
|
||||
mainProgram = "git-cliff";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -20,7 +20,10 @@ bundlerEnv {
|
||||
'';
|
||||
homepage = "http://oleander.io/git-fame-rb";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ nicknovitski ];
|
||||
maintainers = with maintainers; [
|
||||
nicknovitski
|
||||
matthiasbeyer
|
||||
];
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "git-fame";
|
||||
};
|
||||
|
||||
@@ -33,7 +33,10 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://github.com/swsnr/git-gone";
|
||||
changelog = "https://github.com/swsnr/git-gone/raw/v${version}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ cafkafk ];
|
||||
maintainers = with maintainers; [
|
||||
cafkafk
|
||||
matthiasbeyer
|
||||
];
|
||||
mainProgram = "git-gone";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -39,7 +39,10 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://github.com/siedentop/git-quickfix";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ cafkafk ];
|
||||
maintainers = with maintainers; [
|
||||
cafkafk
|
||||
matthiasbeyer
|
||||
];
|
||||
mainProgram = "git-quickfix";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -50,6 +50,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
maintainers = with maintainers; [
|
||||
ethancedwards8
|
||||
fab
|
||||
matthiasbeyer
|
||||
];
|
||||
mainProgram = "gitlint";
|
||||
};
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
cmake,
|
||||
pkg-config,
|
||||
stdenv,
|
||||
apple-sdk_11,
|
||||
curl,
|
||||
openssl,
|
||||
buildPackages,
|
||||
@@ -36,7 +35,7 @@ rustPlatform.buildRustPackage rec {
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
buildInputs = [ curl ] ++ (if stdenv.hostPlatform.isDarwin then [ apple-sdk_11 ] else [ openssl ]);
|
||||
buildInputs = [ curl ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ];
|
||||
|
||||
preFixup = lib.optionalString canRunCmd ''
|
||||
installShellCompletion --cmd gix \
|
||||
|
||||
@@ -26,11 +26,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gpu-screen-recorder";
|
||||
version = "4.2.3";
|
||||
version = "5.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dec05eba.com/snapshot/gpu-screen-recorder.git.${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-M2bk1WwLlbwspEoPIRMix17ihi72UuRWwiKBdPfim2M=";
|
||||
hash = "sha256-w1dtFLSY71UileoF4b1QLKIHYWPE5c2KmsHyRPtn+sA=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -23,11 +23,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gpu-screen-recorder-gtk";
|
||||
version = "4.2.3";
|
||||
version = "5.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dec05eba.com/snapshot/gpu-screen-recorder-gtk.git.${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-pMUjglgRM51hjPbt6VP0aqM0oo7IiyPXTY/kLwwdR/k=";
|
||||
hash = "sha256-uXbiuA1XPWZVwQGLh47rKzCZSEUEPWqYALqMuCGA7do=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -18,6 +18,8 @@
|
||||
|
||||
obs-backgroundremoval = callPackage ./obs-backgroundremoval { };
|
||||
|
||||
obs-color-monitor = qt6Packages.callPackage ./obs-color-monitor.nix { };
|
||||
|
||||
obs-command-source = callPackage ./obs-command-source.nix { };
|
||||
|
||||
obs-composite-blur = callPackage ./obs-composite-blur.nix { };
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
obs-studio,
|
||||
qtbase,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "obs-color-monitor";
|
||||
version = "0.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "norihiro";
|
||||
repo = "obs-color-monitor";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-cVMpmkcw8GzNGyd80g1oKmyiEYGMcRtWtDj9MC7RYf8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [
|
||||
obs-studio
|
||||
qtbase
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir $out/lib $out/share
|
||||
mv $out/obs-plugins/64bit $out/lib/obs-plugins
|
||||
mv $out/data $out/share/obs
|
||||
rm -rf $out/obs-plugins
|
||||
'';
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
meta = {
|
||||
description = "Color Monitor plugin for OBS Studio";
|
||||
homepage = "https://github.com/norihiro/obs-color-monitor";
|
||||
license = lib.licenses.gpl2Only;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ hlad ];
|
||||
};
|
||||
})
|
||||
@@ -32,13 +32,13 @@ in
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "dwm-status";
|
||||
version = "1.8.1";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Gerschtli";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-GkTPEmsnHFLUvbasAOXOQjFKs1Y9aaG87uyPvnQaT8Y=";
|
||||
sha256 = "sha256-OFwI4evwbXLO4ufjrh5SZia79bwbAKVoSm/IPCDku68=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -52,7 +52,7 @@ rustPlatform.buildRustPackage rec {
|
||||
xorg.libX11
|
||||
];
|
||||
|
||||
cargoHash = "sha256-eRfXUnyzOfVSEiwjLCaNbETUPXVU2Ed2VUNM9FjS5YE=";
|
||||
cargoHash = "sha256-CNhRMJZJMMKh5L308a93YL0kJLkt6DdlmILMVPQV90Q=";
|
||||
|
||||
postInstall = lib.optionalString (bins != [ ]) ''
|
||||
wrapProgram $out/bin/dwm-status --prefix "PATH" : "${lib.makeBinPath bins}"
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
apple-sdk_11,
|
||||
darwinMinVersionHook,
|
||||
glibcLocales,
|
||||
# The GraalVM derivation to use
|
||||
graalvmDrv,
|
||||
@@ -35,8 +33,6 @@ let
|
||||
extraArgs = builtins.removeAttrs args [
|
||||
"lib"
|
||||
"stdenv"
|
||||
"apple-sdk_11"
|
||||
"darwinMinVersionHook"
|
||||
"glibcLocales"
|
||||
"jar"
|
||||
"dontUnpack"
|
||||
@@ -60,11 +56,6 @@ stdenv.mkDerivation (
|
||||
removeReferencesTo
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin) [
|
||||
apple-sdk_11
|
||||
(darwinMinVersionHook "11.0")
|
||||
];
|
||||
|
||||
nativeImageBuildArgs = nativeImageBuildArgs ++ extraNativeImageBuildArgs ++ [ graalvmXmx ];
|
||||
|
||||
buildPhase =
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
alsa-lib,
|
||||
boost,
|
||||
curl,
|
||||
meson,
|
||||
config,
|
||||
expat,
|
||||
@@ -42,13 +41,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "aegisub";
|
||||
version = "3.4.0";
|
||||
version = "3.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TypesettingTools";
|
||||
repo = "aegisub";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-HvBbHUWKUFpne7Dj8CB2V9agBSBbB24BXnnYWUjHSDI=";
|
||||
hash = "sha256-3yWtBuCwr1OPOg/nh2s8SFg62vt8zuBMMp0gfOZrjqk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -63,7 +62,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
curl
|
||||
expat
|
||||
ffmpeg
|
||||
ffms
|
||||
@@ -115,10 +113,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# system version?
|
||||
substituteInPlace meson.build \
|
||||
--replace-fail "subdir('tests')" "# subdir('tests')"
|
||||
|
||||
# https://github.com/TypesettingTools/Aegisub/issues/191
|
||||
substituteInPlace src/dialog_colorpicker.cpp \
|
||||
--replace-fail "NSUInteger" "size_t"
|
||||
'';
|
||||
|
||||
# Inject the version, per the AUR package:
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
pkg-config,
|
||||
openssl,
|
||||
pcsclite,
|
||||
apple-sdk_11,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@@ -31,12 +30,9 @@ rustPlatform.buildRustPackage rec {
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
openssl
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
|
||||
buildInputs = [
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "YubiKey plugin for age";
|
||||
|
||||
@@ -22,7 +22,6 @@
|
||||
wayland,
|
||||
xdg-utils,
|
||||
|
||||
apple-sdk_11,
|
||||
}:
|
||||
let
|
||||
rpathLibs =
|
||||
@@ -65,11 +64,7 @@ rustPlatform.buildRustPackage rec {
|
||||
scdoc
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
rpathLibs
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
apple-sdk_11
|
||||
];
|
||||
buildInputs = rpathLibs;
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
|
||||
@@ -4,12 +4,9 @@
|
||||
buildGoModule,
|
||||
fetchzip,
|
||||
pkg-config,
|
||||
libicns,
|
||||
copyDesktopItems,
|
||||
makeDesktopItem,
|
||||
desktopToDarwinBundle,
|
||||
apple-sdk_11,
|
||||
darwinMinVersionHook,
|
||||
wayland,
|
||||
libxkbcommon,
|
||||
vulkan-headers,
|
||||
@@ -44,23 +41,15 @@ buildGoModule rec {
|
||||
desktopToDarwinBundle
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
if stdenv.hostPlatform.isDarwin then
|
||||
[
|
||||
apple-sdk_11
|
||||
# metal dependencies require 10.13 or newer
|
||||
(darwinMinVersionHook "10.13")
|
||||
]
|
||||
else
|
||||
[
|
||||
wayland
|
||||
libxkbcommon
|
||||
vulkan-headers
|
||||
libGL
|
||||
xorg.libX11
|
||||
xorg.libXcursor
|
||||
xorg.libXfixes
|
||||
];
|
||||
buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
wayland
|
||||
libxkbcommon
|
||||
vulkan-headers
|
||||
libGL
|
||||
xorg.libX11
|
||||
xorg.libXcursor
|
||||
xorg.libXfixes
|
||||
];
|
||||
|
||||
# Got different result in utf8 char length?
|
||||
checkFlags = [ "-skip=^TestClearAfter$" ];
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
SDL2,
|
||||
alsa-lib,
|
||||
apple-sdk_11,
|
||||
autoPatchelfHook,
|
||||
fetchFromGitHub,
|
||||
gtk3,
|
||||
@@ -67,9 +66,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libpulseaudio
|
||||
openal
|
||||
udev
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
apple-sdk_11
|
||||
];
|
||||
|
||||
appendRunpaths = [ (lib.makeLibraryPath [ vulkan-loader ]) ];
|
||||
|
||||
@@ -52,7 +52,6 @@
|
||||
wavpack,
|
||||
wxGTK32,
|
||||
gtk3,
|
||||
apple-sdk_11,
|
||||
libpng,
|
||||
libjpeg,
|
||||
}:
|
||||
@@ -144,7 +143,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
util-linux
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
apple-sdk_11
|
||||
libpng
|
||||
libjpeg
|
||||
];
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
SDL2_mixer,
|
||||
libpng,
|
||||
darwin,
|
||||
apple-sdk_11,
|
||||
libicns,
|
||||
imagemagick,
|
||||
}:
|
||||
@@ -37,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
SDL2
|
||||
SDL2_mixer
|
||||
libpng
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
|
||||
];
|
||||
|
||||
installPhase = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
runHook preInstall
|
||||
|
||||
@@ -34,6 +34,9 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://github.com/Canop/bacon";
|
||||
changelog = "https://github.com/Canop/bacon/blob/v${version}/CHANGELOG.md";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [ FlorianFranzen ];
|
||||
maintainers = with lib.maintainers; [
|
||||
FlorianFranzen
|
||||
matthiasbeyer
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -60,7 +60,10 @@ stdenvNoCC.mkDerivation rec {
|
||||
description = "Bash Line Editor -- a full-featured line editor written in pure Bash";
|
||||
mainProgram = "blesh-share";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ aiotter ];
|
||||
maintainers = with maintainers; [
|
||||
aiotter
|
||||
matthiasbeyer
|
||||
];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -4,8 +4,6 @@
|
||||
fetchFromGitHub,
|
||||
autoAddDriverRunpath,
|
||||
installShellFiles,
|
||||
stdenv,
|
||||
apple-sdk_11,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
@@ -28,10 +26,6 @@ rustPlatform.buildRustPackage rec {
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
apple-sdk_11
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
installManPage target/tmp/bottom/manpage/btm.1
|
||||
installShellCompletion \
|
||||
|
||||
@@ -1,11 +1,9 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildNpmPackage,
|
||||
bruno,
|
||||
pkg-config,
|
||||
pango,
|
||||
apple-sdk_11,
|
||||
testers,
|
||||
bruno-cli,
|
||||
}:
|
||||
@@ -28,14 +26,9 @@ buildNpmPackage {
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
pango
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# fix for: https://github.com/NixOS/nixpkgs/issues/272156
|
||||
apple-sdk_11
|
||||
];
|
||||
buildInputs = [
|
||||
pango
|
||||
];
|
||||
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
|
||||
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
cairo,
|
||||
pango,
|
||||
npm-lockfile-fix,
|
||||
apple-sdk_11,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
@@ -43,16 +42,11 @@ buildNpmPackage rec {
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
pixman
|
||||
cairo
|
||||
pango
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# fix for: https://github.com/NixOS/nixpkgs/issues/272156
|
||||
apple-sdk_11
|
||||
];
|
||||
buildInputs = [
|
||||
pixman
|
||||
cairo
|
||||
pango
|
||||
];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
|
||||
@@ -2,9 +2,7 @@
|
||||
lib,
|
||||
SDL2,
|
||||
alsa-lib,
|
||||
apple-sdk_11,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
gtk3,
|
||||
gtksourceview3,
|
||||
libX11,
|
||||
@@ -69,8 +67,7 @@ stdenv.mkDerivation {
|
||||
alsa-lib
|
||||
openal
|
||||
libpulseaudio
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
|
||||
];
|
||||
|
||||
makeFlags =
|
||||
[
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-3ds";
|
||||
version = "0.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust3ds";
|
||||
repo = "cargo-3ds";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-G1XSpvE94gcamvyKKzGZgj5QSwkBNbYWYdZ17ScwW90=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Gt8TJ6VTvpqtpQuD4WYN45/gccfgnw13sKeMqHboTm8=";
|
||||
|
||||
# Integration tests do not run in Nix build environment due to needing to
|
||||
# create and build Cargo workspaces.
|
||||
doCheck = false;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Cargo command to work with Nintendo 3DS project binaries";
|
||||
homepage = "https://github.com/rust3ds/cargo-3ds";
|
||||
license = with lib.licenses; [
|
||||
mit
|
||||
asl20
|
||||
];
|
||||
maintainers = with lib.maintainers; [ l1npengtul ];
|
||||
};
|
||||
}
|
||||
@@ -3,7 +3,6 @@
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
apple-sdk_11,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@@ -31,8 +30,6 @@ rustPlatform.buildRustPackage rec {
|
||||
# assumes the target is x86_64-unknown-linux-gnu
|
||||
"--skip simple_project::it_checks_okay_project_correctly";
|
||||
|
||||
buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cargo subcommand to check rust documentation for broken links";
|
||||
homepage = "https://github.com/deadlinks/cargo-deadlinks";
|
||||
|
||||
+5
-14
@@ -6,24 +6,22 @@
|
||||
rustup,
|
||||
openssl,
|
||||
stdenv,
|
||||
libiconv,
|
||||
Security,
|
||||
makeWrapper,
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-msrv";
|
||||
version = "0.16.2";
|
||||
version = "0.17.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "foresterre";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pgSwyq5KK9PCsmMnquufaw2oW7VSm93xRmozi/uqzNc=";
|
||||
tag = "v${version}";
|
||||
sha256 = "sha256-cRdnx9K+EkVEKtPxQk+gXK6nkgkpWhpYij/5e7pFzMU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-4eGoNKv76+3QVRUbTPiqTiLbQoOX6mVouJ3puxN6pMY=";
|
||||
cargoHash = "sha256-Hs/bdDpJFQ0w+Ds2L5at06Sw3F+5bXu5HU798gR9/9Q=";
|
||||
|
||||
passthru = {
|
||||
updateScript = gitUpdater {
|
||||
@@ -35,14 +33,7 @@ rustPlatform.buildRustPackage rec {
|
||||
# Integration tests fail
|
||||
doCheck = false;
|
||||
|
||||
buildInputs =
|
||||
if stdenv.hostPlatform.isDarwin then
|
||||
[
|
||||
libiconv
|
||||
Security
|
||||
]
|
||||
else
|
||||
[ openssl ];
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
@@ -2,8 +2,6 @@
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
stdenv,
|
||||
apple-sdk_11,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@@ -21,8 +19,6 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
nativeBuildInputs = [ rustPlatform.bindgenHook ];
|
||||
|
||||
buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
|
||||
|
||||
preCheck = "HOME=$(mktemp -d)";
|
||||
|
||||
checkFlags = [
|
||||
|
||||
@@ -1,29 +1,40 @@
|
||||
{ lib, stdenv, fetchFromGitHub, mlton }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
mlton,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "ceptre";
|
||||
version = "unstable-2016-11-27";
|
||||
version = "0-unstable-2024-8-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chrisamaphone";
|
||||
repo = "interactive-lp";
|
||||
rev = "e436fda2ccd44e9c9d226feced9d204311deacf5";
|
||||
hash = "sha256-COYrE9O/Y1/ZBNHNakBwrUVklCuk144RF9bjwa3rl5w=";
|
||||
rev = "22df9ff622f3363824f345089a25016e2a897077";
|
||||
hash = "sha256-MKA/289KWIYzHW0RbHC0Q2fMJT45WcABZrNsCWKZr4Y=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ mlton ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
cp ceptre $out/bin
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Linear logic programming language for modeling generative interactive systems";
|
||||
mainProgram = "ceptre";
|
||||
homepage = "https://github.com/chrisamaphone/interactive-lp";
|
||||
maintainers = with maintainers; [ pSub ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with lib.maintainers; [
|
||||
NotAShelf
|
||||
pSub
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
license = lib.licenses.unfree;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -10,8 +10,6 @@
|
||||
libseccomp,
|
||||
pps-tools,
|
||||
nixosTests,
|
||||
apple-sdk_11,
|
||||
darwinMinVersionHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -40,10 +38,6 @@ stdenv.mkDerivation rec {
|
||||
libcap
|
||||
libseccomp
|
||||
pps-tools
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
apple-sdk_11
|
||||
(darwinMinVersionHook "10.13")
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "cloudflare-dynamic-dns";
|
||||
version = "4.3.12";
|
||||
version = "4.3.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zebradil";
|
||||
repo = "cloudflare-dynamic-dns";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-28fIxwQmM9Lmu5Ak31+5/zw/syYwBDnQDZ0CYfmMR+U=";
|
||||
hash = "sha256-MeVLDgr332B9KWvahlhRz7Yf3R/j2KwR9ROhU3eQnwA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ie5/9qChgEWXKPqhbJzOalKPxTBr4UN9exxvfB8/HrQ=";
|
||||
vendorHash = "sha256-FzEPvLI6tvyQ/nMgCBXPc1RR8YwDU1cC5f/LSZfF3Bc=";
|
||||
|
||||
subPackages = ".";
|
||||
|
||||
|
||||
@@ -20,7 +20,6 @@
|
||||
yaml-cpp,
|
||||
ncurses,
|
||||
file,
|
||||
apple-sdk_11,
|
||||
libutil,
|
||||
sigtool,
|
||||
nixosTests,
|
||||
@@ -73,7 +72,6 @@ stdenv.mkDerivation (final: {
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ libutempter ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
apple-sdk_11
|
||||
libutil
|
||||
];
|
||||
|
||||
|
||||
@@ -12,9 +12,6 @@
|
||||
SDL2,
|
||||
SDL2_mixer,
|
||||
timidity,
|
||||
# Darwin dependencies
|
||||
libiconv,
|
||||
apple-sdk_11,
|
||||
# Update
|
||||
nix-update-script,
|
||||
}:
|
||||
@@ -60,8 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
SDL2
|
||||
SDL2_mixer
|
||||
timidity
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-Wno-dev" ];
|
||||
|
||||
|
||||
@@ -21,7 +21,6 @@
|
||||
python3,
|
||||
asciidoctor,
|
||||
libgit2,
|
||||
apple-sdk_11,
|
||||
wrapGAppsHook3,
|
||||
installShellFiles,
|
||||
buildPlugins ? true,
|
||||
@@ -46,28 +45,23 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
zlib
|
||||
libjpeg
|
||||
wxGTK32
|
||||
libxml2
|
||||
libsigcxx
|
||||
libpng
|
||||
openal
|
||||
libvorbis
|
||||
eigen
|
||||
ftgl
|
||||
freetype
|
||||
glew
|
||||
glib
|
||||
libgit2
|
||||
python3
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
apple-sdk_11
|
||||
];
|
||||
buildInputs = [
|
||||
zlib
|
||||
libjpeg
|
||||
wxGTK32
|
||||
libxml2
|
||||
libsigcxx
|
||||
libpng
|
||||
openal
|
||||
libvorbis
|
||||
eigen
|
||||
ftgl
|
||||
freetype
|
||||
glew
|
||||
glib
|
||||
libgit2
|
||||
python3
|
||||
] ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{
|
||||
apple-sdk_11,
|
||||
fetchFromGitHub,
|
||||
fetchpatch, # Delete at next version bump.
|
||||
lib,
|
||||
@@ -53,7 +52,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
libgit2
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
freetype,
|
||||
alsa-lib,
|
||||
libjack2,
|
||||
apple-sdk_11,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -49,18 +48,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
lib.optionals stdenv.hostPlatform.isLinux [
|
||||
libX11
|
||||
libXext
|
||||
libXcursor
|
||||
libXinerama
|
||||
libXrandr
|
||||
freetype
|
||||
alsa-lib
|
||||
libjack2
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
libX11
|
||||
libXext
|
||||
libXcursor
|
||||
libXinerama
|
||||
libXrandr
|
||||
freetype
|
||||
alsa-lib
|
||||
libjack2
|
||||
];
|
||||
|
||||
# JUCE insists on only dlopen'ing these
|
||||
NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux (toString [
|
||||
|
||||
@@ -0,0 +1,62 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
llvmPackages,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dtbloader";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TravMurav";
|
||||
repo = "dtbloader";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-5Efxi0cojhq9mqB5VMShXx/Sp4CE6Cvr1pcwnUm5zlo=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = with llvmPackages; [
|
||||
clang
|
||||
lld
|
||||
llvm
|
||||
];
|
||||
|
||||
# Disable hardening which adds incompatible flags like -fPIC
|
||||
hardeningDisable = [ "all" ];
|
||||
|
||||
buildPhase = ''
|
||||
make -j$NIX_BUILD_CORES
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/dtbloader/efi
|
||||
cp build-aarch64/dtbloader.efi $out/share/dtbloader/efi/
|
||||
|
||||
mkdir -p $out/share/doc/dtbloader
|
||||
cp README.md $out/share/doc/dtbloader/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "EFI driver that finds and installs DeviceTree into the UEFI configuration table";
|
||||
homepage = "https://github.com/TravMurav/dtbloader";
|
||||
changelog = "https://github.com/TravMurav/dtbloader/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.bsd3;
|
||||
platforms = [
|
||||
# EFI file only works on aarch64 platforms
|
||||
"aarch64-linux"
|
||||
];
|
||||
maintainers = with lib.maintainers; [ liberodark ];
|
||||
mainProgram = "dtbloader.efi";
|
||||
};
|
||||
})
|
||||
@@ -15,7 +15,6 @@
|
||||
libsoup_2_4,
|
||||
webkitgtk_4_0,
|
||||
gst_all_1,
|
||||
apple-sdk_11,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@@ -51,17 +50,15 @@ rustPlatform.buildRustPackage rec {
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook3 ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ makeBinaryWrapper ];
|
||||
|
||||
buildInputs =
|
||||
lib.optionals stdenv.hostPlatform.isLinux [
|
||||
openssl
|
||||
libsoup_2_4
|
||||
webkitgtk_4_0
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-bad
|
||||
gst_all_1.gst-plugins-good
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
openssl
|
||||
libsoup_2_4
|
||||
webkitgtk_4_0
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-bad
|
||||
gst_all_1.gst-plugins-good
|
||||
];
|
||||
|
||||
doCheck = false; # many scoring tests fail
|
||||
|
||||
|
||||
@@ -19,8 +19,6 @@
|
||||
wxGTK32,
|
||||
makeWrapper,
|
||||
stdenv,
|
||||
apple-sdk_11,
|
||||
darwinMinVersionHook,
|
||||
waylandSupport ? false,
|
||||
x11Support ? stdenv.hostPlatform.isLinux,
|
||||
testers,
|
||||
@@ -81,10 +79,6 @@ rustPlatform.buildRustPackage rec {
|
||||
libnotify
|
||||
libxkbcommon
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
apple-sdk_11
|
||||
(darwinMinVersionHook "10.13")
|
||||
]
|
||||
++ lib.optionals waylandSupport [
|
||||
wl-clipboard
|
||||
]
|
||||
|
||||
@@ -69,6 +69,7 @@ rustPlatform.buildRustPackage rec {
|
||||
globin
|
||||
ma27
|
||||
zowoq
|
||||
matthiasbeyer
|
||||
];
|
||||
mainProgram = "fd";
|
||||
};
|
||||
|
||||
@@ -9,8 +9,6 @@
|
||||
qt6Packages,
|
||||
febio,
|
||||
glew,
|
||||
apple-sdk_11,
|
||||
darwinMinVersionHook,
|
||||
fetchpatch,
|
||||
sshSupport ? true,
|
||||
openssl,
|
||||
@@ -74,11 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
]
|
||||
++ lib.optional tetgenSupport tetgen
|
||||
++ lib.optional ffmpegSupport ffmpeg
|
||||
++ lib.optional dicomSupport dcmtk
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
apple-sdk_11
|
||||
(darwinMinVersionHook "10.15")
|
||||
];
|
||||
++ lib.optional dicomSupport dcmtk;
|
||||
|
||||
meta = {
|
||||
description = "FEBio Suite Solver";
|
||||
|
||||
@@ -4,9 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
replaceVars,
|
||||
apple-sdk_11,
|
||||
cmake,
|
||||
darwinMinVersionHook,
|
||||
ninja,
|
||||
zlib,
|
||||
mklSupport ? true,
|
||||
@@ -48,13 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
ninja
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[ zlib ]
|
||||
++ lib.optionals mklSupport [ mkl ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
apple-sdk_11
|
||||
(darwinMinVersionHook "10.15")
|
||||
];
|
||||
buildInputs = [ zlib ] ++ lib.optionals mklSupport [ mkl ];
|
||||
|
||||
meta = {
|
||||
description = "FEBio Suite Solver";
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
fetchFromGitHub,
|
||||
testers,
|
||||
zig_0_11,
|
||||
apple-sdk_11,
|
||||
}:
|
||||
let
|
||||
zig = zig_0_11;
|
||||
@@ -22,8 +21,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [ zig.hook ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
|
||||
|
||||
passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
libXcursor,
|
||||
freetype,
|
||||
alsa-lib,
|
||||
apple-sdk_11,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -53,17 +52,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
lib.optionals stdenv.hostPlatform.isLinux [
|
||||
libX11
|
||||
libXrandr
|
||||
libXinerama
|
||||
libXext
|
||||
libXcursor
|
||||
freetype
|
||||
alsa-lib
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
libX11
|
||||
libXrandr
|
||||
libXinerama
|
||||
libXext
|
||||
libXcursor
|
||||
freetype
|
||||
alsa-lib
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true)
|
||||
|
||||
@@ -19,14 +19,17 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "14x3wizvncdy0xgvmcx541qanwb7bg76abygqy17bxycn1zh5r1x";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
foomatic-filters
|
||||
nativeBuildInputs = [
|
||||
bc
|
||||
foomatic-filters
|
||||
ghostscript
|
||||
systemd
|
||||
vim
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
systemd
|
||||
];
|
||||
|
||||
patches = [
|
||||
./no-hardcode-fw.diff
|
||||
# Support HBPL1 printers. Updated patch based on
|
||||
|
||||
@@ -17,7 +17,6 @@
|
||||
mupdf,
|
||||
fontconfig,
|
||||
freetype,
|
||||
apple-sdk_11,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
@@ -88,9 +87,6 @@ buildGoModule rec {
|
||||
libXxf86vm
|
||||
fontconfig
|
||||
freetype
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
apple-sdk_11
|
||||
];
|
||||
|
||||
# flags are based on https://github.com/richardwilkes/gcs/blob/master/build.sh
|
||||
|
||||
@@ -17,7 +17,6 @@
|
||||
|
||||
openssl,
|
||||
webkitgtk_4_1,
|
||||
apple-sdk_11,
|
||||
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
@@ -71,8 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
[ openssl ]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
webkitgtk_4_1
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
|
||||
];
|
||||
|
||||
env.OPENSSL_NO_VENDOR = true;
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
apple-sdk_11,
|
||||
cmake,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
@@ -20,8 +19,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
@@ -1,10 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
libiconv,
|
||||
apple-sdk_11,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@@ -20,11 +17,6 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
cargoHash = "sha256-9pUUKxPpyoX9f10ZiLWsol2rv66WzQqwa6VubRTrT9Y=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
libiconv
|
||||
apple-sdk_11
|
||||
];
|
||||
|
||||
# Compilation during tests fails if this env var is not set.
|
||||
preCheck = "export GIRT_BUILD_GIT_HASH=${version}";
|
||||
postCheck = "unset GIRT_BUILD_GIT_HASH";
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
zig_0_13,
|
||||
apple-sdk_11,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -21,12 +20,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
zig_0_13.hook
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# The package failed to build on x86_64-darwin because the default was the 10.12 SDK
|
||||
# Once the default on all platforms has been raised to the 11.0 SDK or higher, this can be removed.
|
||||
apple-sdk_11
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace build.zig \
|
||||
--replace-fail 'b.run(&.{ "git", "describe", "--tags", "--always" })' '"${finalAttrs.src.rev}"'
|
||||
|
||||
@@ -5,10 +5,10 @@
|
||||
}:
|
||||
let
|
||||
pname = "heptabase";
|
||||
version = "1.49.0";
|
||||
version = "1.50.0";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage";
|
||||
hash = "sha256-4YjhJEuDMKNvIHir6Je4MKbgZzTfPxdMeuvF/F+kYvw=";
|
||||
hash = "sha256-HFnHzftnLO4nfHxXhvHH4+lVdcPp2N3ihgMhnxSv2bA=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprutils";
|
||||
version = "0.3.0";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "hyprutils";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-5Wvsn+0/Hu6eUUToK9hBWwRlbg1i++lc9or4yPYBUuk=";
|
||||
hash = "sha256-7D5j2sh3Miw2CRdmx8ftepb342pl36kDFJy+3aVfDVc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
apple-sdk_11,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
testers,
|
||||
@@ -22,10 +21,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
apple-sdk_11
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
|
||||
@@ -9,8 +9,6 @@
|
||||
xcbuild,
|
||||
pango,
|
||||
giflib,
|
||||
apple-sdk_11,
|
||||
darwinMinVersionHook,
|
||||
jellyfin,
|
||||
}:
|
||||
buildNpmPackage rec {
|
||||
@@ -26,7 +24,7 @@ buildNpmPackage rec {
|
||||
hash = "sha256-xmy2cr6MJSen6Pok3Wde4mBcu5pM4qtGEBfqMpGdAxY=";
|
||||
};
|
||||
|
||||
nodejs = nodejs_20; # does not build with 22
|
||||
nodejs = nodejs_20; # does not build with 22
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace webpack.common.js \
|
||||
@@ -48,10 +46,6 @@ buildNpmPackage rec {
|
||||
[ pango ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
giflib
|
||||
apple-sdk_11
|
||||
# node-canvas builds code that requires aligned_alloc,
|
||||
# which on Darwin requires at least the 10.15 SDK
|
||||
(darwinMinVersionHook "10.15")
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
cmake,
|
||||
libpng,
|
||||
darwin,
|
||||
apple-sdk_11,
|
||||
libicns,
|
||||
imagemagick,
|
||||
}:
|
||||
@@ -42,7 +41,7 @@ stdenv.mkDerivation rec {
|
||||
SDL2
|
||||
SDL2_mixer
|
||||
libpng
|
||||
] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
|
||||
];
|
||||
|
||||
installPhase = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
runHook preInstall
|
||||
|
||||
@@ -19,7 +19,6 @@
|
||||
libXtst,
|
||||
libXi,
|
||||
wayland,
|
||||
apple-sdk_11,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
@@ -50,17 +49,13 @@ buildNpmPackage rec {
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
lib.optionals stdenv.hostPlatform.isLinux [
|
||||
libxkbcommon
|
||||
libX11
|
||||
libXtst
|
||||
libXi
|
||||
wayland
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
apple-sdk_11
|
||||
];
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
libxkbcommon
|
||||
libX11
|
||||
libXtst
|
||||
libXi
|
||||
wayland
|
||||
];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "lilex";
|
||||
version = "2.530";
|
||||
version = "2.600";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mishamyrt/Lilex/releases/download/${version}/Lilex.zip";
|
||||
hash = "sha256-sBn8DaXj7OXHNaoEAhjTuMmUVUbS0zNZi1h7EjembEo=";
|
||||
hash = "sha256-G8zm35aSiXrnGgYePSwLMBzwSnd9mfCinHZSG1qBH0w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
zig_0_13,
|
||||
apple-sdk_11,
|
||||
callPackage,
|
||||
}:
|
||||
|
||||
@@ -32,8 +31,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
zig.hook
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
|
||||
|
||||
postInstall = ''
|
||||
installManPage man/linuxwave.1
|
||||
'';
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
stdenv,
|
||||
libusb1,
|
||||
pkg-config,
|
||||
lib,
|
||||
writeText,
|
||||
}:
|
||||
let
|
||||
stellaris-udev-rules = writeText "61.stellpad.rules" ''
|
||||
SUBSYSTEM=="usb", ATTRS{idVendor}=="1cbe", ATTRS{idProduct}=="00fd", MODE="0666"
|
||||
'';
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lm4flash";
|
||||
version = "0.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "utzig";
|
||||
repo = "lm4tools";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ZjuCH/XjQEgg6KHAvb95/BkAy+C2OdbtBb/i6K30+uo=";
|
||||
};
|
||||
sourceRoot = "${src.name}/lm4flash";
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libusb1
|
||||
];
|
||||
|
||||
buildFlags = [ "release" ];
|
||||
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 "${stellaris-udev-rules}" "$out/etc/udev/rules.d/61.stellpad.rules"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Command-line firmware flashing tool for the Stellaris Launchpad";
|
||||
longDescription = ''
|
||||
Command-line firmware flashing tool using libusb-1.0 to communicate with
|
||||
the Stellaris Launchpad ICDI. Works on all Linux, Mac OS X, Windows, and
|
||||
BSD systems.
|
||||
'';
|
||||
homepage = "https://github.com/utzig/lm4tools";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
mainProgram = "lm4flash";
|
||||
maintainers = with lib.maintainers; [ MostafaKhaled ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
@@ -19,7 +19,6 @@
|
||||
cargo,
|
||||
rustPlatform,
|
||||
rustc,
|
||||
apple-sdk_11,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -58,9 +57,6 @@ stdenv.mkDerivation rec {
|
||||
curl
|
||||
libarchive
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
apple-sdk_11
|
||||
]
|
||||
++ lib.optionals (!stdenv.isDarwin) [
|
||||
gpm
|
||||
];
|
||||
|
||||
@@ -1,10 +1,8 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
installShellFiles,
|
||||
apple-sdk_11,
|
||||
pandoc,
|
||||
testers,
|
||||
lsd,
|
||||
@@ -28,8 +26,6 @@ rustPlatform.buildRustPackage rec {
|
||||
pandoc
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
|
||||
|
||||
postInstall = ''
|
||||
pandoc --standalone --to man doc/lsd.md -o lsd.1
|
||||
installManPage lsd.1
|
||||
|
||||
@@ -15,8 +15,6 @@
|
||||
# buildInputs
|
||||
openssl,
|
||||
rdkafka,
|
||||
apple-sdk_11,
|
||||
darwinMinVersionHook,
|
||||
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
@@ -138,16 +136,10 @@ rustPlatform.buildRustPackage rec {
|
||||
# Needed to get openssl-sys to use pkg-config.
|
||||
OPENSSL_NO_VENDOR = 1;
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
openssl
|
||||
rdkafka
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer
|
||||
apple-sdk_11
|
||||
(darwinMinVersionHook "10.13")
|
||||
];
|
||||
buildInputs = [
|
||||
openssl
|
||||
rdkafka
|
||||
];
|
||||
|
||||
# the check phase requires linking with rocksdb which can be a problem since
|
||||
# the rust rocksdb crate is not updated very often.
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
zig_0_13,
|
||||
apple-sdk_11,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -24,8 +23,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
zig.hook
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
|
||||
|
||||
meta = {
|
||||
description = "Minisign reimplemented in Zig";
|
||||
homepage = "https://github.com/jedisct1/zig-minisign";
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
apple-sdk_11,
|
||||
cacert,
|
||||
cargo-tauri,
|
||||
desktop-file-utils,
|
||||
@@ -48,10 +47,7 @@ rustPlatform.buildRustPackage rec {
|
||||
pnpm.configHook
|
||||
] ++ lib.optional stdenv.hostPlatform.isDarwin makeBinaryWrapper;
|
||||
|
||||
buildInputs =
|
||||
[ openssl ]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11
|
||||
++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_1;
|
||||
buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_1;
|
||||
|
||||
# Tests fail on other, unrelated packages in the monorepo
|
||||
cargoTestFlags = [
|
||||
|
||||
@@ -19,7 +19,6 @@
|
||||
libxkbcommon,
|
||||
wayland,
|
||||
libdrm,
|
||||
apple-sdk_11,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
@@ -70,9 +69,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
qt6.qtwayland
|
||||
wayland
|
||||
libdrm
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
apple-sdk_11
|
||||
];
|
||||
|
||||
qmakeFlags = [ "CONFIG+=disable-prebuilts" ];
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "moxide";
|
||||
version = "0.1.0";
|
||||
|
||||
cargoHash = "sha256-MqJ3lxnzvvmNXEMgx0su8vRDXAZbNtPuuphNzjeMN+w=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dlurak";
|
||||
repo = "moxide";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-XYEcMaHqu84aKIcV0pQZXl4sIeH9BkRGA2gcwZveXCU=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Tmux session manager with a modular configuration";
|
||||
mainProgram = "moxide";
|
||||
homepage = "https://github.com/dlurak/moxide";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ dlurak ];
|
||||
};
|
||||
}
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
alsa-lib,
|
||||
apple-sdk_11,
|
||||
config,
|
||||
dbus,
|
||||
fetchFromGitHub,
|
||||
@@ -50,7 +49,6 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
buildInputs =
|
||||
[ ncurses ]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11
|
||||
++ lib.optional stdenv.hostPlatform.isLinux openssl
|
||||
++ lib.optional (withALSA || withRodio) alsa-lib
|
||||
++ lib.optional withClipboard libxcb
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
pkg-config,
|
||||
python3,
|
||||
removeReferencesTo,
|
||||
apple-sdk_11,
|
||||
cctools,
|
||||
SDL2,
|
||||
fontconfig,
|
||||
@@ -81,7 +80,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
|
||||
SDL2
|
||||
fontconfig
|
||||
rustPlatform.bindgenHook
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
|
||||
];
|
||||
|
||||
postFixup =
|
||||
let
|
||||
|
||||
@@ -5,23 +5,26 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "nom";
|
||||
version = "2.6.2";
|
||||
version = "2.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "guyfedwards";
|
||||
repo = "nom";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-oaManxhksEBwbe1jmkRmOJMhYFiulGTVCuto4RMznvg=";
|
||||
hash = "sha256-8zUIqOKbiD8tOWfTU9ixyxWMIRsmskmJVcXyM6X9JNs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xolhwdWRjYZMgwI4jq0fGzvxnNjx6EplvZC7XMvBw+M=";
|
||||
vendorHash = "sha256-d5KTDZKfuzv84oMgmsjJoXGO5XYLVKxOB5XehqgRvYw=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/guyfedwards/nom";
|
||||
description = "RSS reader for the terminal";
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ nadir-ishiguro ];
|
||||
maintainers = with maintainers; [
|
||||
nadir-ishiguro
|
||||
matthiasbeyer
|
||||
];
|
||||
mainProgram = "nom";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
apple-sdk_11,
|
||||
ntpd-rs,
|
||||
installShellFiles,
|
||||
pandoc,
|
||||
@@ -25,8 +24,6 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
cargoHash = "sha256-ZB18YbCdJpuu7qTXdHgs2IgDCoc3Hs/aDn4dzXmKI8c=";
|
||||
|
||||
buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pandoc
|
||||
installShellFiles
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
apple-sdk_11,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
@@ -22,10 +20,6 @@ rustPlatform.buildRustPackage {
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
apple-sdk_11
|
||||
];
|
||||
|
||||
cargoHash = "sha256-MHZlXmHAYIiaB6Isutqjrh45jppRzTZRSE3VqzpFBBA=";
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
|
||||
|
||||
@@ -12,7 +12,6 @@
|
||||
llvm,
|
||||
zlib,
|
||||
zstd,
|
||||
apple-sdk_11,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -43,9 +42,6 @@ stdenv.mkDerivation rec {
|
||||
]
|
||||
++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [
|
||||
elfutils
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
apple-sdk_11
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
fetchFromGitHub,
|
||||
ncurses,
|
||||
perl,
|
||||
apple-sdk_11,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -21,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
ncurses
|
||||
perl
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=$(out)"
|
||||
|
||||
@@ -1,13 +1,11 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
gtk4,
|
||||
pkg-config,
|
||||
pango,
|
||||
wrapGAppsHook4,
|
||||
apple-sdk_11,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
@@ -29,14 +27,10 @@ rustPlatform.buildRustPackage rec {
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
gtk4
|
||||
pango
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
apple-sdk_11
|
||||
];
|
||||
buildInputs = [
|
||||
gtk4
|
||||
pango
|
||||
];
|
||||
|
||||
# Disable test_replay tests as they need a gui
|
||||
preCheck = ''
|
||||
|
||||
@@ -3,8 +3,6 @@
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
apple-sdk_11,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@@ -20,9 +18,6 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
cargoHash = "sha256-moRr8usrFHE8YPQnsmeKoDZPAk94qRm9cHzHBLXtGFM=";
|
||||
|
||||
# pizauth cannot be built with default apple-sdk_10 on x86_64-darwin, pin to 11
|
||||
buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
cmark,
|
||||
apple-sdk_11,
|
||||
extra-cmake-modules,
|
||||
gamemode,
|
||||
ghc_filesystem,
|
||||
@@ -57,18 +56,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
stripJavaArchivesHook
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
cmark
|
||||
ghc_filesystem
|
||||
kdePackages.qtbase
|
||||
kdePackages.qtnetworkauth
|
||||
kdePackages.quazip
|
||||
tomlplusplus
|
||||
zlib
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]
|
||||
++ lib.optional gamemodeSupport gamemode;
|
||||
buildInputs = [
|
||||
cmark
|
||||
ghc_filesystem
|
||||
kdePackages.qtbase
|
||||
kdePackages.qtnetworkauth
|
||||
kdePackages.quazip
|
||||
tomlplusplus
|
||||
zlib
|
||||
] ++ lib.optional gamemodeSupport gamemode;
|
||||
|
||||
hardeningEnable = lib.optionals stdenv.hostPlatform.isLinux [ "pie" ];
|
||||
|
||||
|
||||
@@ -15,7 +15,6 @@
|
||||
sphinx,
|
||||
sphinxygen,
|
||||
ninja,
|
||||
apple-sdk_11,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -45,20 +44,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
python3.pkgs.sphinx-lv2-theme
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
xorg.libX11
|
||||
xorg.libXcursor
|
||||
xorg.libXrandr
|
||||
libGL
|
||||
vulkan-loader
|
||||
vulkan-headers
|
||||
xorg.libXext
|
||||
cairo
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
apple-sdk_11
|
||||
];
|
||||
buildInputs = [
|
||||
xorg.libX11
|
||||
xorg.libXcursor
|
||||
xorg.libXrandr
|
||||
libGL
|
||||
vulkan-loader
|
||||
vulkan-headers
|
||||
xorg.libXext
|
||||
cairo
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/lv2/pugl";
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{
|
||||
apple-sdk_11,
|
||||
boost,
|
||||
cmake,
|
||||
dbus,
|
||||
@@ -47,7 +46,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
qt6.qttools
|
||||
zlib
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]
|
||||
++ lib.optionals guiSupport [ dbus ]
|
||||
++ lib.optionals (guiSupport && stdenv.hostPlatform.isLinux) [ qt6.qtwayland ]
|
||||
++ lib.optionals trackerSearch [ python3 ];
|
||||
|
||||
@@ -88,6 +88,7 @@ qt6Packages.stdenv.mkDerivation {
|
||||
maintainers = with maintainers; [
|
||||
pbek
|
||||
totoroot
|
||||
matthiasbeyer
|
||||
];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user