BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2022-06-10 00:02:50 +00:00 committed by GitHub
commit 15065572a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
43 changed files with 1342 additions and 1043 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/virtualisation/podman/default.nix
View file

@ -153,6 +153,12 @@ in
systemd.sockets.podman.wantedBy = [ "sockets.target" ];
systemd.sockets.podman.socketConfig.SocketGroup = "podman";
systemd.user.services.podman.serviceConfig = {
ExecStart = [ "" "${cfg.package}/bin/podman $LOGGING system service" ];
};
systemd.user.sockets.podman.wantedBy = [ "sockets.target" ];
systemd.tmpfiles.packages = [
# The /run/podman rule interferes with our podman group, so we remove
# it and let the systemd socket logic take care of it.

12
pkgs/applications/editors/vim/plugins/generated.nix
View file

@ -556,6 +556,18 @@ final: prev:
meta.homepage = "https://github.com/vim-scripts/align/";
};
alpha-nvim = buildVimPluginFrom2Nix {
pname = "alpha-nvim";
version = "2022-04-22";
src = fetchFromGitHub {
owner = "goolord";
repo = "alpha-nvim";
rev = "4781fcfea5ddc1a92d41b32dc325132ed6fce7a8";
sha256 = "03i75403lskpgaqv7xp5hk4v6kqb0sv15ciil9jyj735ylhry3qq";
};
meta.homepage = "https://github.com/goolord/alpha-nvim/";
};
aniseed = buildVimPluginFrom2Nix {
pname = "aniseed";
version = "2022-05-14";

1
pkgs/applications/editors/vim/plugins/vim-plugin-names
View file

@ -45,6 +45,7 @@ https://github.com/derekelkins/agda-vim/,,
https://github.com/slashmili/alchemist.vim/,,
https://github.com/dense-analysis/ale/,,
https://github.com/vim-scripts/align/,,
https://github.com/goolord/alpha-nvim/,HEAD,
https://github.com/Olical/aniseed/,,
https://github.com/pearofducks/ansible-vim/,,
https://github.com/ckarnell/antonys-macro-repeater/,,

108
pkgs/applications/misc/polychromatic/default.nix Normal file
View file

@ -0,0 +1,108 @@
{ lib
, fetchFromGitHub
, bash
, cairo
, glib
, qt5
, hicolor-icon-theme
, gdk-pixbuf
, imagemagick
, desktop-file-utils
, ninja
, meson
, sassc
, ibus
, usbutils
, libxcb
, python3Packages
, gobject-introspection
, gtk3
, wrapGAppsHook
, libappindicator-gtk3
}:
python3Packages.buildPythonApplication rec {
name = "polychromatic";
version = "0.7.3";
format = "other";
src = fetchFromGitHub {
owner = "polychromatic";
repo = "polychromatic";
rev = "v${version}";
sha256 = "sha256-H++kQ3Fxw56avEsSE1ctu5p0s50s0eQ+jL5zXS3AA94=";
};
postPatch = ''
patchShebangs scripts
substituteInPlace scripts/build-styles.sh \
--replace '$(which sassc 2>/dev/null)' '${sassc}/bin/sassc' \
--replace '$(which sass 2>/dev/null)' '${sassc}/bin/sass'
substituteInPlace pylib/common.py --replace "/usr/share/polychromatic" "$out/share/polychromatic"
'';
preConfigure = ''
scripts/build-styles.sh
'';
buildInputs = [
cairo
hicolor-icon-theme
];
pythonPath = with python3Packages; [
openrazer
pyqt5
pyqtwebengine
];
propagatedBuildInputs = with python3Packages; [
libxcb
colour
colorama
setproctitle
openrazer
openrazer-daemon
requests
ibus
usbutils
pyqt5
libappindicator-gtk3
];
nativeBuildInputs = with python3Packages; [
pyqt5
desktop-file-utils
qt5.wrapQtAppsHook
wrapGAppsHook
ninja
meson
sassc
];
propagatedNativeBuildInputs = [
gobject-introspection
gtk3
gdk-pixbuf
imagemagick
];
makeWrapperArgs = [
"\${qtWrapperArgs[@]}"
];
meta = with lib; {
homepage = "https://polychromatic.app/";
description = "Graphical front-end and tray applet for configuring Razer peripherals on GNU/Linux.";
longDescription = ''
Polychromatic is a frontend for OpenRazer that enables Razer devices
to control lighting effects and more on GNU/Linux.
'';
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ evanjs ];
};
}

4
pkgs/applications/networking/browsers/vivaldi/default.nix
View file

@ -20,11 +20,11 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
version = "5.2.2623.41-1";
version = "5.3.2679.38-1";
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
sha256 = "1kyjplymibvs82bqyjmm0vyv08yg4acl2jghh24rm9x53si6qf2d";
sha256 = "0jsmk12riai8nkj6zqc1frh4fl4w4zj3mncfgrs4niy6dvpasaja";
};
unpackPhase = ''

6
pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "chromium-codecs-ffmpeg-extra";
version = "101.0.4951.15";
version = "102.0.5005.49";
src = fetchurl {
url = "https://launchpadlibrarian.net/594594495/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb";
sha256 = "sha256-aelr/jODmgyVunSFFn6W+QHEmSWJeWzU4SaS5rjHli4=";
url = "https://launchpadlibrarian.net/601067148/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb";
sha256 = "sha256-b0oTDOi9VY+8v4JUAGkqdcum4uis08/v+COTx8eHBXg=";
};
buildInputs = [ dpkg ];

6
pkgs/applications/version-management/git-and-tools/gh/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gh";
version = "2.12.0";
version = "2.12.1";
src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-gJwSnaOJc7W5zA/7D8tmXi3g+or5cNIlJ2J6gS51D6I=";
sha256 = "sha256-zKEHrnMTz+gPU1A9tjqUO5FLD1zQcnbU7pwVQnYI6uA=";
};
vendorSha256 = "sha256-du4IQNQPwM245yr0dSe1C7TU6gaFgvZhxaXi3xsKuWY=";
vendorSha256 = "sha256-sHRahwavPgowKE0EtDU4UNxIJU22edqlY0nOKkaQLPg=";
nativeBuildInputs = [ installShellFiles ];

5
pkgs/applications/version-management/subversion/default.nix
View file

@ -6,6 +6,7 @@
, javahlBindings ? false
, saslSupport ? false
, lib, stdenv, fetchurl, apr, aprutil, zlib, sqlite, openssl, lz4, utf8proc
, CoreServices, Security
, autoconf, libtool
, apacheHttpd ? null, expat, swig ? null, jdk ? null, python3 ? null, py3c ? null, perl ? null
, sasl ? null, serf ? null
@ -38,7 +39,8 @@ let
++ lib.optional httpSupport serf
++ lib.optionals pythonBindings [ python3 py3c ]
++ lib.optional perlBindings perl
++ lib.optional saslSupport sasl;
++ lib.optional saslSupport sasl
++ lib.optional stdenv.hostPlatform.isDarwin [ CoreServices Security ];
patches = [ ./apr-1.patch ] ++ extraPatches;
@ -57,7 +59,6 @@ let
(lib.withFeatureAs (pythonBindings || perlBindings) "swig" swig)
(lib.withFeatureAs saslSupport "sasl" sasl)
(lib.withFeatureAs httpSupport "serf" serf)
"--disable-keychain"
"--with-zlib=${zlib.dev}"
"--with-sqlite=${sqlite.dev}"
] ++ lib.optionals javahlBindings [

13
pkgs/applications/window-managers/eww/Cargo.lock.patch Normal file
View file

@ -0,0 +1,13 @@
diff --git a/Cargo.lock b/Cargo.lock
index 9ae7ab9..c810728 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -403,7 +403,7 @@ dependencies = [
[[package]]
name = "eww"
-version = "0.2.0"
+version = "0.3.0"
dependencies = [
"anyhow",
"bincode",

8
pkgs/applications/window-managers/eww/default.nix
View file

@ -10,16 +10,18 @@
rustPlatform.buildRustPackage rec {
pname = "eww";
version = "0.2.0";
version = "0.3.0";
src = fetchFromGitHub {
owner = "elkowar";
repo = pname;
rev = "v${version}";
sha256 = "050zc3w1z9f2vg6sz86mdxf345gd3s3jf09gf4y8y1mqkzs86b8x";
sha256 = "055il2b3k8x6mrrjin6vkajpksc40phcp4j1iq0pi8v3j7zsfk1a";
};
cargoSha256 = "sha256-LejnTVv9rhL9CVW1fgj2gFv4amHQeziu5uaH2ae8AAw=";
cargoSha256 = "sha256-3hGA730g8E4rwQ9V0wSLUcAEmockXi+spwp50cgf0Mw=";
cargoPatches = [ ./Cargo.lock.patch ];
nativeBuildInputs = [ pkg-config ];

4
pkgs/development/compilers/kotlin/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "kotlin";
version = "1.6.21";
version = "1.7.0";
src = fetchurl {
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
hash = "sha256-YyFm/tifP0MEgvWqB/LiC5I7cu9ojI9affOqFQLG2Lo=";
hash = "sha256-9SFmRK2BVx5dti7CMi/gdGiSe9pA9RFH7WJqKIS1X5o=";
};
propagatedBuildInputs = [ jre ] ;

8
pkgs/development/compilers/kotlin/native.nix
View file

@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
pname = "kotlin-native";
version = "1.6.21";
version = "1.7.0";
src = let
getArch = {
@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
"https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-native-${arch}-${version}.tar.gz";
getHash = arch: {
"macos-aarch64" = "sha256-kkJvlDtK0Y+zeht+9fLX2HL2fyKOIyo0qYkJk+35tMU=";
"macos-x86_64" = "sha256-znTMO8h0pC6bkSUVYmxWPe4HVQPQw/VcJM11ckmG8CA=";
"linux-x86_64" = "sha256-r1H2riRLsZl5+65tw6/cp7rkJWjWoz8PozHt1mWmEfo=";
"macos-aarch64" = "sha256-Xx9MH7QJDCfbPK9fA5U1ZoVbuLoIJyy7QEFMlCD9JXw=";
"macos-x86_64" = "sha256-s5qFpuWeke7LCfUSkNyXBOgWdSJ1+cs6g7mU1osU/J8=";
"linux-x86_64" = "sha256-CnDam72UBSM/aNelhj0JjLNy9gFx5WIPAjtvubnpmpw=";
}.${arch};
in
fetchurl {

1
pkgs/development/compilers/llvm/11/llvm/default.nix
View file

@ -115,6 +115,7 @@ in stdenv.mkDerivation (rec {
rm test/DebugInfo/X86/convert-inlined.ll
rm test/DebugInfo/X86/convert-linked.ll
rm test/tools/dsymutil/X86/op-convert.test
rm test/tools/gold/X86/split-dwarf.ll
rm test/tools/llvm-readobj/ELF/dependent-libraries.test
'' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") ''
# Seems to require certain floating point hardware (NEON?)

2
pkgs/development/compilers/llvm/12/llvm/default.nix
View file

@ -104,6 +104,8 @@ in stdenv.mkDerivation (rec {
rm test/DebugInfo/X86/convert-inlined.ll
rm test/DebugInfo/X86/convert-linked.ll
rm test/tools/dsymutil/X86/op-convert.test
rm test/tools/gold/X86/split-dwarf.ll
rm test/tools/llvm-objcopy/MachO/universal-object.test
'' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") ''
# Seems to require certain floating point hardware (NEON?)
rm test/ExecutionEngine/frem.ll

1
pkgs/development/compilers/llvm/13/llvm/default.nix
View file

@ -94,6 +94,7 @@ in stdenv.mkDerivation (rec {
rm test/DebugInfo/X86/convert-inlined.ll
rm test/DebugInfo/X86/convert-linked.ll
rm test/tools/dsymutil/X86/op-convert.test
rm test/tools/gold/X86/split-dwarf.ll
'' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") ''
# Seems to require certain floating point hardware (NEON?)
rm test/ExecutionEngine/frem.ll

9
pkgs/development/compilers/llvm/14/libcxx/default.nix
View file

@ -62,15 +62,6 @@ stdenv.mkDerivation rec {
buildFlags = lib.optional headersOnly "generate-cxx-headers";
installTargets = lib.optional headersOnly "install-cxx-headers";
# At this point, cxxabi headers would be installed in the dev output, which
# prevents moveToOutput from doing its job later in the build process.
postInstall = lib.optionalString (!headersOnly) ''
mv "$dev/include/c++/v1/"* "$out/include/c++/v1/"
pushd "$dev"
rmdir -p include/c++/v1
popd
'';
passthru = {
isLLVM = true;
};

76
pkgs/development/compilers/llvm/14/libcxx/gnu-install-dirs.patch
View file

@ -1,85 +1,21 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b0569a4a54ca..7d665f5a3258 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,6 +10,8 @@ endif()
#===============================================================================
cmake_minimum_required(VERSION 3.13.4)
+include(GNUInstallDirs)
+
set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
# Add path for custom modules
@@ -415,13 +417,13 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
@@ -436,7 +436,7 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE})
set(LIBCXX_GENERATED_INCLUDE_DIR "${LLVM_BINARY_DIR}/include/c++/v1")
set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LLVM_BINARY_DIR}/include/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1")
- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH
+ set(LIBCXX_INSTALL_LIBRARY_DIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}" CACHE PATH
"Path where built libc++ libraries should be installed.")
- set(LIBCXX_INSTALL_RUNTIME_DIR bin CACHE PATH
+ set(LIBCXX_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH
"Path where built libc++ runtime libraries should be installed.")
- set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH
+ set(LIBCXX_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1" CACHE PATH
"Path where target-agnostic libc++ headers should be installed.")
- set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "include/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1" CACHE PATH
+ set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${CMAKE_INSTALL_INCLUDEDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1" CACHE PATH
set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${CMAKE_INSTALL_INCLUDEDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1" CACHE PATH
"Path where target-specific libc++ headers should be installed.")
if(LIBCXX_LIBDIR_SUBDIR)
string(APPEND LIBCXX_LIBRARY_DIR /${LIBCXX_LIBDIR_SUBDIR})
@@ -431,11 +433,11 @@ elseif(LLVM_LIBRARY_OUTPUT_INTDIR)
set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR})
set(LIBCXX_GENERATED_INCLUDE_DIR "${LLVM_BINARY_DIR}/include/c++/v1")
@@ -453,7 +453,7 @@ else()
set(LIBCXX_GENERATED_INCLUDE_DIR "${CMAKE_BINARY_DIR}/include/c++/v1")
endif()
set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LIBCXX_GENERATED_INCLUDE_DIR}")
- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX} CACHE PATH
+ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} CACHE PATH
+ set(LIBCXX_INSTALL_LIBRARY_DIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" CACHE PATH
"Path where built libc++ libraries should be installed.")
- set(LIBCXX_INSTALL_RUNTIME_DIR bin CACHE PATH
+ set(LIBCXX_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}/c++/v1" CACHE PATH
"Path where built libc++ runtime libraries should be installed.")
- set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH
+ set(LIBCXX_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1" CACHE PATH
"Path where target-agnostic libc++ headers should be installed.")
set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${LIBCXX_INSTALL_INCLUDE_DIR}" CACHE PATH
"Path where target-specific libc++ headers should be installed.")
@@ -443,11 +445,11 @@ else()
set(LIBCXX_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXX_LIBDIR_SUFFIX})
set(LIBCXX_GENERATED_INCLUDE_DIR "${CMAKE_BINARY_DIR}/include/c++/v1")
set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LIBCXX_GENERATED_INCLUDE_DIR}")
- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX} CACHE PATH
+ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} CACHE PATH
"Path where built libc++ libraries should be installed.")
- set(LIBCXX_INSTALL_RUNTIME_DIR bin CACHE PATH
+ set(LIBCXX_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH
"Path where built libc++ runtime libraries should be installed.")
- set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH
+ set(LIBCXX_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1" CACHE PATH
"Path where target-agnostic libc++ headers should be installed.")
set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${LIBCXX_INSTALL_INCLUDE_DIR}" CACHE PATH
"Path where target-specific libc++ headers should be installed.")
diff --git a/cmake/Modules/HandleLibCXXABI.cmake b/cmake/Modules/HandleLibCXXABI.cmake
index 5a8a4a270a1a..d69405ddeeac 100644
--- a/cmake/Modules/HandleLibCXXABI.cmake
+++ b/cmake/Modules/HandleLibCXXABI.cmake
@@ -1,8 +1,9 @@
-
#===============================================================================
# Add an ABI library if appropriate
#===============================================================================
+include(GNUInstallDirs)
+
#
# _setup_abi: Set up the build to use an ABI library
#
@@ -63,7 +64,7 @@ macro(setup_abi_lib abidefines abishared abistatic abifiles abidirs)
if (LIBCXX_INSTALL_HEADERS)
install(FILES "${LIBCXX_BINARY_INCLUDE_DIR}/${fpath}"
- DESTINATION include/c++/v1/${dstdir}
+ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dstdir}"
COMPONENT cxx-headers
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
)

