Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
a5961d9534
19 changed files with 113 additions and 73 deletions
|
|
@ -12,20 +12,20 @@
|
|||
let
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
pname = "obsidian";
|
||||
version = "1.1.15";
|
||||
version = "1.1.16";
|
||||
appname = "Obsidian";
|
||||
meta = with lib; {
|
||||
description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files";
|
||||
homepage = "https://obsidian.md";
|
||||
downloadPage = "https://github.com/obsidianmd/obsidian-releases/releases";
|
||||
license = licenses.obsidian;
|
||||
maintainers = with maintainers; [ atila conradmearns zaninime opeik ];
|
||||
maintainers = with maintainers; [ atila conradmearns zaninime qbit ];
|
||||
};
|
||||
|
||||
filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
|
||||
sha256 = if stdenv.isDarwin then "sha256-8cHNIpgRhEQRRcuM0t6zZNweb92nMe8GopgjYfOLRSA=" else "sha256-rDA0GXQ++QAT4UaT23WkCA5CKCuJsF4ca0g086AiCao=";
|
||||
sha256 = if stdenv.isDarwin then "sha256-0p9vYHd1+kH+2ZTJ5OPeIEKNOzUGRU/M1xlmtyPOvJo=" else "sha256-zO5RpRkatGd5kJTPrTQ5xAYHntyw/7aQUSpZFUnDMnw=";
|
||||
};
|
||||
|
||||
icon = fetchurl {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"version": "1.11.23",
|
||||
"desktopSrcHash": "Q3kyAiBvedTy4jiBkYmEJeonRf6HesdpKgmtOT2sYwI=",
|
||||
"desktopYarnHash": "8lHIkUkFAo7m8XjfnFSAkp4mIKyrXOsnbstRIPXI+vE=",
|
||||
"webSrcHash": "JOfuzo0DQ0v2rC80/HkucLgc2xsCb3eujaH0fg7j0nI=",
|
||||
"webYarnHash": "0Cb7TuRFHcQvYbnVAnXOIwt6NXa7ITrMPJnmbUFaPNU="
|
||||
"version": "1.11.24",
|
||||
"desktopSrcHash": "eAcJwoifIg0yCcYyeueVOL6CeGVMwmHpbr58MOUpK9I=",
|
||||
"desktopYarnHash": "175ln40xp4djzc9wrx2vfg6did4rxy7nyxm6vs95pcbpv1i84g97",
|
||||
"webSrcHash": "45xyfflTGA9LQxKi2WghYdDN0+R4ntjIPONnm+CJ5Dk=",
|
||||
"webYarnHash": "1rwlx73chgq7x4zki9w4y3br8ypvk37vi6agqhk2dvq6y4znr93y"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, stdenv, fetchFromGitHub, openssl, sqlite }:
|
||||
{ lib, stdenv, clang14Stdenv, fetchFromGitHub, openssl, sqlite }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
(if stdenv.isDarwin then clang14Stdenv else stdenv).mkDerivation rec {
|
||||
pname = "signalbackup-tools";
|
||||
version = "20230223-1";
|
||||
version = "20230304-3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bepaald";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-tBjMg+aYXmIhS2tw+D5NkBieWKiWwEVBWs6LA3rFaQQ=";
|
||||
hash = "sha256-y6ApImUkS25kUPih/hl1ngLAkeBAX+MhJ6XuiVU9aZQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -36,6 +36,5 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl3Only;
|
||||
maintainers = [ maintainers.malo ];
|
||||
platforms = platforms.all;
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,7 +40,8 @@ stdenv.mkDerivation rec {
|
|||
] ++ (with ocamlPackages; [
|
||||
camlp4
|
||||
lablgl
|
||||
camlimages_4_2_4
|
||||
camlimages
|
||||
num
|
||||
]);
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -48,6 +49,9 @@ stdenv.mkDerivation rec {
|
|||
substituteInPlace "$f" --replace "+camlp4" \
|
||||
"${ocamlPackages.camlp4}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/camlp4"
|
||||
done
|
||||
|
||||
# Fatal error: exception Sys_error("Mutex.unlock: Operation not permitted")
|
||||
sed -i "/gl_started/d" src/draw.ml* src/main.ml
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{
|
||||
"version": "15.8.3",
|
||||
"repo_hash": "sha256-kODF5qalf8PClbsTgcqm5X2uTXpFA8N9FW+2HCPKxD0=",
|
||||
"version": "15.8.4",
|
||||
"repo_hash": "sha256-8R2a934nC6n482Am7EruV3yHgxFSICuGcKgRBCy7GGI=",
|
||||
"yarn_hash": "1famdjvsbhvnkg5sp2vnc3jzaixww41833pb0427s3qpig0fc7az",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v15.8.3-ee",
|
||||
"rev": "v15.8.4-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "15.8.3",
|
||||
"GITLAB_PAGES_VERSION": "15.8.3",
|
||||
"GITALY_SERVER_VERSION": "15.8.4",
|
||||
"GITLAB_PAGES_VERSION": "15.8.4",
|
||||
"GITLAB_SHELL_VERSION": "14.15.0",
|
||||
"GITLAB_WORKHORSE_VERSION": "15.8.3"
|
||||
"GITLAB_WORKHORSE_VERSION": "15.8.4"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ let
|
|||
gemdir = ./.;
|
||||
};
|
||||
|
||||
version = "15.8.3";
|
||||
version = "15.8.4";
|
||||
package_version = "v${lib.versions.major version}";
|
||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ let
|
|||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jH5cbhoRgFsWJhXhKvdee4n77W2l+GSHGM2NElJTEy8=";
|
||||
sha256 = "sha256-att8MR94uINKOTYlj2sZLezMXZag11qP2p9T9a3Eklc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-8P5X/bqeI1hY45IGsvEWOg3GuetEQF/XtZzUMdX22pA=";
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ in
|
|||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "15.8.3";
|
||||
version = "15.8.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = data.owner;
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ stdenv.mkDerivation rec {
|
|||
strictDeps = true;
|
||||
nativeBuildInputs = [ perl ]
|
||||
++ (with ocamlPackages; [ ocaml findlib ocamlbuild ]);
|
||||
buildInputs = [ ocamlPackages.num ];
|
||||
propagatedBuildInputs = [ libgcrypt ];
|
||||
src = fetchFromGitHub {
|
||||
owner = "samee";
|
||||
|
|
@ -19,6 +20,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patches = [ ./ignore-complex-float128.patch ];
|
||||
|
||||
# https://github.com/samee/obliv-c/issues/76#issuecomment-438958209
|
||||
env.OCAMLBUILD = "ocamlbuild -package num -ocamlopt 'ocamlopt -dontlink num' -ocamlc 'ocamlc -dontlink num'";
|
||||
|
||||
preBuild = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -51,9 +51,9 @@
|
|||
"imagination-experimental" # PowerVR Rogue (currently N/A)
|
||||
"panfrost" # ARM Mali Midgard and up (T/G series)
|
||||
]
|
||||
++ lib.optionals stdenv.isx86_64 [
|
||||
"intel" # Intel (aka ANV), could work on non-x86_64 with PCIe cards, but doesn't build as of 22.3.4
|
||||
"intel_hasvk" # Intel Haswell/Broadwell, experimental, x86_64 only
|
||||
++ lib.optionals stdenv.hostPlatform.isx86 [
|
||||
"intel" # Intel (aka ANV), could work on non-x86 with PCIe cards, but doesn't build
|
||||
"intel_hasvk" # Intel Haswell/Broadwell, "legacy" Vulkan driver (https://www.phoronix.com/news/Intel-HasVK-Drop-Dead-Code)
|
||||
]
|
||||
else [ "auto" ]
|
||||
, eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" ]
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ let
|
|||
};
|
||||
in stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "miopengemm";
|
||||
version = "5.4.2";
|
||||
version = "5.4.3";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "brev-cli";
|
||||
version = "0.6.207";
|
||||
version = "0.6.208";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brevdev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7WPyhhhy9BspbqlfV5mFvD8ny2RIbnONrBguhWIgL2w=";
|
||||
sha256 = "sha256-fgbHaY0trO7MiYxhdatq81PaOIVQpSIU3cUnrIvGI2M=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8=";
|
||||
|
|
|
|||
|
|
@ -56,28 +56,51 @@ let
|
|||
'';
|
||||
};
|
||||
|
||||
mkStdenv = stdenv:
|
||||
let
|
||||
cc = stdenv.cc.override {
|
||||
bintools = stdenv.cc.bintools.override { libc = packages.Libsystem; };
|
||||
libc = packages.Libsystem;
|
||||
};
|
||||
in
|
||||
if stdenv.isAarch64 then stdenv
|
||||
else
|
||||
(overrideCC stdenv cc).override {
|
||||
targetPlatform = stdenv.targetPlatform // {
|
||||
darwinMinVersion = "10.12";
|
||||
darwinSdkVersion = "11.0";
|
||||
};
|
||||
};
|
||||
|
||||
stdenvs = {
|
||||
stdenv = mkStdenv stdenv;
|
||||
} // builtins.listToAttrs (map
|
||||
(v: { name = "clang${v}Stdenv"; value = mkStdenv pkgs."llvmPackages_${v}".stdenv; })
|
||||
[ "12" "13" "14" "15" ]
|
||||
);
|
||||
|
||||
callPackage = newScope (packages // pkgs.darwin // { inherit MacOSX-SDK; });
|
||||
|
||||
packages = {
|
||||
inherit (callPackage ./apple_sdk.nix {}) frameworks libs;
|
||||
packages = stdenvs // {
|
||||
inherit (callPackage ./apple_sdk.nix { }) frameworks libs;
|
||||
|
||||
# TODO: this is nice to be private. is it worth the callPackage above?
|
||||
# Probably, I don't think that callPackage costs much at all.
|
||||
inherit MacOSX-SDK CLTools_Executables;
|
||||
|
||||
Libsystem = callPackage ./libSystem.nix {};
|
||||
Libsystem = callPackage ./libSystem.nix { };
|
||||
LibsystemCross = pkgs.darwin.Libsystem;
|
||||
libcharset = callPackage ./libcharset.nix {};
|
||||
libunwind = callPackage ./libunwind.nix {};
|
||||
libnetwork = callPackage ./libnetwork.nix {};
|
||||
libpm = callPackage ./libpm.nix {};
|
||||
libcharset = callPackage ./libcharset.nix { };
|
||||
libunwind = callPackage ./libunwind.nix { };
|
||||
libnetwork = callPackage ./libnetwork.nix { };
|
||||
libpm = callPackage ./libpm.nix { };
|
||||
# Avoid introducing a new objc4 if stdenv already has one, to prevent
|
||||
# conflicting LLVM modules.
|
||||
objc4 = if stdenv ? objc4 then stdenv.objc4 else callPackage ./libobjc.nix {};
|
||||
objc4 = stdenv.objc4 or (callPackage ./libobjc.nix { });
|
||||
|
||||
# questionable aliases
|
||||
configd = pkgs.darwin.apple_sdk.frameworks.SystemConfiguration;
|
||||
IOKit = pkgs.darwin.apple_sdk.frameworks.IOKit;
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks) IOKit;
|
||||
|
||||
xcodebuild = pkgs.xcbuild.override {
|
||||
inherit (pkgs.darwin.apple_sdk_11_0) stdenv;
|
||||
|
|
@ -89,30 +112,23 @@ let
|
|||
inherit (pkgs) rustc cargo;
|
||||
};
|
||||
|
||||
callPackage = newScope (lib.optionalAttrs stdenv.isDarwin rec {
|
||||
inherit (pkgs.darwin.apple_sdk_11_0) stdenv xcodebuild rustPlatform;
|
||||
callPackage = newScope (lib.optionalAttrs stdenv.isDarwin (stdenvs // rec {
|
||||
inherit (pkgs.darwin.apple_sdk_11_0) xcodebuild rustPlatform;
|
||||
darwin = pkgs.darwin.overrideScope (_: prev: {
|
||||
inherit (prev.darwin.apple_sdk_11_0) Libsystem LibsystemCross libcharset libunwind objc4 configd IOKit Security;
|
||||
inherit (prev.darwin.apple_sdk_11_0)
|
||||
IOKit
|
||||
Libsystem
|
||||
LibsystemCross
|
||||
Security
|
||||
configd
|
||||
libcharset
|
||||
libunwind
|
||||
objc4
|
||||
;
|
||||
apple_sdk = prev.darwin.apple_sdk_11_0;
|
||||
CF = prev.darwin.apple_sdk_11_0.CoreFoundation;
|
||||
});
|
||||
xcbuild = xcodebuild;
|
||||
});
|
||||
|
||||
stdenv =
|
||||
let
|
||||
clang = stdenv.cc.override {
|
||||
bintools = stdenv.cc.bintools.override { libc = packages.Libsystem; };
|
||||
libc = packages.Libsystem;
|
||||
};
|
||||
in
|
||||
if stdenv.isAarch64 then stdenv
|
||||
else
|
||||
(overrideCC stdenv clang).override {
|
||||
targetPlatform = stdenv.targetPlatform // {
|
||||
darwinMinVersion = "10.12";
|
||||
darwinSdkVersion = "11.0";
|
||||
};
|
||||
};
|
||||
}));
|
||||
};
|
||||
in packages
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "android-udev-rules";
|
||||
version = "20230104";
|
||||
version = "20230303";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "M0Rf30";
|
||||
repo = "android-udev-rules";
|
||||
rev = version;
|
||||
sha256 = "sha256-tbejLvig+eTG+DHAchWEMMydd6ePRKyfRVPp6uDhP70=";
|
||||
sha256 = "sha256-ddalOVt0gLuTcwk322fNNn6WNZx1Ubsa4MgaG0Lmn2k=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, kernel }:
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, kernel }:
|
||||
|
||||
let
|
||||
sourceAttrs = (import ./source.nix) { inherit fetchFromGitHub; };
|
||||
|
|
@ -12,6 +12,13 @@ stdenv.mkDerivation {
|
|||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
hardeningDisable = [ "pic" ];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://git.launchpad.net/ubuntu/+source/jool/plain/debian/patches/0001-Linux-6.2.patch?id=3708a5b6c492b7d8e9f78596e61ae8f74ec9640f";
|
||||
hash = "sha256-GkyDY6tcJp7Xd28mrDorEJHxsEowZBJP7BRAdPpsyF8=";
|
||||
})
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
sed -e 's@/lib/modules/\$(.*)@${kernel.dev}/lib/modules/${kernel.modDirVersion}@' -i src/mod/*/Makefile
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -61,7 +61,9 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
doCheck = !stdenv.hostPlatform.isStatic;
|
||||
# TODO: investigate the aarch64-linux failures; see this and linked discussions:
|
||||
# https://github.com/NixOS/nixpkgs/pull/192962
|
||||
doCheck = with stdenv.hostPlatform; !isStatic && !(isAarch64 && isLinux);
|
||||
checkTarget = "unit";
|
||||
checkInputs = [
|
||||
cmocka
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "oven-media-engine";
|
||||
version = "0.15.0";
|
||||
version = "0.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AirenSoft";
|
||||
repo = "OvenMediaEngine";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xw9X6PVXl7fLQcwIQOA3s8DbXKBQ5aqZpnKPgd47gjM=";
|
||||
sha256 = "sha256-Ob+0Ak0ELyHrZfeCiACX2IHsp+6jE//iqPoW6je6GfQ=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/src";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bgpq4";
|
||||
version = "1.8";
|
||||
version = "1.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bgp";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-y1Btpp1xzjAezLaIJBF2+ghMgC/p8mHS/hStGIaKb1o=";
|
||||
sha256 = "sha256-9uFfE3rUQCYbWhtJuRQT9FHf9YeD4THkj/OCp9f1MwI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openfortivpn";
|
||||
version = "1.19.0";
|
||||
version = "1.20.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adrienverge";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HwKkgRS3Hccym78T+suFkIP5nmQDWRAwm0l/PaS1p7o=";
|
||||
sha256 = "sha256-xsH/Nb1/69R2EvAisDnrHWehjDIMBmElCV6evuTwBIQ=";
|
||||
};
|
||||
|
||||
# we cannot write the config file to /etc and as we don't need the file, so drop it
|
||||
|
|
|
|||
|
|
@ -4570,7 +4570,7 @@ with pkgs;
|
|||
|
||||
element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices;
|
||||
electron = electron_22;
|
||||
electron = electron_23;
|
||||
};
|
||||
element-desktop-wayland = writeScriptBin "element-desktop" ''
|
||||
#!/bin/sh
|
||||
|
|
@ -15538,8 +15538,10 @@ with pkgs;
|
|||
|
||||
nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { };
|
||||
|
||||
obliv-c = callPackage ../development/compilers/obliv-c
|
||||
{ stdenv = gcc10StdenvCompat; ocamlPackages = ocaml-ng.ocamlPackages_4_05; };
|
||||
obliv-c = callPackage ../development/compilers/obliv-c {
|
||||
stdenv = gcc10StdenvCompat;
|
||||
ocamlPackages = ocaml-ng.ocamlPackages_4_14;
|
||||
};
|
||||
|
||||
ocaml-ng = callPackage ./ocaml-packages.nix { };
|
||||
ocaml = ocamlPackages.ocaml;
|
||||
|
|
@ -19823,7 +19825,11 @@ with pkgs;
|
|||
fftwSinglePrec = fftw.override { precision = "single"; };
|
||||
fftwFloat = fftwSinglePrec; # the configure option is just an alias
|
||||
fftwLongDouble = fftw.override { precision = "long-double"; };
|
||||
fftwQuad = fftw.override { precision = "quad-precision"; };
|
||||
# Need gcc >= 4.6.0 to build with FFTW with quad precision, but Darwin defaults to Clang
|
||||
fftwQuad = fftw.override {
|
||||
precision = "quad-precision";
|
||||
stdenv = gccStdenv;
|
||||
};
|
||||
fftwMpi = fftw.override { enableMpi = true; };
|
||||
|
||||
filter-audio = callPackage ../development/libraries/filter-audio {};
|
||||
|
|
@ -20196,7 +20202,9 @@ with pkgs;
|
|||
glpk = callPackage ../development/libraries/glpk { };
|
||||
|
||||
glsurf = callPackage ../applications/science/math/glsurf {
|
||||
ocamlPackages = ocaml-ng.ocamlPackages_4_05;
|
||||
ocamlPackages = ocaml-ng.mkOcamlPackages (ocaml-ng.ocamlPackages_4_14.ocaml.override {
|
||||
unsafeStringSupport = true;
|
||||
});
|
||||
};
|
||||
|
||||
glui = callPackage ../development/libraries/glui {};
|
||||
|
|
|
|||
Loading…
Reference in a new issue