Merge master into staging-nixos
This commit is contained in:
nixpkgs-ci[bot]
@@ -25754,6 +25754,12 @@
|
||||
github = "takeda";
|
||||
githubId = 411978;
|
||||
};
|
||||
takeokunn = {
|
||||
email = "bararararatty@gmail.com";
|
||||
github = "takeokunn";
|
||||
githubId = 11222510;
|
||||
name = "Takeo Obara";
|
||||
};
|
||||
taketwo = {
|
||||
email = "alexandrov88@gmail.com";
|
||||
github = "taketwo";
|
||||
|
||||
@@ -143,9 +143,13 @@ in
|
||||
};
|
||||
|
||||
openFirewall = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = "Open ports in the firewall for mpd.";
|
||||
type = lib.types.nullOr lib.types.bool;
|
||||
default = null;
|
||||
description = ''
|
||||
Open ports in the firewall for mpd. If `null` (default), you might
|
||||
get a warning asking you to set it explicitly to `true` or `false`,
|
||||
depending upon the value of `services.mpd.settings.bind_to_address`.
|
||||
'';
|
||||
};
|
||||
|
||||
settings = lib.mkOption {
|
||||
@@ -378,9 +382,9 @@ in
|
||||
])
|
||||
|| (lib.hasPrefix "/" cfg.settings.bind_to_address)
|
||||
)
|
||||
&& !cfg.openFirewall
|
||||
&& (isNull cfg.openFirewall)
|
||||
)
|
||||
"Using '${cfg.settings.bind_to_address}' as services.mpd.settings.bind_to_address without enabling services.mpd.openFirewall, might prevent you from accessing MPD from other clients.";
|
||||
"Using '${cfg.settings.bind_to_address}' as services.mpd.settings.bind_to_address without enabling services.mpd.openFirewall, might prevent you from accessing MPD from other clients. To suppress this warning, set services.mpd.openFirewall explicitly to `false`";
|
||||
|
||||
# install mpd units
|
||||
systemd.packages = [ pkgs.mpd ];
|
||||
@@ -438,7 +442,9 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
networking.firewall.allowedTCPPorts = lib.optionals cfg.openFirewall [ cfg.settings.port ];
|
||||
networking.firewall.allowedTCPPorts = lib.optionals (
|
||||
builtins.isBool cfg.openFirewall && cfg.openFirewall
|
||||
) [ cfg.settings.port ];
|
||||
|
||||
users.users = lib.optionalAttrs (cfg.user == name) {
|
||||
${name} = {
|
||||
|
||||
@@ -208,20 +208,11 @@ in
|
||||
"org.gnome.SettingsDaemon.XSettings.service"
|
||||
];
|
||||
|
||||
# https://github.com/elementary/settings-daemon/issues/217
|
||||
systemd.user.services.elementary-settings-daemon = {
|
||||
description = "elementary Settings Daemon";
|
||||
systemd.user.services."io.elementary.settings-daemon" = {
|
||||
# https://github.com/NixOS/nixpkgs/issues/81138
|
||||
wantedBy = [ "gnome-session-initialized.target" ];
|
||||
after = [ "gnome-session-initialized.target" ];
|
||||
|
||||
# The daemon might launch external applications via g_app_info_launch.
|
||||
environment.PATH = lib.mkForce null;
|
||||
|
||||
serviceConfig = {
|
||||
Slice = "session.slice";
|
||||
ExecStart = "${pkgs.pantheon.elementary-settings-daemon}/bin/io.elementary.settings-daemon";
|
||||
Restart = "on-failure";
|
||||
};
|
||||
};
|
||||
|
||||
# Global environment
|
||||
|
||||
@@ -11,6 +11,10 @@ rec {
|
||||
extraConfigureFlags = [
|
||||
"--with-unsigned-addon-scopes=app,system"
|
||||
"--disable-default-browser-agent"
|
||||
# Flags based on discussion in https://github.com/NixOS/nixpkgs/issues/482250
|
||||
"--disable-debug"
|
||||
"--disable-debug-symbols"
|
||||
"--enable-lto=thin,cross"
|
||||
];
|
||||
|
||||
extraPostPatch = ''
|
||||
|
||||
+397
-397
File diff suppressed because it is too large
Load Diff
@@ -5,7 +5,6 @@
|
||||
qtbase,
|
||||
qttools,
|
||||
qtsvg,
|
||||
qt5compat,
|
||||
opencascade-occt,
|
||||
libGLU,
|
||||
cmake,
|
||||
@@ -17,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "librepcb";
|
||||
version = "1.3.0";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "librepcb";
|
||||
repo = "librepcb";
|
||||
rev = version;
|
||||
hash = "sha256-J4y0ikZNuOguN9msmEQzgcY0/REnOEOoDkY/ga+Cfd8=";
|
||||
hash = "sha256-8hMPrpqwGNYXUTJGL/CMSP+Sjv5F6ZTkJHqauuOxwTw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -31,30 +30,44 @@ stdenv.mkDerivation rec {
|
||||
cmake
|
||||
qttools
|
||||
qtsvg
|
||||
qt5compat
|
||||
wrapQtAppsHook
|
||||
opencascade-occt
|
||||
libGLU
|
||||
rustPlatform.cargoSetupHook
|
||||
cargo
|
||||
rustc
|
||||
];
|
||||
buildInputs = [ qtbase ];
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src cargoRoot;
|
||||
cargoDeps1 = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
cargoRoot = "libs/librepcb/rust-core";
|
||||
hash = "sha256-1td3WjxbDq2lX7c0trpYRhO82ChNAG/ZABBRsekYtq4=";
|
||||
};
|
||||
|
||||
cargoRoot = "libs/librepcb/rust-core";
|
||||
cargoDeps2 = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
cargoRoot = "libs/slint";
|
||||
hash = "sha256-DYcKoaOXYFvAi5VyWdhli73s7qrypeXmzGJNhVzcWtY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace libs/muparser/CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required (VERSION 3.1.0)" "cmake_minimum_required(VERSION 3.10)"
|
||||
substituteInPlace libs/type_safe{/,/external/debug_assert/}CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
|
||||
substituteInPlace libs/googletest{/,/googlemock/,/googletest/}CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required(VERSION 3.2)" "cmake_minimum_required(VERSION 3.10)"
|
||||
# Set up cargo config for the first Rust library
|
||||
mkdir -p libs/librepcb/rust-core/.cargo
|
||||
cat > libs/librepcb/rust-core/.cargo/config.toml <<EOF
|
||||
[source.crates-io]
|
||||
replace-with = "vendored-sources"
|
||||
[source.vendored-sources]
|
||||
directory = "${cargoDeps1}"
|
||||
EOF
|
||||
|
||||
# Set up cargo config for the second Rust library
|
||||
mkdir -p libs/slint/.cargo
|
||||
cat > libs/slint/.cargo/config.toml <<EOF
|
||||
[source.crates-io]
|
||||
replace-with = "vendored-sources"
|
||||
[source.vendored-sources]
|
||||
directory = "${cargoDeps2}"
|
||||
EOF
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
extra-cmake-modules,
|
||||
pkg-config,
|
||||
@@ -49,7 +50,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-n68Ghhsv15TzpOMH4dBTNxa6AYwqN5s2C5pyO9VVaco=";
|
||||
};
|
||||
|
||||
patches = [ ./darwin.patch ];
|
||||
patches = [
|
||||
./darwin.patch
|
||||
# Fix build: Only make the fallthrough define available in C code
|
||||
# https://github.com/86Box/86Box/issues/6607
|
||||
(fetchpatch {
|
||||
name = "fix-fallthrough-define-c-only.patch";
|
||||
url = "https://github.com/86Box/86Box/commit/0092ce15de3efac108b961882f870a8c05e8c38f.patch";
|
||||
hash = "sha256-DqjOtnyk6Zv9XHCLeuxD1wcLfvjGwGFvUWS0alXcchs=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteAllInPlace src/qt/qt_platform.cpp
|
||||
|
||||
@@ -18,16 +18,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "asusctl";
|
||||
version = "6.3.1";
|
||||
version = "6.3.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "asus-linux";
|
||||
repo = "asusctl";
|
||||
tag = version;
|
||||
hash = "sha256-x3WKxjYrWYaLWDi52b3uQSYnr/Qunf6JYu4ikt4ajls=";
|
||||
hash = "sha256-6dZkQ8cPL8dbtvfuc/a5G1BxEaZyNbvy3eRBctFFwVU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-FyVbeHzwMr8UJ2OoVYVekXJFhus/ab7KwfGK4eaua6A=";
|
||||
cargoHash = "sha256-FlEuv/iaNlfXLhHRSmZedPwroCozaEqIvYRqbgJhgEw=";
|
||||
|
||||
postPatch = ''
|
||||
files="
|
||||
|
||||
@@ -164,6 +164,6 @@ buildFHSEnv {
|
||||
iedame
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "${bolt.name}";
|
||||
mainProgram = "bolt-launcher";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bstone";
|
||||
version = "1.3.2";
|
||||
version = "1.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bibendovsky";
|
||||
repo = "bstone";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-D0f4DmVv2Bo3cwCUuo3LsXNWFR16rirpvSnAS2C6YEY=";
|
||||
hash = "sha256-Svqm8gpZ2TgI2MdJc+gY9O7xCYYNo84/bbbqprBFpcc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{
|
||||
"dependencies": {
|
||||
"ae": {
|
||||
"version": "0.0.3461",
|
||||
"sha256": "1mk075r3bas8s699y6sc4fxbdyjhc9cm6qxcqqaj0di9ijb71fq1"
|
||||
"version": "0.0.3701",
|
||||
"sha256": "0vf458cvr8mmvjr87g2i6yhn7yyz1cg4lbixf62b9qnszd88j2q2"
|
||||
},
|
||||
"btrfs": {
|
||||
"version": "0.0.21",
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildDubPackage rec {
|
||||
pname = "btdu";
|
||||
version = "0.6.0";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CyberShadow";
|
||||
repo = "btdu";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-B8ojxdXibeNEZay9S5lzpB6bTKNB2ZI6AQ3XKUHioE0=";
|
||||
hash = "sha256-ZZaBaDKfW52w2YWj34gXFruWNBNqjLUFsPCHmrCKT7I=";
|
||||
};
|
||||
|
||||
dubLock = ./dub-lock.json;
|
||||
@@ -27,6 +27,8 @@ buildDubPackage rec {
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm755 btdu -t $out/bin
|
||||
./btdu --man "" > btdu.1
|
||||
install -Dm644 btdu.1 -t $out/share/man/man1
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
@@ -1,159 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
requireFile,
|
||||
autoPatchelfHook,
|
||||
dpkg,
|
||||
makeWrapper,
|
||||
alsa-lib,
|
||||
dbus,
|
||||
expat,
|
||||
fontconfig,
|
||||
glib,
|
||||
libdrm,
|
||||
libglvnd,
|
||||
libpulseaudio,
|
||||
libudev0-shim,
|
||||
libxkbcommon,
|
||||
libxml2_13,
|
||||
libxslt,
|
||||
nspr,
|
||||
nss,
|
||||
libxscrnsaver,
|
||||
libx11,
|
||||
libsm,
|
||||
libice,
|
||||
buildFHSEnv,
|
||||
copyDesktopItems,
|
||||
makeDesktopItem,
|
||||
libsForQt5,
|
||||
packetTracerSource ? null,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "7.3.1";
|
||||
|
||||
unwrapped = stdenvNoCC.mkDerivation {
|
||||
pname = "ciscoPacketTracer7-unwrapped";
|
||||
inherit version;
|
||||
|
||||
src =
|
||||
if (packetTracerSource != null) then
|
||||
packetTracerSource
|
||||
else
|
||||
requireFile {
|
||||
name = "PacketTracer_731_amd64.deb";
|
||||
hash = "sha256-w5gC0V3WHQC6J/uMEW2kX9hWKrS0mZZVWtZriN6s4n8=";
|
||||
url = "https://www.netacad.com";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
dpkg
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
dbus
|
||||
expat
|
||||
fontconfig
|
||||
glib
|
||||
libdrm
|
||||
libglvnd
|
||||
libpulseaudio
|
||||
libudev0-shim
|
||||
libxkbcommon
|
||||
libxml2_13
|
||||
libxslt
|
||||
nspr
|
||||
nss
|
||||
libice
|
||||
libsm
|
||||
libx11
|
||||
libxscrnsaver
|
||||
];
|
||||
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
|
||||
dpkg-deb -x $src $out
|
||||
chmod 755 "$out"
|
||||
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
makeWrapper "$out/opt/pt/bin/PacketTracer7" "$out/bin/packettracer7" \
|
||||
--set QT_QPA_PLATFORM xcb \
|
||||
--prefix LD_LIBRARY_PATH : "$out/opt/pt/bin"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
|
||||
fhs-env = buildFHSEnv {
|
||||
name = "ciscoPacketTracer7-fhs-env";
|
||||
runScript = lib.getExe' unwrapped "packettracer7";
|
||||
targetPkgs = _: [ libudev0-shim ];
|
||||
};
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "ciscoPacketTracer7";
|
||||
inherit version;
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
ln -s ${fhs-env}/bin/${fhs-env.name} $out/bin/packettracer7
|
||||
|
||||
mkdir -p $out/share/icons/hicolor/48x48/apps
|
||||
ln -s ${unwrapped}/opt/pt/art/app.png $out/share/icons/hicolor/48x48/apps/cisco-packet-tracer-7.png
|
||||
ln -s ${unwrapped}/usr/share/icons/gnome/48x48/mimetypes $out/share/icons/hicolor/48x48/mimetypes
|
||||
ln -s ${unwrapped}/usr/share/mime $out/share/mime
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "cisco-pt7.desktop";
|
||||
desktopName = "Cisco Packet Tracer 7";
|
||||
icon = "cisco-packet-tracer-7";
|
||||
exec = "packettracer7 %f";
|
||||
mimeTypes = [
|
||||
"application/x-pkt"
|
||||
"application/x-pka"
|
||||
"application/x-pkz"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Network simulation tool from Cisco";
|
||||
homepage = "https://www.netacad.com/courses/packet-tracer";
|
||||
license = lib.licenses.unfree;
|
||||
mainProgram = "packettracer7";
|
||||
maintainers = with lib.maintainers; [
|
||||
gepbird
|
||||
];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
knownVulnerabilities = [
|
||||
''
|
||||
Cisco Packet Tracer 7 ships with qt5 qtwebengine.
|
||||
|
||||
${lib.head libsForQt5.qtwebengine.meta.knownVulnerabilities}
|
||||
''
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -10,11 +10,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "copilot-language-server";
|
||||
version = "1.412.0";
|
||||
version = "1.418.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip";
|
||||
hash = "sha256-t1GDRnJq1O5T49/iKSMsRw467EujWmGsuShI8Q8bI8w=";
|
||||
hash = "sha256-DFFQav3UTCItIQo1ksxy29smIMyyAHEDdhrdKf4NH1k=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -27,13 +27,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dune3d";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dune3d";
|
||||
repo = "dune3d";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-9lBaenBxMoJgG5tMM+EZ87xcJ4HhFTA9RUNZt2Jx34Q=";
|
||||
hash = "sha256-QaWdDz+cjceIKDJTZLEbPspClZKtP02YiMtu6mwI6/o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import ./generic.nix {
|
||||
version = "14.0.1";
|
||||
hash = "sha256-nnHpi2mb+QziEtahRVMUt7t+xKiylzLCalh+6ywcP7w=";
|
||||
version = "14.0.2";
|
||||
hash = "sha256-jgRyFfbzJ0Camotkn7f/tvSi7jKIhqEpGVZV8xw5uDQ=";
|
||||
npmDepsHash = "sha256-gyEr5uNZfBELxbvQeZ48xqtay7ObQL4dQaFO9yPC2Hg=";
|
||||
vendorHash = "sha256-7xgm57IqsFOh3CPwGybPHLLlckGLplJpU7M5upYKBl8=";
|
||||
vendorHash = "sha256-RusaQJXToLGL0pdJtCZBQvlTQfDXoaD6dhHNmHQ5Ozk=";
|
||||
lts = false;
|
||||
nixUpdateExtraArgs = [
|
||||
"--override-filename"
|
||||
|
||||
@@ -10,15 +10,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gitsign";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sigstore";
|
||||
repo = "gitsign";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sxkQOqlCgS/QFfRN5Rtdih2zjiGHY6H9Kjlw0Q74W2A=";
|
||||
hash = "sha256-jqWMZATeimmgyb0yD5dzp9h31c9RaClpH2cA+bvhxpg=";
|
||||
};
|
||||
vendorHash = "sha256-CvswCIczi+MyHsluz39CnfVJEcc49wkEby67qHxv+wI=";
|
||||
vendorHash = "sha256-NZvJGexfCjxCQI8R/thv0Z2PaMNSkkGmyPUFJyYxdgM=";
|
||||
|
||||
subPackages = [
|
||||
"."
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kraftkit";
|
||||
pname = "kraft";
|
||||
version = "0.12.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "local-content-share";
|
||||
version = "36";
|
||||
version = "37";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Tanq16";
|
||||
repo = "local-content-share";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-FINKuRzpAwFV2F5FFrM0B3z7sx3PG+Ql8dETwykgyu4=";
|
||||
hash = "sha256-M7C95scyTBcmfH96BEWSK3wQFzv491ADw1SH9IvmwiY=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -20,6 +20,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"man"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Program for writing Microsoft-compatible boot records";
|
||||
homepage = "https://ms-sys.sourceforge.net/";
|
||||
|
||||
@@ -21,13 +21,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nrsc5";
|
||||
version = "3.0.1";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "theori-io";
|
||||
repo = "nrsc5";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-chLoCXbEQaIrSHLQAm0++NGNYuQNCseSCR37qjXwW04=";
|
||||
hash = "sha256-xfgTUIaXt/nb5hNiwi4ws7pzeVGOW72LDSIXg+yLwkw=";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
|
||||
@@ -15,14 +15,14 @@ let
|
||||
in
|
||||
ocamlPackages.buildDunePackage {
|
||||
pname = "owi";
|
||||
version = "0.2-unstable-2026-01-21";
|
||||
version = "0.2-unstable-2026-01-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocamlpro";
|
||||
repo = "owi";
|
||||
rev = "66e4d2ddaa03ee441dc6156b681ad832522ff2cf";
|
||||
rev = "a757ce0dd8ec6b60de019da794c13756b5795aa5";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-KTeCDI67BGkoDBBeBG96BJrvO9kPX+Vztgk1S1PoyIM=";
|
||||
hash = "sha256-D5+vo4MDpku5Z2QqAmulwa49h+Enze2TtVW47AHNLBc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with ocamlPackages; [
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pantheon-tweaks";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pantheon-tweaks";
|
||||
repo = "pantheon-tweaks";
|
||||
rev = version;
|
||||
hash = "sha256-cCrHGOo7dZc28hbZD6Zv8Dw4Ks5JTDsm6A6nkmpUAxk=";
|
||||
hash = "sha256-haiKElDv6lvZeROpiCc2n3I0Ho/l6HjUhu/yBISsT2E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rgrc";
|
||||
version = "0.6.6";
|
||||
version = "0.6.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lazywalker";
|
||||
repo = "rgrc";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-01wZYHxE01GpvFo45Fx7VootmNf/PQsS5jRMBKM7SHY=";
|
||||
hash = "sha256-UFGC41utbAeKa5RnVcnhwvRVXobXOTrqtA/Khwyke9w=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-EoFTZGHviwlvB1eVQS4F0/e0g7Lp9ZipsgEYbZfNwHA=";
|
||||
cargoHash = "sha256-bmMO1qfii31BUZhNnZtiEd+1wuH2sTO0hQ2FVEzYAtE=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "runn";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "k1LoW";
|
||||
repo = "runn";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-rwKz/jFkmB7F4CoeRPgCBCvls3ovEdp907G3NzcY9tY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XFPiTyOoFfbfkhE/UekulsUc2lwoVJskO8ZxcBmiOU0=";
|
||||
|
||||
subPackages = [ "cmd/runn" ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/k1LoW/runn/version.Version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
# Tests require external services (PostgreSQL, MySQL, Chrome, gRPC)
|
||||
doCheck = false;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Scenario-based testing tool for APIs, databases, and more";
|
||||
homepage = "https://github.com/k1LoW/runn";
|
||||
changelog = "https://github.com/k1LoW/runn/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ takeokunn ];
|
||||
mainProgram = "runn";
|
||||
};
|
||||
})
|
||||
@@ -23,12 +23,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "swaylock-plugin";
|
||||
version = "1.8.4";
|
||||
version = "1.8.5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mstoeckl";
|
||||
repo = "swaylock-plugin";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-UoBLEO7KaYihN/Suw9LjMXeV5sKxCULlJFynvuwwplM=";
|
||||
hash = "sha256-CdxOOfKqPm/rWuZjaLOGcFaJpvdjT7GIhx24etPHH5I=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -37,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
meta = chromedriver.meta // {
|
||||
description = "Custom Selenium ChromeDriver that passes all bot mitigation systems";
|
||||
homepage = "https://github.com/ultrafunkamsterdam/undetected-chromedriver";
|
||||
mainProgram = "undetected-chromedriver";
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
@@ -22,14 +22,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "variety";
|
||||
version = "0.8.13";
|
||||
version = "0.9.0-b1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "varietywalls";
|
||||
repo = "variety";
|
||||
tag = version;
|
||||
hash = "sha256-7CTJ3hWddbOX/UfZ1qX9rPNGTfkxQ4pxu23sq9ulgv4=";
|
||||
hash = "sha256-uDQZfWY0RuTsdD/IxpjzSTMMtNq632VAwAjB+CeUIbw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -47,7 +47,10 @@ python3Packages.buildPythonApplication rec {
|
||||
]
|
||||
++ lib.optional appindicatorSupport libayatana-appindicator;
|
||||
|
||||
build-system = with python3Packages; [ setuptools ];
|
||||
build-system = with python3Packages; [
|
||||
setuptools
|
||||
setuptools-gettext
|
||||
];
|
||||
|
||||
dependencies =
|
||||
with python3Packages;
|
||||
@@ -77,12 +80,10 @@ python3Packages.buildPythonApplication rec {
|
||||
'';
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace variety_lib/varietyconfig.py \
|
||||
--replace-fail "__variety_data_directory__ = \"../data\"" \
|
||||
"__variety_data_directory__ = \"$out/share/variety\""
|
||||
substituteInPlace variety/VarietyWindow.py \
|
||||
--replace-fail '[script,' '["${runtimeShell}", script,' \
|
||||
--replace-fail 'check_output(script)' 'check_output(["${runtimeShell}", script])'
|
||||
--replace-fail 'check_output(script)' 'check_output(["${runtimeShell}", script])' \
|
||||
--replace-fail 'os.stat(path).st_mode | stat.S_IEXEC' 'os.stat(path).st_mode | stat.S_IEXEC | stat.S_IWUSR'
|
||||
substituteInPlace data/variety-autostart.desktop.template \
|
||||
--replace-fail "/bin/bash" "${lib.getExe bash}" \
|
||||
--replace-fail "{VARIETY_PATH}" "variety"
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
rustPlatform,
|
||||
pkg-config,
|
||||
openssl,
|
||||
@@ -26,16 +27,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "vector";
|
||||
version = "0.52.0";
|
||||
version = "0.53.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vectordotdev";
|
||||
repo = "vector";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-jwEJ+myovZYcohvxH1VvvOW8xok3HSLvhtMsLC2M3KY=";
|
||||
hash = "sha256-OFybPI2oppntYBEklJtdEhImZc/m4oaSSWylr2hHUjA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-EfgDL5asygFqr8pVcTR9BsYU3fcG28xhrCn5nCkVfcA=";
|
||||
cargoHash = "sha256-Xuff8ZanFCtvitNYnOwCyd0UYjrhrP8UglJqbpScGVM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
@@ -43,6 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
perl
|
||||
git
|
||||
rustPlatform.bindgenHook
|
||||
installShellFiles
|
||||
]
|
||||
# Provides the mig command used by the build scripts
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin darwin.bootstrap_cmds;
|
||||
@@ -116,6 +118,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
--replace-fail "#[tokio::test]" ""
|
||||
'';
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
for shell in bash fish zsh; do
|
||||
installShellCompletion --cmd vector --$shell <($out/bin/vector completion $shell)
|
||||
done
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
|
||||
@@ -28,14 +28,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wezterm";
|
||||
version = "0-unstable-2026-01-09";
|
||||
version = "0-unstable-2026-01-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wezterm";
|
||||
repo = "wezterm";
|
||||
rev = "6e02c91e6b4f14d8df81d2819807212807cc5d5f";
|
||||
rev = "05343b387085842b434d267f91b6b0ec157e4331";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-5KGSAhblAyBT1ppMaGlI94wMGl4/NpLHK7VFMYF+FV4=";
|
||||
hash = "sha256-V6WvkNZryYofarsyfcmsuvtpNJ/c3O+DmOKNvoYPbmA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -58,7 +58,7 @@ rustPlatform.buildRustPackage rec {
|
||||
# https://github.com/wezterm/wezterm/blob/main/nix/flake.nix#L134
|
||||
auditable = false;
|
||||
|
||||
cargoHash = "sha256-am5i7Bsoiu1a4RWDy+dpuHgyZpQvKOlEMzCP8QxbeaQ=";
|
||||
cargoHash = "sha256-waXq0U2Ud7FhlJn3evO7bZSBsOAA39ObiVWHycNQXmA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -1,20 +1,20 @@
|
||||
{
|
||||
"aarch64-darwin": {
|
||||
"version": "1.13.9",
|
||||
"version": "1.13.13",
|
||||
"vscodeVersion": "1.106.0",
|
||||
"url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/a473c86f69ab6b6f98bc47437adc6263df8738d0/Windsurf-darwin-arm64-1.13.9.zip",
|
||||
"sha256": "a4e3930b30d8abb708ef99a08c8f31da4d0dfbf395ad9c8fe4c57640f9eab8f0"
|
||||
"url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/ca71c32d680a52e5f4726f9fcfa5a38efb09ff4c/Windsurf-darwin-arm64-1.13.13.zip",
|
||||
"sha256": "97cb94e35f04e233f0c134340ba3ac0a239e9c345fabeaf0fbd0e118605df988"
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"version": "1.13.9",
|
||||
"version": "1.13.13",
|
||||
"vscodeVersion": "1.106.0",
|
||||
"url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/a473c86f69ab6b6f98bc47437adc6263df8738d0/Windsurf-darwin-x64-1.13.9.zip",
|
||||
"sha256": "d24a452a562ea662f2a56c304b56603bba5af1597025bb6f1d0f3534c94aae1d"
|
||||
"url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/ca71c32d680a52e5f4726f9fcfa5a38efb09ff4c/Windsurf-darwin-x64-1.13.13.zip",
|
||||
"sha256": "b4999a127aa4f6e1a57b78540109a49f1ec6437557c5c1e8351c5b3859237458"
|
||||
},
|
||||
"x86_64-linux": {
|
||||
"version": "1.13.9",
|
||||
"version": "1.13.13",
|
||||
"vscodeVersion": "1.106.0",
|
||||
"url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/a473c86f69ab6b6f98bc47437adc6263df8738d0/Windsurf-linux-x64-1.13.9.tar.gz",
|
||||
"sha256": "a3a4893b354c5d4dc367dbb723bdecef16c3f0e573a7d895219991314fb2c434"
|
||||
"url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/ca71c32d680a52e5f4726f9fcfa5a38efb09ff4c/Windsurf-linux-x64-1.13.13.tar.gz",
|
||||
"sha256": "34ca8e4a8a6485b5462067920b74088112595984306fb63501760eb5a62648fc"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -26,6 +26,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-7dLoKxBbE98FjADTYjjwj6OafJdecAkOCMRcYUYuYV4=";
|
||||
};
|
||||
|
||||
# fixes https://github.com/NixOS/nixpkgs/issues/483585 aka https://gitlab.freedesktop.org/xorg/driver/xf86-video-amdgpu/-/issues/8
|
||||
hardeningDisable = [ "bindnow" ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -27,13 +27,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-settings-daemon";
|
||||
version = "8.4.0";
|
||||
version = "8.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "settings-daemon";
|
||||
rev = version;
|
||||
sha256 = "sha256-VdvwrkafZJ0+z2MYWT83POdo8dZrSAOL5RhAiwGEc2g=";
|
||||
tag = version;
|
||||
hash = "sha256-npHSj+Zq0fqWVjr5kl/C96gfziLMNOeXxCUgxFGht/s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -27,13 +27,13 @@
|
||||
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "smtml";
|
||||
version = "0.19.0";
|
||||
version = "0.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "formalsec";
|
||||
repo = "smtml";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ZS+SVmpmvUP2V3DTQ5+QNjFWgj3O3vFIST5c7CifIos=";
|
||||
hash = "sha256-VnkF+bZXeqaj9LSpyzqH5AM9EQsrW4Rlj5kvyTfYTKE=";
|
||||
};
|
||||
|
||||
minimalOCamlVersion = "4.14";
|
||||
@@ -85,6 +85,7 @@ buildDunePackage (finalAttrs: {
|
||||
downloadPage = "https://github.com/formalsec/smtml";
|
||||
changelog = "https://github.com/formalsec/smtml/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
teams = with lib.teams; [ ngi ];
|
||||
maintainers = with lib.maintainers; [
|
||||
ethancedwards8
|
||||
redianthus
|
||||
|
||||
@@ -18,14 +18,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ariadne";
|
||||
version = "0.27.0";
|
||||
version = "0.27.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mirumee";
|
||||
repo = "ariadne";
|
||||
tag = version;
|
||||
hash = "sha256-y09w1y+NV2HX8cXGMqv6LvPqGXxFfoaz4DS+oH25dNg=";
|
||||
hash = "sha256-Ew01tj/UzZw3IBY33tDfLihWKImjKTZfFcfThphk+H8=";
|
||||
};
|
||||
|
||||
patches = [ ./remove-opentracing.patch ];
|
||||
|
||||
@@ -3,9 +3,11 @@
|
||||
fetchFromGitHub,
|
||||
buildPythonPackage,
|
||||
cffi,
|
||||
isPyPy,
|
||||
# overridden as pkgs.brotli
|
||||
brotli,
|
||||
setuptools,
|
||||
pycparser,
|
||||
pytestCheckHook,
|
||||
hypothesis,
|
||||
}:
|
||||
@@ -28,7 +30,7 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedNativeBuildInputs = [ cffi ];
|
||||
|
||||
dependencies = [ cffi ];
|
||||
dependencies = [ cffi ] ++ lib.optional isPyPy pycparser;
|
||||
|
||||
preBuild = ''
|
||||
export USE_SHARED_BROTLI=1
|
||||
|
||||
@@ -87,11 +87,15 @@ buildPythonPackage rec {
|
||||
let
|
||||
pythonEnv = python.withPackages f;
|
||||
in
|
||||
runCommand "certbot-with-plugins" { } ''
|
||||
mkdir -p $out/bin
|
||||
cd $out/bin
|
||||
ln -s ${pythonEnv}/bin/certbot
|
||||
'';
|
||||
runCommand "certbot-with-plugins-${version}"
|
||||
{
|
||||
inherit pname version;
|
||||
}
|
||||
''
|
||||
mkdir -p $out/bin
|
||||
cd $out/bin
|
||||
ln -s ${pythonEnv}/bin/certbot
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/certbot/certbot";
|
||||
|
||||
@@ -129,6 +129,10 @@ buildPythonPackage rec {
|
||||
"test_resolving_standard_reversible_as_generic"
|
||||
"test_resolving_standard_sequence_as_generic"
|
||||
"test_specialised_collection_types"
|
||||
]
|
||||
++ lib.optionals isPyPy [
|
||||
# hypothesis.errors.Unsatisfiable: Could not find any examples from datetimes(min_value=datetime.datetime(2003, 1, 1, 0, 0), max_value=datetime.datetime(2005, 12, 31, 23, 59, 59, 999999)) that satisfied lambda x: x.month == 2 and x.day == 29
|
||||
"test_bordering_on_a_leap_year"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "hypothesis" ];
|
||||
|
||||
@@ -93,18 +93,23 @@ buildPythonPackage rec {
|
||||
# installed under the same path which is not true in Nix.
|
||||
# With the following patch we just hard-code these paths into the install
|
||||
# script.
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "meson-python>=0.13.1,<0.17.0" meson-python
|
||||
postPatch =
|
||||
lib.optionalString isPyPy ''
|
||||
substituteInPlace tools/generate_matplotlibrc.py \
|
||||
--replace-fail "/usr/bin/env python3" "/usr/bin/env pypy3"
|
||||
''
|
||||
+ ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "meson-python>=0.13.1,<0.17.0" meson-python
|
||||
|
||||
patchShebangs tools
|
||||
''
|
||||
+ lib.optionalString (stdenv.hostPlatform.isLinux && interactive) ''
|
||||
# fix paths to libraries in dlopen calls (headless detection)
|
||||
substituteInPlace src/_c_internal_utils.cpp \
|
||||
--replace-fail libX11.so.6 ${libX11}/lib/libX11.so.6 \
|
||||
--replace-fail libwayland-client.so.0 ${wayland}/lib/libwayland-client.so.0
|
||||
'';
|
||||
patchShebangs tools
|
||||
''
|
||||
+ lib.optionalString (stdenv.hostPlatform.isLinux && interactive) ''
|
||||
# fix paths to libraries in dlopen calls (headless detection)
|
||||
substituteInPlace src/_c_internal_utils.cpp \
|
||||
--replace-fail libX11.so.6 ${libX11}/lib/libX11.so.6 \
|
||||
--replace-fail libwayland-client.so.0 ${wayland}/lib/libwayland-client.so.0
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config ] ++ lib.optionals enableGtk3 [ gobject-introspection ];
|
||||
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
hatch-vcs,
|
||||
hatchling,
|
||||
platformdirs,
|
||||
pytest-freezer,
|
||||
pytest-mock,
|
||||
pytestCheckHook,
|
||||
time-machine,
|
||||
@@ -43,6 +44,7 @@ buildPythonPackage rec {
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
]
|
||||
++ lib.optionals isPyPy [ pytest-freezer ]
|
||||
++ lib.optionals (!isPyPy) [ time-machine ];
|
||||
|
||||
disabledTestPaths = [
|
||||
|
||||
@@ -22,9 +22,6 @@ stdenv.mkDerivation {
|
||||
sed 's/depmod /true /' -i Makefile
|
||||
'';
|
||||
|
||||
# Fix build on Linux kernel >= 5.18
|
||||
env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=implicit-fallthrough" ];
|
||||
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
|
||||
makeFlags = kernelModuleMakeFlags ++ [
|
||||
|
||||
@@ -16,9 +16,9 @@ let
|
||||
variants = {
|
||||
# ./update-zen.py zen
|
||||
zen = {
|
||||
version = "6.18.6"; # zen
|
||||
version = "6.18.7"; # zen
|
||||
suffix = "zen1"; # zen
|
||||
sha256 = "13qr95dncg3n2ijcnvxwgsh5jvmls60znfq68ikivmji06klps2r"; # zen
|
||||
sha256 = "0in7n00g4rq0yiy3gxaymxh33v8g3f147jypylmn998lhs7y3d68"; # zen
|
||||
isLqx = false;
|
||||
};
|
||||
# ./update-zen.py lqx
|
||||
|
||||
@@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
hardeningDisable = [ "pic" ];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
|
||||
|
||||
makeFlags = kernelModuleMakeFlags ++ [
|
||||
"KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||
"INSTALL_MOD_PATH=${placeholder "out"}"
|
||||
|
||||
@@ -10,55 +10,50 @@
|
||||
broken ? false,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (
|
||||
{
|
||||
pname = "nvidia-open";
|
||||
version = "${kernel.version}-${nvidia_x11.version}";
|
||||
stdenv.mkDerivation {
|
||||
pname = "nvidia-open";
|
||||
version = "${kernel.version}-${nvidia_x11.version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NVIDIA";
|
||||
repo = "open-gpu-kernel-modules";
|
||||
rev = nvidia_x11.version;
|
||||
inherit hash;
|
||||
};
|
||||
src = fetchFromGitHub {
|
||||
owner = "NVIDIA";
|
||||
repo = "open-gpu-kernel-modules";
|
||||
rev = nvidia_x11.version;
|
||||
inherit hash;
|
||||
};
|
||||
|
||||
inherit patches;
|
||||
inherit patches;
|
||||
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
|
||||
makeFlags =
|
||||
kernelModuleMakeFlags
|
||||
++ [
|
||||
"IGNORE_PREEMPT_RT_PRESENCE=1"
|
||||
"SYSSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
|
||||
"SYSOUT=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||
"MODLIB=$(out)/lib/modules/${kernel.modDirVersion}"
|
||||
"DATE="
|
||||
"TARGET_ARCH=${stdenv.hostPlatform.parsed.cpu.name}"
|
||||
]
|
||||
++ lib.optionals stdenv.cc.isClang [
|
||||
"C_INCLUDE_PATH=${lib.getLib stdenv.cc.cc}/lib/clang/${lib.versions.major stdenv.cc.cc.version}/include"
|
||||
];
|
||||
makeFlags =
|
||||
kernelModuleMakeFlags
|
||||
++ [
|
||||
"IGNORE_PREEMPT_RT_PRESENCE=1"
|
||||
"SYSSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
|
||||
"SYSOUT=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||
"MODLIB=$(out)/lib/modules/${kernel.modDirVersion}"
|
||||
"DATE="
|
||||
"TARGET_ARCH=${stdenv.hostPlatform.parsed.cpu.name}"
|
||||
]
|
||||
++ lib.optionals stdenv.cc.isClang [
|
||||
"C_INCLUDE_PATH=${lib.getLib stdenv.cc.cc}/lib/clang/${lib.versions.major stdenv.cc.cc.version}/include"
|
||||
];
|
||||
|
||||
installTargets = [ "modules_install" ];
|
||||
enableParallelBuilding = true;
|
||||
installTargets = [ "modules_install" ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "NVIDIA Linux Open GPU Kernel Module";
|
||||
homepage = "https://github.com/NVIDIA/open-gpu-kernel-modules";
|
||||
license = with lib.licenses; [
|
||||
gpl2Plus
|
||||
mit
|
||||
];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
];
|
||||
maintainers = with lib.maintainers; [ nickcao ];
|
||||
inherit broken;
|
||||
};
|
||||
}
|
||||
// lib.optionalAttrs stdenv.hostPlatform.isAarch64 {
|
||||
env.NIX_CFLAGS_COMPILE = "-fno-stack-protector";
|
||||
}
|
||||
)
|
||||
meta = {
|
||||
description = "NVIDIA Linux Open GPU Kernel Module";
|
||||
homepage = "https://github.com/NVIDIA/open-gpu-kernel-modules";
|
||||
license = with lib.licenses; [
|
||||
gpl2Plus
|
||||
mit
|
||||
];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
];
|
||||
maintainers = with lib.maintainers; [ nickcao ];
|
||||
inherit broken;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -22,8 +22,6 @@ stdenv.mkDerivation {
|
||||
|
||||
hardeningDisable = [ "pic" ];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace ./Makefile \
|
||||
--replace /lib/modules/ "${kernel.dev}/lib/modules/" \
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "marcolivierarsenault";
|
||||
domain = "moonraker";
|
||||
version = "1.13.0";
|
||||
version = "1.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "marcolivierarsenault";
|
||||
repo = "moonraker-home-assistant";
|
||||
tag = version;
|
||||
hash = "sha256-3GY0aPCWjrnObaHVQmVjZUsQE4ZB+LtnUxO96IZxZAk=";
|
||||
hash = "sha256-FMYHQWnPsqYWhd2TI6TUBTfpIs4yYjcE7bmS/Fg5PZU=";
|
||||
};
|
||||
|
||||
dependencies = [
|
||||
|
||||
@@ -33,6 +33,11 @@ stdenv.mkDerivation {
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"man"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Dynamic virtual terminal manager";
|
||||
homepage = "http://www.brain-dump.org/projects/dvtm";
|
||||
|
||||
@@ -442,6 +442,7 @@ mapAliases {
|
||||
chrome-gnome-shell = throw "'chrome-gnome-shell' has been renamed to/replaced by 'gnome-browser-connector'"; # Converted to throw 2025-10-27
|
||||
ci-edit = throw "'ci-edit' has been removed due to lack of maintenance upstream"; # Added 2025-08-26
|
||||
cinnamon-common = cinnamon; # Added 2025-08-06
|
||||
ciscoPacketTracer7 = throw "'ciscoPacketTracer7' has been removed in favor of 'ciscoPacketTracer8' and 'ciscoPacketTracer9'";
|
||||
citrix_workspace_23_11_0 = throw "'citrix_workspace_23_11_0' has been removed because it has reached EOL."; # Added 2025-11-25
|
||||
citrix_workspace_24_02_0 = throw "'citrix_workspace_24_02_0' has been removed because it has reached EOL."; # Added 2025-11-25
|
||||
citrix_workspace_24_05_0 = throw "'citrix_workspace_24_05_0' has been removed because it depended on the removed webkitgtk_4_0."; # Added 2025-11-25
|
||||
|
||||
Reference in New Issue
Block a user