1
pkgs/development/compilers/llvm/14/libcxxabi/default.nix
View file

@ -82,6 +82,5 @@ stdenv.mkDerivation rec {
# the UIUC License (a BSD-like license)":
license = with lib.licenses; [ mit ncsa ];
maintainers = llvm_meta.maintainers ++ [ lib.maintainers.vlstill ];
broken = true; # TODO: gnu-install-dirs.patch fails to apply
};
}

36
pkgs/development/compilers/llvm/14/libcxxabi/gnu-install-dirs.patch
View file

@ -1,46 +1,22 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 858f5d5cfd7f..16c67d7062be 100644
index ecbc7091864e..53ba2dbc3bd1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,6 +10,8 @@ endif()
cmake_minimum_required(VERSION 3.13.4)
+include(GNUInstallDirs)
+
set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
# Add path for custom modules
@@ -213,9 +215,9 @@ set(CMAKE_MODULE_PATH
@@ -216,7 +216,7 @@ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH
if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR})
set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE})
- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH
+ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH
"Path where built libc++abi libraries should be installed.")
- set(LIBCXXABI_INSTALL_RUNTIME_DIR bin CACHE PATH
+ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH
"Path where built libc++abi runtime libraries should be installed.")
if(LIBCXX_LIBDIR_SUBDIR)
string(APPEND LIBCXXABI_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR})
@@ -224,16 +226,16 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
elseif(LLVM_LIBRARY_OUTPUT_INTDIR)
set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR})
set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR})
@@ -230,7 +230,7 @@ else()
set(LIBCXXABI_HEADER_DIR ${CMAKE_BINARY_DIR})
set(LIBCXXABI_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXXABI_LIBDIR_SUFFIX})
endif()
- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH
+ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH
"Path where built libc++abi libraries should be installed.")
- set(LIBCXXABI_INSTALL_RUNTIME_DIR bin CACHE PATH
+ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH
"Path where built libc++abi runtime libraries should be installed.")
else()
set(LIBCXXABI_HEADER_DIR ${CMAKE_BINARY_DIR})
set(LIBCXXABI_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXXABI_LIBDIR_SUFFIX})
- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH
+ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH
"Path where built libc++abi libraries should be installed.")
- set(LIBCXXABI_INSTALL_RUNTIME_DIR bin CACHE PATH
+ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH
"Path where built libc++abi runtime libraries should be installed.")
endif()

1
pkgs/development/compilers/llvm/14/libunwind/default.nix
View file

@ -43,6 +43,5 @@ stdenv.mkDerivation rec {
I). It is a dependency of the C++ ABI library, and sometimes is a
dependency of other runtimes.
'';
broken = true; # TODO: gnu-install-dirs.patch fails to apply
};
}

52
pkgs/development/compilers/llvm/14/libunwind/gnu-install-dirs.patch
View file

