Merge master into staging-next
This commit is contained in:
commit
3e6debe078
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"TrueZen-nvim": {
|
||||
"date": "2022-08-21",
|
||||
"date": "2022-08-31",
|
||||
"new": "true-zen-nvim"
|
||||
},
|
||||
"compe-tmux": {
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -53,7 +53,6 @@
|
|||
, zsh
|
||||
|
||||
# command-t dependencies
|
||||
, rake
|
||||
, ruby
|
||||
|
||||
# cpsm dependencies
|
||||
|
@ -240,9 +239,11 @@ self: super: {
|
|||
};
|
||||
|
||||
command-t = super.command-t.overrideAttrs (old: {
|
||||
buildInputs = [ ruby rake ];
|
||||
buildInputs = [ ruby ];
|
||||
buildPhase = ''
|
||||
rake make
|
||||
substituteInPlace lua/wincent/commandt/lib/Makefile \
|
||||
--replace '/bin/bash' 'bash'
|
||||
make build
|
||||
rm ruby/command-t/ext/command-t/*.o
|
||||
'';
|
||||
});
|
||||
|
@ -979,7 +980,7 @@ self: super: {
|
|||
libiconv
|
||||
];
|
||||
|
||||
cargoSha256 = "sha256-prqS4cx5T+EiilXf3v7ResNBtgst0Kpgvayknf0QDXA=";
|
||||
cargoSha256 = "sha256-QAfHhpXABuOPaHCfQQZYhBERGXMaJPFipWHt/MeSc3c=";
|
||||
};
|
||||
in
|
||||
''
|
||||
|
@ -1102,7 +1103,7 @@ self: super: {
|
|||
vim-isort = super.vim-isort.overrideAttrs (old: {
|
||||
postPatch = ''
|
||||
substituteInPlace ftplugin/python_vimisort.vim \
|
||||
--replace 'import vim' 'import vim; import sys; sys.path.append("${python2.pkgs.isort}/${python2.sitePackages}")'
|
||||
--replace 'import vim' 'import vim; import sys; sys.path.append("${python3.pkgs.isort}/${python3.sitePackages}")'
|
||||
'';
|
||||
});
|
||||
|
||||
|
|
|
@ -475,6 +475,7 @@ https://github.com/dstein64/nvim-scrollview/,,
|
|||
https://github.com/dcampos/nvim-snippy/,HEAD,
|
||||
https://github.com/ishan9299/nvim-solarized-lua/,,
|
||||
https://github.com/nvim-pack/nvim-spectre/,,
|
||||
https://github.com/kylechui/nvim-surround/,main,
|
||||
https://github.com/norcalli/nvim-terminal.lua/,,
|
||||
https://github.com/kyazdani42/nvim-tree.lua/,,
|
||||
https://github.com/nvim-treesitter/nvim-treesitter/,,
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "logseq";
|
||||
version = "0.8.2";
|
||||
version = "0.8.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
|
||||
sha256 = "sha256-kUBSoNs9pKnAC4OKFuvtHb0sLxNCsNOosXesMULcpgc=";
|
||||
sha256 = "sha256-OJ/1SFG/UNkNSYtAQprKlc9JhT9/co4XH941mu+YsXE=";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
};
|
||||
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "temporal";
|
||||
version = "1.17.4";
|
||||
version = "1.17.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "temporalio";
|
||||
repo = "temporal";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FT1GOhB3PN5CBktMm5Z2xe6MF3U/BUQj7XViinTjWG4=";
|
||||
sha256 = "sha256-u8GyaXpiVZdPDoPAqIa+TY+JQFZeSGOLrUy+e3E4kig=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-MT/BmGTdyEzmXjuwlA6WhLIWlrQz3Wc4Tl5dMI1587Q=";
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
, configText ? ""
|
||||
}:
|
||||
let
|
||||
version = "2203";
|
||||
version = "2206";
|
||||
|
||||
sysArch =
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then "x64"
|
||||
|
@ -35,8 +35,8 @@ let
|
|||
pname = "vmware-horizon-files";
|
||||
inherit version;
|
||||
src = fetchurl {
|
||||
url = "https://download3.vmware.com/software/CART23FQ1_LIN_2203_TARBALL/VMware-Horizon-Client-Linux-2203-8.5.0-19586897.tar.gz";
|
||||
sha256 = "27429dddaeedfa8b701d7aa7868f60ad58efa42687d7f27e84375fda9f5cd137";
|
||||
url = "https://download3.vmware.com/software/CART23FQ2_LIN_2206_TARBALL/VMware-Horizon-Client-Linux-2206-8.6.0-20094634.tar.gz";
|
||||
sha256 = "9819eae5708bf0d71156b81283e3a70100e2e22de9db827a8956ca8e83b2414a";
|
||||
};
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
installPhase = ''
|
||||
|
@ -51,7 +51,7 @@ let
|
|||
rm "$out/lib/vmware/gcc/libstdc++.so.6"
|
||||
|
||||
# This library causes the program to core-dump occasionally. Use ours instead.
|
||||
rm $out/lib/vmware/view/crtbora/libcairo.*
|
||||
rm -r $out/lib/vmware/view/crtbora
|
||||
|
||||
${lib.concatMapStrings wrapBinCommands bins}
|
||||
'';
|
||||
|
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sngrep";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "irontec";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-GxC9+O72GHE8Tc6FReO7EdpZTSaqn9mBpZCYaKybJls=";
|
||||
sha256 = "sha256-dXCOuae/T38Ltq4uywPJW5TGMyXwaECUj3/Zq4sDflU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sierra-breeze-enhanced";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kupiqu";
|
||||
repo = "SierraBreezeEnhanced";
|
||||
rev = "V${version}";
|
||||
sha256 = "sha256-G1Ra7ld34AMPLZM0+3iEJHRFRMHVewZKTTXfmiu7PAk=";
|
||||
sha256 = "sha256-Tzd8ATdmOjVe8OCSdcB9h7r6sqtb+24Fq80t/hmGJcE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ];
|
||||
|
|
17
pkgs/development/compilers/fpc/binary-builder-darwin.sh
Executable file
17
pkgs/development/compilers/fpc/binary-builder-darwin.sh
Executable file
|
@ -0,0 +1,17 @@
|
|||
source $stdenv/setup
|
||||
|
||||
pkgdir=$(pwd)/pkg
|
||||
deploydir=$(pwd)/deploy
|
||||
|
||||
undmg $src
|
||||
mkdir $out
|
||||
mkdir $pkgdir
|
||||
mkdir $deploydir
|
||||
|
||||
pkg=*.mpkg/Contents/Packages/*.pkg
|
||||
xar -xf $pkg -C $pkgdir
|
||||
pushd $deploydir
|
||||
cat $pkgdir/Payload | gunzip -dc | cpio -i
|
||||
popd
|
||||
echo $deploydir
|
||||
cp -r $deploydir/usr/local/* $out
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl }:
|
||||
{ stdenv, fetchurl, undmg, cpio, xar, lib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fpc-binary";
|
||||
|
@ -20,9 +20,26 @@ stdenv.mkDerivation rec {
|
|||
url = "mirror://sourceforge/project/freepascal/Linux/${version}/fpc-${version}.aarch64-linux.tar";
|
||||
sha256 = "b39470f9b6b5b82f50fc8680a5da37d2834f2129c65c24c5628a80894d565451";
|
||||
}
|
||||
else if stdenv.isDarwin then
|
||||
fetchurl {
|
||||
url = "mirror://sourceforge/project/freepascal/Mac%20OS%20X/${version}/fpc-${version}.intelarm64-macosx.dmg";
|
||||
sha256 = "05d4510c8c887e3c68de20272abf62171aa5b2ef1eba6bce25e4c0bc41ba8b7d";
|
||||
}
|
||||
else throw "Not supported on ${stdenv.hostPlatform.system}.";
|
||||
|
||||
builder = ./binary-builder.sh;
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
undmg
|
||||
xar
|
||||
cpio
|
||||
];
|
||||
|
||||
builder =
|
||||
if stdenv.hostPlatform.isLinux then
|
||||
./binary-builder.sh
|
||||
else if stdenv.hostPlatform.isDarwin then
|
||||
./binary-builder-darwin.sh
|
||||
else throw "Not supported on ${stdenv.hostPlatform}.";
|
||||
|
||||
meta = {
|
||||
description = "Free Pascal Compiler from a binary distribution";
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchurl, gawk, fetchpatch }:
|
||||
{ lib, stdenv, fetchurl, gawk, fetchpatch, undmg, cpio, xar, darwin, libiconv }:
|
||||
|
||||
let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in
|
||||
let startFPC = import ./binary.nix { inherit stdenv fetchurl undmg cpio xar lib; }; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.2.2";
|
||||
|
@ -11,7 +11,12 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "85ef993043bb83f999e2212f1bca766eb71f6f973d362e2290475dbaaf50161f";
|
||||
};
|
||||
|
||||
buildInputs = [ startFPC gawk ];
|
||||
buildInputs = [ startFPC gawk ]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
libiconv
|
||||
darwin.apple_sdk.frameworks.CoreFoundation
|
||||
];
|
||||
|
||||
glibc = stdenv.cc.libc.out;
|
||||
|
||||
# Patch paths for linux systems. Other platforms will need their own patches.
|
||||
|
@ -29,8 +34,18 @@ stdenv.mkDerivation rec {
|
|||
# substitute the markers set by the mark-paths patch
|
||||
substituteInPlace fpcsrc/compiler/systems/t_linux.pas --subst-var-by dynlinker-prefix "${glibc}"
|
||||
substituteInPlace fpcsrc/compiler/systems/t_linux.pas --subst-var-by syslibpath "${glibc}/lib"
|
||||
# Replace the `codesign --remove-signature` command with a custom script, since `codesign` is not available
|
||||
# in nixpkgs
|
||||
substituteInPlace fpcsrc/compiler/Makefile \
|
||||
--replace \
|
||||
"\$(CODESIGN) --remove-signature" \
|
||||
"${./remove-signature.sh}" \
|
||||
--replace "ifneq (\$(CODESIGN),)" "ifeq (\$(OS_TARGET), darwin)"
|
||||
'';
|
||||
|
||||
NIX_LDFLAGS = lib.optionalString
|
||||
stdenv.isDarwin (with darwin.apple_sdk.frameworks; "-F${CoreFoundation}/Library/Frameworks");
|
||||
|
||||
makeFlags = [ "NOGDB=1" "FPC=${startFPC}/bin/fpc" ];
|
||||
|
||||
installFlags = [ "INSTALL_PREFIX=\${out}" ];
|
||||
|
@ -41,6 +56,11 @@ stdenv.mkDerivation rec {
|
|||
done
|
||||
mkdir -p $out/lib/fpc/etc/
|
||||
$out/lib/fpc/*/samplecfg $out/lib/fpc/${version} $out/lib/fpc/etc/
|
||||
|
||||
# Generate config files in /etc since on darwin, ppc* does not follow symlinks
|
||||
# to resolve the location of /etc
|
||||
mkdir -p $out/etc
|
||||
$out/lib/fpc/*/samplecfg $out/lib/fpc/${version} $out/etc
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
@ -52,6 +72,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://www.freepascal.org";
|
||||
maintainers = [ maintainers.raskin ];
|
||||
license = with licenses; [ gpl2 lgpl2 ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
3
pkgs/development/compilers/fpc/remove-signature.sh
Executable file
3
pkgs/development/compilers/fpc/remove-signature.sh
Executable file
|
@ -0,0 +1,3 @@
|
|||
source $stdenv/setup
|
||||
|
||||
codesign_allocate -r -i "$1" -o "$1"
|
|
@ -1,12 +0,0 @@
|
|||
{ callPackage, fetchurl, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "1.55.0";
|
||||
|
||||
patches = [ ./clang-math.patch ./clang-math-2.patch ./gcc-5.patch ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2";
|
||||
sha256 = "0lkv5dzssbl5fmh2nkaszi8x9qbj80pr4acf9i26sj3rvlih1w7z";
|
||||
};
|
||||
})
|
|
@ -1,45 +0,0 @@
|
|||
From 6bb71fdd8f7cc346d90fb14beb38b7297fc1ffd9 Mon Sep 17 00:00:00 2001
|
||||
From: Andrey Semashev <andrey.semashev@gmail.com>
|
||||
Date: Sun, 26 Jan 2014 13:58:48 +0400
|
||||
Subject: [PATCH] Fixed incorrect initialization of 128-bit values, when no
|
||||
native support for 128-bit integers is available.
|
||||
|
||||
---
|
||||
boost/atomic/detail/cas128strong.hpp | 10 +++++++---
|
||||
1 file changed, 7 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/boost/atomic/detail/cas128strong.hpp b/boost/atomic/detail/cas128strong.hpp
|
||||
index 906c13e..dcb4d7d 100644
|
||||
--- a/boost/atomic/detail/cas128strong.hpp
|
||||
+++ b/boost/atomic/detail/cas128strong.hpp
|
||||
@@ -196,15 +196,17 @@ class base_atomic<T, void, 16, Sign>
|
||||
|
||||
public:
|
||||
BOOST_DEFAULTED_FUNCTION(base_atomic(void), {})
|
||||
- explicit base_atomic(value_type const& v) BOOST_NOEXCEPT : v_(0)
|
||||
+ explicit base_atomic(value_type const& v) BOOST_NOEXCEPT
|
||||
{
|
||||
+ memset(&v_, 0, sizeof(v_));
|
||||
memcpy(&v_, &v, sizeof(value_type));
|
||||
}
|
||||
|
||||
void
|
||||
store(value_type const& value, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT
|
||||
{
|
||||
- storage_type value_s = 0;
|
||||
+ storage_type value_s;
|
||||
+ memset(&value_s, 0, sizeof(value_s));
|
||||
memcpy(&value_s, &value, sizeof(value_type));
|
||||
platform_fence_before_store(order);
|
||||
platform_store128(value_s, &v_);
|
||||
@@ -247,7 +249,9 @@ class base_atomic<T, void, 16, Sign>
|
||||
memory_order success_order,
|
||||
memory_order failure_order) volatile BOOST_NOEXCEPT
|
||||
{
|
||||
- storage_type expected_s = 0, desired_s = 0;
|
||||
+ storage_type expected_s, desired_s;
|
||||
+ memset(&expected_s, 0, sizeof(expected_s));
|
||||
+ memset(&desired_s, 0, sizeof(desired_s));
|
||||
memcpy(&expected_s, &expected, sizeof(value_type));
|
||||
memcpy(&desired_s, &desired, sizeof(value_type));
|
||||
|
|
@ -1,65 +0,0 @@
|
|||
From e4bde20f2eec0a51be14533871d2123bd2ab9cf3 Mon Sep 17 00:00:00 2001
|
||||
From: Andrey Semashev <andrey.semashev@gmail.com>
|
||||
Date: Fri, 28 Feb 2014 12:43:11 +0400
|
||||
Subject: [PATCH] More compilation fixes for the case when 128-bit integers are
|
||||
not supported.
|
||||
|
||||
---
|
||||
boost/atomic/detail/gcc-atomic.hpp | 17 ++++++++++++-----
|
||||
1 file changed, 12 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/boost/atomic/detail/gcc-atomic.hpp b/boost/atomic/detail/gcc-atomic.hpp
|
||||
index a130590..4af99a1 100644
|
||||
--- a/boost/atomic/detail/gcc-atomic.hpp
|
||||
+++ b/boost/atomic/detail/gcc-atomic.hpp
|
||||
@@ -958,14 +958,16 @@ class base_atomic<T, void, 16, Sign>
|
||||
|
||||
public:
|
||||
BOOST_DEFAULTED_FUNCTION(base_atomic(void), {})
|
||||
- explicit base_atomic(value_type const& v) BOOST_NOEXCEPT : v_(0)
|
||||
+ explicit base_atomic(value_type const& v) BOOST_NOEXCEPT
|
||||
{
|
||||
+ memset(&v_, 0, sizeof(v_));
|
||||
memcpy(&v_, &v, sizeof(value_type));
|
||||
}
|
||||
|
||||
void store(value_type const& v, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT
|
||||
{
|
||||
- storage_type tmp = 0;
|
||||
+ storage_type tmp;
|
||||
+ memset(&tmp, 0, sizeof(tmp));
|
||||
memcpy(&tmp, &v, sizeof(value_type));
|
||||
__atomic_store_n(&v_, tmp, atomics::detail::convert_memory_order_to_gcc(order));
|
||||
}
|
||||
@@ -980,7 +982,8 @@ class base_atomic<T, void, 16, Sign>
|
||||
|
||||
value_type exchange(value_type const& v, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT
|
||||
{
|
||||
- storage_type tmp = 0;
|
||||
+ storage_type tmp;
|
||||
+ memset(&tmp, 0, sizeof(tmp));
|
||||
memcpy(&tmp, &v, sizeof(value_type));
|
||||
tmp = __atomic_exchange_n(&v_, tmp, atomics::detail::convert_memory_order_to_gcc(order));
|
||||
value_type res;
|
||||
@@ -994,7 +997,9 @@ class base_atomic<T, void, 16, Sign>
|
||||
memory_order success_order,
|
||||
memory_order failure_order) volatile BOOST_NOEXCEPT
|
||||
{
|
||||
- storage_type expected_s = 0, desired_s = 0;
|
||||
+ storage_type expected_s, desired_s;
|
||||
+ memset(&expected_s, 0, sizeof(expected_s));
|
||||
+ memset(&desired_s, 0, sizeof(desired_s));
|
||||
memcpy(&expected_s, &expected, sizeof(value_type));
|
||||
memcpy(&desired_s, &desired, sizeof(value_type));
|
||||
const bool success = __atomic_compare_exchange_n(&v_, &expected_s, desired_s, false,
|
||||
@@ -1010,7 +1015,9 @@ class base_atomic<T, void, 16, Sign>
|
||||
memory_order success_order,
|
||||
memory_order failure_order) volatile BOOST_NOEXCEPT
|
||||
{
|
||||
- storage_type expected_s = 0, desired_s = 0;
|
||||
+ storage_type expected_s, desired_s;
|
||||
+ memset(&expected_s, 0, sizeof(expected_s));
|
||||
+ memset(&desired_s, 0, sizeof(desired_s));
|
||||
memcpy(&expected_s, &expected, sizeof(value_type));
|
||||
memcpy(&desired_s, &desired, sizeof(value_type));
|
||||
const bool success = __atomic_compare_exchange_n(&v_, &expected_s, desired_s, true,
|
|
@ -1,45 +0,0 @@
|
|||
diff --git a/tools/build/src/tools/python.jam b/tools/build/src/tools/python.jam
|
||||
index 273b28a..2d2031e 100644
|
||||
--- a/tools/build/v2/tools/python.jam
|
||||
+++ b/tools/build/v2/tools/python.jam
|
||||
@@ -428,13 +428,7 @@ local rule windows-installed-pythons ( version ? )
|
||||
|
||||
local rule darwin-installed-pythons ( version ? )
|
||||
{
|
||||
- version ?= $(.version-countdown) ;
|
||||
-
|
||||
- local prefix
|
||||
- = [ GLOB /System/Library/Frameworks /Library/Frameworks
|
||||
- : Python.framework ] ;
|
||||
-
|
||||
- return $(prefix)/Versions/$(version)/bin/python ;
|
||||
+ return ;
|
||||
}
|
||||
|
||||
|
||||
@@ -890,25 +884,6 @@ local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? :
|
||||
|
||||
# See if we can find a framework directory on darwin.
|
||||
local framework-directory ;
|
||||
- if $(target-os) = darwin
|
||||
- {
|
||||
- # Search upward for the framework directory.
|
||||
- local framework-directory = $(libraries[-1]) ;
|
||||
- while $(framework-directory:D=) && $(framework-directory:D=) != Python.framework
|
||||
- {
|
||||
- framework-directory = $(framework-directory:D) ;
|
||||
- }
|
||||
-
|
||||
- if $(framework-directory:D=) = Python.framework
|
||||
- {
|
||||
- debug-message framework directory is \"$(framework-directory)\" ;
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- debug-message "no framework directory found; using library path" ;
|
||||
- framework-directory = ;
|
||||
- }
|
||||
- }
|
||||
|
||||
local dll-path = $(libraries) ;
|
||||
|
|
@ -5,32 +5,17 @@
|
|||
}:
|
||||
|
||||
let
|
||||
# for boost 1.55 we need to use 1.56's b2
|
||||
# since 1.55's build system is not working
|
||||
# with our derivation
|
||||
useBoost156 = rec {
|
||||
version = "1.56.0";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/boost/boost_${lib.replaceStrings ["."] ["_"] version}.tar.bz2";
|
||||
sha256 = "07gz62nj767qzwqm3xjh11znpyph8gcii0cqhnx7wvismyn34iqk";
|
||||
};
|
||||
};
|
||||
|
||||
makeBoost = file:
|
||||
lib.fix (self:
|
||||
callPackage file {
|
||||
boost-build = boost-build.override {
|
||||
# useBoost allows us passing in src and version from
|
||||
# the derivation we are building to get a matching b2 version.
|
||||
useBoost =
|
||||
if lib.versionAtLeast self.version "1.56"
|
||||
then self
|
||||
else useBoost156; # see above
|
||||
useBoost = self;
|
||||
};
|
||||
}
|
||||
);
|
||||
in {
|
||||
boost155 = makeBoost ./1.55.nix;
|
||||
boost159 = makeBoost ./1.59.nix;
|
||||
boost160 = makeBoost ./1.60.nix;
|
||||
boost165 = makeBoost ./1.65.nix;
|
||||
|
|
|
@ -1,64 +0,0 @@
|
|||
https://svn.boost.org/trac/boost/ticket/10125
|
||||
|
||||
boost/thread/pthread/once.hpp | 6 +++---
|
||||
boost/thread/pthread/once_atomic.hpp | 2 +-
|
||||
boost/thread/win32/once.hpp | 2 +-
|
||||
3 files changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/boost/thread/pthread/once.hpp b/boost/thread/pthread/once.hpp
|
||||
index ccfb051..0bef038 100644
|
||||
--- a/boost/thread/pthread/once.hpp
|
||||
+++ b/boost/thread/pthread/once.hpp
|
||||
@@ -42,7 +42,7 @@ namespace boost
|
||||
}
|
||||
|
||||
#ifdef BOOST_THREAD_PROVIDES_ONCE_CXX11
|
||||
-#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
|
||||
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
|
||||
template<typename Function, class ...ArgTypes>
|
||||
inline void call_once(once_flag& flag, BOOST_THREAD_RV_REF(Function) f, BOOST_THREAD_RV_REF(ArgTypes)... args);
|
||||
#else
|
||||
@@ -65,7 +65,7 @@ namespace boost
|
||||
private:
|
||||
volatile thread_detail::uintmax_atomic_t epoch;
|
||||
|
||||
-#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
|
||||
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
|
||||
template<typename Function, class ...ArgTypes>
|
||||
friend void call_once(once_flag& flag, BOOST_THREAD_RV_REF(Function) f, BOOST_THREAD_RV_REF(ArgTypes)... args);
|
||||
#else
|
||||
@@ -118,7 +118,7 @@ namespace boost
|
||||
// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2444.html
|
||||
|
||||
|
||||
-#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
|
||||
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
|
||||
|
||||
|
||||
template<typename Function, class ...ArgTypes>
|
||||
diff --git a/boost/thread/pthread/once_atomic.hpp b/boost/thread/pthread/once_atomic.hpp
|
||||
index 9e2f876..923f07b 100644
|
||||
--- a/boost/thread/pthread/once_atomic.hpp
|
||||
+++ b/boost/thread/pthread/once_atomic.hpp
|
||||
@@ -115,7 +115,7 @@ namespace boost
|
||||
#endif
|
||||
|
||||
|
||||
-#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
|
||||
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
|
||||
|
||||
template<typename Function, class ...ArgTypes>
|
||||
inline void call_once(once_flag& flag, BOOST_THREAD_RV_REF(Function) f, BOOST_THREAD_RV_REF(ArgTypes)... args)
|
||||
diff --git a/boost/thread/win32/once.hpp b/boost/thread/win32/once.hpp
|
||||
index cafcfd4..9b37b31 100644
|
||||
--- a/boost/thread/win32/once.hpp
|
||||
+++ b/boost/thread/win32/once.hpp
|
||||
@@ -227,7 +227,7 @@ namespace boost
|
||||
}
|
||||
}
|
||||
|
||||
-#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
|
||||
+#if !defined BOOST_NO_CXX11_VARIADIC_TEMPLATES && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
|
||||
//#if defined(BOOST_THREAD_RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR)
|
||||
inline void call_once(once_flag& flag, void (*f)())
|
||||
{
|
|
@ -118,10 +118,7 @@ stdenv.mkDerivation {
|
|||
patchFlags = [];
|
||||
|
||||
patches = patches
|
||||
++ optional stdenv.isDarwin (
|
||||
if version == "1.55.0"
|
||||
then ./darwin-1.55-no-system-python.patch
|
||||
else ./darwin-no-system-python.patch)
|
||||
++ optional stdenv.isDarwin ./darwin-no-system-python.patch
|
||||
# Fix boost-context segmentation faults on ppc64 due to ABI violation
|
||||
++ optional (versionAtLeast version "1.61" &&
|
||||
versionOlder version "1.71") (fetchpatch {
|
||||
|
|
|
@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "http://www.dlib.net";
|
||||
license = licenses.boost;
|
||||
maintainers = with maintainers; [ christopherpoole ma27 ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "drogon";
|
||||
version = "1.7.5";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "drogonframework";
|
||||
repo = "drogon";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DrpaXUaoO35DgmX8cYb3kbXfd6PlqI6pjEKnroiRxvg=";
|
||||
sha256 = "sha256-rpn1TaEdiD/tM8F0Uc7yjF3EFGpu3/hAS0CITraLkMU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
@ -8,13 +8,13 @@
|
|||
nv-codec-headers = nv-codec-headers-11;
|
||||
}).overrideAttrs (old: rec {
|
||||
pname = "jellyfin-ffmpeg";
|
||||
version = "5.1-1";
|
||||
version = "5.1-2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jellyfin";
|
||||
repo = "jellyfin-ffmpeg";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-R3+SJ2RNaRRK6+N9eGOf/0qUgaXkT/cswkxf+7W2+Fo=";
|
||||
sha256 = "sha256-lw2W65mbBhiSnegxLSRqDz2WMM82ght/KB4i+5BiL4o=";
|
||||
};
|
||||
|
||||
configureFlags = old.configureFlags ++ [
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, libsamplerate, libsndfile, fftw
|
||||
, vamp-plugin-sdk, ladspaH, meson, ninja }:
|
||||
, vamp-plugin-sdk, ladspaH, meson, ninja, darwin }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rubberband";
|
||||
|
@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config meson ninja ];
|
||||
buildInputs = [ libsamplerate libsndfile fftw vamp-plugin-sdk ladspaH ];
|
||||
buildInputs = [ libsamplerate libsndfile fftw vamp-plugin-sdk ladspaH ] ++ lib.optionals stdenv.isDarwin
|
||||
(with darwin.apple_sdk.frameworks; [Accelerate CoreGraphics CoreVideo]);
|
||||
makeFlags = [ "AR:=$(AR)" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -20,6 +21,6 @@ stdenv.mkDerivation rec {
|
|||
# commercial license available as well, see homepage. You'll get some more optimized routines
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.goibhniu maintainers.marcweber ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aesedb";
|
||||
version = "0.0.7";
|
||||
version = "0.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-zDzTQ7drq2jFvTO170GKbY76HjnWcFbcw9YSfDnltGQ=";
|
||||
hash = "sha256-TetXhDrWG6MECm/nhsZDUwcOJwP5drFO+YLarGC2pak=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "minikerberos";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-3uh0iFBD+WW4DWl1gcwfGERCq21CrF8iggNKULnAhUE=";
|
||||
hash = "sha256-wFz82EaxlzsrDVAenp+iomNUPXdisFL8gD/B3oSShqM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tfsec";
|
||||
version = "1.27.5";
|
||||
version = "1.27.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-uywh5wYA1MD/7VJWfXvDaV8pYoj4i7Ais2fSAiljX7Q=";
|
||||
hash = "sha256-dQ0Hx98MZTHBUrttJqjXu98OWLBoN071NGr9leLQbBs=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
@ -22,7 +22,7 @@ buildGoModule rec {
|
|||
# "-extldflags '-fno-PIC -static'"
|
||||
];
|
||||
|
||||
vendorSha256 = "sha256-VL1kR8iL/mvtdRZPyp4lG2hClwdNOjQPpaOBsOxATds=";
|
||||
vendorSha256 = "sha256-QwMoieziiQsD22qrjHJA+Yjar+wrwx1/37PaS3ghUiU=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/tfsec"
|
||||
|
|
|
@ -43,13 +43,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "github-runner";
|
||||
version = "2.296.0";
|
||||
version = "2.296.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "actions";
|
||||
repo = "runner";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-TLBd+L4k/qtY9q0j+soxaLCfER/USZyYCqk0r8A6sSo=";
|
||||
hash = "sha256-vE1x/wRzjcRR56jUgW8PVM2SzsG87IKXOZghloZBgYM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "seer";
|
||||
version = "1.8";
|
||||
version = "1.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "epasveer";
|
||||
repo = "seer";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Qx58oXSy1z8q9Tdgps6PlBrHutWs50E6K/M5vJKcjB0=";
|
||||
sha256 = "sha256-YIxKjykhuxTAr0kEmlj2JFA2NRs1vknpoJAGEoshwtg=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "oh-my-posh";
|
||||
version = "8.36.4";
|
||||
version = "8.36.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jandedobbeleer";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-aTpAFERzNKezZU3+B5Ni4qasqJrpOwNBbZ5zeJLwGUM=";
|
||||
sha256 = "sha256-Q2vp8NkWroU/p74oB3MeGYC+Ld6Z62fjEwIMiAGjHTo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-t4FpvXsGVsTYoGM8wY2JelscnlmDzrLMPYk7zGUfo58=";
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "pscale";
|
||||
version = "0.113.0";
|
||||
version = "0.115.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "planetscale";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-I7zAICnc9MqQtk3KXixJenfTWsZSlxYjhj48bdgtU3w=";
|
||||
sha256 = "sha256-XiTH3Ep7dTvAdE3AAjPJztEcnvWqX+qf/zED8xpC9N0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-nIoVmuD4kW0SeFLqsZgw0fZmbhdNN8VTqlmaB9SRU6s=";
|
||||
vendorSha256 = "sha256-arTp77VocH5isIoq3B55G/6sQjVbmoduCywiJYJaAws=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
|
|
|
@ -57,5 +57,6 @@ stdenv.mkDerivation rec {
|
|||
license = with licenses; [ lgpl21Only gpl2Only mit ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.bjornfor ];
|
||||
broken = (lib.versions.majorMinor kernel.modDirVersion) == "5.10";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "qovery-cli";
|
||||
version = "0.45.0";
|
||||
version = "0.46.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Qovery";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cJb5Cac7WDhtNL/7uIIvAz7Kum3Ff2g6tmKyTJWvq00=";
|
||||
hash = "sha256-DNwAsHznu+I8CItyvz4fG7QZDuQQvYPRYiy4qJbKZ3s=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-KHLknBymDAwr7OxS2Ysx6WU5KQ9kmw0bE2Hlp3CBW0c=";
|
||||
vendorSha256 = "sha256-4TY7/prMbvw5zVPJRoMLg7Omrxvh1HPGsdz1wqPn4uU=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Qovery Command Line Interface";
|
||||
|
|
|
@ -33,7 +33,7 @@ xorg,
|
|||
}:
|
||||
|
||||
let
|
||||
version = "1.32.6";
|
||||
version = "1.33.0";
|
||||
|
||||
rpath = lib.makeLibraryPath [
|
||||
alsa-lib
|
||||
|
@ -82,7 +82,7 @@ let
|
|||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb";
|
||||
sha256 = "sha256-lrdDy8wtkIBQC/OPdSoKmOFIuajKeu1qtyRHOLZSSVI=";
|
||||
sha256 = "sha256-P5QNSFaE04YP+zOPWKE5Rf6vffhcBwNdju7aTTnDbJ0=";
|
||||
}
|
||||
else
|
||||
throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}";
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "mutagen-compose";
|
||||
version = "0.15.1";
|
||||
version = "0.15.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mutagen-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vdgAil/88fl5/UhsbbAWrxh/YUiGbyXj4pqZFv4YwHc=";
|
||||
sha256 = "sha256-Ass6BXOevFuyT6eLZ8J5XRN44YAfBdoQ7N+/5152uR0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-qb0auYQJHnpGafonWoYq3tax6uLdOCIdz+oZ7I6bytk=";
|
||||
vendorSha256 = "sha256-rzMcUQvP27GBGohcWrSzu7fEP6lwEwgo3sWXuEeZES8=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gopsuinfo";
|
||||
version = "0.1.1";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nwg-piotr";
|
||||
repo = "gopsuinfo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-lEc5k89L0ViihcbYh6I5m+Z6Q/rhLFGwftc3WD2EJ/M=";
|
||||
sha256 = "sha256-atUx035Tyy73AUBvhyo8cUHID5pTKj2/+PX9i/TRfoE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-RsplFwUL4KjWaXE6xvURX+4wkNG+i+1oyBXwLyVcb2Q=";
|
||||
|
|
|
@ -17506,7 +17506,6 @@ with pkgs;
|
|||
boolstuff = callPackage ../development/libraries/boolstuff { };
|
||||
|
||||
inherit (callPackage ../development/libraries/boost { inherit (buildPackages) boost-build; })
|
||||
boost155
|
||||
boost159
|
||||
boost160
|
||||
boost165
|
||||
|
@ -33093,7 +33092,7 @@ with pkgs;
|
|||
gl117 = callPackage ../games/gl-117 { };
|
||||
|
||||
globulation2 = callPackage ../games/globulation {
|
||||
boost = boost155;
|
||||
boost = boost168; # breaks with >= boost169
|
||||
};
|
||||
|
||||
gltron = callPackage ../games/gltron { };
|
||||
|
@ -33569,7 +33568,7 @@ with pkgs;
|
|||
space-orbit = callPackage ../games/space-orbit { };
|
||||
|
||||
spring = callPackage ../games/spring
|
||||
{ stdenv = gcc10StdenvCompat; asciidoc = asciidoc-full; boost = boost155; };
|
||||
{ stdenv = gcc10StdenvCompat; asciidoc = asciidoc-full; };
|
||||
|
||||
springLobby = callPackage ../games/spring/springlobby.nix { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue