Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
3180ce092d
|
|
@ -3,7 +3,7 @@
|
|||
, fetchFromGitHub
|
||||
, qmake
|
||||
, wrapQtAppsHook
|
||||
, qscintilla-qt6
|
||||
, qt6Packages
|
||||
, bison
|
||||
, flex
|
||||
, which
|
||||
|
|
@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
buildInputs = [
|
||||
alsa-lib
|
||||
libsndfile
|
||||
qscintilla-qt6
|
||||
qt6Packages.qscintilla
|
||||
] ++ lib.optional (audioBackend == "pulse") libpulseaudio
|
||||
++ lib.optional (audioBackend == "jack") libjack2;
|
||||
|
||||
|
|
|
|||
|
|
@ -6,19 +6,19 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "optimism";
|
||||
version = "1.1.1";
|
||||
version = "1.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ethereum-optimism";
|
||||
repo = "optimism";
|
||||
rev = "op-node/v${version}";
|
||||
hash = "sha256-COTpmjDH1u2dJA0nKPBG1Aocpyyo8NdtowwjHDTbEKI=";
|
||||
hash = "sha256-UDNqD3gA27qqaJYbpgOWoL0AeLb7OZRCRJcGNKRq67g=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
subPackages = [ "op-node/cmd" "op-proposer/cmd" "op-batcher/cmd" ];
|
||||
|
||||
vendorHash = "sha256-yAUeCX05dCVEvIzp0cXB/qYVtu3gQfgFi1CNZZKllOU=";
|
||||
vendorHash = "sha256-OGOdU6X3dcAu4BDpG62bK8LaMo+NuzFOUSjdPNhRGZM=";
|
||||
|
||||
buildInputs = [
|
||||
libpcap
|
||||
|
|
|
|||
|
|
@ -57,6 +57,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# Add `cgi-bin` to the default list to avoid pulling in whole
|
||||
# of `gcc` into build closure.
|
||||
stripDebugList = [ "cgi-bin" "lib" "lib32" "lib64" "libexec" "bin" "sbin" ];
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace $out/lib/systemd/system-shutdown/nutshutdown \
|
||||
--replace /bin/sleep "${coreutils}/bin/sleep" \
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, lib, buildGoModule, fetchFromGitHub }:
|
||||
let
|
||||
version = "1.5.3";
|
||||
version = "1.6.1";
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "ktunnel";
|
||||
|
|
@ -10,7 +10,7 @@ buildGoModule {
|
|||
owner = "omrikiei";
|
||||
repo = "ktunnel";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7SWj9Emm78xpzdvJFKqpI5HVQi0ohbixkgXKGTy5C/A=";
|
||||
sha256 = "sha256-rcUCIUIyBCSuMly7y0GUNQCdJUgsj7Oi6Hpz23uXoJw=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qalculate-gtk";
|
||||
version = "4.8.0";
|
||||
version = "4.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qalculate";
|
||||
repo = "qalculate-gtk";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-GYy3Ot2vjXpCp89Rib3Ua0XeVGOOTejKcaqNZvPmxm0=";
|
||||
sha256 = "sha256-bG0hui5GjHWHny/8Rq5sZGz3s5rYnYlpc+K8I/LwDto=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qalculate-qt";
|
||||
version = "4.8.0";
|
||||
version = "4.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qalculate";
|
||||
repo = "qalculate-qt";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-7VlaoiY+HgHCMZCegUdy2wpgfx3fKaViMtkdNRleHaA=";
|
||||
hash = "sha256-hH+orU+5PmPcrhkLKCdsDhVCrD8Mvxp2RPTGSlsUP7Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake intltool pkg-config qttools wrapQtAppsHook ];
|
||||
|
|
|
|||
31
pkgs/data/icons/whitesur-cursors/default.nix
Normal file
31
pkgs/data/icons/whitesur-cursors/default.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "whitesur-cursors";
|
||||
version = "unstable-2022-06-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = "WhiteSur-cursors";
|
||||
rev = "5c94e8c22de067282f4cf6d782afd7b75cdd08c8";
|
||||
sha256 = "sha256-CFse0XZzJu+PWDcqmvIXvue+3cKX47oavZU9HYRDAg0=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -dm 755 $out/share/icons/WhiteSur-cursors
|
||||
cp -r dist/* $out/share/icons/WhiteSur-cursors
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "An x-cursor theme inspired by macOS and based on capitaine-cursors";
|
||||
homepage = "https://github.com/vinceliuice/WhiteSur-cursors";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ tomasajt ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -50,8 +50,7 @@
|
|||
, makeWrapper
|
||||
# - Build Octave Qt GUI:
|
||||
, enableQt ? false
|
||||
, qt5
|
||||
, qscintilla
|
||||
, libsForQt5
|
||||
, libiconv
|
||||
, darwin
|
||||
}:
|
||||
|
|
@ -132,9 +131,9 @@ in stdenv.mkDerivation (finalAttrs: {
|
|||
gnuplot
|
||||
python3
|
||||
] ++ lib.optionals enableQt [
|
||||
qt5.qtbase
|
||||
qt5.qtsvg
|
||||
qscintilla
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtsvg
|
||||
libsForQt5.qscintilla
|
||||
] ++ lib.optionals (enableJava) [
|
||||
jdk
|
||||
] ++ lib.optionals (!stdenv.isDarwin) [
|
||||
|
|
@ -149,9 +148,9 @@ in stdenv.mkDerivation (finalAttrs: {
|
|||
gfortran
|
||||
texinfo
|
||||
] ++ lib.optionals enableQt [
|
||||
qt5.wrapQtAppsHook
|
||||
qt5.qtscript
|
||||
qt5.qttools
|
||||
libsForQt5.wrapQtAppsHook
|
||||
libsForQt5.qtscript
|
||||
libsForQt5.qttools
|
||||
];
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libqalculate";
|
||||
version = "4.8.0";
|
||||
version = "4.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qalculate";
|
||||
repo = "libqalculate";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-wONqqd8Ds10SvkUrj7Ps6BfqUNPE6hCnQrKDTEglVEQ=";
|
||||
sha256 = "sha256-4WqKlwVf4/ixVr98lPFVfNL6EOIfHHfL55xLsYqxkhY=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
|
|
|||
|
|
@ -6,9 +6,16 @@
|
|||
, qtmacextras ? null
|
||||
, qmake
|
||||
, fixDarwinDylibNames
|
||||
, darwin
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
stdenv' = if stdenv.isDarwin then
|
||||
darwin.apple_sdk_11_0.stdenv
|
||||
else
|
||||
stdenv
|
||||
;
|
||||
in stdenv'.mkDerivation rec {
|
||||
pname = "qscintilla-qt5";
|
||||
version = "2.13.2";
|
||||
|
||||
|
|
|
|||
|
|
@ -94,5 +94,7 @@ buildPythonPackage rec {
|
|||
homepage = "https://github.com/asdf-format/asdf";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ];
|
||||
# Many tests fail, according to Hydra
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, findutils
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
|
|
@ -11,23 +12,31 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "extension-helpers";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ca1bfac67c79cf4a7a0c09286ce2a24eec31bf17715818d0726318dd0e5050e6";
|
||||
hash = "sha256-SUYMeKP40fjOwXRHn16FrURZSMzEFgM8WqPm3fLFAik=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Not needed to allow this package to build, but meant for it's dependent
|
||||
# packages, like astropy. See explanation at:
|
||||
# https://github.com/astropy/extension-helpers/pull/59
|
||||
(fetchpatch {
|
||||
url = "https://github.com/astropy/extension-helpers/commit/796f3e7831298df2d26b6d994b13fd57061a56d1.patch";
|
||||
hash = "sha256-NnqK9HQq1hQ66RUJf9gTCuLyA0BVqVtL292mSXJ9860=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
wheel
|
||||
];
|
||||
|
||||
patches = [ ./permissions.patch ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
findutils
|
||||
pip
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
diff --git a/extension_helpers/_setup_helpers.py b/extension_helpers/_setup_helpers.py
|
||||
index ec3e547..e2419f7 100644
|
||||
--- a/extension_helpers/_setup_helpers.py
|
||||
+++ b/extension_helpers/_setup_helpers.py
|
||||
@@ -79,8 +79,13 @@ def get_extensions(srcdir='.'):
|
||||
if len(ext_modules) > 0:
|
||||
main_package_dir = min(packages, key=len)
|
||||
src_path = os.path.join(os.path.dirname(__file__), 'src')
|
||||
- shutil.copy(os.path.join(src_path, 'compiler.c'),
|
||||
- os.path.join(srcdir, main_package_dir, '_compiler.c'))
|
||||
+ a = os.path.join(src_path, 'compiler.c')
|
||||
+ b = os.path.join(srcdir, main_package_dir, '_compiler.c')
|
||||
+ try:
|
||||
+ os.unlink(b)
|
||||
+ except OSError:
|
||||
+ pass
|
||||
+ shutil.copy(a, b)
|
||||
ext = Extension(main_package_dir + '.compiler_version',
|
||||
[os.path.join(main_package_dir, '_compiler.c')])
|
||||
ext_modules.append(ext)
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
{ lib
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
|
||||
|
|
@ -10,6 +11,11 @@
|
|||
, oldest-supported-numpy
|
||||
, setuptools-scm
|
||||
, wheel
|
||||
# testing
|
||||
, pytestCheckHook
|
||||
, pytest-xdist
|
||||
, pytest-astropy
|
||||
, python
|
||||
|
||||
# runtime
|
||||
, numpy
|
||||
|
|
@ -18,21 +24,30 @@
|
|||
, pyyaml
|
||||
}:
|
||||
|
||||
let
|
||||
buildPythonPackage rec {
|
||||
pname = "astropy";
|
||||
version = "5.2.1";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
version = "5.3.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8"; # according to setup.cfg
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-9q4noHf46oSQPvp2x5C5hWFzQaAISw0hw5H3o/MyrCM=";
|
||||
hash = "sha256-AzDfn116IlQ2fpuM9EJVuhBwsGEjGIxqcu3BgEk/k7s=";
|
||||
};
|
||||
patches = [
|
||||
# Fixes running tests in parallel issue
|
||||
# https://github.com/astropy/astropy/issues/15316. Fix from
|
||||
# https://github.com/astropy/astropy/pull/15327
|
||||
(fetchpatch {
|
||||
url = "https://github.com/astropy/astropy/commit/1042c0fb06a992f683bdc1eea2beda0b846ed356.patch";
|
||||
hash = "sha256-bApAcGBRrJ94thhByoYvdqw2e6v77+FmTfgmGcE6MMk=";
|
||||
})
|
||||
];
|
||||
|
||||
# Relax cython dependency to allow this to build, upstream only doesn't
|
||||
# support cython 3 as of writing. See:
|
||||
# https://github.com/astropy/astropy/issues/15315
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'cython==' 'cython>='
|
||||
|
|
@ -54,14 +69,28 @@ buildPythonPackage {
|
|||
pyyaml
|
||||
];
|
||||
|
||||
# infinite recursion with pytest-astropy (pytest-astropy-header depends on astropy itself)
|
||||
doCheck = false;
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-xdist
|
||||
pytest-astropy
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
# Not running it inside the build directory. See:
|
||||
# https://github.com/astropy/astropy/issues/15316#issuecomment-1722190547
|
||||
preCheck = ''
|
||||
cd "$out"
|
||||
export HOME="$(mktemp -d)"
|
||||
export OMP_NUM_THREADS=$(( $NIX_BUILD_CORES / 4 ))
|
||||
'';
|
||||
pythonImportsCheck = [
|
||||
"astropy"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Astronomy/Astrophysics library for Python";
|
||||
homepage = "https://www.astropy.org";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.kentjames ];
|
||||
license = lib.licenses.bsd3;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [ kentjames doronbehar ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -66,6 +66,8 @@ buildPythonPackage rec {
|
|||
description = "Functions and classes to access online data resources";
|
||||
homepage = "https://astroquery.readthedocs.io/";
|
||||
license = licenses.bsd3;
|
||||
# Broken since a certain astropy update, due to API incompatibility
|
||||
broken = true;
|
||||
maintainers = [ maintainers.smaret ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "botocore-stubs";
|
||||
version = "1.31.52";
|
||||
version = "1.31.53";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "botocore_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-L6m3jHozWpTZGAeXc9wxmHht50FYYYfYR6hxC5wzcAk=";
|
||||
hash = "sha256-Ag7eB210DaUvzJ6tiwZB+2xVc/HXwX1hudnRRLOZBfg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvclive";
|
||||
version = "2.16.0";
|
||||
version = "3.0.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-VxZXZhbKtym1ow/dU3G4yu4X1GwCsXzcau/YocertzY=";
|
||||
hash = "sha256-nTxgRfzrKYl6aC8rxusZPBihpsKp7gCyxKVOiDrTNtE=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -3,18 +3,21 @@
|
|||
, buildPythonPackage
|
||||
, python
|
||||
, graphviz
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gprof2dot";
|
||||
version = "2021.02.21";
|
||||
version = "2022.07.29";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jrfonseca";
|
||||
repo = "gprof2dot";
|
||||
rev = version;
|
||||
sha256 = "1jjhsjf5fdi1fkn7mvhnzkh6cynl8gcjrygd3cya5mmda3akhzic";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-nIsBO6KTyG2VZZRXrkU/T/a9Ki1x6hda5Vv3rZv/mJM=";
|
||||
};
|
||||
|
||||
makeWrapperArgs = [
|
||||
|
|
@ -22,7 +25,9 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
# Needed so dot is on path of the test script
|
||||
nativeCheckInputs = [ graphviz ];
|
||||
nativeCheckInputs = [
|
||||
graphviz
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
|
@ -34,8 +39,9 @@ buildPythonPackage rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/jrfonseca/gprof2dot";
|
||||
description = "Python script to convert the output from many profilers into a dot graph";
|
||||
homepage = "https://github.com/jrfonseca/gprof2dot";
|
||||
changelog = "https://github.com/jrfonseca/gprof2dot/releases/tag/${version}";
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with maintainers; [ pmiddend ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "iocextract";
|
||||
version = "1.16.0";
|
||||
version = "1.16.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "InQuest";
|
||||
repo = "python-iocextract";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-jwMu4G146FpH6aFCiZK9tI/3CKnZYC2RCtO9QXXaquQ=";
|
||||
hash = "sha256-cCp9ug/TuVY1zL+kiDlFGBmfFJyAmVwxLD36WT0oRAE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "liccheck";
|
||||
version = "0.9.1";
|
||||
version = "0.9.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "dhatim";
|
||||
repo = "python-license-check";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ZgwHcZI0vsNYJWPkUnoBogVPPIuifAX9hu4fa1fHSz4=";
|
||||
hash = "sha256-2WJw5TVMjOr+GX4YV0nssOtQeYvDHBLnlWquJQWPL9I=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,17 +4,21 @@
|
|||
, iso8601
|
||||
, bottle
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "m3u8";
|
||||
version = "3.5.0";
|
||||
version = "3.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "globocom";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-9Xmbc1aL7SI24FFn0/5KJtAM3+Xyvd3bwUh8DU1wGKE=";
|
||||
hash = "sha256-JLYRkibcvmNct2eIBfBP7z3gR680xhZL/Kn/1S7feoo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -38,8 +42,9 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/globocom/m3u8";
|
||||
description = "Python m3u8 parser";
|
||||
homepage = "https://github.com/globocom/m3u8";
|
||||
changelog = "https://github.com/globocom/m3u8/releases/tag//${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ Scriptkiddi ];
|
||||
};
|
||||
|
|
|
|||
76
pkgs/development/python-modules/podman/default.nix
Normal file
76
pkgs/development/python-modules/podman/default.nix
Normal file
|
|
@ -0,0 +1,76 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fixtures
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pyxdg
|
||||
, requests
|
||||
, requests-mock
|
||||
, setuptools
|
||||
, tomli
|
||||
, urllib3
|
||||
, wheel
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "podman";
|
||||
version = "4.6.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "podman-py";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-76mLgkQgYbm04bj1VX7SC/kW8JEbYjbK3x6Xb612wnk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pyxdg
|
||||
requests
|
||||
tomli
|
||||
urllib3
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
fixtures
|
||||
pytestCheckHook
|
||||
requests-mock
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"podman"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Integration tests require a running container setup
|
||||
"AdapterIntegrationTest"
|
||||
"ContainersIntegrationTest"
|
||||
"ImagesIntegrationTest"
|
||||
"ManifestsIntegrationTest"
|
||||
"NetworksIntegrationTest"
|
||||
"PodsIntegrationTest"
|
||||
"SecretsIntegrationTest"
|
||||
"SystemIntegrationTest"
|
||||
"VolumesIntegrationTest"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python bindings for Podman's RESTful API";
|
||||
homepage = "https://github.com/containers/podman-py";
|
||||
changelog = "https://github.com/containers/podman-py/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, jinja2
|
||||
, oldest-supported-numpy
|
||||
, setuptools-scm
|
||||
|
|
@ -8,20 +9,28 @@
|
|||
, liberfa
|
||||
, packaging
|
||||
, numpy
|
||||
, pytestCheckHook
|
||||
, pytest-doctestplus
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyerfa";
|
||||
format = "pyproject";
|
||||
version = "2.0.0.1";
|
||||
|
||||
doCheck = false;
|
||||
version = "2.0.0.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-L9Rjf/4sHm7edILBP1g7p8cxGdeL75AXVEjOUGoO3jA=";
|
||||
hash = "sha256-13+7+lg1DBlMy5nl2TqgXTwrFNWq2LZi2Txq2f/0Hzk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Sort of helps maybe for https://github.com/liberfa/pyerfa/issues/112
|
||||
(fetchpatch {
|
||||
url = "https://github.com/liberfa/pyerfa/commit/4866342b94c5e7344711146f1186a4c3e7534da8.patch";
|
||||
hash = "sha256-uPFFdLYfRweQdeEApBAw6Ulqh31NTQwwmnaU+x/M+C0=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
jinja2
|
||||
oldest-supported-numpy
|
||||
|
|
@ -31,14 +40,32 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
liberfa
|
||||
numpy
|
||||
];
|
||||
buildInputs = [
|
||||
liberfa
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
export PYERFA_USE_SYSTEM_LIBERFA=1
|
||||
'';
|
||||
|
||||
# See https://github.com/liberfa/pyerfa/issues/112#issuecomment-1721197483
|
||||
NIX_CFLAGS_COMPILE = "-O2";
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-doctestplus
|
||||
];
|
||||
# Getting circular import errors without this, not clear yet why. This was mentioned to
|
||||
# upstream at: https://github.com/liberfa/pyerfa/issues/112 and downstream at
|
||||
# https://github.com/NixOS/nixpkgs/issues/255262
|
||||
preCheck = ''
|
||||
cd $out
|
||||
'';
|
||||
pythonImportsCheck = [
|
||||
"erfa"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python bindings for ERFA routines";
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-fx";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -39,7 +39,7 @@ buildPythonPackage rec {
|
|||
owner = "cielong";
|
||||
repo = "pyfx";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-nRMeYL0JGvCtUQBUMXUsZ4+F2KX+x/CbZ61sAidT9so=";
|
||||
hash = "sha256-Bgg6UbAyog1I4F2NfULY+UlPf2HeyBJdxm4+5bmCLN0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchpatch
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
|
|
@ -97,5 +98,7 @@ buildPythonPackage rec {
|
|||
homepage = "https://github.com/QCoDeS/Qcodes_loop";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ evilmav ];
|
||||
# Some tests fail on this platform
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "setupmeta";
|
||||
version = "3.4.0";
|
||||
version = "3.5.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "codrsquad";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-HNGoLCTidgnaU5QA+0d/PQuCswigjdvQC3/w19i+Xuc=";
|
||||
hash = "sha256-r3pGlcdem+c5I2dKrRueksesqq9HTk0oEr/xJuM7vuc=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
|
|
|||
|
|
@ -63,5 +63,7 @@ buildPythonPackage rec {
|
|||
changelog = "https://github.com/radio-astro-tools/spectral-cube/releases/tag/v${version}";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ smaret ];
|
||||
# Tests fail to start, according to Hydra
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "weconnect";
|
||||
version = "0.58.0";
|
||||
version = "0.58.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "tillsteinbach";
|
||||
repo = "WeConnect-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-2+RvDAKIUsQwmVrqcgt0RXOF+Z+lZ6oSyZyI+HTcZBs=";
|
||||
hash = "sha256-fSrmprt3aiYa8gRXOWKHKXah3zSqhRvD32nVdMrihwA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "xmlschema";
|
||||
version = "2.3.1";
|
||||
version = "2.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "sissaschool";
|
||||
repo = "xmlschema";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-0xXA3IguVAyFp5dFvuzAQhzJlGMmNthmPXcja9FYV44=";
|
||||
hash = "sha256-ETWD+i0VJbmfSHFvOsRkuzScKZdEyr6It3+U5Q7cQbQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-tally";
|
||||
version = "1.0.29";
|
||||
version = "1.0.30";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-SCxigQ6jhT+r6ixgCGwWDtvU8WUJ+5eWYe8DIWPBWhY=";
|
||||
hash = "sha256-5k4nx4VSYN4jscCwj5NVYnV5/GS0PRCA23xR6STHr88=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-ZX2T+wKIgYJqOK6118wmsMBKigtJvPqJ2hVtyh23zUk=";
|
||||
cargoHash = "sha256-eyGDizffuIPpa797YplD6763/JlVtoMAxybK9KsgmLE=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [
|
||||
DiskArbitration
|
||||
|
|
|
|||
|
|
@ -1,38 +1,38 @@
|
|||
{
|
||||
"testing": {
|
||||
"version": "6.6-rc1",
|
||||
"hash": "02zh3dnikyhhlas9xccia963d4yqmzq0m4b8s10x8mjng3na45hd"
|
||||
"version": "6.6-rc2",
|
||||
"hash": "sha256:1hbva5vsfi48h82ll4kmhzm5hxp7340bj2smwgvjikam26icaj54"
|
||||
},
|
||||
"6.5": {
|
||||
"version": "6.5.4",
|
||||
"hash": "0s8nzd8yaq06bq8byk7aakbk95gh0rhlif26h1biw94v48anrxxx"
|
||||
"hash": "sha256:0s8nzd8yaq06bq8byk7aakbk95gh0rhlif26h1biw94v48anrxxx"
|
||||
},
|
||||
"6.4": {
|
||||
"version": "6.4.16",
|
||||
"hash": "0zgj1z97jyx7wf12zrnlcp0mj4cl43ais9qsy6dh1jwylf2fq9ln"
|
||||
"hash": "sha256:0zgj1z97jyx7wf12zrnlcp0mj4cl43ais9qsy6dh1jwylf2fq9ln"
|
||||
},
|
||||
"6.1": {
|
||||
"version": "6.1.54",
|
||||
"hash": "09sfrq2l8f777mx2n9mhb6bgz1064bl04921byqnmk87si31w653"
|
||||
"hash": "sha256:09sfrq2l8f777mx2n9mhb6bgz1064bl04921byqnmk87si31w653"
|
||||
},
|
||||
"5.15": {
|
||||
"version": "5.15.132",
|
||||
"hash": "1b0qjsaqjw2rk86shmmrj2aasblkn27acjmc761vnjg7sv2baxs1"
|
||||
"hash": "sha256:1b0qjsaqjw2rk86shmmrj2aasblkn27acjmc761vnjg7sv2baxs1"
|
||||
},
|
||||
"5.10": {
|
||||
"version": "5.10.195",
|
||||
"hash": "0n4vg2i9sq89wnz85arlyvwysh9s83cgzs5bk2wh98bivi5fwfs1"
|
||||
"hash": "sha256:0n4vg2i9sq89wnz85arlyvwysh9s83cgzs5bk2wh98bivi5fwfs1"
|
||||
},
|
||||
"5.4": {
|
||||
"version": "5.4.256",
|
||||
"hash": "0fim5q9xakwnjfg48bpsic9r2r8dvrjlalqqkm9vh1rml9mhi967"
|
||||
"hash": "sha256:0fim5q9xakwnjfg48bpsic9r2r8dvrjlalqqkm9vh1rml9mhi967"
|
||||
},
|
||||
"4.19": {
|
||||
"version": "4.19.294",
|
||||
"hash": "03x0xsb8a369zdr81hg6xdl5n5v48k6iwnhj6r29725777lvvbfc"
|
||||
"hash": "sha256:03x0xsb8a369zdr81hg6xdl5n5v48k6iwnhj6r29725777lvvbfc"
|
||||
},
|
||||
"4.14": {
|
||||
"version": "4.14.325",
|
||||
"hash": "117p1mdha57f6d3kdwac9jrbmib7g77q4xhir8ghl6fmrs1f2sav"
|
||||
"hash": "sha256:117p1mdha57f6d3kdwac9jrbmib7g77q4xhir8ghl6fmrs1f2sav"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +1,27 @@
|
|||
{ branch, lib, fetchurl, buildLinux, ... } @ args:
|
||||
{ branch, lib, fetchurl, fetchzip, buildLinux, ... } @ args:
|
||||
|
||||
let
|
||||
allKernels = builtins.fromJSON (builtins.readFile ./kernels-org.json);
|
||||
thisKernel = allKernels.${branch};
|
||||
inherit (thisKernel) version;
|
||||
|
||||
src =
|
||||
# testing kernels are a special case because they don't have tarballs on the CDN
|
||||
if branch == "testing"
|
||||
then fetchzip {
|
||||
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
|
||||
inherit (thisKernel) hash;
|
||||
}
|
||||
else fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v${lib.versions.major version}.x/linux-${version}.tar.xz";
|
||||
inherit (thisKernel) hash;
|
||||
};
|
||||
|
||||
args' = (builtins.removeAttrs args ["branch"]) // {
|
||||
inherit src version;
|
||||
|
||||
args' = (builtins.removeAttrs args ["branch"]) // rec {
|
||||
inherit (thisKernel) version;
|
||||
modDirVersion = lib.versions.pad 3 version;
|
||||
extraMeta.branch = branch;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v${lib.versions.major version}.x/linux-${version}.tar.xz";
|
||||
sha256 = thisKernel.hash;
|
||||
};
|
||||
} // (args.argsOverride or {});
|
||||
in
|
||||
buildLinux args'
|
||||
|
|
|
|||
|
|
@ -1,61 +1,83 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i python3 -p "python3.withPackages (ps: [ ps.beautifulsoup4 ps.lxml ])"
|
||||
from enum import Enum
|
||||
from bs4 import BeautifulSoup, NavigableString, Tag
|
||||
from dataclasses import dataclass
|
||||
import json
|
||||
import os
|
||||
import pathlib
|
||||
import re
|
||||
import subprocess
|
||||
import urllib.request
|
||||
import sys
|
||||
import urllib.request
|
||||
from dataclasses import dataclass
|
||||
from enum import Enum
|
||||
|
||||
from bs4 import BeautifulSoup, NavigableString, Tag
|
||||
|
||||
HERE = pathlib.Path(__file__).parent
|
||||
ROOT = HERE.parent.parent.parent.parent
|
||||
VERSIONS_FILE = HERE / "kernels-org.json"
|
||||
|
||||
|
||||
class KernelNature(Enum):
|
||||
MAINLINE = 1
|
||||
STABLE = 2
|
||||
LONGTERM = 3
|
||||
|
||||
|
||||
@dataclass
|
||||
class KernelRelease:
|
||||
nature: KernelNature
|
||||
version: str
|
||||
branch: str
|
||||
date: str
|
||||
link: str
|
||||
eol: bool = False
|
||||
|
||||
|
||||
def parse_release(release: Tag) -> KernelRelease | None:
|
||||
columns: list[Tag] = list(release.find_all('td'))
|
||||
columns: list[Tag] = list(release.find_all("td"))
|
||||
try:
|
||||
nature = KernelNature[columns[0].get_text().rstrip(':').upper()]
|
||||
nature = KernelNature[columns[0].get_text().rstrip(":").upper()]
|
||||
except KeyError:
|
||||
return None
|
||||
|
||||
version = columns[1].get_text().rstrip(' [EOL]')
|
||||
version = columns[1].get_text().rstrip(" [EOL]")
|
||||
date = columns[2].get_text()
|
||||
link = columns[3].find('a')
|
||||
link = columns[3].find("a")
|
||||
if link is not None and isinstance(link, Tag):
|
||||
link = link.attrs.get('href')
|
||||
assert link is not None, f'link for kernel {version} is non-existent'
|
||||
eol = bool(release.find(class_='eolkernel'))
|
||||
link = link.attrs.get("href")
|
||||
assert link is not None, f"link for kernel {version} is non-existent"
|
||||
eol = bool(release.find(class_="eolkernel"))
|
||||
|
||||
return KernelRelease(
|
||||
nature=nature,
|
||||
branch=get_branch(version),
|
||||
version=version,
|
||||
date=date,
|
||||
link=link,
|
||||
eol=eol,
|
||||
)
|
||||
|
||||
return KernelRelease(nature=nature, version=version, date=date, link=link, eol=eol)
|
||||
|
||||
def get_branch(version: str):
|
||||
# This is a testing kernel.
|
||||
if 'rc' in version:
|
||||
return 'testing'
|
||||
if "rc" in version:
|
||||
return "testing"
|
||||
else:
|
||||
major, minor, *_ = version.split(".")
|
||||
return f"{major}.{minor}"
|
||||
|
||||
|
||||
def get_hash(url: str):
|
||||
return subprocess.check_output(["nix-prefetch-url", url]).decode().strip()
|
||||
def get_hash(kernel: KernelRelease):
|
||||
if kernel.branch == "testing":
|
||||
args = ["--unpack"]
|
||||
else:
|
||||
args = []
|
||||
|
||||
hash = (
|
||||
subprocess.check_output(["nix-prefetch-url", kernel.link] + args)
|
||||
.decode()
|
||||
.strip()
|
||||
)
|
||||
return f"sha256:{hash}"
|
||||
|
||||
|
||||
def commit(message):
|
||||
|
|
@ -65,19 +87,19 @@ def commit(message):
|
|||
def main():
|
||||
kernel_org = urllib.request.urlopen("https://kernel.org/")
|
||||
soup = BeautifulSoup(kernel_org.read().decode(), "lxml")
|
||||
release_table = soup.find(id='releases')
|
||||
release_table = soup.find(id="releases")
|
||||
if not release_table or isinstance(release_table, NavigableString):
|
||||
print(release_table)
|
||||
print('Failed to find the release table on https://kernel.org')
|
||||
print("Failed to find the release table on https://kernel.org")
|
||||
sys.exit(1)
|
||||
|
||||
releases = release_table.find_all('tr')
|
||||
releases = release_table.find_all("tr")
|
||||
parsed_releases = filter(None, [parse_release(release) for release in releases])
|
||||
all_kernels = json.load(VERSIONS_FILE.open())
|
||||
|
||||
for kernel in parsed_releases:
|
||||
branch = get_branch(kernel.version)
|
||||
nixpkgs_branch = branch.replace('.', '_')
|
||||
nixpkgs_branch = branch.replace(".", "_")
|
||||
|
||||
old_version = all_kernels.get(branch, {}).get("version")
|
||||
if old_version == kernel.version:
|
||||
|
|
@ -91,13 +113,17 @@ def main():
|
|||
|
||||
print(message)
|
||||
|
||||
all_kernels[branch] = {"version": kernel.version, "hash": get_hash(kernel.link)}
|
||||
all_kernels[branch] = {
|
||||
"version": kernel.version,
|
||||
"hash": get_hash(kernel),
|
||||
}
|
||||
|
||||
with VERSIONS_FILE.open("w") as fd:
|
||||
json.dump(all_kernels, fd, indent=4)
|
||||
fd.write("\n") # makes editorconfig happy
|
||||
|
||||
commit(message)
|
||||
if os.environ.get("COMMIT") == "1":
|
||||
commit(message)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
|
|
|||
|
|
@ -26,10 +26,13 @@ let
|
|||
export NIX_STATE_DIR=$TEST_ROOT/var/nix
|
||||
export NIX_STORE_DIR=$TEST_ROOT/store
|
||||
|
||||
# cargo tests run in parallel by default, which would then run into
|
||||
# https://github.com/NixOS/nix/issues/2706 unless the store is initialised first
|
||||
# Ensure that even if tests run in parallel, we don't get an error
|
||||
# We'd run into https://github.com/NixOS/nix/issues/2706 unless the store is initialised first
|
||||
nix-store --init
|
||||
'';
|
||||
# The tests use the shared environment variables,
|
||||
# so we cannot run them in parallel
|
||||
dontUseCargoParallelTests = true;
|
||||
postCheck = ''
|
||||
cargo fmt --check
|
||||
cargo clippy -- -D warnings
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "naabu";
|
||||
version = "2.1.7";
|
||||
version = "2.1.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "naabu";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-x6TmV8c5p9Uuc9uJG3+FNNpdmzdzgQpsyO29dly7PuU=";
|
||||
hash = "sha256-/EVlg0NhWJRowHttwYq+i/3BhO5o8w74kRLWIjSI6AQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-9LIPRiLKszfz9Gj26G03TPHOqCXi1s3CYiaadInlD84=";
|
||||
vendorHash = "sha256-LoYArDsCJCDSI02nFSUVemYNeF+q5xAjV2QyWjMOXIY=";
|
||||
|
||||
buildInputs = [
|
||||
libpcap
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "trufflehog";
|
||||
version = "3.56.1";
|
||||
version = "3.57.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trufflesecurity";
|
||||
repo = "trufflehog";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-4FN3FAs6Sc2LLcqaKsSxJS9VVNwp/Zit9gZT+qDXRik=";
|
||||
hash = "sha256-EzzjtrorfFYO6mEe8F/lYbHP96G04pFIRc6fzLa8eeY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-NBwPyA+NuW9RA/dXj+FpTa6RU0WOZRrey7gosDOatG8=";
|
||||
vendorHash = "sha256-iCCk5ngXsAyVaPeCllIrT1KjoM0KlNlgCiLeASquMco=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -69,6 +69,5 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
license = lib.licenses.bsd2;
|
||||
maintainers = with lib.maintainers; [ AndersonTorres dtzWill ];
|
||||
platforms = lib.platforms.all;
|
||||
broken = stdenv.isDarwin && stdenv.isx86_64; # ofborg fails while testing
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1520,6 +1520,8 @@ mapAliases ({
|
|||
qlandkartegt = throw "'qlandkartegt' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-04-17
|
||||
qr-filetransfer = throw ''"qr-filetransfer" has been renamed to "qrcp"''; # Added 2020-12-02
|
||||
qshowdiff = throw "'qshowdiff' (Qt4) is unmaintained and not been updated since its addition in 2010"; # Added 2022-06-14
|
||||
qscintilla = libsForQt5.qscintilla; # Added 2023-09-20
|
||||
qscintilla-qt6 = qt6Packages.qscintilla; # Added 2023-09-20
|
||||
qtscrobbler = throw "qtscrobbler has been removed, because it was unmaintained"; # Added 2022-05-26
|
||||
qt-3 = throw "qt-3 has been removed from nixpkgs, as it's unmaintained and insecure"; # Added 2021-02-15
|
||||
qt512 = throw "Qt 5 versions prior to 5.15 are no longer supported upstream and have been removed"; # Added 2022-11-24
|
||||
|
|
|
|||
|
|
@ -12478,12 +12478,6 @@ with pkgs;
|
|||
|
||||
qprint = callPackage ../tools/text/qprint { };
|
||||
|
||||
qscintilla = libsForQt5.callPackage ../development/libraries/qscintilla {
|
||||
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
|
||||
};
|
||||
|
||||
qscintilla-qt6 = qt6Packages.callPackage ../development/libraries/qscintilla { };
|
||||
|
||||
qrcp = callPackage ../tools/networking/qrcp { };
|
||||
|
||||
qrscan = callPackage ../tools/misc/qrscan { };
|
||||
|
|
@ -30400,6 +30394,8 @@ with pkgs;
|
|||
|
||||
weather-icons = callPackage ../data/fonts/weather-icons { };
|
||||
|
||||
whitesur-cursors = callPackage ../data/icons/whitesur-cursors { };
|
||||
|
||||
whitesur-gtk-theme = callPackage ../data/themes/whitesur {
|
||||
inherit (gnome) gnome-shell;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8539,6 +8539,8 @@ self: super: with self; {
|
|||
|
||||
podcats = callPackage ../development/python-modules/podcats { };
|
||||
|
||||
podman = callPackage ../development/python-modules/podman { };
|
||||
|
||||
poetry-core = callPackage ../development/python-modules/poetry-core { };
|
||||
|
||||
poetry-dynamic-versioning = callPackage ../development/python-modules/poetry-dynamic-versioning { };
|
||||
|
|
|
|||
|
|
@ -221,6 +221,8 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea
|
|||
|
||||
quazip = callPackage ../development/libraries/quazip { };
|
||||
|
||||
qscintilla = callPackage ../development/libraries/qscintilla { };
|
||||
|
||||
qwt = callPackage ../development/libraries/qwt/default.nix { };
|
||||
|
||||
qwt6_1 = callPackage ../development/libraries/qwt/6_1.nix { };
|
||||
|
|
|
|||
|
|
@ -36,6 +36,8 @@ in
|
|||
|
||||
quazip = callPackage ../development/libraries/quazip { };
|
||||
|
||||
qscintilla = callPackage ../development/libraries/qscintilla { };
|
||||
|
||||
qxlsx = callPackage ../development/libraries/qxlsx { };
|
||||
|
||||
poppler = callPackage ../development/libraries/poppler {
|
||||
|
|
|
|||
Loading…
Reference in a new issue