@ -1,65 +1,21 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e3cc66dd2226..1299b596ce0d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,6 +8,8 @@ endif()
cmake_minimum_required(VERSION 3.13.4)
+include(GNUInstallDirs)
+
set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
# Add path for custom modules
@@ -139,25 +141,27 @@ set(CMAKE_MODULE_PATH
@@ -147,7 +147,7 @@ set(LIBUNWIND_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH
if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE})
- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH
+ set(LIBUNWIND_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}" CACHE PATH
+ "Path where built libunwind headers should be installed.")
+ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH
"Path where built libunwind libraries should be installed.")
- set(LIBUNWIND_INSTALL_RUNTIME_DIR bin CACHE PATH
+ set(LIBUNWIND_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH
"Path where built libunwind runtime libraries should be installed.")
if(LIBCXX_LIBDIR_SUBDIR)
string(APPEND LIBUNWIND_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR})
string(APPEND LIBUNWIND_INSTALL_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR})
@@ -159,7 +159,7 @@ else()
else()
set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX})
endif()
-elseif(LLVM_LIBRARY_OUTPUT_INTDIR)
- set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR})
- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH
- "Path where built libunwind libraries should be installed.")
- set(LIBUNWIND_INSTALL_RUNTIME_DIR bin CACHE PATH
- "Path where built libunwind runtime libraries should be installed.")
else()
- set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX})
- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH
+ if(LLVM_LIBRARY_OUTPUT_INTDIR)
+ set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR})
+ else()
+ set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX})
+ endif()
+ set(LIBUNWIND_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}" CACHE PATH
+ "Path where built libunwind headers should be installed.")
+ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH
"Path where built libunwind libraries should be installed.")
- set(LIBUNWIND_INSTALL_RUNTIME_DIR bin CACHE PATH
+ set(LIBUNWIND_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH
"Path where built libunwind runtime libraries should be installed.")
endif()
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index c3bb1dd0f69f..adf1766c44cb 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -14,7 +14,7 @@ if(LIBUNWIND_INSTALL_HEADERS)
foreach(file ${files})
get_filename_component(dir ${file} DIRECTORY)
install(FILES ${file}
- DESTINATION "include/${dir}"
+ DESTINATION "${LIBUNWIND_INSTALL_INCLUDE_DIR}/${dir}"
COMPONENT unwind-headers
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
)

2
pkgs/development/compilers/mozart/default.nix
View file

@ -34,6 +34,8 @@ in stdenv.mkDerivation rec {
sha256 = "1hgh1a8hgzgr6781as4c4rc52m2wbazdlw3646s57c719g5xphjz";
};
patches = [ ./patch-limits.diff ];
postConfigure = ''
cp ${bootcompiler} bootcompiler/bootcompiler.jar
'';

10
pkgs/development/compilers/mozart/patch-limits.diff Normal file
View file

@ -0,0 +1,10 @@
--- mozart2-2.0.1.orig/vm/vm/main/core-forward-decl.hh 2018-09-05 03:16:51.000000000 +0200
+++ mozart2-2.0.1/vm/vm/main/core-forward-decl.hh 2021-08-03 10:31:50.281476430 +0200
@@ -36,6 +36,7 @@
#include <cstdint>
#include <ostream>
#include <functional>
+#include <limits>
#include <memory>
#include <cassert>

7
pkgs/development/libraries/arrow-cpp/default.nix
View file

@ -78,11 +78,14 @@ stdenv.mkDerivation rec {
};
sourceRoot = "apache-arrow-${version}/cpp";
${if enableJemalloc then "ARROW_JEMALLOC_URL" else null} = jemalloc.src;
# versions are all taken from
# https://github.com/apache/arrow/blob/apache-arrow-8.0.0/cpp/thirdparty/versions.txt
${if enableJemalloc then "ARROW_JEMALLOC_URL" else null} = fetchurl {
url = "https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2";
hash = "sha256-NDMOXOJ2CZ4uiVDZM121qHVomkxqVnUe87HYxTf4h/Y=";
};
ARROW_MIMALLOC_URL = fetchFromGitHub {
owner = "microsoft";
repo = "mimalloc";

2
pkgs/development/libraries/gpgme/default.nix
View file

@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
# debugging is disabled
lib.optional (qtbase != null) "-DQT_NO_DEBUG"
# https://www.gnupg.org/documentation/manuals/gpgme/Largefile-Support-_0028LFS_0029.html
++ lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64"
++ lib.optional stdenv.hostPlatform.is32bit "-D_FILE_OFFSET_BITS=64"
);
doCheck = true;

8
pkgs/development/libraries/jellyfin-ffmpeg/default.nix
View file

@ -1,14 +1,14 @@
{ ffmpeg_4, ffmpeg-full, fetchFromGitHub, lib }:
{ ffmpeg_5, ffmpeg-full, fetchFromGitHub, lib }:
(ffmpeg-full.override { ffmpeg = ffmpeg_4; }).overrideAttrs (old: rec {
(ffmpeg-full.override { ffmpeg = ffmpeg_5; }).overrideAttrs (old: rec {
pname = "jellyfin-ffmpeg";
version = "4.4.1-4";
version = "5.0.1-5";
src = fetchFromGitHub {
owner = "jellyfin";
repo = "jellyfin-ffmpeg";
rev = "v${version}";
sha256 = "0y7iskamlx30f0zknbscpi308y685nbnbf5gr9cj1znr5dlfb0bn";
sha256 = "sha256-rFzBAniw2vQGFn2GDlz6NiB/Ow2EZlE3Lu+ceYTStkM=";
};
postPatch = ''

1
pkgs/development/node-packages/main-programs.nix
View file

@ -49,6 +49,7 @@
git-run = "gr";
gitmoji-cli = "gitmoji";
graphql-cli = "graphql";
graphql-language-service-cli = "graphql-lsp";
grunt-cli = "grunt";
gulp-cli = "gulp";
kaput-cli = "kaput";

2
pkgs/development/node-packages/node-packages.json
View file

@ -141,7 +141,9 @@
, "gitmoji-cli"
, "glob"
, "gramma"
, "graphql"
, "graphql-cli"
, "graphql-language-service-cli"
, "graphqurl"
, "grunt-cli"
, "makam"

1824
pkgs/development/node-packages/node-packages.nix generated
View file

File diff suppressed because it is too large Load diff

8
pkgs/development/node-packages/overrides.nix
View file

@ -148,6 +148,14 @@ final: prev: {
meta = oldAttrs.meta // { broken = since "10"; };
});
graphql-language-service-cli = prev.graphql-language-service-cli.override {
nativeBuildInputs = [ pkgs.makeWrapper ];
postInstall = ''
wrapProgram "$out/bin/graphql-lsp" \
--prefix NODE_PATH : ${final.graphql}/lib/node_modules
'';
};
hsd = prev.hsd.override {
buildInputs = [ final.node-gyp-build pkgs.unbound ];
};

14
pkgs/development/python-modules/db-dtypes/default.nix
View file

@ -6,17 +6,21 @@
, pandas
, pyarrow
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "db-dtypes";
version = "1.0.1";
version = "1.0.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "googleapis";
repo = "python-db-dtypes-pandas";
rev = "v${version}";
hash = "sha256-T/cyJ0PY5p/y8CKrmeAa9nvnuRs4hd2UKiYiMHLaa7A=";
rev = "refs/tags/v${version}";
hash = "sha256-LLKhYLzGUQRx4ciWv1TilYvTOO0sj6rdkPlJLPZ8VXA=";
};
propagatedBuildInputs = [
@ -30,7 +34,9 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [ "db_dtypes" ];
pythonImportsCheck = [
"db_dtypes"
];
meta = with lib; {
description = "Pandas Data Types for SQL systems (BigQuery, Spanner)";

4
pkgs/development/python-modules/google-cloud-automl/default.nix
View file

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "google-cloud-automl";
version = "2.7.2";
version = "2.7.3";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-CUsLMX0zRONChgzejZnBztth5ORMZyb6rj6mok2pMMU=";
hash = "sha256-c6Su9hff+eHr0ddQOyv1Zo0IqcpTw6SmMK+iR5WQMs8=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-datastore/default.nix
View file

@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "google-cloud-datastore";
version = "2.6.2";
version = "2.7.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Ie/SyTY8AkmDXRKWwZiukD76HpwJEtp7IBusWj+Y4HE=";
sha256 = "sha256-TS4noRo/spz+0x3I3bWbHJ3orrjQCDyy7OkSYn4z4G0=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-monitoring/default.nix
View file

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "google-cloud-monitoring";
version = "2.9.1";
version = "2.9.2";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-FoB6SGDrVDHG60WeWmGwfVbSwt6xdq9da2QwSikpIlU=";
hash = "sha256-ePJGEBzo5lXBnCDMuZQPVoU9gT4yfDs8YZB50x4xb90=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-spanner/default.nix
View file

@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "google-cloud-spanner";
version = "3.14.0";
version = "3.14.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-QOUMedRvbEEDwr1RIsS8tEdvk++OmPBXC4Q5XLzWASs=";
sha256 = "sha256-d1d81cUtQu6DqKopv082HlmgSYOAWUdaBYBLjzFyC2M=";
};
propagatedBuildInputs = [

20
pkgs/development/python-modules/pikepdf/default.nix
View file

@ -1,14 +1,13 @@
{ lib
, attrs
, buildPythonPackage
, defusedxml
, fetchFromGitHub
, hypothesis
, pythonOlder
, importlib-metadata
, jbig2dec
, lxml
, mupdf
, packaging
, pillow
, psutil
, pybind11
@ -17,15 +16,13 @@
, python-dateutil
, python-xmp-toolkit
, qpdf
, setuptools
, setuptools-scm
, setuptools-scm-git-archive
, substituteAll
}:
buildPythonPackage rec {
pname = "pikepdf";
version = "5.1.3";
version = "5.1.4";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -40,7 +37,7 @@ buildPythonPackage rec {
postFetch = ''
rm "$out/.git_archival.txt"
'';
hash = "sha256-jkAwc1bQ1jRDf/qY+xAjiLXXO98qKjyX+J7Lu4tYWoI=";
hash = "sha256-nCzG1QYwERKo/T16hEGIG//PwSrpWRmKLXdj42WGyls=";
};
patches = [
@ -53,6 +50,9 @@ buildPythonPackage rec {
postPatch = ''
sed -i 's|\S*/opt/homebrew.*|pass|' setup.py
substituteInPlace setup.py \
--replace setuptools_scm_git_archive ""
'';
SETUPTOOLS_SCM_PRETEND_VERSION = version;
@ -63,7 +63,6 @@ buildPythonPackage rec {
];
nativeBuildInputs = [
setuptools-scm-git-archive
setuptools-scm
];
@ -78,11 +77,10 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [
defusedxml
lxml
packaging
pillow
setuptools
] ++ lib.optionals (pythonOlder "3.8") [
importlib-metadata
];
pythonImportsCheck = [ "pikepdf" ];
@ -92,6 +90,6 @@ buildPythonPackage rec {
description = "Read and write PDFs with Python, powered by qpdf";
license = licenses.mpl20;
maintainers = with maintainers; [ kiwi dotlambda ];
changelog = "https://github.com/pikepdf/pikepdf/blob/${version}/docs/release_notes.rst";
changelog = "https://github.com/pikepdf/pikepdf/blob/${src.rev}/docs/releasenotes/version${lib.versions.major version}.rst";
};
}

2
pkgs/development/tools/golangci-lint/default.nix
View file

@ -31,10 +31,10 @@ buildGoModule rec {
'';
meta = with lib; {
broken = stdenv.isDarwin;
description = "Fast linters Runner for Go";
homepage = "https://golangci-lint.run/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ anpryl manveru mic92 ];
broken = stdenv.isDarwin && stdenv.isx86_64;
};
}

4
pkgs/servers/haste-server/default.nix
View file

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "haste-server";
version = "9e921d59098c1093050201942f71d357fa89ffee";
version = "787d839086faee0b55c76ce5944fa207d22e85b4";
src = fetchFromGitHub {
owner = "toptal";
repo = "haste-server";
rev = version;
hash = "sha256-D3wgb4SX19CiCVQI4GFdfuVpC6BSCcd8UdK3ZW1sZa0=";
hash = "sha256-68IFY9YmXi4acTs9oXw6f5w7gg1lh+iakwYJciTPkQE=";
};
nativeBuildInputs = [

30
pkgs/servers/haste-server/node-deps.nix
View file

@ -67,13 +67,13 @@ let
sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==";
};
};
"async-3.2.3" = {
"async-3.2.4" = {
name = "async";
packageName = "async";
version = "3.2.3";
version = "3.2.4";
src = fetchurl {
url = "https://registry.npmjs.org/async/-/async-3.2.3.tgz";
sha512 = "spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==";
url = "https://registry.npmjs.org/async/-/async-3.2.4.tgz";
sha512 = "iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==";
};
};
"async-cache-1.1.0" = {
@ -973,7 +973,7 @@ let
version = "1.1.14";
src = fetchurl {
url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz";
sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9";
sha512 = "+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==";
};
};
"readable-stream-3.6.0" = {
@ -1000,7 +1000,7 @@ let
version = "0.8.1";
src = fetchurl {
url = "https://registry.npmjs.org/redis/-/redis-0.8.1.tgz";
sha1 = "159f2130599a2f719e44b03f0b4b7612f992fcb2";
sha512 = "XiXVEcXsJ6N71BAltCQ5vDOPhWeFyIaOqInVpXnRghK0WAc7ZPwXEjX6rkBCrlsnX6gXOPvsUvAzb5KhvajbiQ==";
};
};
"redis-url-0.1.0" = {
@ -1009,7 +1009,7 @@ let
version = "0.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/redis-url/-/redis-url-0.1.0.tgz";
sha1 = "4da5e5b181b6c0cad6e1a55c7f50a8e6ee7779bb";
sha512 = "LVc0kybiwS2FY0uhe7Pjs4hGqHE+ygI3v7WQu+Qmr3acJ5atGid6vc98e2S9FoyIwfAekGWRwBFoRHxJnqW0Qw==";
};
};
"require-directory-2.1.1" = {
@ -1018,7 +1018,7 @@ let
version = "2.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz";
sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42";
sha512 = "fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==";
};
};
"safe-buffer-5.2.1" = {
@ -1072,7 +1072,7 @@ let
version = "0.0.10";
src = fetchurl {
url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz";
sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0";
sha512 = "KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==";
};
};
"statuses-1.5.0" = {
@ -1081,7 +1081,7 @@ let
version = "1.5.0";
src = fetchurl {
url = "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz";
sha1 = "161c7dac177659fd9811f43771fa99381478628c";
sha512 = "OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==";
};
};
"streamsearch-0.1.2" = {
@ -1090,7 +1090,7 @@ let
version = "0.1.2";
src = fetchurl {
url = "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz";
sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a";
sha512 = "jos8u++JKm0ARcSUTAZXOVC0mSox7Bhn6sBgty73P1f3JGf7yG2clTbBNHUdde/kdvP2FESam+vM6l8jBrNxHA==";
};
};
"string-width-2.1.1" = {
@ -1117,7 +1117,7 @@ let
version = "0.10.31";
src = fetchurl {
url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
sha512 = "ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==";
};
};
"string_decoder-1.3.0" = {
@ -1135,7 +1135,7 @@ let
version = "4.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz";
sha1 = "a8479022eb1ac368a871389b635262c505ee368f";
sha512 = "4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==";
};
};
"strip-ansi-6.0.1" = {
@ -1341,7 +1341,7 @@ let
name = "haste";
packageName = "haste";
version = "0.1.0";
src = ../../../../../../../../../nix/store/83sz6s07psdzc54741nm0qgxfnnb62l7-source;
src = ../../../../../../../../../nix/store/sa8y38xfqrbklwvwb484fgx0lgks9wa1-source;
dependencies = [
sources."@ungap/promise-all-settled-1.1.2"
sources."ansi-colors-4.1.1"
@ -1349,7 +1349,7 @@ let
sources."ansi-styles-4.3.0"
sources."anymatch-3.1.2"
sources."argparse-2.0.1"
sources."async-3.2.3"
sources."async-3.2.4"
sources."async-cache-1.1.0"
sources."balanced-match-1.0.2"
sources."base64-js-1.5.1"

4
pkgs/tools/misc/tmux/default.nix
View file

@ -23,7 +23,7 @@ in
stdenv.mkDerivation rec {
pname = "tmux";
version = "3.3";
version = "3.3a";
outputs = [ "out" "man" ];
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
owner = "tmux";
repo = "tmux";
rev = version;
sha256 = "sha256-Sxj2vXkbbPNRrqJKeIYwI7xdBtwRbl6a6a3yZr7UWW0=";
sha256 = "sha256-SygHxTe7N4y7SdzKixPFQvqRRL57Fm8zWYHfTpW+yVY=";
};
nativeBuildInputs = [

35
pkgs/tools/networking/apc-temp-fetch/default.nix Normal file
View file

@ -0,0 +1,35 @@
{ lib
, buildPythonApplication
, fetchPypi
, pythonOlder
, requests
}:
buildPythonApplication rec {
pname = "apc-temp-fetch";
version = "0.0.1";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
pname = "APC-Temp-fetch";
inherit version;
hash = "sha256-2hNrTrYQadNJWzj7/dDou+a6uI+Ksyrbru9rBqIHXaM=";
};
propagatedBuildInputs = [
requests
];
pythonImportsCheck = [
"APC_Temp_fetch"
];
meta = with lib; {
description = "unified temperature fetcher interface to several UPS network adapters";
homepage = "https://github.com/YZITE/APC_Temp_fetch";
license = licenses.asl20;
maintainers = [ maintainers.zseri ];
};
}

22
pkgs/tools/text/mdbook-admonish/default.nix Normal file
View file

@ -0,0 +1,22 @@
{ lib, stdenv, fetchCrate, rustPlatform, CoreServices }:
rustPlatform.buildRustPackage rec {
pname = "mdbook-admonish";
version = "1.6.0";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-GH4T7arBabm+DXIJa3seP6L13DBleoNqYwzxhoCZJgI=";
};
cargoSha256 = "sha256-v0usxkGWs/qzUPU6ZwtTpUD7hXdSBZGYQifMZnr7sfI=";
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
meta = with lib; {
description = "A preprocessor for mdbook to add Material Design admonishments";
license = licenses.mit;
maintainers = with maintainers; [ jmgilman ];
homepage = "https://github.com/tommilligan/mdbook-admonish";
};
}

14
pkgs/top-level/all-packages.nix
View file

@ -4387,6 +4387,8 @@ with pkgs;
apple-music-electron = callPackage ../applications/audio/apple-music-electron { };
apc-temp-fetch = with python3.pkgs; callPackage ../tools/networking/apc-temp-fetch { };
arping = callPackage ../tools/networking/arping { };
arpoison = callPackage ../tools/networking/arpoison { };
@ -7747,6 +7749,10 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
mdbook-admonish = callPackage ../tools/text/mdbook-admonish {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
mdcat = callPackage ../tools/text/mdcat {
inherit (darwin.apple_sdk.frameworks) Security;
inherit (python3Packages) ansi2html;
@ -24738,6 +24744,8 @@ with pkgs;
poly = callPackage ../data/fonts/poly { };
polychromatic = libsForQt5.callPackage ../applications/misc/polychromatic { };
polytopes_db = callPackage ../data/misc/polytopes_db { };
pop-gtk-theme = callPackage ../data/themes/pop-gtk { };
@ -29793,8 +29801,10 @@ with pkgs;
sublime-merge
sublime-merge-dev;
inherit (callPackages ../applications/version-management/subversion { sasl = cyrus_sasl; })
subversion;
inherit (callPackages ../applications/version-management/subversion {
sasl = cyrus_sasl;
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
}) subversion;
subversionClient = subversion.override {
bdbSupport = false;