Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
dc84f21849
27 changed files with 122 additions and 71 deletions
|
|
@ -396,8 +396,7 @@ in {
|
|||
ManagerEnvironment=${lib.concatStringsSep " " (lib.mapAttrsToList (n: v: "${n}=${lib.escapeShellArg v}") cfg.managerEnvironment)}
|
||||
'';
|
||||
|
||||
"/lib/modules".source = "${modulesClosure}/lib/modules";
|
||||
"/lib/firmware".source = "${modulesClosure}/lib/firmware";
|
||||
"/lib".source = "${modulesClosure}/lib";
|
||||
|
||||
"/etc/modules-load.d/nixos.conf".text = concatStringsSep "\n" config.boot.initrd.kernelModules;
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
in {
|
||||
imports = [
|
||||
(lib.mkRemovedOptionModule [ "systemd" "oomd" "enableUserServices" ] "Use systemd.oomd.enableUserSlices instead.")
|
||||
(lib.mkRenamedOptionModule [ "systemd" "oomd" "enableUserServices" ] [ "systemd" "oomd" "enableUserSlices" ])
|
||||
];
|
||||
|
||||
options.systemd.oomd = {
|
||||
|
|
@ -61,6 +61,7 @@ in {
|
|||
};
|
||||
systemd.user.units."slice" = lib.mkIf cfg.enableUserSlices {
|
||||
text = ''
|
||||
[Slice]
|
||||
ManagedOOMMemoryPressure=kill
|
||||
ManagedOOMMemoryPressureLimit=80%
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
, ninja
|
||||
, curl
|
||||
, perl
|
||||
, llvmPackages_13
|
||||
, desktop-file-utils
|
||||
, exiv2
|
||||
, glib
|
||||
|
|
@ -57,17 +56,15 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.4.2";
|
||||
version = "4.6.0";
|
||||
pname = "darktable";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
|
||||
sha256 = "c11d28434fdf2e9ce572b9b1f9bc4e64dcebf6148e25080b4c32eb51916cfa98";
|
||||
sha256 = "sha256-cksn4yBNGCLebcU+oJCmsc5V98MiJtNGQmiXdcaKrMI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja llvmPackages_13.llvm pkg-config intltool perl desktop-file-utils wrapGAppsHook ]
|
||||
# LLVM Clang C compiler version 11.1.0 is too old and is unsupported. Version 12+ is required.
|
||||
++ lib.optionals stdenv.isDarwin [ llvmPackages_13.clang ];
|
||||
nativeBuildInputs = [ cmake ninja llvmPackages.llvm pkg-config intltool perl desktop-file-utils wrapGAppsHook ];
|
||||
|
||||
buildInputs = [
|
||||
cairo
|
||||
|
|
|
|||
|
|
@ -34,14 +34,14 @@ https://github.com/NixOS/nixpkgs/issues/199596#issuecomment-1310136382 */
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "1.4.11";
|
||||
version = "1.4.12";
|
||||
pname = "syncthingtray";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Martchus";
|
||||
repo = "syncthingtray";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-wzIIiVo6EmfQAyaIVsVsT4lfm0ThhGBgETV0036Pgvo=";
|
||||
sha256 = "sha256-KfJ/MEgQdvzAM+rnKGMsjnRrbFeFu6F8Or+rgFNLgFI=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "flarectl";
|
||||
version = "0.84.0";
|
||||
version = "0.85.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = "cloudflare-go";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RHt5Hu3N7gJIg7daylBSr9p7Hb9eQQUK2CfC6q/pblM=";
|
||||
hash = "sha256-mXbWiHU28MlcYbS+RLHToJZpVMWsQ7qY6dAyY+ulwjw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XziR/ZB0kva/sl2Tj+m0pdK5HxLW6osBXD00+m/y0cQ=";
|
||||
vendorHash = "sha256-v6xhhufqxfFvY3BpcM6Qvpljf/vE8ZwPG47zhx+ilb0=";
|
||||
|
||||
subPackages = [ "cmd/flarectl" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "hdrop";
|
||||
version = "0.2.4";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Schweber";
|
||||
repo = "hdrop";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VsM1wPl8edAnZUvYw3IeOHw/XQ2pvbLt0v3G0B8+iSA=";
|
||||
hash = "sha256-IVLc1USBkkIBEll1jRIAAszyGCmpw5Sy74Zyalv3W+w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -69,5 +69,6 @@ rustPlatform.buildRustPackage rec {
|
|||
changelog = "https://github.com/tweag/nickel/blob/${version}/RELEASES.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ AndersonTorres felschr matthiasbeyer ];
|
||||
mainProgram = "nickel";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
# https://github.com/abathur/resholve/issues/107
|
||||
resholve.mkDerivation rec {
|
||||
pname = "nix-direnv";
|
||||
version = "3.0.3";
|
||||
version = "3.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = "nix-direnv";
|
||||
rev = version;
|
||||
hash = "sha256-dwSICqFshBI9/4u40fkEqOuhTndnAx/w88zsnIzEcBk=";
|
||||
hash = "sha256-3Fkat0HWU/hdQKwJYx5KWVzX8sVbGtFTon6G6/F9zFk=";
|
||||
};
|
||||
|
||||
# skip min version checks which are redundant when built with nix
|
||||
|
|
|
|||
|
|
@ -36,5 +36,6 @@ stdenv.mkDerivation {
|
|||
platforms = with lib.platforms; linux ++ darwin;
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ];
|
||||
mainProgram = "swift-format";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -66,6 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
changelog = "https://ziglang.org/download/${finalAttrs.version}/release-notes.html";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ andrewrk ] ++ lib.teams.zig.members;
|
||||
mainProgram = "zig";
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
} // removeAttrs args [ "hash" ])
|
||||
|
|
|
|||
|
|
@ -39,8 +39,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||
--set-default JAVA_HOME ${jdkBabashka}
|
||||
|
||||
installShellCompletion --cmd bb --bash ${babashka-unwrapped}/share/bash-completion/completions/bb.bash
|
||||
installShellCompletion --cmd bb --zsh ${babashka-unwrapped}/share/fish/vendor_completions.d/bb.fish
|
||||
installShellCompletion --cmd bb --fish ${babashka-unwrapped}/share/zsh/site-functions/_bb
|
||||
installShellCompletion --cmd bb --zsh ${babashka-unwrapped}/share/zsh/site-functions/_bb
|
||||
installShellCompletion --cmd bb --fish ${babashka-unwrapped}/share/fish/vendor_completions.d/bb.fish
|
||||
'' +
|
||||
lib.optionalString withRlwrap ''
|
||||
substituteInPlace $out/bin/bb \
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "psqlodbc";
|
||||
version = "13.02.0000";
|
||||
version = "16.00.0000";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://ftp.postgresql.org/pub/odbc/versions/src/psqlodbc-${version}.tar.gz";
|
||||
hash = "sha256-s5t+XEH9ZHXFUREvpyS/V8SkRhdexBiKkOKETMFhJYU=";
|
||||
hash = "sha256-r9iS+J0uzujT87IxTxvVvy0CIBhyxuNDHlwxCW7KTIs=";
|
||||
};
|
||||
|
||||
buildInputs = [ libiodbc postgresql openssl ];
|
||||
|
|
|
|||
|
|
@ -66,6 +66,16 @@ let
|
|||
revert = true;
|
||||
hash = "sha256-cjB2sC4cvZn0UEc+sm6ZpjyC78ssqB1Kb5nlZQ15M4A=";
|
||||
})
|
||||
# CVE-2023-51714: Potential Integer Overflow in Qt's HTTP2 implementation
|
||||
# https://www.qt.io/blog/security-advisory-potential-integer-overflow-in-qts-http2-implementation
|
||||
(fetchpatch2 {
|
||||
url = "https://download.qt.io/official_releases/qt/6.5/0001-CVE-2023-51714-qtbase-6.5.diff";
|
||||
hash = "sha256-0Xnolq9dWkKUrmLUlv15uQ9nkZXrY3AsmvChaLX8P2I=";
|
||||
})
|
||||
(fetchpatch2 {
|
||||
url = "https://download.qt.io/official_releases/qt/6.6/0002-CVE-2023-51714-qtbase-6.6.diff";
|
||||
hash = "sha256-+/u3vy5Ci6Z4jy00L07iYAnqHvVdqUzqVnT9uVIqs60=";
|
||||
})
|
||||
];
|
||||
};
|
||||
env = callPackage ./qt-env.nix { };
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qtutilities";
|
||||
version = "6.13.3";
|
||||
version = "6.13.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Martchus";
|
||||
repo = "qtutilities";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-/3PEbUMphblB3HgLkDb4l7GykuXL/ZOsKBrs8h72uwE=";
|
||||
hash = "sha256-AlDPu2mD2OrjBq3tUxQBAoqD32L9MiSjcUNGWzpj/xc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bleak-retry-connector";
|
||||
version = "3.3.0";
|
||||
version = "3.4.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-5yhr+W2ZSy/uSgmz23pyIKcoJ34h/eDsoyv+N9Hi36w=";
|
||||
hash = "sha256-hhoYPpNJ8myW2KMe7o7gvbjnmpY4OYudaDA/vV8BkN8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -5,23 +5,28 @@
|
|||
, getmac
|
||||
, pythonOlder
|
||||
, requests
|
||||
, setuptools
|
||||
, zeroconf
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "boschshcpy";
|
||||
version = "0.2.84";
|
||||
format = "setuptools";
|
||||
version = "0.2.88";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tschamm";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-aSFnDLzJCZjHX6m/iZKC5F5kY7JXRZp0//jY8kkjC3I=";
|
||||
repo = "boschshcpy";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-tyx7VJGsU9YYNJQy1mly0AgwKULZ1BWeRzz1BDgXrUU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cryptography
|
||||
getmac
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "crc";
|
||||
version = "6.0.0";
|
||||
version = "6.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "Nicoretti";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-bQa+hkWRXRlyvX3/RL3DAjh9V/kTNg8C7/6viLLKtpk=";
|
||||
hash = "sha256-NfJGiVxvFPlecDB72/Dfe0yafBH9dghGQh/TAnbPzOA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dnslib";
|
||||
version = "0.9.23";
|
||||
version = "0.9.24";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-MQGW0+OM4gUbYe670vHQj8yTT6M2DyIDGGTRbv6Lync=";
|
||||
hash = "sha256-7xZ4aKMNTOfJC5ISedfs+5hr6OvFMPPmBQouy2hwfHY=";
|
||||
};
|
||||
|
||||
checkPhase = ''
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-data";
|
||||
version = "3.5.0";
|
||||
version = "3.6.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "iterative";
|
||||
repo = "dvc-data";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-vLSb+RIaebF+ili+6bvU8wplcpycPVRadUkhkLHdqi8=";
|
||||
hash = "sha256-It7l74R1cD9r6SmQfxCZ1VvuO0BLqjP2DEGHCKy99n8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hcloud";
|
||||
version = "1.33.0";
|
||||
version = "1.33.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-xkANXrFG6Tm/fz9Hnutga1q4uw43xaAT1rlmUbTag/g=";
|
||||
hash = "sha256-GCiw+HbN/0na2fiAS16On72nj09VR0Naw6wwCIQ4zl8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "holidays";
|
||||
version = "0.39";
|
||||
version = "0.40";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
|||
owner = "dr-prodigy";
|
||||
repo = "python-holidays";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-PsrdR4voEAiEhgoeR03Xp/tacqtcEt1FhO4kfMYkSos=";
|
||||
hash = "sha256-rFitLHUgXSWNd59VzG01ggaTHfVzI50OAi7Gxr6pMug=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ lib
|
||||
, async-timeout
|
||||
, bleak
|
||||
, bleak-retry-connector
|
||||
, boto3
|
||||
|
|
@ -10,12 +9,13 @@
|
|||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
, requests
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyswitchbot";
|
||||
version = "0.42.0";
|
||||
format = "setuptools";
|
||||
version = "0.43.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
|
@ -23,11 +23,14 @@ buildPythonPackage rec {
|
|||
owner = "Danielhiversen";
|
||||
repo = "pySwitchbot";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-oJUdQex+kjL4Yuuz02ASjFDjyfWA/Hsopy+ujGbDkLs=";
|
||||
hash = "sha256-+YolfvzyJVZ+EkEmPrmAXUbttxYzCFl5DT3nUaUCnuc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
async-timeout
|
||||
bleak
|
||||
bleak-retry-connector
|
||||
boto3
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "yalexs-ble";
|
||||
version = "2.3.2";
|
||||
version = "2.4.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "bdraco";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-uHkJEtaohuTRs1RXDPbe4dohbjBnYi9MFguP9CTwM5w=";
|
||||
hash = "sha256-kdEeLd+83Pdno1ZzirZUrRk/7q0WFc/XfqvuKvVQ8/s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,9 +1,12 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, symlinkJoin
|
||||
, prismlauncher-unwrapped
|
||||
, makeWrapper
|
||||
, wrapQtAppsHook
|
||||
, addOpenGLRunpath
|
||||
|
||||
, prismlauncher-unwrapped
|
||||
|
||||
, qtbase # needed for wrapQtAppsHook
|
||||
, qtsvg
|
||||
, qtwayland
|
||||
|
|
@ -11,6 +14,7 @@
|
|||
, libpulseaudio
|
||||
, libGL
|
||||
, glfw
|
||||
, glfw-wayland-minecraft
|
||||
, openal
|
||||
, jdk8
|
||||
, jdk17
|
||||
|
|
@ -25,23 +29,43 @@
|
|||
, gamemodeSupport ? stdenv.isLinux
|
||||
, textToSpeechSupport ? stdenv.isLinux
|
||||
, controllerSupport ? stdenv.isLinux
|
||||
|
||||
# The flag `withWaylandGLFW` enables runtime-checking of `WAYLAND_DISPLAY`;
|
||||
# if the option is enabled, a patched version of GLFW will be added to
|
||||
# `LD_LIBRARY_PATH` so that the launcher can use the correct one
|
||||
# depending on the desktop environment used.
|
||||
, withWaylandGLFW ? false
|
||||
|
||||
, jdks ? [ jdk17 jdk8 ]
|
||||
, additionalLibs ? [ ]
|
||||
, additionalPrograms ? [ ]
|
||||
}:
|
||||
|
||||
assert lib.assertMsg (withWaylandGLFW -> stdenv.isLinux) "withWaylandGLFW is only available on Linux";
|
||||
|
||||
let
|
||||
prismlauncherFinal = prismlauncher-unwrapped.override {
|
||||
# By default, this package uses a binary wrapper for `wrapQtAppsHook`.
|
||||
# Enabling `shellWrapper` will add `makeWrapper` to `nativeBuildInputs`,
|
||||
# causing `wrapQtAppsHook` to output a shell wrapper instead.
|
||||
# This is needed for checking environment variables at runtime
|
||||
# and modifying others if necessary (see above option for example).
|
||||
# Warning: This can make the program start slower, by about four milliseconds.
|
||||
shellWrapper = withWaylandGLFW;
|
||||
|
||||
prismlauncher' = prismlauncher-unwrapped.override {
|
||||
inherit msaClientID gamemodeSupport;
|
||||
};
|
||||
in
|
||||
symlinkJoin {
|
||||
name = "prismlauncher-${prismlauncherFinal.version}";
|
||||
|
||||
paths = [ prismlauncherFinal ];
|
||||
symlinkJoin {
|
||||
name = "prismlauncher-${prismlauncher'.version}";
|
||||
|
||||
paths = [ prismlauncher' ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapQtAppsHook
|
||||
];
|
||||
]
|
||||
++ lib.optional shellWrapper makeWrapper;
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
|
|
@ -49,20 +73,29 @@ symlinkJoin {
|
|||
]
|
||||
++ lib.optional (lib.versionAtLeast qtbase.version "6" && stdenv.isLinux) qtwayland;
|
||||
|
||||
waylandPreExec = ''
|
||||
if [ -n "$WAYLAND_DISPLAY" ]; then
|
||||
export LD_LIBRARY_PATH=${lib.getLib glfw-wayland-minecraft}/lib:"$LD_LIBRARY_PATH"
|
||||
fi
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
${lib.optionalString withWaylandGLFW ''
|
||||
qtWrapperArgs+=(--run "$waylandPreExec")
|
||||
''}
|
||||
|
||||
wrapQtAppsHook
|
||||
'';
|
||||
|
||||
qtWrapperArgs =
|
||||
let
|
||||
runtimeLibs = (with xorg; [
|
||||
libX11
|
||||
libXext
|
||||
libXcursor
|
||||
libXrandr
|
||||
libXxf86vm
|
||||
])
|
||||
++ [
|
||||
runtimeLibs = [
|
||||
xorg.libX11
|
||||
xorg.libXext
|
||||
xorg.libXcursor
|
||||
xorg.libXrandr
|
||||
xorg.libXxf86vm
|
||||
|
||||
# lwjgl
|
||||
libpulseaudio
|
||||
libGL
|
||||
|
|
@ -93,5 +126,5 @@ symlinkJoin {
|
|||
"--prefix PATH : ${lib.makeBinPath runtimePrograms}"
|
||||
];
|
||||
|
||||
inherit (prismlauncherFinal) meta;
|
||||
inherit (prismlauncher') meta;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tintin";
|
||||
version = "2.02.31";
|
||||
version = "2.02.40";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scandum";
|
||||
repo = "tintin";
|
||||
rev = version;
|
||||
hash = "sha256-emCxA5+YB4S7QXxRqkDKN1xeWttR857VfGzFQ1cGbYg=";
|
||||
hash = "sha256-nJTxAAM5HOStYFjEopLA47ruM9uoVway+aH97AdXo/w=";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib pcre gnutls ]
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "qmake2cmake";
|
||||
version = "1.0.5";
|
||||
version = "1.0.6";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://codereview.qt-project.org/qt/qmake2cmake";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6a1CIzHj9kmNgWN6QPNNUbiugkyfSrrIb7Fbz0ocr6o=";
|
||||
hash = "sha256-M5XVQ8MXo2Yxg5eZCho2YAGFtB0h++mEAg8NcQVuP/w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -5,18 +5,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cnquery";
|
||||
version = "9.12.1";
|
||||
version = "9.12.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mondoohq";
|
||||
repo = "cnquery";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ezk9HgNf4FBW/PEaNUhsb3/l1ChTC42F3slXXa8ZJp4=";
|
||||
hash = "sha256-DMJuQkxU6VNaPgcdvKY5p/124t02QvAo8lDT9B50Ze0=";
|
||||
};
|
||||
|
||||
subPackages = [ "apps/cnquery" ];
|
||||
|
||||
vendorHash = "sha256-iycKyidVpdWeccK4RxENUxEFUmQKkIyyW1c3JFZ3gx4=";
|
||||
vendorHash = "sha256-AHVmvmTn2MlL+aVBUQs4PA3k8w9/QQRD57DvSpSq09I=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "cloud-native, graph-based asset inventory";
|
||||
|
|
|
|||
Loading…
Reference in a new issue