Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
83383ab4a5
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -9,6 +9,7 @@
|
|||
outputs/
|
||||
result-*
|
||||
result
|
||||
repl-result-*
|
||||
!pkgs/development/python-modules/result
|
||||
/doc/NEWS.html
|
||||
/doc/NEWS.txt
|
||||
|
|
|
|||
|
|
@ -1,41 +1,12 @@
|
|||
{ appimageTools
|
||||
, lib
|
||||
, fetchurl
|
||||
, texlive
|
||||
, pandoc
|
||||
}:
|
||||
{ callPackage, texlive }:
|
||||
|
||||
# Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs.
|
||||
let
|
||||
pname = "zettlr";
|
||||
version = "2.3.0";
|
||||
name = "${pname}-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage";
|
||||
sha256 = "sha256-3p9RO6hpioYF6kdGV+/9guoqxaPCJG73OsrN69SHQHk=";
|
||||
builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; inherit texlive; })) {
|
||||
zettlr = {
|
||||
version = "2.3.0";
|
||||
hash = "sha256-3p9RO6hpioYF6kdGV+/9guoqxaPCJG73OsrN69SHQHk=";
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
inherit name src;
|
||||
};
|
||||
in
|
||||
appimageTools.wrapType2 rec {
|
||||
inherit name src;
|
||||
|
||||
multiArch = false; # no 32bit needed
|
||||
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc ];
|
||||
extraInstallCommands = ''
|
||||
mv $out/bin/{${name},${pname}}
|
||||
install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/Zettlr.desktop
|
||||
install -m 444 -D ${appimageContents}/Zettlr.png $out/share/icons/hicolor/512x512/apps/Zettlr.png
|
||||
substituteInPlace $out/share/applications/Zettlr.desktop \
|
||||
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A markdown editor for writing academic texts and taking notes";
|
||||
homepage = "https://www.zettlr.com";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ tfmoraes ];
|
||||
zettlr-beta = {
|
||||
version = "3.0.0-beta.7";
|
||||
hash = "sha256-zIZaINE27bcjbs8yCGQ3UKAwStFdvhHD3Q1F93LrG4U=";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
42
pkgs/applications/misc/zettlr/generic.nix
Normal file
42
pkgs/applications/misc/zettlr/generic.nix
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
{ pname
|
||||
, version
|
||||
, hash
|
||||
, appimageTools
|
||||
, lib
|
||||
, fetchurl
|
||||
, texlive
|
||||
, pandoc
|
||||
}:
|
||||
|
||||
# Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs.
|
||||
let
|
||||
name = "${pname}-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage";
|
||||
inherit hash;
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
inherit name src;
|
||||
};
|
||||
in
|
||||
appimageTools.wrapType2 rec {
|
||||
inherit name src;
|
||||
|
||||
multiArch = false; # no 32bit needed
|
||||
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc ];
|
||||
extraInstallCommands = ''
|
||||
mv $out/bin/{${name},${pname}}
|
||||
install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/Zettlr.desktop
|
||||
install -m 444 -D ${appimageContents}/Zettlr.png $out/share/icons/hicolor/512x512/apps/Zettlr.png
|
||||
substituteInPlace $out/share/applications/Zettlr.desktop \
|
||||
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A markdown editor for writing academic texts and taking notes";
|
||||
homepage = "https://www.zettlr.com";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ tfmoraes ];
|
||||
};
|
||||
}
|
||||
|
|
@ -91,11 +91,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "brave";
|
||||
version = "1.56.9";
|
||||
version = "1.56.20";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
sha256 = "sha256-cw41xUewYB/M6xHZhhL9nX1J9vnNGA9TFJWI/Qwdu/k=";
|
||||
sha256 = "sha256-ub44AI0Fu3V8SRhiBrQueJZaSdl4/cI6DQ3QYJfGseo=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
mkChromiumDerivation (base: rec {
|
||||
name = "chromium-browser";
|
||||
packageName = "chromium";
|
||||
buildTargets = [ "mksnapshot" "chrome_sandbox" "chrome" ];
|
||||
buildTargets = [ "run_mksnapshot_default" "chrome_sandbox" "chrome" ];
|
||||
|
||||
outputs = ["out" "sandbox"];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,7 @@
|
|||
{ stdenv, lib, fetchurl, fetchpatch
|
||||
, buildPackages
|
||||
, pkgsBuildBuild
|
||||
, pkgsBuildTarget
|
||||
# Channel data:
|
||||
, channel, upstream-info
|
||||
# Helper functions:
|
||||
|
|
@ -8,8 +11,10 @@
|
|||
, ninja, pkg-config
|
||||
, python3, perl
|
||||
, which
|
||||
, llvmPackages
|
||||
, llvmPackages_attrName
|
||||
, rustc
|
||||
, libuuid
|
||||
, overrideCC
|
||||
# postPatch:
|
||||
, pkgsBuildHost
|
||||
# configurePhase:
|
||||
|
|
@ -116,6 +121,33 @@ let
|
|||
inherit (upstream-info.deps.ungoogled-patches) rev sha256;
|
||||
};
|
||||
|
||||
# There currently isn't a (much) more concise way to get a stdenv
|
||||
# that uses lld as its linker without bootstrapping pkgsLLVM; see
|
||||
# https://github.com/NixOS/nixpkgs/issues/142901
|
||||
buildPlatformLlvmStdenv =
|
||||
let
|
||||
llvmPackages = pkgsBuildBuild.${llvmPackages_attrName};
|
||||
in
|
||||
overrideCC llvmPackages.stdenv
|
||||
(llvmPackages.stdenv.cc.override {
|
||||
inherit (llvmPackages) bintools;
|
||||
});
|
||||
|
||||
chromiumRosettaStone = {
|
||||
cpu = platform:
|
||||
let name = platform.parsed.cpu.name;
|
||||
in ({ "x86_64" = "x64";
|
||||
"i686" = "x86";
|
||||
"arm" = "arm";
|
||||
"aarch64" = "arm64";
|
||||
}.${platform.parsed.cpu.name}
|
||||
or (throw "no chromium Rosetta Stone entry for cpu: ${name}"));
|
||||
os = platform:
|
||||
if platform.isLinux
|
||||
then "linux"
|
||||
else throw "no chromium Rosetta Stone entry for os: ${platform.config}";
|
||||
};
|
||||
|
||||
base = rec {
|
||||
pname = "${packageName}-unwrapped";
|
||||
inherit (upstream-info) version;
|
||||
|
|
@ -130,16 +162,35 @@ let
|
|||
ninja pkg-config
|
||||
python3WithPackages perl
|
||||
which
|
||||
llvmPackages.bintools
|
||||
buildPackages.${llvmPackages_attrName}.bintools
|
||||
bison gperf
|
||||
];
|
||||
|
||||
depsBuildBuild = [
|
||||
buildPlatformLlvmStdenv
|
||||
buildPlatformLlvmStdenv.cc
|
||||
pkg-config
|
||||
libuuid
|
||||
libpng # needed for "host/generate_colors_info"
|
||||
]
|
||||
# When cross-compiling, chromium builds a huge proportion of its
|
||||
# components for both the `buildPlatform` (which it calls
|
||||
# `host`) as well as for the `hostPlatform` -- easily more than
|
||||
# half of the dependencies are needed here. To avoid having to
|
||||
# maintain a separate list of buildPlatform-dependencies, we
|
||||
# simply throw in the kitchen sink.
|
||||
++ buildInputs
|
||||
;
|
||||
|
||||
buildInputs = [
|
||||
(libpng.override { apngSupport = false; }) # https://bugs.chromium.org/p/chromium/issues/detail?id=752403
|
||||
bzip2 flac speex opusWithCustomModes
|
||||
libevent expat libjpeg snappy
|
||||
libcap
|
||||
xdg-utils minizip libwebp
|
||||
] ++ lib.optionals (!xdg-utils.meta.broken) [
|
||||
xdg-utils
|
||||
] ++ [
|
||||
minizip libwebp
|
||||
libusb1 re2
|
||||
ffmpeg libxslt libxml2
|
||||
nasm
|
||||
|
|
@ -162,6 +213,7 @@ let
|
|||
++ lib.optional pulseSupport libpulseaudio;
|
||||
|
||||
patches = [
|
||||
./cross-compile.patch
|
||||
# Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed):
|
||||
./patches/no-build-timestamps.patch
|
||||
# For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags:
|
||||
|
|
@ -225,6 +277,7 @@ let
|
|||
'/usr/share/locale/' \
|
||||
'${glibc}/share/locale/'
|
||||
|
||||
'' + lib.optionalString (!xdg-utils.meta.broken) ''
|
||||
sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg-utils}/bin/xdg-@' \
|
||||
chrome/browser/shell_integration_linux.cc
|
||||
|
||||
|
|
@ -268,9 +321,27 @@ let
|
|||
# weaken or disable security measures like sandboxing or ASLR):
|
||||
is_official_build = true;
|
||||
disable_fieldtrial_testing_config = true;
|
||||
|
||||
# note: chromium calls buildPlatform "host" and calls hostPlatform "target"
|
||||
host_cpu = chromiumRosettaStone.cpu stdenv.buildPlatform;
|
||||
host_os = chromiumRosettaStone.os stdenv.buildPlatform;
|
||||
target_cpu = chromiumRosettaStone.cpu stdenv.hostPlatform;
|
||||
v8_target_cpu = chromiumRosettaStone.cpu stdenv.hostPlatform;
|
||||
target_os = chromiumRosettaStone.os stdenv.hostPlatform;
|
||||
|
||||
# Build Chromium using the system toolchain (for Linux distributions):
|
||||
#
|
||||
# What you would expect to be caled "target_toolchain" is
|
||||
# actually called either "default_toolchain" or "custom_toolchain",
|
||||
# depending on which part of the codebase you are in; see:
|
||||
# https://github.com/chromium/chromium/blob/d36462cc9279464395aea5e65d0893d76444a296/build/config/BUILDCONFIG.gn#L17-L44
|
||||
custom_toolchain = "//build/toolchain/linux/unbundle:default";
|
||||
host_toolchain = "//build/toolchain/linux/unbundle:default";
|
||||
host_toolchain = "//build/toolchain/linux/unbundle:host";
|
||||
v8_snapshot_toolchain = "//build/toolchain/linux/unbundle:host";
|
||||
|
||||
host_pkg_config = "${pkgsBuildBuild.pkg-config}/bin/pkg-config";
|
||||
pkg_config = "${pkgsBuildHost.pkg-config}/bin/${stdenv.cc.targetPrefix}pkg-config";
|
||||
|
||||
# Don't build against a sysroot image downloaded from Cloud Storage:
|
||||
use_sysroot = false;
|
||||
# Because we use a different toolchain / compiler version:
|
||||
|
|
@ -304,7 +375,7 @@ let
|
|||
rtc_use_pipewire = true;
|
||||
# Disable PGO because the profile data requires a newer compiler version (LLVM 14 isn't sufficient):
|
||||
chrome_pgo_phase = 0;
|
||||
clang_base_path = "${llvmPackages.stdenv.cc}";
|
||||
clang_base_path = "${pkgsBuildTarget.${llvmPackages_attrName}.stdenv.cc}";
|
||||
use_qt = false;
|
||||
# To fix the build as we don't provide libffi_pic.a
|
||||
# (ld.lld: error: unable to find library -l:libffi_pic.a):
|
||||
|
|
@ -313,6 +384,9 @@ let
|
|||
# We do intentionally not set rustc_version as nixpkgs will never do incremental
|
||||
# rebuilds, thus leaving this empty is fine.
|
||||
rust_sysroot_absolute = "${rustc}";
|
||||
} // lib.optionalAttrs (!(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) {
|
||||
# https://www.mail-archive.com/v8-users@googlegroups.com/msg14528.html
|
||||
arm_control_flow_integrity = "none";
|
||||
} // lib.optionalAttrs proprietaryCodecs {
|
||||
# enable support for the H.264 codec
|
||||
proprietary_codecs = true;
|
||||
|
|
@ -342,6 +416,11 @@ let
|
|||
# our Clang is always older than Chromium's and the build logs have a size
|
||||
# of approx. 25 MB without this option (and this saves e.g. 66 %).
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-unknown-warning-option";
|
||||
env.BUILD_CC = "$CC_FOR_BUILD";
|
||||
env.BUILD_CXX = "$CXX_FOR_BUILD";
|
||||
env.BUILD_AR = "$AR_FOR_BUILD";
|
||||
env.BUILD_NM = "$NM_FOR_BUILD";
|
||||
env.BUILD_READELF = "$READELF_FOR_BUILD";
|
||||
|
||||
buildPhase = let
|
||||
buildCommand = target: ''
|
||||
|
|
|
|||
|
|
@ -0,0 +1,31 @@
|
|||
diff --git a/build/toolchain/linux/unbundle/BUILD.gn b/build/toolchain/linux/unbundle/BUILD.gn
|
||||
index a091491236bb1..d36fd4e652fbf 100644
|
||||
--- a/build/toolchain/linux/unbundle/BUILD.gn
|
||||
+++ b/build/toolchain/linux/unbundle/BUILD.gn
|
||||
@@ -9,6 +9,7 @@ gcc_toolchain("default") {
|
||||
cxx = getenv("CXX")
|
||||
ar = getenv("AR")
|
||||
nm = getenv("NM")
|
||||
+ readelf = getenv("READELF")
|
||||
ld = cxx
|
||||
|
||||
extra_cflags = getenv("CFLAGS")
|
||||
@@ -27,6 +28,7 @@ gcc_toolchain("host") {
|
||||
cxx = getenv("BUILD_CXX")
|
||||
ar = getenv("BUILD_AR")
|
||||
nm = getenv("BUILD_NM")
|
||||
+ readelf = getenv("BUILD_READELF")
|
||||
ld = cxx
|
||||
|
||||
extra_cflags = getenv("BUILD_CFLAGS")
|
||||
@@ -35,7 +37,8 @@ gcc_toolchain("host") {
|
||||
extra_ldflags = getenv("BUILD_LDFLAGS")
|
||||
|
||||
toolchain_args = {
|
||||
- current_cpu = current_cpu
|
||||
- current_os = current_os
|
||||
+ current_cpu = host_cpu
|
||||
+ current_os = host_os
|
||||
+ v8_current_cpu = target_cpu
|
||||
}
|
||||
}
|
||||
|
|
@ -16,11 +16,17 @@
|
|||
, cupsSupport ? true
|
||||
, pulseSupport ? config.pulseaudio or stdenv.isLinux
|
||||
, commandLineArgs ? ""
|
||||
, pkgsBuildTarget
|
||||
, pkgsBuildBuild
|
||||
, pkgs
|
||||
}:
|
||||
|
||||
let
|
||||
llvmPackages = llvmPackages_16;
|
||||
stdenv = llvmPackages.stdenv;
|
||||
# Sometimes we access `llvmPackages` via `pkgs`, and other times
|
||||
# via `pkgsFooBar`, so a string (attrname) is the only way to have
|
||||
# a single point of control over the LLVM version used.
|
||||
llvmPackages_attrName = "llvmPackages_16";
|
||||
stdenv = pkgs.${llvmPackages_attrName}.stdenv;
|
||||
|
||||
upstream-info = (import ./upstream-info.nix).${channel};
|
||||
|
||||
|
|
@ -42,7 +48,7 @@ let
|
|||
callPackage = newScope chromium;
|
||||
|
||||
chromium = rec {
|
||||
inherit stdenv llvmPackages upstream-info;
|
||||
inherit stdenv llvmPackages_attrName upstream-info;
|
||||
|
||||
mkChromiumDerivation = callPackage ./common.nix ({
|
||||
inherit channel chromiumVersionAtLeast versionRange;
|
||||
|
|
@ -60,7 +66,12 @@ let
|
|||
inherit channel chromiumVersionAtLeast enableWideVine ungoogled;
|
||||
};
|
||||
|
||||
ungoogled-chromium = callPackage ./ungoogled.nix {};
|
||||
# ungoogled-chromium is, contrary to its name, not a build of
|
||||
# chromium. It is a patched copy of chromium's *source code*.
|
||||
# Therefore, it needs to come from buildPackages, because it
|
||||
# contains python scripts which get /nix/store/.../bin/python3
|
||||
# patched into their shebangs.
|
||||
ungoogled-chromium = pkgsBuildBuild.callPackage ./ungoogled.nix {};
|
||||
};
|
||||
|
||||
pkgSuffix = if channel == "dev" then "unstable" else
|
||||
|
|
@ -209,8 +220,10 @@ in stdenv.mkDerivation {
|
|||
|
||||
export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS
|
||||
|
||||
'' + lib.optionalString (!xdg-utils.meta.broken) ''
|
||||
# Mainly for xdg-open but also other xdg-* tools (this is only a fallback; \$PATH is suffixed so that other implementations can be used):
|
||||
export PATH="\$PATH\''${PATH:+:}${xdg-utils}/bin"
|
||||
'' + ''
|
||||
|
||||
.
|
||||
w
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubefirst";
|
||||
version = "2.2.5";
|
||||
version = "2.2.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubefirst";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WlY9CdMY5fgEkXc/d/aUxr5c93oKd3vWQkUlX1jWaZo=";
|
||||
hash = "sha256-sIX+B08JNwWr4QsWWi4kpqaY9uZbIeiM2sVvMCvSb0I=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-vIIaiHciA7ZPW0GWJNL/wx0siiNfXK16jYjMkMDfywE=";
|
||||
vendorHash = "sha256-F+kzj2lBSFawfc8OyPf6V2XVB1418uhv+cv3CHpXUk0=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/kubefirst/runtime/configs.K1Version=v${version}"];
|
||||
|
||||
|
|
|
|||
|
|
@ -110,13 +110,13 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"aws": {
|
||||
"hash": "sha256-IIbSrtCm3GKJqfHstdczkptPLKHkNthtgzo0zORRPMQ=",
|
||||
"hash": "sha256-y4KAw4hX+Hl+laVzOoNVxUXo4AkjWEKYSf87ffpSh2w=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/aws",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-aws",
|
||||
"rev": "v5.10.0",
|
||||
"rev": "v5.11.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-UeXYx3AfUrWJB6o1qSrYqmnk6obJXnToyF0dHLhRfVQ="
|
||||
"vendorHash": "sha256-lf/bx9Uwf2jkOKfgYc2JPJ9Rt0PKHpIHzHW5Dfmt5rM="
|
||||
},
|
||||
"azuread": {
|
||||
"hash": "sha256-aLckXkWxMsDS1ddPucAmjFS6+mkwHeAO1+BlPNaF6cI=",
|
||||
|
|
@ -128,11 +128,11 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"azurerm": {
|
||||
"hash": "sha256-Ff+9TpObtwCGn/xkb9YIQeXdKeX9c/jfps/XgvHk/Go=",
|
||||
"hash": "sha256-7ekMsiMvyJuwp+/fzKJcvp7RirunsGykTH62Z8Znz4Q=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-azurerm",
|
||||
"rev": "v3.67.0",
|
||||
"rev": "v3.68.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
@ -191,13 +191,13 @@
|
|||
"vendorHash": "sha256-oVXrSI+DU6NgmVIPcS4He4mHVrkA2tMxFUpxMnv0bu4="
|
||||
},
|
||||
"checkly": {
|
||||
"hash": "sha256-UXIni594P85sgS8XVLoJ0+UTBeUS0XC+oj98KJUfghg=",
|
||||
"hash": "sha256-69oRZpJNRFJCwAZNcmVfYTNKmtBgFocvEUZpr4jbJQg=",
|
||||
"homepage": "https://registry.terraform.io/providers/checkly/checkly",
|
||||
"owner": "checkly",
|
||||
"repo": "terraform-provider-checkly",
|
||||
"rev": "v1.6.7",
|
||||
"rev": "v1.6.8",
|
||||
"spdx": null,
|
||||
"vendorHash": "sha256-ATj1tGTS7FnEQDa6KuDQITGuVimP0A4sdlUNJ6RNIqI="
|
||||
"vendorHash": "sha256-cnvXf0zJrJvpRbQMm2pF7f2cuazxDR4193JCbyGuL2Y="
|
||||
},
|
||||
"ciscoasa": {
|
||||
"hash": "sha256-xzc44FEy2MPo51Faq/VFwg411JK9e0kQucpt0vdN8yg=",
|
||||
|
|
@ -664,11 +664,11 @@
|
|||
"vendorHash": "sha256-9AmfvoEf7E6lAblPIWizElng5GQJG/hQ5o6Mo3AN+EA="
|
||||
},
|
||||
"launchdarkly": {
|
||||
"hash": "sha256-I4d/REcXlyFX+LztvpkWjXjlWZD2JL//mewvgNdw2Rc=",
|
||||
"hash": "sha256-dK7JxmC/GRjsMpiJb2e8EyFl+V/KcxKlw8/5IbyFlXY=",
|
||||
"homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly",
|
||||
"owner": "launchdarkly",
|
||||
"repo": "terraform-provider-launchdarkly",
|
||||
"rev": "v2.13.3",
|
||||
"rev": "v2.13.4",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-jggXSnERsraNqkQKFpUtlglSOi02n4eAp4graJ6K+ZA="
|
||||
},
|
||||
|
|
@ -944,11 +944,11 @@
|
|||
"vendorHash": "sha256-j+3qtGlueKZgf0LuNps4Wc9G3EmpSgl8ZNSLqslyizI="
|
||||
},
|
||||
"rancher2": {
|
||||
"hash": "sha256-/BAaOZM9SZA0crEEB0+UlCzDo2d4RfNdDQe04pCTCdE=",
|
||||
"hash": "sha256-thojEtfA8vn5fMTBuOClAKt3rlKs2XK7/RRMYSHAoMM=",
|
||||
"homepage": "https://registry.terraform.io/providers/rancher/rancher2",
|
||||
"owner": "rancher",
|
||||
"repo": "terraform-provider-rancher2",
|
||||
"rev": "v3.1.0",
|
||||
"rev": "v3.1.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-2uNawlNPmByjoIjufl3yMfo2MdV+MsXqSRVEWursHKc="
|
||||
},
|
||||
|
|
|
|||
|
|
@ -39,6 +39,10 @@ buildGoModule rec {
|
|||
|
||||
postInstall = ''
|
||||
installManPage man/man*/*
|
||||
installShellCompletion --cmd git-lfs \
|
||||
--bash <($out/bin/git-lfs completion bash) \
|
||||
--fish <($out/bin/git-lfs completion fish) \
|
||||
--zsh <($out/bin/git-lfs completion zsh)
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "adafruit-platformdetect";
|
||||
version = "3.48.0";
|
||||
version = "3.49.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "Adafruit-PlatformDetect";
|
||||
inherit version;
|
||||
hash = "sha256-wc8TC1IoeeeANlQILFeXUx9jJqpn1Mr3KNhJC6ZJAhU=";
|
||||
hash = "sha256-bLwPnKLOdk8scKF4hQgkBXRoz0Ph6/pcRLlJdN+cDoA=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiooss2";
|
||||
version = "0.2.6";
|
||||
version = "0.2.7";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "karajan1001";
|
||||
repo = "aiooss2";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-VVfDH9QWF9gBhd2pOjKH5+VdNSvl1q0iauAbo88wNaM=";
|
||||
hash = "sha256-eMmJpX7bjX5r6GW9N5KmLQpo5V8i6F95TfInct34a2g=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dask-awkward";
|
||||
version = "2023.8.0";
|
||||
version = "2023.8.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "dask-contrib";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-2nF2G6bpwHeMlB0+/DRW4I7W6mK3wfXkuqCSRQusJu4=";
|
||||
hash = "sha256-sSsd35Psf3VEydkNxtd9mSBzV23S7fRM/jhbC9T62kY=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dsmr-parser";
|
||||
version = "1.2.4";
|
||||
version = "1.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "ndokter";
|
||||
repo = "dsmr_parser";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-R/4k6yZS96yAkjhO/Ay9MJ2KUlq9TFQvsUoqpjvZcKI=";
|
||||
hash = "sha256-nPhXJgky9/CgqBnyqbF2+BASHRSpwKd0ePIRFMq29Vc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-data";
|
||||
version = "2.6.0";
|
||||
version = "2.9.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Tqo2dhTes/HHhWqBZkJ9qW8i6FGWRx1Uk+0Q3pwsD+M=";
|
||||
hash = "sha256-NJAemtzqpqgWRmsXfcw9gj7T10jARemUMehIxTI7+fQ=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -33,6 +33,10 @@ buildPythonPackage rec {
|
|||
--replace 'get_output(f"{kc} gssapi --prefix")' '"${lib.getDev krb5}"'
|
||||
'';
|
||||
|
||||
env = lib.optionalAttrs (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) {
|
||||
GSSAPI_SUPPORT_DETECT = "false";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cython
|
||||
krb5
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "meilisearch";
|
||||
version = "0.28.1";
|
||||
version = "0.28.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "meilisearch";
|
||||
repo = "meilisearch-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-iaho3a6Agk5Utl7px+E3afUJfoWbhoYSCe2WqYzDF1w=";
|
||||
hash = "sha256-S1ZBSkWqCU6EpFqLpxCN1ZNswJroF86+26WeyYPD0S0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mypy-boto3-builder";
|
||||
version = "7.16.1";
|
||||
version = "7.17.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "youtype";
|
||||
repo = "mypy_boto3_builder";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-zqiJqjsE54mzN1/NScKeXtRa3Tt3IzSdtnmOxP4meEE=";
|
||||
hash = "sha256-QzofWNnYTAlxoeJm8HRaGBOV5rqkhjHHOEwYNrXTh/I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mypy-boto3-s3";
|
||||
version = "1.28.15.post1";
|
||||
version = "1.28.16";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-ZVAr6CV4n9FuTKzxCuzWQIVUtgrl0mG+YP1GvuadhZI=";
|
||||
hash = "sha256-TlX9rXKbbm9FIR41S9Ggp0WlZf6dHkYnN/d1wohJz7U=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "neo4j";
|
||||
version = "5.10.0";
|
||||
version = "5.11.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "neo4j";
|
||||
repo = "neo4j-python-driver";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-UD7y/OVoYyEL+68CW+kc8m8poATqRRSwoP6XQyUbGC0=";
|
||||
hash = "sha256-xPMO1Db1+TwOT+JsBGJcTc7BL2B8Eb1K3kqKMGnsUmE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "publicsuffixlist";
|
||||
version = "0.10.0.20230711";
|
||||
version = "0.10.0.20230730";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-yFShirput7wpYLQoDauxW5xxc6o2ptWFAYSAEqDmzBA=";
|
||||
hash = "sha256-HNOEfsHrwCBpcVYwlYrWe9/rfn+fNfaZ0w/EEpjO7aw=";
|
||||
};
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
, asynccmd
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
|
|
@ -11,18 +12,22 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyspcwebgw";
|
||||
version = "0.6.0";
|
||||
format = "setuptools";
|
||||
version = "0.7.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mbrrg";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Pjv8AxXuwi48Z8U+LSZZ+OhXrE3KlX7jlmnXTBLxXOs=";
|
||||
hash = "sha256-gdIrbr25GXaX26B1f7u0NKbqqnAC2tmMFZspzW6I4HI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
asynccmd
|
||||
aiohttp
|
||||
|
|
@ -43,6 +48,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python module for the SPC Web Gateway REST API";
|
||||
homepage = "https://github.com/mbrrg/pyspcwebgw";
|
||||
changelog = "https://github.com/pyspcwebgw/pyspcwebgw/releases/tag/v${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-roborock";
|
||||
version = "0.30.3";
|
||||
version = "0.31.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
|
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
|||
owner = "humbertogontijo";
|
||||
repo = "python-roborock";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-EHHyuiG/yRGY7/Z5TAq/83rIkyehg37eTFxSOWrVhR0=";
|
||||
hash = "sha256-t5UYdoaKqUrEIgRQy1URtNhFmlkB2sgGwsLrclqH6Tg=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
|
|||
|
|
@ -1,65 +1,84 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, pythonRelaxDepsHook
|
||||
, attrs
|
||||
, boto3
|
||||
, cloudpickle
|
||||
, google-pasta
|
||||
, importlib-metadata
|
||||
, numpy
|
||||
, protobuf
|
||||
, protobuf3-to-dict
|
||||
, smdebug-rulesconfig
|
||||
, importlib-metadata
|
||||
, packaging
|
||||
, pandas
|
||||
, pathos
|
||||
, packaging
|
||||
, pythonOlder
|
||||
, schema
|
||||
, pyyaml
|
||||
, jsonschema
|
||||
, platformdirs
|
||||
, tblib
|
||||
, urllib3
|
||||
, docker
|
||||
, scipy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sagemaker";
|
||||
version = "2.135.0";
|
||||
version = "2.173.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-ypdcqEYLxHbfnq1ycq3hVLThhIIs3pq29Fv33Ly2hbE=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "sagemaker-python-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Fzkw37bRBbCD7VBIsN4Qkk6dI0Qh4Gvt5TJbnoUuPCs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pythonRelaxDepsHook ];
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
# FIXME: Remove when >= 2.111.0
|
||||
"attrs"
|
||||
"protobuf"
|
||||
"boto3"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
attrs
|
||||
boto3
|
||||
cloudpickle
|
||||
google-pasta
|
||||
importlib-metadata
|
||||
numpy
|
||||
packaging
|
||||
pathos
|
||||
protobuf
|
||||
protobuf3-to-dict
|
||||
smdebug-rulesconfig
|
||||
importlib-metadata
|
||||
packaging
|
||||
pandas
|
||||
pathos
|
||||
schema
|
||||
pyyaml
|
||||
jsonschema
|
||||
platformdirs
|
||||
tblib
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
[ "$($out/bin/sagemaker-upgrade-v2 --help 2>&1 | grep -cim1 'pandas failed to import')" -eq "0" ]
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
doCheck = false; # many test dependencies are not available in nixpkgs
|
||||
|
||||
pythonImportsCheck = [
|
||||
"sagemaker"
|
||||
"sagemaker.lineage.visualizer"
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
local = [ urllib3 docker pyyaml ];
|
||||
scipy = [ scipy ];
|
||||
# feature-processor = [ pyspark sagemaker-feature-store-pyspark ]; # not available in nixpkgs
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for training and deploying machine learning models on Amazon SageMaker";
|
||||
homepage = "https://github.com/aws/sagemaker-python-sdk/";
|
||||
|
|
|
|||
|
|
@ -29,11 +29,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qtcreator";
|
||||
version = "11.0.0";
|
||||
version = "11.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.qt.io/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz";
|
||||
hash = "sha256-2/RPVfsDg00nC+3v9pWsT8Aq862oRfW575graxWaFDA=";
|
||||
hash = "sha256-T55ZOFPPO/gGxlc6u2/EF2dhQWAj2X3e0H4ZxFbW23M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,8 +1,10 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, cmark
|
||||
, Cocoa
|
||||
, ninja
|
||||
, jdk17
|
||||
, zlib
|
||||
|
|
@ -13,7 +15,8 @@
|
|||
, ghc_filesystem
|
||||
, gamemode
|
||||
, msaClientID ? null
|
||||
, gamemodeSupport ? true
|
||||
, gamemodeSupport ? stdenv.isLinux
|
||||
,
|
||||
}:
|
||||
let
|
||||
libnbtplusplus = fetchFromGitHub {
|
||||
|
|
@ -23,7 +26,11 @@ let
|
|||
sha256 = "sha256-TvVOjkUobYJD9itQYueELJX3wmecvEdCbJ0FinW2mL4=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
assert lib.assertMsg (stdenv.isLinux || !gamemodeSupport) "gamemodeSupport is only available on Linux";
|
||||
|
||||
stdenv.mkDerivation
|
||||
rec {
|
||||
pname = "prismlauncher-unwrapped";
|
||||
version = "7.2";
|
||||
|
||||
|
|
@ -34,23 +41,53 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-RArg60S91YKp1Mt97a5JNfBEOf2cmuX4pK3VAx2WfqM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules cmake jdk17 ninja ];
|
||||
buildInputs = [
|
||||
qtbase
|
||||
zlib
|
||||
quazip
|
||||
ghc_filesystem
|
||||
tomlplusplus
|
||||
cmark
|
||||
] ++ lib.optional gamemodeSupport gamemode;
|
||||
patches = lib.optionals stdenv.isDarwin [
|
||||
# https://github.com/PrismLauncher/PrismLauncher/pull/1452
|
||||
# These patches allow us to disable the Sparkle updater and cmake bundling
|
||||
# TODO: remove these when updating to 8.0
|
||||
(fetchpatch {
|
||||
name = "disable-sparkle-when-url-is-empty.patch";
|
||||
url = "https://github.com/PrismLauncher/PrismLauncher/commit/48e50401968a72846350c6fbd76cc957b64a6b5a.patch";
|
||||
hash = "sha256-IFxp6Sj87ogQcMooV4Ql5/4B+C7oTzEk+4tlMud2OLo=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "make-install_bundle-cached.patch";
|
||||
url = "https://github.com/PrismLauncher/PrismLauncher/commit/a8498b0dab94d0ab6c9e5cf395e5003db541b749.patch";
|
||||
hash = "sha256-ji5GGUnzVut9xFXkynqf9aVR9FO/zsqIbt3P9dexJ2I=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "dont-include-sparkle-when-not-enabled.patch";
|
||||
url = "https://github.com/PrismLauncher/PrismLauncher/commit/51bfda937d47837ed426150ed6f43a60b4ca0ce1.patch";
|
||||
hash = "sha256-7hMgANOg4zRIf3F2AfLXGR3dAEBqVmKm/J5SH0G5oCk=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "introduce-internal-updater-variable.patch";
|
||||
url = "https://github.com/PrismLauncher/PrismLauncher/commit/b1aa9e584624a0732dd55fc6c459524a8abfe6ba.patch";
|
||||
hash = "sha256-mm++EfnBxz7NVtKLMb889mMq8F/OdQmzob8OmlvNlRA=";
|
||||
})
|
||||
];
|
||||
|
||||
hardeningEnable = [ "pie" ];
|
||||
nativeBuildInputs = [ extra-cmake-modules cmake jdk17 ninja ];
|
||||
buildInputs =
|
||||
[
|
||||
qtbase
|
||||
zlib
|
||||
quazip
|
||||
ghc_filesystem
|
||||
tomlplusplus
|
||||
cmark
|
||||
]
|
||||
++ lib.optional gamemodeSupport gamemode
|
||||
++ lib.optionals stdenv.isDarwin [ Cocoa ];
|
||||
|
||||
hardeningEnable = lib.optionals stdenv.isLinux [ "pie" ];
|
||||
|
||||
cmakeFlags = [
|
||||
# downstream branding
|
||||
"-DLauncher_BUILD_PLATFORM=nixpkgs"
|
||||
] ++ lib.optionals (msaClientID != null) [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ]
|
||||
++ lib.optionals (lib.versionOlder qtbase.version "6") [ "-DLauncher_QT_VERSION_MAJOR=5" ];
|
||||
++ lib.optionals (lib.versionOlder qtbase.version "6") [ "-DLauncher_QT_VERSION_MAJOR=5" ]
|
||||
++ lib.optionals stdenv.isDarwin [ "-DINSTALL_BUNDLE=nodeps" "-DMACOSX_SPARKLE_UPDATE_FEED_URL=''" ];
|
||||
|
||||
postUnpack = ''
|
||||
rm -rf source/libraries/libnbtplusplus
|
||||
|
|
@ -67,7 +104,7 @@ stdenv.mkDerivation rec {
|
|||
their own mods, texture packs, saves, etc) and helps you manage them and
|
||||
their associated options with a simple interface.
|
||||
'';
|
||||
platforms = platforms.linux;
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
changelog = "https://github.com/PrismLauncher/PrismLauncher/releases/tag/${version}";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ minion3665 Scrumplex getchoo ];
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
, gamemode
|
||||
|
||||
, msaClientID ? null
|
||||
, gamemodeSupport ? true
|
||||
, gamemodeSupport ? stdenv.isLinux
|
||||
, jdks ? [ jdk17 jdk8 ]
|
||||
, additionalLibs ? [ ]
|
||||
}:
|
||||
|
|
@ -38,7 +38,7 @@ symlinkJoin {
|
|||
qtbase
|
||||
qtsvg
|
||||
]
|
||||
++ lib.optional (lib.versionAtLeast qtbase.version "6") qtwayland;
|
||||
++ lib.optional (lib.versionAtLeast qtbase.version "6" && stdenv.isLinux) qtwayland;
|
||||
|
||||
postBuild = ''
|
||||
wrapQtAppsHook
|
||||
|
|
@ -64,9 +64,9 @@ symlinkJoin {
|
|||
++ additionalLibs;
|
||||
|
||||
in
|
||||
[
|
||||
[ "--prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}" ]
|
||||
++ lib.optionals stdenv.isLinux [
|
||||
"--set LD_LIBRARY_PATH /run/opengl-driver/lib:${lib.makeLibraryPath libs}"
|
||||
"--prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}"
|
||||
# xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
|
||||
"--prefix PATH : ${lib.makeBinPath [xorg.xrandr]}"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -13,15 +13,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "foomatic-db";
|
||||
version = "unstable-2023-06-30";
|
||||
version = "unstable-2023-08-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
# there is also a daily snapshot at the `downloadPage`,
|
||||
# but it gets deleted quickly and would provoke 404 errors
|
||||
owner = "OpenPrinting";
|
||||
repo = "foomatic-db";
|
||||
rev = "5b916154bcc37d9881f71110b3d5a7e624a67c95";
|
||||
hash = "sha256-mbIVtrmLT8saZga6rIMY55xCQWadV9BSlZR4669wNCs=";
|
||||
rev = "a6e32fa657f3598dc87c650a9fa9cfa38dda6a60";
|
||||
hash = "sha256-lEnog9Klxny6oEm/l2HDlI0DY5aIdPjHhWCBex2vp9Y=";
|
||||
};
|
||||
|
||||
buildInputs = [ cups cups-filters ghostscript gnused perl ];
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "mediamtx";
|
||||
version = "0.23.7";
|
||||
version = "0.23.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aler9";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-kkB4OuBBz9kdymUmXSkr3alE62O1T0woK5BNAwRBN4o=";
|
||||
hash = "sha256-ICH102Z18dbabXVYgxCX4JTQ75v0A9wx2pIsZHIXDFg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-LCdMSyCbndus+VviT4Zp3mZ4ZzpF0F+ONroJsayb5lo=";
|
||||
vendorHash = "sha256-uqcv05AHwwPxrix+FWSWpV8vKFqKQsMn8qEgD71zgo8=";
|
||||
|
||||
# Tests need docker
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "lemmy-ui",
|
||||
"version": "0.18.2",
|
||||
"version": "0.18.3",
|
||||
"description": "An isomorphic UI for lemmy",
|
||||
"repository": "https://github.com/LemmyNet/lemmy-ui",
|
||||
"license": "AGPL-3.0",
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
"scripts": {
|
||||
"analyze": "webpack --mode=none",
|
||||
"prebuild:dev": "yarn clean && node generate_translations.js",
|
||||
"build:dev": "webpack --env LEMMY_UI_DISABLE_CSP=true --env COMMIT_HASH=$(git rev-parse --short HEAD) --mode=development",
|
||||
"build:dev": "webpack --env COMMIT_HASH=$(git rev-parse --short HEAD) --mode=development",
|
||||
"prebuild:prod": "yarn clean && node generate_translations.js",
|
||||
"build:prod": "webpack --env COMMIT_HASH=$(git rev-parse --short HEAD) --mode=production",
|
||||
"clean": "yarn run rimraf dist",
|
||||
|
|
@ -69,7 +69,6 @@
|
|||
"jwt-decode": "^3.1.2",
|
||||
"lemmy-js-client": "0.18.1",
|
||||
"lodash.isequal": "^4.5.0",
|
||||
"lodash.merge": "^4.6.2",
|
||||
"markdown-it": "^13.0.1",
|
||||
"markdown-it-container": "^3.0.0",
|
||||
"markdown-it-emoji": "^2.0.2",
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"serverVersion": "0.18.2",
|
||||
"uiVersion": "0.18.2",
|
||||
"serverHash": "sha256-T08CjsRREgGJb1vXJrYihYaCin8NNHtsG+2PUHoI4Ho=",
|
||||
"serverCargoHash": "sha256-nTZcLOpsbdeGzpz3PzgXZEGZHMbvSDA5rB2A3S9tMF8=",
|
||||
"uiHash": "sha256-qFFnmdCONjfPyfp8v0VonPQP8G5b2DVpxEUAQT731Z0=",
|
||||
"serverVersion": "0.18.3",
|
||||
"uiVersion": "0.18.3",
|
||||
"serverHash": "sha256-1feDR3WX4hwaAPEGkM3syb+CsYS3zkzQb2q8be/4UC4=",
|
||||
"serverCargoHash": "sha256-CVZyOwM0BAeIVy74tj4NNE6occ6yo8eWpMhMb1DnoJY=",
|
||||
"uiHash": "sha256-asmn5KQ4hhy1yGoeUrQJZLWXPelnb16utQWYplDqIOg=",
|
||||
"uiYarnDepsHash": "sha256-fRJpA9WstNNNOePoqotJKYmlikkcjc34iM0WO8+a/3Q="
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i python3 -p python3 python3.pkgs.semver nix-prefetch-github
|
||||
#! nix shell -i python3 -p python3 python3.pkgs.semver nix-prefetch-github
|
||||
from urllib.request import Request, urlopen
|
||||
import dataclasses
|
||||
import subprocess
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "dysk";
|
||||
version = "2.7.1";
|
||||
version = "2.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Canop";
|
||||
repo = "dysk";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5KUTb2mSYQdkT3K5BrBCQqq45q0MzFYG1UmE+5eBnuc=";
|
||||
hash = "sha256-3uukeuxB1GjmJ59bkgDEzgG9RMZhmB5TSv3uiXV8GNg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-YmA1Qx3oKHXlXs3FWoLMRAnFdIQaFdLJaNwj/FxIS5Q=";
|
||||
cargoHash = "sha256-td4B9/DAmASqLGO3PVLLWeO3GeDbLHI7wNcOT1qk20k=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -41,7 +41,10 @@ python3.pkgs.buildPythonApplication rec {
|
|||
# see https://github.com/phillipberndt/autorandr/issues/197
|
||||
installShellCompletion --cmd autorandr \
|
||||
--bash contrib/bash_completion/autorandr \
|
||||
--zsh contrib/zsh_completion/_autorandr
|
||||
--zsh contrib/zsh_completion/_autorandr \
|
||||
--fish contrib/fish_copletion/autorandr.fish
|
||||
# In the line above there's a typo that needs to be fixed in the next
|
||||
# release
|
||||
|
||||
make install TARGETS='autostart_config' PREFIX=$out DESTDIR=$out
|
||||
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "barman";
|
||||
version = "3.4.0";
|
||||
version = "3.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EnterpriseDB";
|
||||
repo = pname;
|
||||
rev = "refs/tags/release/${version}";
|
||||
hash = "sha256-K5y5C+K/fMhgOcSsCMaIgY6ce9UUPszoyumsfNHKjBo=";
|
||||
hash = "sha256-5mecCg5c+fu6WUgmNEL4BR+JCild02YAuYgLwO1MGnI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "star-history";
|
||||
version = "1.0.12";
|
||||
version = "1.0.13";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-znISDhxmAEw38TWAtA3xCZrplYs1pQ+DvfCucGDJZSU=";
|
||||
sha256 = "sha256-WOdiBN/qyszAI4GNFB/RuZd9EV0uj9l5yUnryZ6cqSE=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-GBms5Ha7agwG5u2U+perN8Uo5ihL4QFRZh2wxlV+Wxo=";
|
||||
cargoSha256 = "sha256-sET5Gf4vLJAvgdslT+bov9vzCKuTKCEJ0/+JR2GfhmY=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "arti";
|
||||
version = "1.1.6";
|
||||
version = "1.1.7";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.torproject.org";
|
||||
|
|
@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec {
|
|||
owner = "core";
|
||||
repo = "arti";
|
||||
rev = "arti-v${version}";
|
||||
sha256 = "sha256-6VmpBt1KxWRdZJLVPNeqETQnZITGoX+rz29eIiOnHnU=";
|
||||
sha256 = "sha256-RUBSF6zG+LpBopnCo/mj+Sr+iFz95Ce0p0/RNIOuRCg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Q/1zgfF1v3D5Mg+JhS0K9mF4BN9xHV2tf7AtsBHZGh0=";
|
||||
cargoHash = "sha256-ngIrAaQY3aWPridH67ZKACbFRkP8BeZ1W1wji6IPBAA=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -37764,11 +37764,15 @@ with pkgs;
|
|||
|
||||
principia = callPackage ../games/principia { };
|
||||
|
||||
prismlauncher-qt5-unwrapped = libsForQt5.callPackage ../games/prismlauncher { };
|
||||
prismlauncher-qt5-unwrapped = libsForQt5.callPackage ../games/prismlauncher {
|
||||
inherit (darwin.apple_sdk.frameworks) Cocoa;
|
||||
};
|
||||
|
||||
prismlauncher-qt5 = libsForQt5.callPackage ../games/prismlauncher/wrapper.nix { prismlauncher-unwrapped = prismlauncher-qt5-unwrapped; };
|
||||
|
||||
prismlauncher-unwrapped = qt6Packages.callPackage ../games/prismlauncher { };
|
||||
prismlauncher-unwrapped = qt6Packages.callPackage ../games/prismlauncher {
|
||||
inherit (darwin.apple_sdk.frameworks) Cocoa;
|
||||
};
|
||||
|
||||
prismlauncher = qt6Packages.callPackage ../games/prismlauncher/wrapper.nix { };
|
||||
|
||||
|
|
@ -41494,9 +41498,9 @@ with pkgs;
|
|||
|
||||
zalgo = callPackage ../tools/misc/zalgo { };
|
||||
|
||||
zettlr = callPackage ../applications/misc/zettlr {
|
||||
inherit (callPackage ../applications/misc/zettlr {
|
||||
texlive = texlive.combined.scheme-medium;
|
||||
};
|
||||
}) zettlr zettlr-beta;
|
||||
|
||||
unpoller = callPackage ../servers/monitoring/unpoller { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue