Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
35eee590be
2
.github/CODEOWNERS
vendored
2
.github/CODEOWNERS
vendored
@ -53,7 +53,7 @@
|
||||
/pkgs/test/nixpkgs-check-by-name @infinisil
|
||||
/pkgs/by-name/README.md @infinisil
|
||||
/pkgs/top-level/by-name-overlay.nix @infinisil
|
||||
/.github/workflows/check-by-name.nix @infinisil
|
||||
/.github/workflows/check-by-name.yml @infinisil
|
||||
|
||||
# Nixpkgs build-support
|
||||
/pkgs/build-support/writers @lassulus @Profpatsch
|
||||
|
||||
4
.github/workflows/check-by-name.yml
vendored
4
.github/workflows/check-by-name.yml
vendored
@ -19,11 +19,13 @@ jobs:
|
||||
steps:
|
||||
- name: Resolving the merge commit
|
||||
run: |
|
||||
if result=$(git ls-remote --exit-code ${{ github.event.pull_request.base.repo.clone_url }} refs/pull/${{ github.event.pull_request.number }}/merge); then
|
||||
if result=$(git ls-remote --exit-code ${{ github.event.pull_request.base.repo.clone_url }} refs/pull/${{ github.event.pull_request.number }}/merge 2>&1); then
|
||||
mergedSha=$(cut -f1 <<< "$result")
|
||||
echo "The PR appears to not have any conflicts, checking the merge commit $mergedSha"
|
||||
else
|
||||
echo "The PR may have a merge conflict"
|
||||
echo "'git ls-remote' output was:"
|
||||
echo "$result"
|
||||
exit 1
|
||||
fi
|
||||
echo "mergedSha=$mergedSha" >> "$GITHUB_ENV"
|
||||
|
||||
@ -172,7 +172,7 @@ in {
|
||||
ln -sf '${file}' "${local}"
|
||||
'') rules}
|
||||
|
||||
if [ ! -f /etc/opensnitch-system-fw.json ]; then
|
||||
if [ ! -f /etc/opensnitchd/system-fw.json ]; then
|
||||
cp "${pkgs.opensnitch}/etc/opensnitchd/system-fw.json" "/etc/opensnitchd/system-fw.json"
|
||||
fi
|
||||
'');
|
||||
|
||||
@ -27,11 +27,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bitwig-studio";
|
||||
version = "5.0.7";
|
||||
version = "5.0.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb";
|
||||
sha256 = "sha256-jsHGUAVRUiz9soffW1PvF6UUGzbGhltaKtEW5ynq/Xk=";
|
||||
sha256 = "sha256-B6s8FuNvJ3NdU7uZ+AsZkiFf9p6WcLzoZPsfzors1kk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ];
|
||||
|
||||
@ -1,38 +1,60 @@
|
||||
{ fetchurl, lib, stdenv, gettext, libmpcdec, libao }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, gettext
|
||||
, libao
|
||||
, libmpcdec
|
||||
}:
|
||||
|
||||
let version = "0.2.4"; in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mpc123";
|
||||
inherit version;
|
||||
version = "0.2.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/mpc123/version%20${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "0sf4pns0245009z6mbxpx7kqy4kwl69bc95wz9v23wgappsvxgy1";
|
||||
src = fetchFromGitLab {
|
||||
domain = "salsa.debian.org";
|
||||
owner = "debian";
|
||||
repo = "mpc123";
|
||||
rev = "upstream/${finalAttrs.version}";
|
||||
hash = "sha256-+/yxb19CJzyjQmT3O21pEmPR5YudmyCxWwo+W3uOB9Q=";
|
||||
};
|
||||
|
||||
patches = [ ./use-gcc.patch ];
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gettext
|
||||
libao
|
||||
libmpcdec
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"CC=${stdenv.cc.targetPrefix}cc"
|
||||
];
|
||||
|
||||
# Workaround build failure on -fno-common toolchains like upstream
|
||||
# gcc-10. Otherwise build fails as:
|
||||
# ld: /build/cc566Cj9.o:(.bss+0x0): multiple definition of `mpc123_file_reader'; ao.o:(.bss+0x40): first defined here
|
||||
env.NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
|
||||
buildInputs = [ gettext libmpcdec libao ];
|
||||
|
||||
installPhase =
|
||||
# XXX: Should install locales too (though there's only 1 available).
|
||||
'' mkdir -p "$out/bin"
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p "$out/bin"
|
||||
cp -v mpc123 "$out/bin"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://mpc123.sourceforge.net/";
|
||||
|
||||
description = "A Musepack (.mpc) audio player";
|
||||
|
||||
homepage = "https://github.com/bucciarati/mpc123";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
|
||||
mainProgram = "mpc123";
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
Don't worry, just use GCC and everything's gonna be alright.
|
||||
|
||||
--- mpc123-0.2.4/Makefile 2008-03-21 22:14:38.000000000 +0100
|
||||
+++ mpc123-0.2.4/Makefile 2010-01-28 23:26:49.000000000 +0100
|
||||
@@ -17,7 +17,7 @@
|
||||
# along with this program; if not, write to the Free Software Foundation,
|
||||
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
-CC := $(shell which colorgcc || which cc)
|
||||
+CC := gcc
|
||||
|
||||
TAGSPRG := ctags
|
||||
|
||||
@ -11,11 +11,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocenaudio";
|
||||
version = "3.12.7";
|
||||
version = "3.13.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}";
|
||||
sha256 = "sha256-+D/JvC0emKdxzd0l2n1QZ0geosrMpdpaxru5z61kqxA=";
|
||||
sha256 = "sha256-h5t5DpZD9zmmyGRueXBG5Pn+vZstm5yCUr6Mx3eyvsc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "besu";
|
||||
version = "23.7.2";
|
||||
version = "23.7.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://hyperledger.jfrog.io/artifactory/${pname}-binaries/${pname}/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-90sywaNDy62QqIqlkna0xe7+pGQ+5UKrorv4mPha4kI=";
|
||||
sha256 = "sha256-wSymqYYVV+C/jycHb4yK/M5vFWRofl8Cv9yWwrGIRv8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openvi";
|
||||
version = "7.4.23";
|
||||
version = "7.4.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "johnsonjh";
|
||||
repo = "OpenVi";
|
||||
rev = version;
|
||||
hash = "sha256-DwecSnByRkjBFqy3gWJ0+1srF2YsNACqKrAITn6wXJw=";
|
||||
hash = "sha256-jfh82Ti8iVqsh7G9BnHbc3cQP8D9dGV71YJ28SBjjgA=";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses perl ];
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "browsr";
|
||||
version = "1.16.0";
|
||||
version = "1.17.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juftin";
|
||||
repo = "browsr";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Tb/7ek5aKFxv8g4jAmj9nQ909LiHqrAXJoeC9o6fwFM=";
|
||||
hash = "sha256-FExDKugFP94C3zMnR1V4QDPWeM2OtRH2ei0LNs3h06c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "batik";
|
||||
version = "1.16";
|
||||
version = "1.17";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/xmlgraphics/batik/binaries/batik-bin-${version}.tar.gz";
|
||||
sha256 = "sha256-Y4bJ6X46sKx1+fmNkOS2RU7gn7n0fKDnkOYMq0S8fYM=";
|
||||
sha256 = "sha256-sEJphF3grlwZCEt3gHHm4JF8RpvKKBLLvKXf2lu/dhA=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,25 +1,43 @@
|
||||
{ fetchurl, lib, stdenv, libjpeg, libpng, libtiff, perl, cmake }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, cmake
|
||||
, libjpeg
|
||||
, libpng
|
||||
, libtiff
|
||||
, perl
|
||||
, darwin
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libpano13";
|
||||
version = "2.9.22";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/panotools/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-r/xoMM2+ccKNJzHcv43qKs2m2f/UYJxtvzugxoRAqOM=";
|
||||
url = "mirror://sourceforge/panotools/libpano13-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-r/xoMM2+ccKNJzHcv43qKs2m2f/UYJxtvzugxoRAqOM=";
|
||||
};
|
||||
|
||||
buildInputs = [ perl libjpeg libpng libtiff ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
strictDeps = true;
|
||||
|
||||
# one of the tests succeeds on my machine but fails on Hydra (no idea why)
|
||||
#doCheck = true;
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libjpeg
|
||||
libpng
|
||||
libtiff
|
||||
perl
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Carbon
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://panotools.sourceforge.net/";
|
||||
description = "Free software suite for authoring and displaying virtual reality panoramas";
|
||||
homepage = "https://panotools.sourceforge.net/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
|
||||
platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice
|
||||
maintainers = [ lib.maintainers.wegank ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -6,19 +6,19 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "furtherance";
|
||||
version = "1.8.1";
|
||||
version = "1.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lakoliu";
|
||||
repo = "Furtherance";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-KNC0e1Qfls+TcUDPvLaTWWF4ELBJYPE7Oo9/4PK10js=";
|
||||
hash = "sha256-tr7TBqfqKzMnYBMHJmrAW/HViqT4rydBBZvBqgpnfSk=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit (finalAttrs) src;
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}";
|
||||
hash = "sha256-NHrKk7XgqeEuNAOyIDfzFJzIExTpUfv83Pdv/NPkgYQ=";
|
||||
hash = "sha256-MFiMoTMW83QxV3BOyZaa1XmfRNieCT007N/4vfSD67Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "moonlight-embedded";
|
||||
version = "2.6.0";
|
||||
version = "2.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moonlight-stream";
|
||||
repo = "moonlight-embedded";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BZYFN6X6UNllwlovnpEwDSocA5ZfSDUOyr8JTg4z9ak=";
|
||||
sha256 = "sha256-/gRm3fViTpoTOkIEu6+mrGTVTAFTmwdWV0MKoFF5vkc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -85,8 +85,8 @@ mkChromiumDerivation (base: rec {
|
||||
then "https://github.com/ungoogled-software/ungoogled-chromium"
|
||||
else "https://www.chromium.org/";
|
||||
maintainers = with lib.maintainers; if ungoogled
|
||||
then [ squalus primeos michaeladler networkexception ]
|
||||
else [ primeos thefloweringash networkexception ];
|
||||
then [ squalus primeos michaeladler networkexception emilylange ]
|
||||
else [ primeos thefloweringash networkexception emilylange ];
|
||||
license = if enableWideVine then lib.licenses.unfree else lib.licenses.bsd3;
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "chromium";
|
||||
|
||||
@ -2,24 +2,24 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kube-router";
|
||||
version = "1.6.0";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudnativelabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3hfStQ87t8zKyRqUoUViAqRcI8AQXhYSwOGqwIm6Q/w=";
|
||||
hash = "sha256-7laXw0tC25zPTeLJlB/rX6WVcRFCd6DCB+3EUPnE4cM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-kV5tUGhOm0/q5btOQu4TtDO5dVmACNNvDS7iNgm/Xio=";
|
||||
vendorHash = "sha256-qJA6gnb+VIkJD24iq6yyn8r4zYY19ZywcyalwfaTtbo=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/cloudnativelabs/kube-router/pkg/version.Version=${version}"
|
||||
"-X github.com/cloudnativelabs/kube-router/pkg/version.BuildDate=Nix"
|
||||
"-X github.com/cloudnativelabs/kube-router/v2/pkg/version.Version=${version}"
|
||||
"-X github.com/cloudnativelabs/kube-router/v2/pkg/version.BuildDate=Nix"
|
||||
];
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "odo";
|
||||
version = "3.14.0";
|
||||
version = "3.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "redhat-developer";
|
||||
repo = "odo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-d6C+nOz60CPnEsSf74+WBTaeIXGKtysVELg0+dXM1cU=";
|
||||
sha256 = "sha256-UPq211Lo95r2b/Ov/a7uhb5p9M3MlNd72VwkMXPHy2Y=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -31,13 +31,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "firewalld";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firewalld";
|
||||
repo = "firewalld";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-seOokeFbjCuwUsB6MbrxaeTlPUzwNzkJPbByM9/oDDU=";
|
||||
sha256 = "sha256-hGMO3uqUlh5h4HYmJiFdfZZw+y1yjprlSadYvix2LIU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcoap";
|
||||
version = "4.3.3";
|
||||
version = "4.3.4";
|
||||
src = fetchFromGitHub {
|
||||
repo = "libcoap";
|
||||
owner = "obgm";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-RS37Fpo1uzwEKzCysilXiH/NYOySEYGPOk0R/+rqiag=";
|
||||
sha256 = "sha256-x8r5fHY8J0NYE7nPSw/bPpK/iTLKioKpQKmVw73KOtg=";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
automake
|
||||
|
||||
@ -10,12 +10,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "flamp";
|
||||
version = "2.2.07";
|
||||
version = "2.2.09";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.code.sf.net/p/fldigi/flamp";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-BnKL1iwaw1iJC5qcGCvdMr461n0BSYxk61dbAnhpz2c=";
|
||||
hash = "sha256-ev+Ik/e1zQGTH4FeiCDPHbrcXlctencEo4R0+M2Kg+g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -27,13 +27,13 @@ assert !(pulseaudioSupport && portaudioSupport);
|
||||
|
||||
gnuradioMinimal.pkgs.mkDerivation rec {
|
||||
pname = "gqrx";
|
||||
version = "2.17";
|
||||
version = "2.17.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gqrx-sdr";
|
||||
repo = "gqrx";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QnwkiH8KqoHa2Q3knh0OAyGBySAArEtdpO+lTzqJ4j0=";
|
||||
hash = "sha256-dwqb/TYNkaXSLXQ0QJEQpy1es0hgNrkNnZww9RpfTt8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -14,11 +14,11 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "kstars";
|
||||
version = "3.6.6";
|
||||
version = "3.6.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz";
|
||||
sha256 = "sha256-Z4PatRvtIJBoeRDJJYkkBTOB/R+R7nGdDT38bfAShJQ=";
|
||||
sha256 = "sha256-uEgzvhlHHpXyvi3Djfwg3GmYeZq+r48m7OJFIDARpe4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
|
||||
@ -12,11 +12,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepgit";
|
||||
version = "4.3";
|
||||
version = "4.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.syntevo.com/downloads/deepgit/deepgit-linux-${lib.replaceStrings [ "." ] [ "_" ] version}.tar.gz";
|
||||
hash = "sha256-bA/EySZjuSDYaZplwHcpeP1VakcnG5K1hYTk7cSVbz0=";
|
||||
hash = "sha256-Ovd9MjgpMJvNySW/FPXYVtpLoCSQP1W1nlcNkgI7sgA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ lib, stdenv, fetchurl, makeWrapper, libglvnd, libnotify, jre, zip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "13.9.1";
|
||||
version = "14.0.0";
|
||||
pname = "mediathekview";
|
||||
src = fetchurl {
|
||||
url = "https://download.mediathekview.de/stabil/MediathekView-${version}-linux.tar.gz";
|
||||
sha256 = "4BYKkYhl1YjiAZyfNRdV5KQL+dVkL058uhTG892mXUM=";
|
||||
sha256 = "sha256-vr0yqKVRodtXalHEIsm5gdEp9wPU9U5nnYhMk7IiPF4=";
|
||||
};
|
||||
|
||||
|
||||
|
||||
@ -71,6 +71,10 @@ let
|
||||
composerNoScripts = previousAttrs.composerNoScripts or true;
|
||||
};
|
||||
|
||||
COMPOSER_CACHE_DIR="/dev/null";
|
||||
COMPOSER_DISABLE_NETWORK="1";
|
||||
COMPOSER_MIRROR_PATH_REPOS="1";
|
||||
|
||||
meta = previousAttrs.meta or { } // {
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
|
||||
@ -49,7 +49,7 @@ composerInstallConfigureHook() {
|
||||
fi
|
||||
|
||||
echo "Validating consistency between composer.lock and ${composerRepository}/composer.lock"
|
||||
if [[! @diff@ composer.lock "${composerRepository}/composer.lock"]]; then
|
||||
if ! @cmp@ -s "composer.lock" "${composerRepository}/composer.lock"; then
|
||||
echo
|
||||
echo "ERROR: vendorHash is out of date"
|
||||
echo
|
||||
@ -88,7 +88,6 @@ composerInstallBuildHook() {
|
||||
|
||||
# Since the composer.json file has been modified in the previous step, the
|
||||
# composer.lock file needs to be updated.
|
||||
COMPOSER_DISABLE_NETWORK=1 \
|
||||
COMPOSER_ROOT_VERSION="${version}" \
|
||||
composer \
|
||||
--lock \
|
||||
@ -118,10 +117,7 @@ composerInstallInstallHook() {
|
||||
# the autoloader.
|
||||
# The COMPOSER_ROOT_VERSION environment variable is needed only for
|
||||
# vimeo/psalm.
|
||||
COMPOSER_CACHE_DIR=/dev/null \
|
||||
COMPOSER_DISABLE_NETWORK=1 \
|
||||
COMPOSER_ROOT_VERSION="${version}" \
|
||||
COMPOSER_MIRROR_PATH_REPOS="1" \
|
||||
composer \
|
||||
--no-ansi \
|
||||
--no-interaction \
|
||||
|
||||
@ -55,7 +55,6 @@ composerRepositoryBuildHook() {
|
||||
# Build the local composer repository
|
||||
# The command 'build-local-repo' is provided by the Composer plugin
|
||||
# nix-community/composer-local-repo-plugin.
|
||||
COMPOSER_CACHE_DIR=/dev/null \
|
||||
composer-local-repo-plugin --no-ansi build-local-repo ${composerNoDev:+--no-dev} -r repository
|
||||
|
||||
echo "Finished composerRepositoryBuildHook"
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ lib
|
||||
, makeSetupHook
|
||||
, diffutils
|
||||
, jq
|
||||
, moreutils
|
||||
, makeBinaryWrapper
|
||||
@ -22,7 +23,7 @@
|
||||
substitutions = {
|
||||
# Specify the stdenv's `diff` by abspath to ensure that the user's build
|
||||
# inputs do not cause us to find the wrong `diff`.
|
||||
diff = "${lib.getBin buildPackages.diffutils}/bin/diff";
|
||||
cmp = "${lib.getBin buildPackages.diffutils}/bin/cmp";
|
||||
};
|
||||
} ./composer-install-hook.sh;
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "Boogie";
|
||||
version = "3.0.4";
|
||||
version = "3.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "boogie-org";
|
||||
repo = "boogie";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-yebThnIOpZ5crYsSZtbDj8Gn6DznTNJ4T/TsFR3gWvs=";
|
||||
sha256 = "sha256-KciQakwus7cKjtfp5x8nDV7bbTXlzILcL3ivCJAV6Vk=";
|
||||
};
|
||||
|
||||
projectFile = [ "Source/Boogie.sln" ];
|
||||
|
||||
50
pkgs/by-name/oc/octorpki/package.nix
Normal file
50
pkgs/by-name/oc/octorpki/package.nix
Normal file
@ -0,0 +1,50 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "octorpki";
|
||||
version = "1.5.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = "cfrpki";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-eqIAauwFh1Zbv3Jkk8plz1OR3ZW8fs0ugNwwTnSHSFM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/cloudflare/cfrpki/pull/150
|
||||
(fetchpatch {
|
||||
url = "https://github.com/cloudflare/cfrpki/commit/fd0c4e95b880c463430c91ce1f86205b9309399b.patch";
|
||||
hash = "sha256-cJ0mWkjtGvgTIH5eEum8h2Gy2PqR+nPto+mj5m/I/d4=";
|
||||
})
|
||||
];
|
||||
|
||||
ldflags = [
|
||||
"-X main.version=v${version}"
|
||||
"-X main.talpath=${placeholder "out"}/share/tals"
|
||||
];
|
||||
|
||||
subPackages = [
|
||||
"cmd/octorpki"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share
|
||||
cp -R cmd/octorpki/tals $out/share/tals
|
||||
'';
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/cloudflare/cfrpki#octorpki";
|
||||
changelog = "https://github.com/cloudflare/cfrpki/releases/tag/v${version}";
|
||||
description = "A software used to download RPKI (RFC 6480) certificates and validate them";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.all;
|
||||
maintainers = teams.wdz.members;
|
||||
};
|
||||
}
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "raft-cowsql";
|
||||
version = "0.17.3";
|
||||
version = "0.17.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cowsql";
|
||||
repo = "raft";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Ad09giGVsAVtm/0GRU/OaZx7BGjL5TlU8BrzFaFlE9k=";
|
||||
hash = "sha256-ZAUC2o0VWpC/zMOVOAxW+CAdiDTXa5JG0gfHirTjm88=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
||||
40
pkgs/by-name/se/serial-unit-testing/package.nix
Normal file
40
pkgs/by-name/se/serial-unit-testing/package.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, udev
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "serial-unit-testing";
|
||||
version = "0.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "markatk";
|
||||
repo = "serial-unit-testing";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SLwTwEQdwbus9RFskFjU8m4fS9Pnp8HsgnKkBvTqmSI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-PoV2v0p0L3CTtC9VMAx2Z/ZsSAIFi2gh2TtOp64S6ZQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
udev
|
||||
];
|
||||
|
||||
# tests require a serial port
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Automate testing of serial communication with any serial port device";
|
||||
homepage = "https://github.com/markatk/serial-unit-testing";
|
||||
changelog = "https://github.com/markatk/serial-unit-testing/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ rudolfvesely ];
|
||||
mainProgram = "sut";
|
||||
};
|
||||
}
|
||||
39
pkgs/by-name/sw/swipe-guess/package.nix
Normal file
39
pkgs/by-name/sw/swipe-guess/package.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromSourcehut
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "swipe-guess";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~earboxer";
|
||||
repo = "swipeGuess";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8bPsnqjLeeZ7btTre9j1T93VWY9+FdBdJdxyvBVt34s=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
${lib.getExe stdenv.cc} swipeGuess.c -o swipeGuess
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -Dm555 swipeGuess -t $out/bin
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Completion plugin for touchscreen-keyboards on mobile devices";
|
||||
homepage = "https://git.sr.ht/~earboxer/swipeGuess/";
|
||||
license = lib.licenses.agpl3Only;
|
||||
mainProgram = "swipeGuess";
|
||||
maintainers = with lib.maintainers; [ eclairevoyant ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
@ -1,15 +0,0 @@
|
||||
diff -Naur source-old/src/CMakeLists.txt source-new/src/CMakeLists.txt
|
||||
--- source-old/src/CMakeLists.txt 1969-12-31 21:00:01.000000000 -0300
|
||||
+++ source-new/src/CMakeLists.txt 2021-10-29 12:03:06.461399341 -0300
|
||||
@@ -362,10 +360,8 @@
|
||||
if (EXISTS ${EXTERNAL_SRC_DIR}/git/openal AND STATIC_OPENAL)
|
||||
amsg("${CL_YEL}Building OpenAL static from external/git mirror${CL_RST}")
|
||||
ExternalProject_Add(OpenAL
|
||||
- SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/openal
|
||||
+ SOURCE_DIR "${EXTERNAL_SRC_DIR}/git/openal"
|
||||
BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/openal_static
|
||||
- UPDATE_COMMAND ""
|
||||
- GIT_REPOSITORY "${EXTERNAL_SRC_DIR}/git/openal"
|
||||
${EXTERNAL_DEFS}
|
||||
${CMAKE_EXTERNAL_DEFS}
|
||||
-DALSOFT_BACKEND_DSOUND=OFF
|
||||
@ -1,17 +0,0 @@
|
||||
diff -Naur source-old/src/CMakeLists.txt source-new/src/CMakeLists.txt
|
||||
--- source-old/src/CMakeLists.txt 1969-12-31 21:00:01.000000000 -0300
|
||||
+++ source-new/src/CMakeLists.txt 2021-10-29 12:03:06.461399341 -0300
|
||||
@@ -419,12 +415,7 @@
|
||||
set(LUA_TAG "luajit51")
|
||||
if (EXISTS ${EXTERNAL_SRC_DIR}/git/luajit)
|
||||
ExternalProject_Add(luajit
|
||||
- SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/luajit
|
||||
- GIT_REPOSITORY "${EXTERNAL_SRC_DIR}/git/luajit"
|
||||
- CONFIGURE_COMMAND ""
|
||||
- GIT_TAG "v2.1.0-beta3"
|
||||
- UPDATE_COMMAND ""
|
||||
- INSTALL_COMMAND ""
|
||||
+ SOURCE_DIR "${EXTERNAL_SRC_DIR}/git/luajit"
|
||||
BUILD_IN_SOURCE 1
|
||||
BUILD_COMMAND "${EXTMAKE_CMD}"
|
||||
DEFAULT_CC=${CMAKE_C_COMPILER}
|
||||
@ -1,15 +0,0 @@
|
||||
diff -Naur source-old/src/frameserver/decode/default/CMakeLists.txt source-new/src/frameserver/decode/default/CMakeLists.txt
|
||||
--- source-old/src/frameserver/decode/default/CMakeLists.txt 1969-12-31 21:00:01.000000000 -0300
|
||||
+++ source-new/src/frameserver/decode/default/CMakeLists.txt 2021-10-29 12:01:31.989933725 -0300
|
||||
@@ -62,10 +62,8 @@
|
||||
if (STATIC_LIBUVC)
|
||||
pkg_check_modules(LIBUSB_1 REQUIRED libusb-1.0)
|
||||
ExternalProject_Add(libuvc
|
||||
- SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/frameserver/decode/libuvc"
|
||||
+ SOURCE_DIR "${EXTERNAL_SRC_DIR}/git/libuvc"
|
||||
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/libuvc_static"
|
||||
- UPDATE_COMMAND ""
|
||||
- GIT_REPOSITORY "${EXTERNAL_SRC_DIR}/git/libuvc"
|
||||
${EXTERNAL_DEFS}
|
||||
${CMAKE_EXTERNAL_DEFS}
|
||||
-DBUILD_UVC_STATIC=ON
|
||||
@ -1,25 +0,0 @@
|
||||
{ fetchgit, fetchFromGitHub }:
|
||||
{
|
||||
letoram-openal-src = fetchFromGitHub {
|
||||
owner = "letoram";
|
||||
repo = "openal";
|
||||
rev = "81e1b364339b6aa2b183f39fc16c55eb5857e97a";
|
||||
sha256 = "sha256-X3C3TDZPiOhdZdpApC4h4KeBiWFMxkFsmE3gQ1Rz420=";
|
||||
};
|
||||
freetype-src = fetchgit {
|
||||
url = "git://git.sv.nongnu.org/freetype/freetype2.git";
|
||||
rev = "275b116b40c9d183d42242099ea9ff276985855b";
|
||||
sha256 = "sha256-YVyJttaXt19MSuD0pmazwxNKz65jcqqWvIgmDj4d3MA=";
|
||||
};
|
||||
libuvc-src = fetchFromGitHub {
|
||||
owner = "libuvc";
|
||||
repo = "libuvc";
|
||||
rev = "a4de53e7e265f8c6a64df7ccd289f318104e1916";
|
||||
hash = "sha256-a+Q0PTV4ujGnX55u49VJfMgQljZunZYRvkR0tIkGnHI=";
|
||||
};
|
||||
luajit-src = fetchgit {
|
||||
url = "https://luajit.org/git/luajit-2.0.git";
|
||||
rev = "899093a9e0fa5b16f27016381ef4b15529dadff2";
|
||||
sha256 = "sha256-bCi1ms78HCOOgStIY2tSGM9LUEX3qnwadLLeYWWu1KI=";
|
||||
};
|
||||
}
|
||||
@ -32,10 +32,12 @@
|
||||
, makeWrapper
|
||||
, mesa
|
||||
, mupdf
|
||||
, ninja
|
||||
, openal
|
||||
, openjpeg
|
||||
, pcre
|
||||
, pcre2
|
||||
, pkg-config
|
||||
, ruby
|
||||
, sqlite
|
||||
, tesseract
|
||||
, valgrind
|
||||
@ -44,28 +46,54 @@
|
||||
, xcbutil
|
||||
, xcbutilwm
|
||||
, xz
|
||||
, buildManPages ? true, ruby
|
||||
, buildManPages ? true
|
||||
, useBuiltinLua ? true
|
||||
, useStaticFreetype ? false
|
||||
, useStaticLibuvc ? false
|
||||
, useEspeak ? !stdenv.isDarwin
|
||||
, useStaticLibuvc ? true
|
||||
, useStaticOpenAL ? true
|
||||
, useStaticSqlite ? false
|
||||
, useStaticSqlite ? true
|
||||
, useTracy ? true
|
||||
}:
|
||||
|
||||
let
|
||||
cmakeFeatureFlag = feature: flag:
|
||||
"-D${feature}=${if flag then "on" else "off"}";
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "arcan" + lib.optionalString useStaticOpenAL "-static-openal";
|
||||
version = "0.6.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
allSources = {
|
||||
letoram-arcan-src = fetchFromGitHub {
|
||||
owner = "letoram";
|
||||
repo = "arcan";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-7H3fVSsW5VANLqwhykY+Q53fPjz65utaGksh/OpZnJM=";
|
||||
rev = "85c8564bdbee8468a5716bea64daf1d78937ffbf";
|
||||
hash = "sha256-etmj1vpZTjxbmr4UiLBEK57WFJ1NeEnY5WfBYajX3ls=";
|
||||
};
|
||||
letoram-openal-src = fetchFromGitHub {
|
||||
owner = "letoram";
|
||||
repo = "openal";
|
||||
rev = "81e1b364339b6aa2b183f39fc16c55eb5857e97a";
|
||||
hash = "sha256-X3C3TDZPiOhdZdpApC4h4KeBiWFMxkFsmE3gQ1Rz420=";
|
||||
};
|
||||
libuvc-src = fetchFromGitHub {
|
||||
owner = "libuvc";
|
||||
repo = "libuvc";
|
||||
rev = "68d07a00e11d1944e27b7295ee69673239c00b4b";
|
||||
hash = "sha256-IdV18mnPTDBODpS1BXl4ulkFyf1PU2ZmuVGNOIdQwzE=";
|
||||
};
|
||||
luajit-src = fetchFromGitHub {
|
||||
owner = "LuaJIT";
|
||||
repo = "LuaJIT";
|
||||
rev = "656ecbcf8f669feb94e0d0ec4b4f59190bcd2e48";
|
||||
hash = "sha256-/gGQzHgYuWGqGjgpEl18Rbh3Sx2VP+zLlx4N9/hbYLc=";
|
||||
};
|
||||
tracy-src = fetchFromGitHub {
|
||||
owner = "wolfpld";
|
||||
repo = "tracy";
|
||||
rev = "93537dff336e0796b01262e8271e4d63bf39f195";
|
||||
hash = "sha256-FNB2zTbwk8hMNmhofz9GMts7dvH9phBRVIdgVjRcyQM=";
|
||||
};
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "arcan";
|
||||
version = "0.6.2.1-unstable-2023-10-14";
|
||||
|
||||
src = allSources.letoram-arcan-src;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
@ -77,7 +105,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
espeak
|
||||
ffmpeg
|
||||
file
|
||||
freetype
|
||||
@ -100,13 +127,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libvncserver
|
||||
libxcb
|
||||
libxkbcommon
|
||||
lua5_1
|
||||
luajit
|
||||
mesa
|
||||
mupdf.dev
|
||||
openal
|
||||
openjpeg.dev
|
||||
pcre
|
||||
pcre2
|
||||
sqlite
|
||||
tesseract
|
||||
valgrind
|
||||
@ -115,40 +140,29 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
xcbutil
|
||||
xcbutilwm
|
||||
xz
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Nixpkgs-specific: redirect vendoring
|
||||
./000-openal.patch
|
||||
./001-luajit.patch
|
||||
./002-libuvc.patch
|
||||
]
|
||||
++ lib.optionals useEspeak [
|
||||
espeak
|
||||
];
|
||||
|
||||
# Emulate external/git/clone.sh
|
||||
postUnpack = let
|
||||
inherit (import ./clone-sources.nix { inherit fetchFromGitHub fetchgit; })
|
||||
letoram-openal-src freetype-src libuvc-src luajit-src;
|
||||
inherit (allSources)
|
||||
letoram-openal-src libuvc-src luajit-src tracy-src;
|
||||
prepareSource = flag: source: destination:
|
||||
lib.optionalString flag ''
|
||||
cp -va ${source}/ ${destination}
|
||||
chmod --recursive 744 ${destination}
|
||||
'';
|
||||
in
|
||||
''
|
||||
pushd $sourceRoot/external/git/
|
||||
''
|
||||
+ (lib.optionalString useStaticOpenAL ''
|
||||
cp -a ${letoram-openal-src}/ openal
|
||||
chmod --recursive 744 openal
|
||||
'')
|
||||
+ (lib.optionalString useStaticFreetype ''
|
||||
cp -a ${freetype-src}/ freetype
|
||||
chmod --recursive 744 freetype
|
||||
'')
|
||||
+ (lib.optionalString useStaticLibuvc ''
|
||||
cp -a ${libuvc-src}/ libuvc
|
||||
chmod --recursive 744 libuvc
|
||||
'')
|
||||
+ (lib.optionalString useBuiltinLua ''
|
||||
cp -a ${luajit-src}/ luajit
|
||||
chmod --recursive 744 luajit
|
||||
'') +
|
||||
''
|
||||
+ prepareSource useStaticOpenAL letoram-openal-src "openal"
|
||||
+ prepareSource useStaticLibuvc libuvc-src "libuvc"
|
||||
+ prepareSource useBuiltinLua luajit-src "luajit"
|
||||
+ prepareSource useTracy tracy-src "tracy"
|
||||
+ ''
|
||||
popd
|
||||
'';
|
||||
|
||||
@ -156,11 +170,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
substituteInPlace ./src/platform/posix/paths.c \
|
||||
--replace "/usr/bin" "$out/bin" \
|
||||
--replace "/usr/share" "$out/share"
|
||||
|
||||
substituteInPlace ./src/CMakeLists.txt --replace "SETUID" "# SETUID"
|
||||
substituteInPlace ./src/CMakeLists.txt \
|
||||
--replace "SETUID" "# SETUID"
|
||||
'';
|
||||
|
||||
# INFO: Arcan build scripts require the manpages to be generated before the
|
||||
# INFO: Arcan build scripts require the manpages to be generated *before* the
|
||||
# `configure` phase
|
||||
preConfigure = lib.optionalString buildManPages ''
|
||||
pushd doc
|
||||
@ -169,17 +183,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_PRESET=everything"
|
||||
# The upstream project recommends tagging the distribution
|
||||
"-DDISTR_TAG=Nixpkgs"
|
||||
"-DENGINE_BUILDTAG=${finalAttrs.version}"
|
||||
(cmakeFeatureFlag "HYBRID_SDL" true)
|
||||
(cmakeFeatureFlag "BUILTIN_LUA" useBuiltinLua)
|
||||
(cmakeFeatureFlag "DISABLE_JIT" useBuiltinLua)
|
||||
(cmakeFeatureFlag "STATIC_FREETYPE" useStaticFreetype)
|
||||
(cmakeFeatureFlag "STATIC_LIBUVC" useStaticLibuvc)
|
||||
(cmakeFeatureFlag "STATIC_OPENAL" useStaticOpenAL)
|
||||
(cmakeFeatureFlag "STATIC_SQLite3" useStaticSqlite)
|
||||
(lib.cmakeFeature "DISTR_TAG" "Nixpkgs")
|
||||
(lib.cmakeFeature "ENGINE_BUILDTAG" finalAttrs.src.rev)
|
||||
(lib.cmakeFeature "BUILD_PRESET" "everything")
|
||||
(lib.cmakeBool "BUILTIN_LUA" useBuiltinLua)
|
||||
(lib.cmakeBool "DISABLE_JIT" useBuiltinLua)
|
||||
(lib.cmakeBool "STATIC_LIBUVC" useStaticLibuvc)
|
||||
(lib.cmakeBool "STATIC_SQLite3" useStaticSqlite)
|
||||
(lib.cmakeBool "ENABLE_TRACY" useTracy)
|
||||
"../src"
|
||||
];
|
||||
|
||||
@ -187,7 +199,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"format"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://arcan-fe.com/";
|
||||
description = "Combined Display Server, Multimedia Framework, Game Engine";
|
||||
longDescription = ''
|
||||
@ -196,8 +208,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
e.g. game development, real-time streaming video, monitoring and
|
||||
surveillance, up to and including desktop compositors and window managers.
|
||||
'';
|
||||
license = with licenses; [ bsd3 gpl2Plus lgpl2Plus ];
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
license = with lib.licenses; [ bsd3 gpl2Plus lgpl2Plus ];
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "cat9";
|
||||
version = "unstable-2023-02-11";
|
||||
version = "unstable-2023-06-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "letoram";
|
||||
repo = "cat9";
|
||||
rev = "1da9949c728e0734a883d258a8a05ca0e3dd5897";
|
||||
hash = "sha256-kit+H9u941oK2Ko8S/1w+3DN6ktnfBtd+3s9XgU+qOQ=";
|
||||
rev = "4d8a0c539a5c756acada96fd80e7eb3b9554ac05";
|
||||
hash = "sha256-T3RPuldKTzHm0EdfdMOtHv9kcr9oE9YQgdzv/jjPPnc=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "durden";
|
||||
version = "unstable-2023-01-19";
|
||||
version = "unstable-2023-08-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "letoram";
|
||||
repo = "durden";
|
||||
rev = "bba1bcc8992ea5826fd3b1c798cb271141b7c8e2";
|
||||
hash = "sha256-PK9ObMJ3SbHZLnLjxk4smh5N0WaM/2H/Y+T5vKBdHWA=";
|
||||
rev = "728d7fc3292cc162b1cea505c8a71512b2e84925";
|
||||
hash = "sha256-UL36JeppnoFDdzdsJMsWKJL58ioz9eOaNEZp/7DGV9w=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalPackages: {
|
||||
pname = "pipeworld";
|
||||
version = "unstable-2023-02-05";
|
||||
version = "unstable-2023-03-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "letoram";
|
||||
repo = "pipeworld";
|
||||
rev = "58b2e9fe15ef0baa4b04c27079bfa386ec62b28e";
|
||||
hash = "sha256-PbKejghMkLZdeQJD9fObw9xhGH24IX72X7pyjapTXJM=";
|
||||
rev = "9ea79f72ad500fe78b9f46e680be87eaac3bfb0e";
|
||||
hash = "sha256-/cjse6XXrdLoUB35GLgl871qINOm4SvKPTbfoBceLu0=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ ballerina, lib, writeText, runCommand, makeWrapper, fetchzip, stdenv, openjdk }:
|
||||
let
|
||||
version = "2201.6.0";
|
||||
version = "2201.8.1";
|
||||
codeName = "swan-lake";
|
||||
in stdenv.mkDerivation {
|
||||
pname = "ballerina";
|
||||
@ -8,7 +8,7 @@ in stdenv.mkDerivation {
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://dist.ballerina.io/downloads/${version}/ballerina-${version}-${codeName}.zip";
|
||||
sha256 = "sha256-yttRswqNq8Tam1OwnC9klwrryDDqdHMzzRs9T9pYlnU=";
|
||||
hash = "sha256-tfsaZnZOsKVm56s3nNI/27wrbVg5fcJ8tW2THSQ8ec0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "erg";
|
||||
version = "0.6.22";
|
||||
version = "0.6.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "erg-lang";
|
||||
repo = "erg";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dUGwSNN6eAMXIaIn3/xQxZAcyH1tTOrj4oRMkkI1KXU=";
|
||||
hash = "sha256-7UzITXvEpzMdKj9YIsuz6uYBLtk//OmTlnUegTLu+HA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-TLEFy4r+CA8XcPYw5cX7qCIRrj/8q9Z1YOnkAKpjwug=";
|
||||
cargoHash = "sha256-A2HjobYgM22CIWYJusJUfPObNHlhN7y1lsv2mVzvluk=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, fetchFromGitHub, glfw, freetype, openssl, makeWrapper, upx, boehmgc, xorg, binaryen, darwin }:
|
||||
|
||||
let
|
||||
version = "weekly.2023.19";
|
||||
version = "weekly.2023.42";
|
||||
ptraceSubstitution = ''
|
||||
#include <sys/types.h>
|
||||
#include <sys/ptrace.h>
|
||||
@ -9,12 +9,12 @@ let
|
||||
# Required for bootstrap.
|
||||
vc = stdenv.mkDerivation {
|
||||
pname = "v.c";
|
||||
version = "unstable-2023-05-14";
|
||||
version = "unstable-2023-10-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vlang";
|
||||
repo = "vc";
|
||||
rev = "f7c2b5f2a0738d0d236161c9de9f31dd0280ac86";
|
||||
sha256 = "sha256-xU3TvyNgc0o4RCsHtoC6cZTNaue2yuAiolEOvP37TKA=";
|
||||
rev = "bbfdece2ef5cab8a52b03c4df1ca0f803639069b";
|
||||
hash = "sha256-UdifiUDTivqJ94NJB25mF/xXeiEAE55QaIUwWwdAllQ=";
|
||||
};
|
||||
|
||||
# patch the ptrace reference for darwin
|
||||
@ -30,8 +30,8 @@ let
|
||||
markdown = fetchFromGitHub {
|
||||
owner = "vlang";
|
||||
repo = "markdown";
|
||||
rev = "6e970bd0a7459ad7798588f1ace4aa46c5e789a2";
|
||||
hash = "sha256-hFf7c8ZNMU1j7fgmDakuO7tBVr12Wq0dgQddJnkMajE=";
|
||||
rev = "3a173bee57a48dcfc1c0177555e45116befac48e";
|
||||
hash = "sha256-TWiCUMzAzHidtzXEYtUQ7uuksW+EIjE/fZ+s2Mr+uWI=";
|
||||
};
|
||||
boehmgcStatic = boehmgc.override {
|
||||
enableStatic = true;
|
||||
@ -45,7 +45,7 @@ stdenv.mkDerivation {
|
||||
owner = "vlang";
|
||||
repo = "v";
|
||||
rev = version;
|
||||
sha256 = "sha256-fHn1z2q3LmSycCOa1ii4DoHvbEW4uJt3Psq3/VuZNVQ=";
|
||||
hash = "sha256-sQ3M6tMufL560lvtWoa5f5MpOT4D8K5uq4kDPHNmUog=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ glfw freetype openssl ]
|
||||
|
||||
54
pkgs/development/libraries/applet-window-appmenu/default.nix
Normal file
54
pkgs/development/libraries/applet-window-appmenu/default.nix
Normal file
@ -0,0 +1,54 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, kcoreaddons
|
||||
, kdeclarative
|
||||
, kdecoration
|
||||
, plasma-framework
|
||||
, plasma-workspace
|
||||
, libSM
|
||||
, qtx11extras
|
||||
, kwindowsystem
|
||||
, libdbusmenu
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "applet-window-appmenu";
|
||||
version = "unstable-2022-06-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "psifidotos";
|
||||
repo = "applet-window-appmenu";
|
||||
rev = "1de99c93b0004b80898081a1acfd1e0be807326a";
|
||||
hash = "sha256-PLlZ2qgdge8o1mZOiPOXSmTQv1r34IUmWTmYFGEzNTI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
kcoreaddons
|
||||
kdeclarative
|
||||
kdecoration
|
||||
kwindowsystem
|
||||
plasma-framework
|
||||
plasma-workspace
|
||||
libSM
|
||||
qtx11extras
|
||||
libdbusmenu
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Plasma 5 applet in order to show window menu in your panels";
|
||||
homepage = "https://github.com/psifidotos/applet-window-appmenu";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ greydot ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "actor-framework";
|
||||
version = "0.19.0";
|
||||
version = "0.19.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "actor-framework";
|
||||
repo = "actor-framework";
|
||||
rev = version;
|
||||
hash = "sha256-pGX8BjDupJb7rmaxig0XX9RCKiIw2GjM4TVmcB5HJ+I=";
|
||||
hash = "sha256-Qi3nyUSwrYBy8lCP+R6/u/WtnZJcgSwb07pZVScAzcU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
@ -19,7 +19,9 @@ stdenv.mkDerivation rec {
|
||||
"-DCAF_ENABLE_EXAMPLES:BOOL=OFF"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-faligned-allocation";
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
checkTarget = "test";
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freetds";
|
||||
version = "1.3.20";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-IK4R87gG5PvA+gtZMftHO7V0i+6dSH9qoSiFCDV4pe0=";
|
||||
hash = "sha256-is0TOZicZHCYA+In0ggretJkvmauvU26LGmnaKy4ZxM=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -23,7 +23,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gusb";
|
||||
version = "0.4.6";
|
||||
version = "0.4.7";
|
||||
|
||||
outputs = [ "bin" "out" "dev" "devdoc" ];
|
||||
|
||||
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "hughsie";
|
||||
repo = "libgusb";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-CtB9+5dDs+l05NyIFkKJpS1x3zHSykhLW3HiIM0RUWY=";
|
||||
hash = "sha256-E0H3MqNxYXP40wKMcI1cwLKWGVOnPNazbH6K3TbzpCQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lombok";
|
||||
version = "1.18.28";
|
||||
version = "1.18.30";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://projectlombok.org/downloads/lombok-${version}.jar";
|
||||
sha256 = "sha256-t3TcT8pUMiXYtejBY360E8Q2Oy5hPpUiJ3b3kqjOwOA=";
|
||||
sha256 = "sha256-1+4SLu4erutFGCqJ/zb8LdCGhY0bL1S2Fcb+97odYBI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ mkDerivation
|
||||
, extra-cmake-modules
|
||||
, aspell, qtbase, qttools
|
||||
, aspell, hunspell, qtbase, qttools
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
pname = "sonnet";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [ aspell qttools ];
|
||||
buildInputs = [ aspell hunspell qttools ];
|
||||
propagatedBuildInputs = [ qtbase ];
|
||||
}
|
||||
|
||||
@ -15,11 +15,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdatovka";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gitlab.nic.cz/datovka/libdatovka/-/archive/v${version}/libdatovka-v${version}.tar.gz";
|
||||
sha256 = "sha256-aG7U8jP3pvOeFDetYVOx+cE78ys0uSkKNjSgB09ste8=";
|
||||
sha256 = "sha256-EqCS77MpjfR0Td07WKB7jWRBxAoKRtbAgyyThFOJXL8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libnet";
|
||||
version = "1.2";
|
||||
version = "1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sam-github";
|
||||
repo = "libnet";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Y/wd9c4whUbfpvWvKzJV6vJN3AlA14XBejchRG6wBc4=";
|
||||
hash = "sha256-P3LaDMMNPyEnA8nO1Bm7H0mW/hVBr0cFdg+p2JmWcGI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libsv";
|
||||
version = "1.1";
|
||||
version = "1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uael";
|
||||
repo = "sv";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-icvGQi6FNSZXNGs2oLiUKu6rrVsWcXh1r91kycGjnwY=";
|
||||
sha256 = "sha256-sc7WTRY8XTm5+J+zlS7tGa2f+2d7apj+XHyBafZXXeE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
# https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "oneDNN";
|
||||
version = "3.2.1";
|
||||
version = "3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oneapi-src";
|
||||
repo = "oneDNN";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-/LbT2nHPpZHjY3xbJ9bDabR7aIMvetNP4mB+rxuTfy8=";
|
||||
hash = "sha256-dC4Z1OvqIF8YhuSeVo+E0CohdXYIfkeTEw3/QuYA/90=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "raft-canonical";
|
||||
version = "0.17.1";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "canonical";
|
||||
repo = "raft";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-P6IYl6xcsqXw1ilt6HYw757FL2syy1XePBVGbPAlz6Q=";
|
||||
hash = "sha256-C3LfrdXNs5AG9B2n2c39fTjv2gri910EYxApGWwtH90=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook file pkg-config ];
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, buildPecl, fetchFromGitHub }:
|
||||
|
||||
let
|
||||
version = "1.0.0beta7";
|
||||
version = "1.0.0RC2";
|
||||
in buildPecl {
|
||||
inherit version;
|
||||
pname = "opentelemetry";
|
||||
@ -10,7 +10,7 @@ in buildPecl {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-php-instrumentation";
|
||||
rev = version;
|
||||
hash = "sha256-FDCgRN+aV9c6ceKszrHDBmi14dEhrirlU8cbYrmIGdY=";
|
||||
hash = "sha256-sCsJ4ZmQXTTG+ZxDzw3b6Su/8QUAVZv7vV6SuLBET+0=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/ext";
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytest-asyncio
|
||||
, pytest-mock
|
||||
, pytestCheckHook
|
||||
, python-socks
|
||||
@ -18,7 +19,7 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pogzyb";
|
||||
repo = pname;
|
||||
repo = "asyncwhois";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-fYXxoS4bGTat5QT98ETmWk/VKXJmg9mtkUu02SZT4Eo=";
|
||||
};
|
||||
@ -30,6 +31,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-asyncio
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
];
|
||||
@ -52,6 +54,8 @@ buildPythonPackage rec {
|
||||
"test_whois_query_run"
|
||||
"test_whois_query_create_connection"
|
||||
"test_whois_query_send_and_recv"
|
||||
"test_input_parameters_for_domain_query"
|
||||
"test__get_top_level_domain"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aws-lambda-builders";
|
||||
version = "1.37.0";
|
||||
version = "1.40.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "awslabs";
|
||||
repo = "aws-lambda-builders";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ukHDrxx+Jxlp/Ypg1ltz7WN07X16spNdC7YygJhTBJo=";
|
||||
hash = "sha256-4LapTxeJtzuXdWRgDmsQ8/yDeYZfMz+kJwpZKF7stmc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "awscrt";
|
||||
version = "0.19.2";
|
||||
version = "0.19.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-7qIPIZW2OiNTV/obZmqInQtfw9GIgQe1Gh3GuAlwHLI=";
|
||||
hash = "sha256-UMIzuGZBff/7szG3CuO3oHZOfY4WcYqW9mUAGFBWLvA=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bellows";
|
||||
version = "0.36.5";
|
||||
version = "0.36.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "zigpy";
|
||||
repo = "bellows";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-f4AgYpqb4s5F46nGi0FjLQ9YRHetLfaA/jLydiewxOM=";
|
||||
hash = "sha256-ThLUWcGMTHg/ASKiL19iLe+9hq7KybWm+38PdoDhWvk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -363,12 +363,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.28.63";
|
||||
version = "1.28.64";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-7PT7K1txvlLPyXDuBZ/hdDntGQTQOVUI9VRcOA1NlR0=";
|
||||
hash = "sha256-zky/LBr6GhTFw8xWp094wMGISAzalgom+Zi5P/FjzgY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "botocore-stubs";
|
||||
version = "1.31.63";
|
||||
version = "1.31.64";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "botocore_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-hzcVpcIdD0WTYoOTx45Hz5TlOkPkCGOp718WX83PkA8=";
|
||||
hash = "sha256-K1sbzvl1nNMgIyJ1PLrNk2s2rtAwFuUjh98y4aojMwo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -4,20 +4,29 @@
|
||||
, pyopenssl
|
||||
, tldextract
|
||||
, pytestCheckHook
|
||||
, pytest-cov
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "certauth";
|
||||
version = "1.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ikreymer";
|
||||
repo = "certauth";
|
||||
rev = "ad2bae5d40a9e45519fc1f2cd7678174bbc55b3d"; # Repo has no git tags
|
||||
# Repo has no git tags, https://github.com/ikreymer/certauth/issues/15
|
||||
rev = "ad2bae5d40a9e45519fc1f2cd7678174bbc55b3d";
|
||||
hash = "sha256-Rso5N0jb9k7bdorjPIUMNiZZPnzwbkxFNiTpsJ9pco0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "--cov certauth " ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pyopenssl
|
||||
tldextract
|
||||
@ -25,10 +34,20 @@ buildPythonPackage rec {
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-cov
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "certauth" ];
|
||||
pythonImportsCheck = [
|
||||
"certauth"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Tests want to download Public Suffix List
|
||||
"test_file_wildcard"
|
||||
"test_file_wildcard_subdomains"
|
||||
"test_in_mem_parent_wildcard_cert"
|
||||
"test_in_mem_parent_wildcard_cert_at_tld"
|
||||
"test_in_mem_parent_wildcard_cert_2"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple CertificateAuthority and host certificate creation, useful for man-in-the-middle HTTPS proxy";
|
||||
|
||||
@ -14,15 +14,22 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "corsair-scan";
|
||||
version = "0.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Santandersecurityresearch";
|
||||
repo = "corsair_scan";
|
||||
rev = "v${version}";
|
||||
sha256 = "09jsv5bag7mjy0rxsxjzmg73rjl7qknzr0d7a7himd7v6a4ikpmk";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-s94ZiTL7tBrhUaeB/O3Eh8o8zqtfdt0z8LKep1bZWiY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'pytest-runner'," ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
validators
|
||||
requests
|
||||
@ -36,16 +43,20 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'pytest-runner'," ""
|
||||
'';
|
||||
pythonImportsCheck = [
|
||||
"corsair_scan"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "corsair_scan" ];
|
||||
disabledTests = [
|
||||
# Tests want to download Public Suffix List
|
||||
"test_corsair_scan_401"
|
||||
"test_corsair_scan_origin"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module to check for Cross-Origin Resource Sharing (CORS) misconfigurations";
|
||||
homepage = "https://github.com/Santandersecurityresearch/corsair_scan";
|
||||
changelog = "https://github.com/Santandersecurityresearch/corsair_scan/releases/tag/v${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cyclonedx-python-lib";
|
||||
version = "4.2.2";
|
||||
version = "4.2.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -32,7 +32,7 @@ buildPythonPackage rec {
|
||||
owner = "CycloneDX";
|
||||
repo = "cyclonedx-python-lib";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-7bqIKwKGfMj5YPqZpvWtP881LNOgvJ+DMHs1U63gCN0=";
|
||||
hash = "sha256-I94YsfDJ+FGQBRWCRKum917tXJ5vFm/cWbbM+NpwA4M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "devpi-common";
|
||||
version = "4.0.0";
|
||||
version = "4.0.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-N4f43B1Dg1mCnDF3Sj2341vVXNdjlDzF1vn7ORoLWJ8=";
|
||||
hash = "sha256-LSd3AfrwXUpvbL234ED5PAoAKG2+h9XAou6uuiBVkZw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,62 +1,88 @@
|
||||
{ buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
{ lib
|
||||
, beautifulsoup4
|
||||
, boto3
|
||||
, buildPythonPackage
|
||||
, cryptography
|
||||
, dnspython
|
||||
, fetchFromGitHub
|
||||
, importlib-metadata
|
||||
, localzone
|
||||
, oci
|
||||
, poetry-core
|
||||
, pyotp
|
||||
, pytest-vcr
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
, requests
|
||||
, tldextract
|
||||
, pytestCheckHook
|
||||
, pytest-vcr
|
||||
# Optional depedencies
|
||||
, boto3
|
||||
, localzone
|
||||
, softlayer
|
||||
, tldextract
|
||||
, zeep
|
||||
, dnspython
|
||||
, oci
|
||||
, lib
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dns_lexicon";
|
||||
version = "3.14.1";
|
||||
format = "pyproject";
|
||||
version = "3.16.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Analogj";
|
||||
repo = "lexicon";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-flK2G9mdUWMUACQPo6TqYZ388EacIqkq//tCzUS+Eo8=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-GUYsTZPvsqGemViSqgEvYhyjTEut42akMq2ZK2P1fX0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
beautifulsoup4
|
||||
cryptography
|
||||
pyotp
|
||||
pyyaml
|
||||
requests
|
||||
tldextract
|
||||
] ++ lib.optionals (pythonOlder "3.10") [
|
||||
importlib-metadata
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
route53 = [
|
||||
boto3
|
||||
];
|
||||
localzone = [
|
||||
localzone
|
||||
];
|
||||
softlayer = [
|
||||
softlayer
|
||||
];
|
||||
ddns = [
|
||||
dnspython
|
||||
];
|
||||
duckdns = [
|
||||
dnspython
|
||||
];
|
||||
oci = [
|
||||
oci
|
||||
];
|
||||
full = [
|
||||
boto3
|
||||
dnspython
|
||||
localzone
|
||||
oci
|
||||
softlayer
|
||||
zeep
|
||||
];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-vcr
|
||||
] ++ passthru.optional-dependencies.full;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
beautifulsoup4
|
||||
cryptography
|
||||
importlib-metadata
|
||||
pyyaml
|
||||
requests
|
||||
tldextract
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
route53 = [ boto3 ];
|
||||
localzone = [ localzone ];
|
||||
softlayer = [ softlayer ];
|
||||
ddns = [ dnspython ];
|
||||
duckdns = [ dnspython ];
|
||||
oci = [ oci ];
|
||||
full = [ boto3 localzone softlayer zeep dnspython oci ];
|
||||
};
|
||||
|
||||
pytestFlagsArray = [
|
||||
"tests/"
|
||||
];
|
||||
@ -64,11 +90,20 @@ buildPythonPackage rec {
|
||||
disabledTestPaths = [
|
||||
# Needs network access
|
||||
"tests/providers/test_auto.py"
|
||||
|
||||
# Needs network access (and an API token)
|
||||
"tests/providers/test_namecheap.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Tests want to download Public Suffix List
|
||||
"test_client_legacy_init"
|
||||
"test_client_basic_init"
|
||||
"test_client_init"
|
||||
"test_client_parse_env"
|
||||
"test_missing"
|
||||
"action_is_correctly"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"lexicon"
|
||||
];
|
||||
@ -77,8 +112,7 @@ buildPythonPackage rec {
|
||||
description = "Manipulate DNS records on various DNS providers in a standardized way";
|
||||
homepage = "https://github.com/AnalogJ/lexicon";
|
||||
changelog = "https://github.com/AnalogJ/lexicon/blob/v${version}/CHANGELOG.md";
|
||||
maintainers = with maintainers; [ aviallon ];
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ aviallon ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -1,29 +1,42 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, poetry-core
|
||||
, lxml
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "docx2python";
|
||||
version = "unstable-2020-11-15";
|
||||
version = "2.11.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
# Pypi does not contain tests
|
||||
src = fetchFromGitHub {
|
||||
owner = "ShayHill";
|
||||
repo = pname;
|
||||
rev = "21b2edafc0a01a6cfb73aefc61747a65917e2cad";
|
||||
sha256 = "1nwg17ziwm9a2x7yxsscj8zgc1d383ifsk5w7qa2fws6gf627kyi";
|
||||
repo = "docx2python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-SavRYnNbESRQh9Elk8qCt/qdI2x+sYZJFMYy+Gojg2k=";
|
||||
};
|
||||
|
||||
preCheck = "cd test"; # Tests require the `test/resources` folder to be accessible
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
disabledTests = [ # asserts related to file deletions fail
|
||||
"test_docx2python.py"
|
||||
"test_docx_context.py"
|
||||
"test_google_docs.py"
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
lxml
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "docx2python" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/ShayHill/docx2python";
|
||||
description = "Extract docx headers, footers, (formatted) text, footnotes, endnotes, properties, and images";
|
||||
changelog = "https://github.com/ShayHill/docx2python/blob/${src.rev}/CHANGELOG.md";
|
||||
maintainers = [ maintainers.ivar ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
|
||||
@ -18,14 +18,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastai";
|
||||
version = "2.7.12";
|
||||
version = "2.7.13";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-5ayA/0bdgHDGcKNI8xpkyF6hqR3DIMIQZIjzQzMoKRY=";
|
||||
hash = "sha256-q1KBBAAKrTzq6USRwBjvT23mXpjQT2gjBsxuZ4w54rY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,32 +1,38 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, jinja2
|
||||
, poetry-core
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jinja2-git";
|
||||
version = "unstable-2021-07-20";
|
||||
format = "pyproject";
|
||||
version = "1.3.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wemake-services";
|
||||
repo = "jinja2-git";
|
||||
# this is master, we can't patch because of poetry.lock :(
|
||||
# luckily, there appear to have been zero API changes since then, only
|
||||
# dependency upgrades
|
||||
rev = "c6d19b207eb6ac07182dc8fea35251d286c82512";
|
||||
sha256 = "0yw0318w57ksn8azmdyk3zmyzfhw0k281fddnxyf4115bx3aph0g";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-XuN2L3/HLcZ/WPWiCtufDOmkxj+q4I6IOgjrGQHfNLk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = [ jinja2 ];
|
||||
|
||||
# the tests need to be run on the git repository
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "jinja2_git" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/wemake-services/jinja2-git";
|
||||
description = "Jinja2 extension to handle git-specific things";
|
||||
changelog = "https://github.com/wemake-services/jinja2-git/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ cpcloud ];
|
||||
};
|
||||
|
||||
@ -1,47 +1,49 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, setuptools
|
||||
, lxml
|
||||
, matplotlib
|
||||
, midiutil
|
||||
, numpy
|
||||
, pytestCheckHook
|
||||
, scikit-image
|
||||
, scikit-learn
|
||||
}:
|
||||
let
|
||||
rev = "8d0ce91d831b0592c111ddb38fc9aa8eba130ed2";
|
||||
version = "1.2";
|
||||
in
|
||||
buildPythonPackage {
|
||||
pname = "mung";
|
||||
version = "unstable-2022-07-10";
|
||||
inherit version;
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OMR-Research";
|
||||
repo = "mung";
|
||||
inherit rev;
|
||||
hash = "sha256-QzCkB9Wj4dTPuMCMweFw6IsSwBBzV0Nfx7+VX7Plnio=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-NSKaJkJRevTy5gh6/ik8Qe46bOPdznsmXPgh7Xz7vXQ=";
|
||||
};
|
||||
|
||||
format = "setuptools";
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
lxml
|
||||
numpy
|
||||
scikit-image
|
||||
scikit-learn
|
||||
matplotlib
|
||||
midiutil
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"mung"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Music Notation Graph: a data model for optical music recognition";
|
||||
homepage = "https://github.com/OMR-Research/mung";
|
||||
changelog = "https://github.com/OMR-Research/mung/blob/${rev}/CHANGES.md";
|
||||
changelog = "https://github.com/OMR-Research/mung/blob/${version}/CHANGES.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ piegames ];
|
||||
};
|
||||
|
||||
@ -1,38 +1,60 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, pyusb
|
||||
, influxdb-client
|
||||
, pyserial
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
buildPythonPackage rec {
|
||||
pname = "openant-unstable";
|
||||
version = "2017-02-11";
|
||||
version = "1.2.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Tigge";
|
||||
repo = "openant";
|
||||
rev = "ed89281e37f65d768641e87356cef38877952397";
|
||||
sha256 = "1g81l9arqdy09ijswn3sp4d6i3z18d44lzyb78bwnvdb14q22k19";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Ook9dwcyWvpaGylVDjBxQ2bnXRUBPYQHo6Wub+ISpwE=";
|
||||
};
|
||||
|
||||
# Removes some setup.py hacks intended to install udev rules.
|
||||
# We do the job ourselves in postInstall below.
|
||||
postPatch = ''
|
||||
sed -i -e '/cmdclass=.*/d' setup.py
|
||||
'';
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
install -dm755 "$out/etc/udev/rules.d"
|
||||
install -m644 resources/ant-usb-sticks.rules "$out/etc/udev/rules.d/99-ant-usb-sticks.rules"
|
||||
install -m644 resources/42-ant-usb-sticks.rules "$out/etc/udev/rules.d/99-ant-usb-sticks.rules"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ pyusb ];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
serial = [
|
||||
pyserial
|
||||
];
|
||||
influx = [
|
||||
influxdb-client
|
||||
];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"openant"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Tigge/openant";
|
||||
description = "ANT and ANT-FS Python Library";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "opower";
|
||||
version = "0.0.35";
|
||||
version = "0.0.36";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "tronikos";
|
||||
repo = "opower";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-bS9KsPMuzQ+4AXsVzKiCevZujU4iW2hZ+eSJheM4NRI=";
|
||||
hash = "sha256-onfPTbfBWSoQ75w8g0ub7xwzcNKvHOdfAD5RyUAc5ss=";
|
||||
};
|
||||
|
||||
pythonRemoveDeps = [
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
}:
|
||||
let
|
||||
pname = "pgmpy";
|
||||
version = "0.1.23";
|
||||
version = "0.1.24";
|
||||
# optional-dependencies = {
|
||||
# all = [ daft ];
|
||||
# };
|
||||
@ -37,8 +37,8 @@ buildPythonPackage {
|
||||
src = fetchFromGitHub {
|
||||
owner = "pgmpy";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4NY37Awhu2mnfZQ/biN1wa9rkGHhTxfZm0+V7D83NR0=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-IMlo4SBxO9sPoZl0rQGc3FcvvIN/V/WZz+1BD7aBfzs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -101,6 +101,8 @@ buildPythonPackage rec {
|
||||
"test_persist"
|
||||
"test_timeout_download_from_spider_nodata_rcvd"
|
||||
"test_timeout_download_from_spider_server_hangs"
|
||||
"test_unbounded_response"
|
||||
"CookiesMiddlewareTest"
|
||||
# Depends on uvloop
|
||||
"test_asyncio_enabled_reactor_different_loop"
|
||||
"test_asyncio_enabled_reactor_same_loop"
|
||||
|
||||
@ -1,19 +1,24 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, six
|
||||
, tldextract
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "surt";
|
||||
version = "0.3.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "internetarchive";
|
||||
repo = "surt";
|
||||
rev = "6934c321b3e2f66af9c001d882475949f00570c5"; # Has no git tag
|
||||
# Has no git tag, https://github.com/internetarchive/surt/issues/26
|
||||
rev = "6934c321b3e2f66af9c001d882475949f00570c5";
|
||||
hash = "sha256-pSMNpFfq2V0ANWNFPcb1DwPHccbfddo9P4xZ+ghwbz4=";
|
||||
};
|
||||
|
||||
@ -26,7 +31,15 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "surt" ];
|
||||
pythonImportsCheck = [
|
||||
"surt"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Tests want to download Public Suffix List
|
||||
"test_getPublicPrefix"
|
||||
"test_getPublicSuffix"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Sort-friendly URI Reordering Transform (SURT) python module";
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, filelock
|
||||
, idna
|
||||
, pytest-mock
|
||||
@ -15,16 +15,20 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tldextract";
|
||||
version = "3.6.0";
|
||||
format = "pyproject";
|
||||
version = "5.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-pdi2WDeR2sominWS6892QVL6SWF5g8SZFu6d6Zs2YiI=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "john-kurkowski";
|
||||
repo = "tldextract";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-oZ7L7DGe9HmBo5a489LXjajiSecJNLGHzCF/7DV9au4=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
@ -43,11 +47,6 @@ buildPythonPackage rec {
|
||||
responses
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pytest.ini \
|
||||
--replace " --pylint" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"tldextract"
|
||||
];
|
||||
@ -59,6 +58,7 @@ buildPythonPackage rec {
|
||||
from the registered domain and subdomains of a URL.
|
||||
'';
|
||||
homepage = "https://github.com/john-kurkowski/tldextract";
|
||||
changelog = "https://github.com/john-kurkowski/tldextract/blob/${version}/CHANGELOG.md";
|
||||
license = with licenses; [ bsd3 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@ -22,14 +22,14 @@ with py.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.5.8";
|
||||
version = "2.5.10";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-cnlX40JwkSlqq+T328nQtI9v4RyW8EZ/nzXK9drdkSc=";
|
||||
hash = "sha256-0S4sNJv3kWgZGK40xBVJ3n4PGS7ms2pJap2nyWnK4Mg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -7,12 +7,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jacoco";
|
||||
version = "0.8.10";
|
||||
version = "0.8.11";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://search.maven.org/remotecontent?filepath=org/jacoco/jacoco/${version}/jacoco-${version}.zip";
|
||||
stripRoot = false;
|
||||
sha256 = "sha256-V8I3DXoeUPNxAe7z/ISGa5UQAyLJN7RKXlD0FOw92Oo=";
|
||||
sha256 = "sha256-Sd4Kh5ts0IdHhd9vF1XZzZ2KFRb+rsnzpam6Ysxu910=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
@ -25,11 +25,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "liquibase";
|
||||
version = "4.23.2";
|
||||
version = "4.24.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-/H0qn6l9kSA9Y5tmRxXUCVPGyRVaUiWg3cTIB5uaNkE=";
|
||||
hash = "sha256-bs9jinW1AbeYGJ2oJOFn8p25NHcYYQnyVJUIxiZtCyo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "sqlfluff";
|
||||
version = "2.3.2";
|
||||
version = "2.3.3";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-buDDu5UQmO1ImWXzqwlFZHYbn2FUjAxs8KbQX+g/mvg=";
|
||||
hash = "sha256-VCvlNR/0SX3bnGw+gSGkAoS+6zig5lrDv9/Gez+TIb4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gosec";
|
||||
version = "2.17.0";
|
||||
version = "2.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "securego";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cVW0CsVEBitSXS1Ciyt/EhE38KM7x4Up3aYUwKwrxvg=";
|
||||
hash = "sha256-z+5MR4tiKa2vVJslFdAcVLxrR6aXoPxAHaqNgN2QlMc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-mxSfdkqwJBUu34VWQ2Xlb2Jbz1QgWUH78Xngge9+AfA=";
|
||||
vendorHash = "sha256-jekw3uc2ZEH9s+26jMFVteHUD0iyURlVq8zBlVPihqs=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/gosec"
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "librarian-puppet-go";
|
||||
version = "0.3.9";
|
||||
version = "0.3.10";
|
||||
|
||||
goPackagePath = "github.com/tmtk75/librarian-puppet-go";
|
||||
|
||||
@ -10,7 +10,7 @@ buildGoPackage rec {
|
||||
owner = "tmtk75";
|
||||
repo = "librarian-puppet-go";
|
||||
rev = "v${version}";
|
||||
sha256 = "19x2hz3b8xkhy2nkyjg6s4qvs55mh84fvjwp157a86dmxwkdf45y";
|
||||
sha256 = "sha256-IEhqyowyLTXDEhg4nkix1N45S0+k+RngMP6TsaZQ4mI=";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lttng-tools";
|
||||
version = "2.13.10";
|
||||
version = "2.13.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://lttng.org/files/lttng-tools/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-5dEJXsEyJWXzjxSTRvcZZ0lsKB6sxR7Fx3mUuFDn0zU=";
|
||||
sha256 = "sha256-rFuu75+mkJNrHKAezRdC2nYsLAhRH/G06SOTjZTQ+Xk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nxpmicro-mfgtools";
|
||||
version = "1.5.21";
|
||||
version = "1.5.125";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nxp-imx";
|
||||
repo = "mfgtools";
|
||||
rev = "uuu_${version}";
|
||||
sha256 = "sha256-XVvGsHltlA3h9hd3C88G3s2wIZ1EVM6DmvdiwD82vTw=";
|
||||
sha256 = "sha256-f9Nt303xXZzLSu3GtOEpyaL91WVFUmKO7mxi8UNX3go=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config installShellFiles ];
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opengrok";
|
||||
version = "1.12.14";
|
||||
version = "1.12.15";
|
||||
|
||||
# binary distribution
|
||||
src = fetchurl {
|
||||
url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-4v+fDmDnmoAZimf63nSCqUp0y+a5UKQBxNWSNp64XE4=";
|
||||
hash = "sha256-AEKzhNSNJOOyK/fiAepqios7xoexAi4M4zbMTPdyyeA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rustywind";
|
||||
version = "0.19.0";
|
||||
version = "0.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "avencera";
|
||||
repo = "rustywind";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wPr+BNj3/YP+g0OkqkGSN1X8g/p3xDRcHvdDMAOP9Cc=";
|
||||
hash = "sha256-3VG3EIcNp1fcNctrQO+mcGkAObHYPZQGdU83mi7WxPs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-frBE3pJvQdntt48/RHz3F2qqrgmXFR//5CyCfdcSfik=";
|
||||
cargoHash = "sha256-hqGhh3YZ8Pz0hhC+HNdwc7PZVzGeMZqmctVjbQx7SQo=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "neil";
|
||||
version = "0.2.61";
|
||||
version = "0.2.62";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "babashka";
|
||||
repo = "neil";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MoQf7dxdmUlIZZMjuKBJOCu61L8qiAlmVssf6pUhqA8=";
|
||||
sha256 = "sha256-zSZ62RMHZLuhIPdde0cfWae+uFpWVjMfHuLAJdRedJA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "heaptrack";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KDE";
|
||||
repo = "heaptrack";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-AzHQnPYhmCHGco7JoKal57PC6NKUoMTeflHtFsBxQpA=";
|
||||
sha256 = "sha256-pP+s60ERnmOctYTe/vezCg0VYzziApNY0QaF3aTccZU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules ];
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
|
||||
let
|
||||
pname = "bootstrap-studio";
|
||||
version = "6.4.5";
|
||||
version = "6.5.1";
|
||||
src = fetchurl {
|
||||
url = "https://releases.bootstrapstudio.io/${version}/Bootstrap%20Studio.AppImage";
|
||||
sha256 = "sha256-kCMqDNRC3H3WBpDJCBXBxvWRuiGCrZ7gRGghXiGtGq8=";
|
||||
sha256 = "sha256-mx9KkMwFzdjhzofr+4l7MTerGfSSsI8+z8jmaoV8uvo=";
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
in
|
||||
|
||||
@ -13,20 +13,22 @@
|
||||
, libogg
|
||||
, libvorbis
|
||||
, libGLU
|
||||
, enet
|
||||
, synfigstudio
|
||||
, inkscape
|
||||
, imagemagick
|
||||
, pngquant
|
||||
, xz
|
||||
, bc
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hikounomizu";
|
||||
version = "0.9.2";
|
||||
version = "1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.tuxfamily.org/hnm/${version}/hikounomizu-${version}-src.tar.bz2";
|
||||
hash = "sha256-ZtvzQAiYG4IcdgKiBDIQFOJVnLbz1TsiIbdZr/0Y2U8=";
|
||||
hash = "sha256-Hw/BA7jOW9KGdde1NLDh4SfQXxvZkNGx/sHXukgFZ5M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -39,6 +41,7 @@ stdenv.mkDerivation rec {
|
||||
imagemagick
|
||||
pngquant
|
||||
xz
|
||||
bc
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@ -51,10 +54,11 @@ stdenv.mkDerivation rec {
|
||||
libogg
|
||||
libvorbis
|
||||
libGLU
|
||||
enet
|
||||
];
|
||||
|
||||
postBuild = ''
|
||||
make data -j$NIX_BUILD_CORES
|
||||
make data HNM_PARALLEL=$NIX_BUILD_CORES
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
openttd.overrideAttrs (oldAttrs: rec {
|
||||
pname = "openttd-jgrpp";
|
||||
version = "0.54.4";
|
||||
version = "0.55.3";
|
||||
|
||||
src = fetchFromGitHub rec {
|
||||
owner = "JGRennison";
|
||||
repo = "OpenTTD-patches";
|
||||
rev = "jgrpp-${version}";
|
||||
hash = "sha256-bTpHlKffQbANXIrAn9WSEK/PEzBW1nzaHhGKIyclAo0=";
|
||||
hash = "sha256-E1+pXpXNHOu9nPTGSY8baVaKf1Um6IGDjpi1MmENez8=";
|
||||
};
|
||||
|
||||
buildInputs = oldAttrs.buildInputs ++ [ zstd ];
|
||||
|
||||
@ -67,13 +67,13 @@ with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "conky";
|
||||
version = "1.19.4";
|
||||
version = "1.19.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brndnmtthws";
|
||||
repo = "conky";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-XptnokBWtBx0W2k2C9jVwIYH8pOrDUbuQLvh8JrW/w8=";
|
||||
hash = "sha256-m8tI68PUEkO+tWbcq8CF5TAiKqFU9kcXMbi6NszS7NE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -9,11 +9,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "klibc";
|
||||
version = "2.0.12";
|
||||
version = "2.0.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/libs/klibc/2.0/klibc-${version}.tar.xz";
|
||||
hash = "sha256-cfgWoNOr46uotGMZrlyhR+eno4QBs/XiYgJfTcCMR10=";
|
||||
hash = "sha256-1nOilPdC1ZNoIi/1w4Ri2BCYxVBjeZ3m+4p7o9SvBDY=";
|
||||
};
|
||||
|
||||
patches = [ ./no-reinstall-kernel-headers.patch ];
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "projecteur";
|
||||
version = "0.9.2";
|
||||
version = "0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jahnf";
|
||||
repo = "Projecteur";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = false;
|
||||
hash = "sha256-kg6oYtJ4H5A6RNATBg+XvMfCb9FlhEBFjfxamGosMQg=";
|
||||
hash = "sha256-F7o93rBjrDTmArTIz8RB/uGBOYE6ny/U7ppk+jEhM5A=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "apache-felix";
|
||||
version = "7.0.1";
|
||||
version = "7.0.5";
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/felix/org.apache.felix.main.distribution-${version}.tar.gz";
|
||||
sha256 = "sha256-WypiOdJhqKngIFVNf/XXAUDRdS8rANxWrcT846hcWTo=";
|
||||
sha256 = "sha256-N9mbkIzMkMV2RLONv15EiosJxMU9iEJvwPWEauPIEe8=";
|
||||
};
|
||||
buildCommand =
|
||||
''
|
||||
|
||||
@ -3,16 +3,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "imgproxy";
|
||||
version = "3.19.0";
|
||||
version = "3.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
hash = "sha256-EGnamJBotPDatsWG+XLI/QhF2464aphkB9oS631oj+c=";
|
||||
hash = "sha256-qTOMoeTk9fGBSmioTRBUa3xRXOIW6OJj8aH0b/vP7dw=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-gjRUt8/LECFSU2DG4ALi7a3DxKAGFoW98eBgeE5i2+s=";
|
||||
vendorHash = "sha256-SaxoFCEDniphr1ZZ5prE996CeHegB+a8dpGaMpjsrtQ=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config gobject-introspection ];
|
||||
|
||||
|
||||
@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mautrix-whatsapp";
|
||||
version = "0.10.2";
|
||||
version = "0.10.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mautrix";
|
||||
repo = "whatsapp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-GWtci/OiipaUFzzha3GvkoKmN1lb9Fg3i+X1ZFkGKtc=";
|
||||
hash = "sha256-lBseLxxk+3/eoJMdq4muOrA0TgEhwIReGtQO1OzqBFc=";
|
||||
};
|
||||
|
||||
buildInputs = [ olm ];
|
||||
|
||||
vendorHash = "sha256-IEBSY61Bjuc42GqQUvChqLayO1hiDEDBxlMoAKJo12E=";
|
||||
vendorHash = "sha256-QUZ9x9BDlhoWLvdt8BTIKxHcsclT6arGICeJnOafs1g=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "metabase";
|
||||
version = "0.47.0";
|
||||
version = "0.47.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.metabase.com/v${version}/metabase.jar";
|
||||
hash = "sha256-m/A6RkFjlxGWvsMGWQBB6PVx8k4dWjRpU2Pw3qHrqAk=";
|
||||
hash = "sha256-oIGIrEa2iHvvseP3sAcwiUK7ky43scfyaSO7S3G7bEo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -11,11 +11,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "opensearch";
|
||||
version = "2.10.0";
|
||||
version = "2.11.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://artifacts.opensearch.org/releases/bundle/opensearch/${finalAttrs.version}/opensearch-${finalAttrs.version}-linux-x64.tar.gz";
|
||||
hash = "sha256-oJLxdXHn+fEp2ATWdyFRbfM/QebAWiT7cogxIwLrgfs=";
|
||||
hash = "sha256-j9bN09E4VikDPqvhRULfOjATme5KgVGrdv0rIPdd4Sw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user