Merge branch 'master' into staging-next
Resolve correctly the three-way merge between https://github.com/NixOS/nixpkgs/pull/251681, https://github.com/NixOS/nixpkgs/pull/227900, and https://github.com/NixOS/nixpkgs/pull/246022
This commit is contained in:
Theodore Ni
commit
c173b99c6c
33 changed files with 155 additions and 135 deletions
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, lv2 }:
|
||||
{ lib, stdenv, fetchFromSourcehut, meson, ninja, pkg-config, lv2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "airwindows-lv2";
|
||||
version = "20.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hannesbraun";
|
||||
version = "22.0";
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~hannes";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-uflvUmUzOtF3BwiLfnd+qhz+ZYyn8AKvODFs599phhU=";
|
||||
sha256 = "sha256-u62wLRrJ45ap981Q8JmMnanc8AWQb1MJHK32PEr10I4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config ];
|
||||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Airwindows plugins (ported to LV2)";
|
||||
homepage = "https://github.com/hannesbraun/airwindows-lv2";
|
||||
homepage = "https://sr.ht/~hannes/airwindows-lv2";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.magnetophon ];
|
||||
platforms = platforms.unix;
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lsp-plugins";
|
||||
version = "1.2.8";
|
||||
version = "1.2.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz";
|
||||
sha256 = "sha256-udVYyR6rDOCAKggpvY58jjpoLmB6wXiivvdzYylkE9c=";
|
||||
sha256 = "sha256-2Yf+4TYGWF/AMI1kNvVOx9g6CSIoeZKY63qC/zJNilc=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
|
|
|||
|
|
@ -7,8 +7,6 @@
|
|||
, perl
|
||||
, atomicparsley
|
||||
, ffmpeg
|
||||
, flvstreamer
|
||||
, rtmpdump
|
||||
}:
|
||||
|
||||
perlPackages.buildPerlPackage rec {
|
||||
|
|
@ -25,7 +23,7 @@ perlPackages.buildPerlPackage rec {
|
|||
nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang;
|
||||
buildInputs = [ perl ];
|
||||
propagatedBuildInputs = with perlPackages; [
|
||||
HTMLParser HTTPCookies LWP LWPProtocolHttps XMLLibXML XMLSimple Mojolicious
|
||||
LWP LWPProtocolHttps XMLLibXML Mojolicious
|
||||
];
|
||||
|
||||
preConfigure = "touch Makefile.PL";
|
||||
|
|
@ -36,7 +34,7 @@ perlPackages.buildPerlPackage rec {
|
|||
runHook preInstall
|
||||
mkdir -p $out/bin $out/share/man/man1
|
||||
cp get_iplayer $out/bin
|
||||
wrapProgram $out/bin/get_iplayer --suffix PATH : ${lib.makeBinPath [ atomicparsley ffmpeg flvstreamer rtmpdump ]} --prefix PERL5LIB : $PERL5LIB
|
||||
wrapProgram $out/bin/get_iplayer --suffix PATH : ${lib.makeBinPath [ atomicparsley ffmpeg ]} --prefix PERL5LIB : $PERL5LIB
|
||||
cp get_iplayer.1 $out/share/man/man1
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
@ -46,9 +44,9 @@ perlPackages.buildPerlPackage rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Downloads TV and radio from BBC iPlayer";
|
||||
description = "Downloads TV and radio programmes from BBC iPlayer and BBC Sounds";
|
||||
license = licenses.gpl3Plus;
|
||||
homepage = "https://squarepenguin.co.uk/";
|
||||
homepage = "https://github.com/get-iplayer/get_iplayer";
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ rika jgarcia ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nwg-dock-hyprland";
|
||||
version = "0.1.4";
|
||||
version = "0.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nwg-piotr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-aPCz9m2Qnge8XhEbvpXb2U/eT5xvJkaSoorkkoY3gp0=";
|
||||
sha256 = "sha256-DDHKEGb7ghZwrMKrFtplTz7Hi1CITW6oxa/EJM4JDA8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-GhcrIVnZRbiGTfeUAWvslOVWDZmoL0ZRnjgTtQgxe2Q=";
|
||||
vendorHash = "sha256-5fN/6HASfTMb80YYAIoWRqnRGMvvX4d8C2UvOc0jQU0=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "morgen";
|
||||
version = "2.7.5";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb";
|
||||
sha256 = "sha256-gsH+KJt0d1Xe1JhgXuqot/vrMw9eBzIpCGlGeaeVJ+k=";
|
||||
sha256 = "sha256-6d1KYUlXv+bHPITt2zs++AtyaAT8SSCG9T8ZsgOKDiw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -23,13 +23,16 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "planify";
|
||||
version = "4.1";
|
||||
version = "4.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alainm23";
|
||||
repo = "planify";
|
||||
rev = version;
|
||||
sha256 = "sha256-H8TPuqKRwbcB+2NTC5ZIK7y6uiYbTT4svtx21FbTzME=";
|
||||
# The commit is named as "Release 4.1.1", published to Flathub, but not tags
|
||||
# https://github.com/flathub/io.github.alainm23.planify/commit/2a353ccfcf3379add6778d569f49da37f40accfa
|
||||
# https://github.com/alainm23/planify/issues/1002
|
||||
rev = "adf3629bcacfc9978f6dde5b87eff0278533ab3e";
|
||||
hash = "sha256-xqklvSYmqBQ+IQ3lRjMbV4W4vD/rLCln7rBVCbYiBGo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dataexplorer";
|
||||
version = "3.7.9";
|
||||
version = "3.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://savannah/dataexplorer/dataexplorer-${version}-src.tar.gz";
|
||||
sha256 = "sha256-CdIWAde7mytXP9U1PfI9d/rFK7Agy5biIq5tMTW9RD4=";
|
||||
sha256 = "sha256-ZluT/jCjcOrlh2nqe0j56shmtGqfm11BCnsp6mWDXkQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ant makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "lxgw-neoxihei";
|
||||
version = "1.103.1";
|
||||
version = "1.104";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf";
|
||||
hash = "sha256-z9SzSt+GXV+9GLtzjY6EQQa6bKrixYo03kEfzGfug90=";
|
||||
hash = "sha256-R2b3zc+BwX9RvabqxXbRRHV3kKh5G1bnGg0ZP4BnBMI=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -24,24 +24,24 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "julia-bin";
|
||||
version = "1.9.2";
|
||||
version = "1.9.3";
|
||||
|
||||
src = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz";
|
||||
sha256 = "4c2d799f442d7fe718827b19da2bacb72ea041b9ce55f24eee7b1313f57c4383";
|
||||
sha256 = "d76670cc9ba3e0fd4c1545dd3d00269c0694976a1176312795ebce1692d323d1";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://julialang-s3.julialang.org/bin/linux/aarch64/${lib.versions.majorMinor version}/julia-${version}-linux-aarch64.tar.gz";
|
||||
sha256 = "682397f8895149f0e283f0b27bffc6694033bdfb19f9366c80f6efdf3685f27c";
|
||||
sha256 = "55437879f6b98470d96c4048b922501b643dfffb8865abeb90c7333a83df7524";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://julialang-s3.julialang.org/bin/mac/x64/${lib.versions.majorMinor version}/julia-${version}-mac64.tar.gz";
|
||||
sha256 = "a2e8eb31a89b26e4a99349303aeff8e8ee780144bbdb1f7eda6f41024d42cadb";
|
||||
sha256 = "6eea87748424488226090d1e7d553e72ab106a873d63c732fc710a3d080abb97";
|
||||
};
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://julialang-s3.julialang.org/bin/mac/aarch64/${lib.versions.majorMinor version}/julia-${version}-macaarch64.tar.gz";
|
||||
sha256 = "77c71ff8cb1fcdb84097e86a9fb579a8b34d8e7fd8e24d43107042e0fb988b76";
|
||||
sha256 = "f518e38d7bd5b37766fb051916bd295993aa4b52a47018f4c98b5fde721ced87";
|
||||
};
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "julia";
|
||||
version = "1.9.2";
|
||||
version = "1.9.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz";
|
||||
hash = "sha256-hwY9TC6kHHNqoujLvHwvGgYuIjlVFX+EBFU87XZJE80=";
|
||||
hash = "sha256-j8DJ3FRDoo01m9ed2jlA+pS6K3lmuJhlvrINqBEjwxY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kotlin";
|
||||
version = "1.9.0";
|
||||
version = "1.9.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
|
||||
sha256 = "1s5y9180r97qmfysw3rm39y5c646rj4z149ywhnyj2cqby00vi8z";
|
||||
sha256 = "0hh3qa4nical29wkm3byqvmd00xhx9gp7hslx8l0z3ngxqyqcx3x";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ jre ] ;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kotlin-native";
|
||||
version = "1.9.0";
|
||||
version = "1.9.10";
|
||||
|
||||
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" = "0728zm72ywyl6yhrfkad3whg2xly9bx7whp8alfi980qf468b1jh";
|
||||
"macos-x86_64" = "09j2i06qypw7ag2wrfkci9gnvprj96n3362p5vynr65jrzm5b8ww";
|
||||
"linux-x86_64" = "1v58n8ap5kifhawz30lk6rb2sp0qyiiy8gihw2ngbbhvakkigg8q";
|
||||
"macos-aarch64" = "1pn371hy6hkyji4vkfiw3zw30wy0yyfhkxnkkyr8m0609945mkyj";
|
||||
"macos-x86_64" = "13c28czvja93zaff0kzqf8crzh998l90gznq0cl6k2j3c0jhyrgm";
|
||||
"linux-x86_64" = "0nxaiwn4akfpkibq42y8kfn5hdd7vzkm296qx4a9ai7l36cngcqx";
|
||||
}.${arch};
|
||||
in
|
||||
fetchurl {
|
||||
|
|
|
|||
|
|
@ -208,8 +208,7 @@ let
|
|||
import ../qtModule.nix
|
||||
{
|
||||
inherit perl;
|
||||
inherit lib stdenv;
|
||||
inherit buildPackages;
|
||||
inherit lib;
|
||||
# Use a variant of mkDerivation that does not include wrapQtApplications
|
||||
# to avoid cyclic dependencies between Qt modules.
|
||||
mkDerivation =
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
if [[ -n "${__nix_qtbase-}" ]]; then
|
||||
if [ -z "${dontWorryAboutQtMismatch-}" ]; then
|
||||
# Throw an error if a different version of Qt was already set up.
|
||||
if [[ "$__nix_qtbase" != "@dev@" ]]; then
|
||||
echo >&2 "Error: detected mismatched Qt dependencies:"
|
||||
|
|
@ -7,7 +6,6 @@ if [[ -n "${__nix_qtbase-}" ]]; then
|
|||
echo >&2 " $__nix_qtbase"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
else # Only set up Qt once.
|
||||
__nix_qtbase="@dev@"
|
||||
|
||||
|
|
|
|||
|
|
@ -29,15 +29,10 @@
|
|||
, developerBuild ? false
|
||||
, decryptSslTraffic ? false
|
||||
, testers
|
||||
, buildPackages
|
||||
}:
|
||||
|
||||
let
|
||||
debugSymbols = debug || developerBuild;
|
||||
qtPlatformCross = plat: with plat;
|
||||
if isLinux
|
||||
then "linux-generic-g++"
|
||||
else throw "Please add a qtPlatformCross entry for ${plat.config}";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
|
|
@ -88,11 +83,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
nativeBuildInputs = [ bison flex gperf lndir perl pkg-config which ]
|
||||
++ lib.optionals stdenv.isDarwin [ xcbuild ];
|
||||
|
||||
# `qtbase` expects to find `cc` (with no prefix) in the
|
||||
# `$PATH`, so the following is needed even if
|
||||
# `stdenv.buildPlatform.canExecute stdenv.hostPlatform`
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
propagatedNativeBuildInputs = [ lndir ];
|
||||
|
||||
# libQt5Core links calls CoreFoundation APIs that call into the system ICU. Binaries linked
|
||||
|
|
@ -172,11 +162,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
export MAKEFLAGS+=" -j$NIX_BUILD_CORES"
|
||||
|
||||
./bin/syncqt.pl -version $version
|
||||
'' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
|
||||
# QT's configure script will refuse to use pkg-config unless these two environment variables are set
|
||||
export PKG_CONFIG_SYSROOT_DIR=/
|
||||
export PKG_CONFIG_LIBDIR=${lib.getLib pkg-config}/lib
|
||||
echo 'QMAKE_PKG_CONFIG=''$''${CROSS_COMPILE}pkg-config' >> mkspecs/devices/${qtPlatformCross stdenv.hostPlatform}/qmake.conf
|
||||
'';
|
||||
|
||||
postConfigure = ''
|
||||
|
|
@ -224,8 +209,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
# To prevent these failures, we need to override PostgreSQL detection.
|
||||
PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq";
|
||||
|
||||
# do not pass --host and --build to configureFlags as QT's configure script doesn't understand them
|
||||
configurePlatforms = [ ];
|
||||
# TODO Remove obsolete and useless flags once the build will be totally mastered
|
||||
configureFlags = [
|
||||
"-plugindir $(out)/$(qtPluginPrefix)"
|
||||
|
|
@ -252,9 +235,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"-L" "${icu.out}/lib"
|
||||
"-I" "${icu.dev}/include"
|
||||
"-pch"
|
||||
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
"-device ${qtPlatformCross stdenv.hostPlatform}"
|
||||
"-device-option CROSS_COMPILE=${stdenv.cc.targetPrefix}"
|
||||
]
|
||||
++ lib.optional debugSymbols "-debug"
|
||||
++ lib.optionals developerBuild [
|
||||
|
|
|
|||
|
|
@ -1,8 +1,4 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, mkDerivation, perl
|
||||
, buildPackages
|
||||
}:
|
||||
{ lib, mkDerivation, perl }:
|
||||
|
||||
let inherit (lib) licenses maintainers platforms; in
|
||||
|
||||
|
|
@ -22,7 +18,6 @@ mkDerivation (args // {
|
|||
|
||||
nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ perl self.qmake ];
|
||||
propagatedBuildInputs = (args.qtInputs or []) ++ (args.propagatedBuildInputs or []);
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
outputs = args.outputs or [ "out" "dev" ];
|
||||
setOutputFlags = args.setOutputFlags or false;
|
||||
|
|
@ -79,7 +74,4 @@ mkDerivation (args // {
|
|||
maintainers = with maintainers; [ qknight ttuegel periklis bkchr ];
|
||||
platforms = platforms.unix;
|
||||
} // (args.meta or {});
|
||||
|
||||
} // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) {
|
||||
dontWorryAboutQtMismatch = true;
|
||||
})
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
, aiohttp
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, pyjwt
|
||||
|
|
@ -10,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioaseko";
|
||||
version = "0.1.0";
|
||||
version = "0.1.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -19,18 +18,9 @@ buildPythonPackage rec {
|
|||
owner = "milanmeu";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-RgIwA5/W7qtgI9ZTF4oDPuzSc+r04ZV3JOaNNFjS0pU=";
|
||||
hash = "sha256-bjPl0yrRaTIEEuPV8NbWu2hx/es5bcu2tDBZV+95fUc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Remove time, https://github.com/milanmeu/aioaseko/pull/6
|
||||
(fetchpatch {
|
||||
name = "remove-time.patch";
|
||||
url = "https://github.com/milanmeu/aioaseko/commit/07d7ca43a2edd060e95a64737f072d98ba938484.patch";
|
||||
hash = "sha256-67QaqSy5mGY/22jWHOkymr0pFoiizVQAXlrqXRb3tG0=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, fetchFromGitHub, buildPythonPackage
|
||||
, lxml, pycryptodomex, construct
|
||||
, argon2-cffi, python-dateutil, future
|
||||
, argon2-cffi, python-dateutil
|
||||
, python
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pykeepass";
|
||||
version = "4.0.5";
|
||||
version = "4.0.6";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
|
|
@ -14,16 +14,12 @@ buildPythonPackage rec {
|
|||
owner = "libkeepass";
|
||||
repo = "pykeepass";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-IdILcIhrxcTDddoxiK257II0V7ctVb1CTLfTPmuwjTQ=";
|
||||
hash = "sha256-832cTVzI/MFdwiw6xWzRG35z3iwqb5Qpf6W6XYBIFWs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace "==" ">="
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
lxml pycryptodomex construct
|
||||
argon2-cffi python-dateutil future
|
||||
argon2-cffi python-dateutil
|
||||
];
|
||||
|
||||
propagatedNativeBuildInputs = [ argon2-cffi ];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, aresponses
|
||||
, backoff
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, packaging
|
||||
|
|
@ -15,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-bsblan";
|
||||
version = "0.5.12";
|
||||
version = "0.5.14";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -24,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "liudger";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ftu79SnVa7wOMx/RiRBDPmmG7Mmw84r30G4yDzBea2k=";
|
||||
hash = "sha256-UCl5M9UbsUcroNF2iYzTLD9uIJF7PdxwrVt3PNI3iRc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -41,6 +42,7 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
backoff
|
||||
packaging
|
||||
pydantic
|
||||
yarl
|
||||
|
|
|
|||
|
|
@ -18,10 +18,12 @@
|
|||
, pympler
|
||||
, python-dateutil
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, requests
|
||||
, rich
|
||||
, tenacity
|
||||
, toml
|
||||
, tornado
|
||||
, typing-extensions
|
||||
, tzlocal
|
||||
, validators
|
||||
|
|
@ -30,16 +32,23 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "streamlit";
|
||||
version = "1.24.1";
|
||||
version = "1.26.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version format;
|
||||
hash = "sha256-/V8LZHmOlwY2RAj7WJt3WVMUpjFdE7LXULljx66X82I=";
|
||||
hash = "sha256-JUdfsVo8yfsYSUXz/JNvARmYvYOG4MiS/r4UyWJb9Ho=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pythonRelaxDepsHook ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"pillow"
|
||||
"pydeck"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
altair
|
||||
blinker
|
||||
|
|
@ -60,6 +69,7 @@ buildPythonPackage rec {
|
|||
rich
|
||||
tenacity
|
||||
toml
|
||||
tornado
|
||||
typing-extensions
|
||||
tzlocal
|
||||
validators
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "buildkit";
|
||||
version = "0.12.1";
|
||||
version = "0.12.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moby";
|
||||
repo = "buildkit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Fee/XuxtNP9+T8kRd3yeEhFvpfaIgMkqfSaZCpaYEdM=";
|
||||
hash = "sha256-u85Yrg3aMG6Tx8onivSy1p7yB4lZxsBWF4bxnwO68EE=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
@ -22,6 +22,7 @@ buildGoModule rec {
|
|||
meta = with lib; {
|
||||
description = "Concurrent, cache-efficient, and Dockerfile-agnostic builder toolkit";
|
||||
homepage = "https://github.com/moby/buildkit";
|
||||
changelog = "https://github.com/moby/buildkit/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ vdemeester marsam developer-guy ];
|
||||
mainProgram = "buildctl";
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "complgen";
|
||||
version = "unstable-2023-08-17";
|
||||
version = "unstable-2023-08-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adaszko";
|
||||
repo = "complgen";
|
||||
rev = "4f01c04184b31804009e0002ff6ba1c777439798";
|
||||
hash = "sha256-KQFMWVHTlkf65ghgv3oR2Jz4QtXkdz6CNIC3eeyBgBg=";
|
||||
rev = "8c9b9c51f3465c6d858e15f442b63e94b2f5ed1b";
|
||||
hash = "sha256-oYRaH3FbAFY7QujgFpUDD8gVam4+Gm9qROxCTMYBg9I=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-m/eFpwMZOOVGVeXjQwNZheuPeGkJd0mAF903ML/Kr90=";
|
||||
cargoHash = "sha256-LHnIIkQLuY+A09qhxSiyLmUpX/dES7xBE5m1uRPI0i0=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Generate {bash,fish,zsh} completions from a single EBNF-like grammar";
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "protoc-gen-connect-go";
|
||||
version = "1.9.0";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bufbuild";
|
||||
owner = "connectrpc";
|
||||
repo = "connect-go";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-2U5f+VUXZ8J9K27RccKvEY7FJs57XMasKMk+xgy0LuI=";
|
||||
hash = "sha256-sKAocI2zT2jbw42Oe7lX8J1wLVBh7RfJe1hP8aXRCuM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3opkr4kUD3NQNbNYOdSWIDqKbArv9OQUkBMzae1ccVY=";
|
||||
|
|
@ -20,11 +20,16 @@ buildGoModule rec {
|
|||
"cmd/protoc-gen-connect-go"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
# test all paths
|
||||
unset subPackages
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "library for building browser and gRPC-compatible HTTP APIs";
|
||||
homepage = "https://github.com/bufbuild/connect-go";
|
||||
changelog = "https://github.com/bufbuild/connect-go/releases/tag/v${version}";
|
||||
description = "Simple, reliable, interoperable, better gRPC";
|
||||
homepage = "https://github.com/connectrpc/connect-go";
|
||||
changelog = "https://github.com/connectrpc/connect-go/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ kilimnik ];
|
||||
maintainers = with maintainers; [ kilimnik jk ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
rustPlatform.buildRustPackage {
|
||||
pname = "cargo-bundle";
|
||||
# the latest stable release fails to build on darwin
|
||||
version = "unstable-2023-03-17";
|
||||
version = "unstable-2023-08-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "burtonageo";
|
||||
repo = "cargo-bundle";
|
||||
rev = "eb9fe1b0880c7c0e929a93edaddcb0a61cd3f0d4";
|
||||
hash = "sha256-alO+Q9IK5Hz09+TqHWsbjuokxISKQfQTM6QnLlUNydw=";
|
||||
rev = "c9f7a182d233f0dc4ad84e10b1ffa0d44522ea43";
|
||||
hash = "sha256-n+c83pmCvFdNRAlcadmcZvYj+IRqUYeE8CJVWWYbWDQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-h+QPbwYTJk6dieta/Q+VAhYe8/YH/Nik6gslzUn0YxI=";
|
||||
cargoHash = "sha256-Ea658jHomktmzXtU5wmd0bRX+i5n46hCvexYxYbjjUc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -16,12 +16,12 @@ let
|
|||
];
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "insomnia";
|
||||
version = "2023.4.0";
|
||||
version = "2023.5.5";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
"https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb";
|
||||
sha256 = "sha256-7tkd0HaJeDdCvX1t1XCHrrQ23xFrcMsy1nhJJEp6klk=";
|
||||
sha256 = "sha256-/SrSpkfF3IrLl6BC4UknsTDraqN8uFKrKQSzQpBaRLY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -27,12 +27,12 @@ rec {
|
|||
stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest;
|
||||
|
||||
production = generic {
|
||||
version = "535.98";
|
||||
sha256_64bit = "sha256-E1DAmVLTe+L5DWCONq47BQtE/Rb22akZMHGhK/0FTsM=";
|
||||
sha256_aarch64 = "sha256-ikqj7bvSvCGlkDviaqagyoSZhpf6ZU3TiKKxNDZm3RU=";
|
||||
openSha256 = "sha256-dgc5Z70NSpBARelNy6XaZ4e7Tz9vWJWeNek3TSztJus=";
|
||||
settingsSha256 = "sha256-jCRfeB1w6/dA27gaz6t5/Qo7On0zbAPIi74LYLel34s=";
|
||||
persistencedSha256 = "sha256-WviDU6B50YG8dO64CGvU3xK8WFUX8nvvVYm/fuGyroM=";
|
||||
version = "535.104.05";
|
||||
sha256_64bit = "sha256-L51gnR2ncL7udXY2Y1xG5+2CU63oh7h8elSC4z/L7ck=";
|
||||
sha256_aarch64 = "sha256-J4uEQQ5WK50rVTI2JysBBHLpmBEWQcQ0CihgEM6xuvk=";
|
||||
openSha256 = "sha256-0ng4hyiUt0rHZkNveFTo+dSaqkMFO4UPXh85/js9Zbw=";
|
||||
settingsSha256 = "sha256-pS9W5LMenX0Rrwmpg1cszmpAYPt0Mx+apVQmOmLWTog=";
|
||||
persistencedSha256 = "sha256-uqT++w0gZRNbzyqbvP3GBqgb4g18r6VM3O8AMEfM7GU=";
|
||||
};
|
||||
|
||||
latest = selectHighestVersion production (generic {
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "mox";
|
||||
version = "0.0.5";
|
||||
version = "0.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mjl-";
|
||||
repo = "mox";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-f5/K6cPqJJkbdiVCNGOTd9Fjx2/gvSZCxeR6nnEaeJw=";
|
||||
hash = "sha256-RNzjDAvyz0RfD4GV6hT9RNJOfHSUXCLfwN4+V5acX28=";
|
||||
};
|
||||
|
||||
# set the version during buildtime
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@ let
|
|||
x86_64-darwin = "x64";
|
||||
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
hash = {
|
||||
x64-linux_hash = "sha256-46BfIsJEgtZMKQdiCqSFdM2whaYRwRLycv0pmY2InDk=";
|
||||
arm64-linux_hash = "sha256-zTDqbQz966RYV3FSBxmtN9JMe0j0AA21GCz4f0+NnHw=";
|
||||
x64-osx_hash = "sha256-EKy8vOvCHCcC5PheIdKyr5tWZ18Q+XeKh3mCrqcG7oA=";
|
||||
x64-linux_hash = "sha256-0q+MHdNRzq7gmv5jiArU1q+1UBWNZx0JRgiIy2pnIAc=";
|
||||
arm64-linux_hash = "sha256-NtbzzbWfEE1thyGOuJhTYXPxhTpw9lqXcvvlfmvCMqM=";
|
||||
x64-osx_hash = "sha256-oz2Sbvr8fky0mpBUXRKYki3UL0ewA/a2hEtPISBV8Ko=";
|
||||
}."${arch}-${os}_hash";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "readarr";
|
||||
version = "0.2.4.1999";
|
||||
version = "0.3.3.2171";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rustypaste";
|
||||
version = "0.12.1";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "orhun";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-AdcoyBtPgTK94VDBsCGozPU5enqCquY7r5IuEm3oW/g=";
|
||||
sha256 = "sha256-dyj5Zg49APsRLaOOCvyZ7X8qNLgzRcBZBCS5IR0dDCs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-VJjXwvMDSnDedcxJTjg6tVjPUxjRGTSOnx2nXgXCdzI=";
|
||||
cargoHash = "sha256-yw1ldacFxTKV1/A2XxZAZ2DpC0gJFjeGz5Yduw3RZEU=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.CoreServices
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gh-dash";
|
||||
version = "3.10.0";
|
||||
version = "3.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dlvhdr";
|
||||
repo = "gh-dash";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ypYM/FXp+BObR2fjVCV8nDJhRuuu2Y7213haAJnzRIE=";
|
||||
hash = "sha256-XvNc68pVwqBLthkr3jb578Avpnr1NKT1XWUD4aazBHw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lOIONv+7cUUC0mGCwYkOkDn3zHreYpFeqmTbp2Ob3yM=";
|
||||
vendorHash = "sha256-COPEgRqogRkGuJm56n9Cqljr7H8QT0RSKAdnXbHm+nw=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "h";
|
||||
version = "1.0.3";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zimbatm";
|
||||
repo = "h";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RyQZ9F+rZ0a/90hljSyNCzYK8eA3rYJlJkV7B5NPRzY=";
|
||||
hash = "sha256-eitUKOo2c1c+SyctkUW/SUb2RCKUoU6nJplfJVdwBSs=";
|
||||
};
|
||||
|
||||
buildInputs = [ ruby ];
|
||||
|
|
|
|||
44
pkgs/tools/wayland/stacktile/default.nix
Normal file
44
pkgs/tools/wayland/stacktile/default.nix
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromSourcehut
|
||||
, wayland
|
||||
, wayland-scanner
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "stacktile";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~leon_plickat";
|
||||
repo = "stacktile";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-IOFxgYMjh92jx2CPfBRZDL/1ucgfHtUyAL5rS2EG+Gc=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
wayland-scanner
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
wayland
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
"MANDIR=${placeholder "man"}/share/man"
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://sr.ht/~leon_plickat/stacktile/";
|
||||
description = "Layout generator for the river Wayland compositor";
|
||||
license = with lib.licenses; [ gpl3Plus ];
|
||||
mainProgram = "stacktile";
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
|
@ -1304,6 +1304,8 @@ with pkgs;
|
|||
|
||||
singularity-tools = callPackage ../build-support/singularity-tools { };
|
||||
|
||||
stacktile = callPackage ../tools/wayland/stacktile { };
|
||||
|
||||
sirula = callPackage ../tools/wayland/sirula { };
|
||||
|
||||
sitelen-seli-kiwen = callPackage ../data/fonts/sitelen-seli-kiwen { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue