Merge master into staging-next

This commit is contained in:
github-actions[bot] 2022-09-05 00:02:45 +00:00 committed by GitHub
commit f8118e6f67
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
39 changed files with 739 additions and 497 deletions

View file

@ -2046,6 +2046,12 @@
githubId = 1516457;
name = "Christian Albrecht";
};
CactiChameleon9 = {
email = "h19xjkkp@duck.com";
github = "CactiChameleon9";
githubId = 51231053;
name = "Daniel";
};
callahad = {
email = "dan.callahan@gmail.com";
github = "callahad";

View file

@ -450,6 +450,13 @@
<literal>&quot;wine64&quot;</literal>.
</para>
</listitem>
<listitem>
<para>
The <literal>paperless</literal> module now defaults
<literal>PAPERLESS_TIME_ZONE</literal> to your configured
system timezone.
</para>
</listitem>
<listitem>
<para>
(Neo)Vim can not be configured with

View file

@ -157,6 +157,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
- The `meta.mainProgram` attribute of packages in `wineWowPackages` now defaults to `"wine64"`.
- The `paperless` module now defaults `PAPERLESS_TIME_ZONE` to your configured system timezone.
- (Neo)Vim can not be configured with `configure.pathogen` anymore to reduce maintainance burden.
Use `configure.packages` instead.

View file

@ -73,8 +73,8 @@ in
};
colors = mkOption {
type = types.listOf types.str;
default = [];
type = with types; listOf (strMatching "[[:xdigit:]]{6}");
default = [ ];
example = [
"002b36" "dc322f" "859900" "b58900"
"268bd2" "d33682" "2aa198" "eee8d5"

View file

@ -2,15 +2,15 @@
python3Packages.buildPythonApplication rec {
pname = "manuskript";
version = "0.13.1";
version = "0.14.0";
format = "other";
src = fetchFromGitHub {
repo = pname;
owner = "olivierkes";
rev = version;
hash = "sha256-TEmAamNdqBK7bu62tLtJl05wBI6hga84PQSrWiMPROY=";
rev = "refs/tags/${version}";
hash = "sha256-mWLkah4eO1i5sp79xGLCIkr26TpbXxuVxIJ6gudKGWI=";
};
nativeBuildInputs = [ wrapQtAppsHook ];

View file

@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "cherrytree";
version = "0.99.47";
version = "0.99.48";
src = fetchFromGitHub {
owner = "giuspen";
repo = "cherrytree";
rev = version;
sha256 = "sha256-qKBf/7DBIpK1o/xlDlWeVXkSSV5a3y9hoWsAzeTIsf4=";
sha256 = "sha256-mNWep+ZMQzb2PBHgzUKRpfMhP0ok1RZiuIoyH3P7+TI=";
};
nativeBuildInputs = [

View file

@ -13,7 +13,7 @@
stdenv.mkDerivation rec {
pname = "termius";
version = "7.42.1";
version = "7.45.3";
src = fetchurl {
# find the latest version with
@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
# curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_url' -r
# and the sha512 with
# curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r
url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_117.snap";
sha512 = "1e9a6e14a7046a8297c9f067211257cfbbe4dc121ddf4123271ddb96eccbfa504b6e0d05de2077326127ae1d0b2e571c232125e51bfaa1ef82d6cbf9355f13e6";
url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_123.snap";
sha512 = "1a43ece6ccb0f5a7b29a3ff0c41f27b0d82bd90214cc3d0b88dbd57ecaf2f59c092906e7ed377e3d04f2fc418027f7a0cb7f2e4458ef619663b84b080581c375";
};
desktopItem = makeDesktopItem {

View file

@ -1,11 +1,11 @@
{ lib, mkDerivation, fetchzip, qtbase, qttools, cmake, sqlite }:
mkDerivation rec {
pname = "tagainijisho";
version = "1.2.0";
version = "1.2.1";
src = fetchzip {
url = "https://github.com/Gnurou/tagainijisho/releases/download/${version}/tagainijisho-${version}.tar.gz";
hash = "sha256-fLq4Wfpa7Wr62KvHztgLiXE8eopCq+wipgabFm2bq6w=";
hash = "sha256-NYmvkjGl+lgFh4PPWGxitupYJ2DOyCBAYlITGb3FMj8=";
};
nativeBuildInputs = [ cmake ];

View file

@ -0,0 +1,32 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, boost
, eigen
, zlib
}:
stdenv.mkDerivation rec {
pname = "iqtree";
version = "2.2.0.4";
src = fetchFromGitHub {
owner = "iqtree";
repo = "iqtree2";
rev = "v${version}";
sha256 = "sha256:0ickw1ldpvv2m66yzbvqfhn8k07qdkhbjrlqjs6vcf3s42j5c6pq";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake ];
buildInputs = [ boost eigen zlib ];
meta = with lib; {
homepage = "http://www.iqtree.org/";
description = "Efficient and versatile phylogenomic software by maximum likelihood";
license = licenses.lgpl2;
maintainers = with maintainers; [ bzizou ];
};
}

View file

@ -8,12 +8,12 @@ stdenv.mkDerivation {
hardeningDisable = [ "stackprotector" ];
src = fetchurl {
url = "http://www.sas.upenn.edu/~vnanda/source/perseus_4_beta.zip";
sha256 = "09brijnqabhgfjlj5wny0bqm5dwqcfkp1x5wif6yzdmqh080jybj";
url = "http://people.maths.ox.ac.uk/nanda/source/perseus_4_beta.zip";
sha256 = "sha256-cnkJEIC4tu+Ni7z0cKdjmLdS8QLe8iKpdA8uha2MeSU=";
};
sourceRoot = ".";
NIX_CFLAGS_COMPILE = [ "-std=c++14" ];
buildPhase = ''
g++ Pers.cpp -O3 -fpermissive -o perseus
'';
@ -32,7 +32,7 @@ stdenv.mkDerivation {
around datasets arising from point samples, images, distance
matrices and so forth.
'';
homepage = "http://www.sas.upenn.edu/~vnanda/perseus/index.html";
homepage = "http://people.maths.ox.ac.uk/nanda/perseus/index.html";
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ erikryb ];
platforms = lib.platforms.linux;

View file

@ -21,11 +21,11 @@ let
self = python3Packages.buildPythonApplication rec {
pname = "mercurial${lib.optionalString fullBuild "-full"}";
version = "6.2.1";
version = "6.2.2";
src = fetchurl {
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
sha256 = "sha256-isXXog0cKtVNTCY9E0FkZG3DSo46a+1pz76rr404gto=";
sha256 = "sha256-nvqdpfSXqHUKycSPpDHEq3IgnxNgGAxdSSDRMRsEIN8=";
};
format = "other";
@ -35,7 +35,7 @@ let
cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
inherit src;
name = "mercurial-${version}";
sha256 = "sha256-shmeTQSCpQLrRUbL5bu9nAiPideZUe31YNCrClLM1eI=";
sha256 = "sha256-hvjp45Iv+fjs8R5Q+k96chY5j0S2Vs6+VrXzMuc2Cwg=";
sourceRoot = "mercurial-${version}/rust";
} else null;
cargoRoot = if rustSupport then "rust" else null;
@ -148,6 +148,17 @@ let
# doesn't like the extra setlocale warnings emitted by our bash wrappers
test-locale.t
# Python 3.10 error message change https://bz.mercurial-scm.org/show_bug.cgi?id=6643
test-http-bad-server.t
# Python 3.10-3.12 deprecation warning: distutils
# https://bz.mercurial-scm.org/show_bug.cgi?id=6729
test-hghave.t
# Python 3.10-3.12 deprecation warning: asyncore
# https://bz.mercurial-scm.org/show_bug.cgi?id=6727
test-patchbomb-tls.t
EOF
export HGTEST_REAL_HG="${mercurial}/bin/hg"

View file

@ -3,7 +3,10 @@
, libcap, libdrm, libepoxy, minijail, virglrenderer, wayland, wayland-protocols
}:
let
rustPlatform.buildRustPackage rec {
pname = "crosvm";
version = "104.0";
src = fetchgit {
url = "https://chromium.googlesource.com/crosvm/crosvm";
rev = "265aab613b1eb31598ea0826f04810d9f010a2c6";
@ -11,18 +14,6 @@ let
fetchSubmodules = true;
};
# use vendored virglrenderer
virglrenderer' = virglrenderer.overrideAttrs (oa: {
src = "${src}/third_party/virglrenderer";
});
in
rustPlatform.buildRustPackage rec {
pname = "crosvm";
version = "104.0";
inherit src;
separateDebugInfo = true;
patches = [
@ -34,7 +25,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ minijail-tools pkg-config protobuf wayland-scanner ];
buildInputs = [
libcap libdrm libepoxy minijail virglrenderer' wayland wayland-protocols
libcap libdrm libepoxy minijail virglrenderer wayland wayland-protocols
];
arch = stdenv.hostPlatform.parsed.cpu.name;

View file

@ -20,11 +20,17 @@ buildGoModule rec {
];
installPhase = ''
runHook preInstall
install -D $GOPATH/bin/buildx $out/libexec/docker/cli-plugins/docker-buildx
mkdir -p $out/bin
ln -s $out/libexec/docker/cli-plugins/docker-buildx $out/bin/docker-buildx
runHook postInstall
'';
meta = with lib; {
description = "Docker CLI plugin for extended build capabilities with BuildKit";
homepage = "https://github.com/docker/buildx";
license = licenses.asl20;
maintainers = [ maintainers.ivan-babrou ];
};

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "precice";
version = "2.4.0";
version = "2.5.0";
src = fetchFromGitHub {
owner = "precice";
repo = pname;
rev = "v${version}";
sha256 = "0qmwdxpbmy4dvjxav3dls18qns734j0yfvxvjrh1nnkk36qhfp3q";
sha256 = "sha256-n/UuiVHw1zwlhwR/HDaKgoMnPy6fm9HWZ5FmAr7F/GE=";
};
cmakeFlags = [

View file

@ -1,21 +1,21 @@
{ stdenv, lib, fetchFromGitHub, cmake,
mesa, libGLU, glfw,
libX11, libXi, libXcursor, libXrandr, libXinerama,
alsaSupport ? stdenv.hostPlatform.isLinux, alsa-lib,
pulseSupport ? stdenv.hostPlatform.isLinux, libpulseaudio,
sharedLib ? true,
includeEverything ? true
{ stdenv, lib, fetchFromGitHub, cmake, fetchpatch
, mesa, libGLU, glfw
, libX11, libXi, libXcursor, libXrandr, libXinerama
, alsaSupport ? stdenv.hostPlatform.isLinux, alsa-lib
, pulseSupport ? stdenv.hostPlatform.isLinux, libpulseaudio
, sharedLib ? true
, includeEverything ? true
}:
stdenv.mkDerivation rec {
pname = "raylib";
version = "4.0.0";
version = "4.2.0";
src = fetchFromGitHub {
owner = "raysan5";
repo = pname;
rev = version;
sha256 = "1mszf5v7qy38cv1fisq6xd9smb765hylhkv1ms9y7shmdl2ni6b7";
sha256 = "sha256-aMIjywcQxki0cKlNznPAMfvrtGj3qcR95D4/BDuPZZM=";
};
nativeBuildInputs = [ cmake ];
@ -24,10 +24,21 @@ stdenv.mkDerivation rec {
] ++ lib.optional alsaSupport alsa-lib
++ lib.optional pulseSupport libpulseaudio;
patches = [
# fixes glfw compile error;
# remove with next raylib version > 4.2.0 or when glfw 3.4.0 is released.
(fetchpatch {
url = "https://github.com/raysan5/raylib/commit/2ad7967db80644a25ca123536cf2f6efcb869684.patch";
sha256 = "sha256-/xgzox1ITeoZ91QWdwnJJ+jJ5nJsMHcEgbIEdNYh4NY=";
name = "raylib-glfw-fix.patch";
})
];
# https://github.com/raysan5/raylib/wiki/CMake-Build-Options
cmakeFlags = [
"-DUSE_EXTERNAL_GLFW=ON"
"-DBUILD_EXAMPLES=OFF"
"-DCUSTOMIZE_BUILD=1"
] ++ lib.optional includeEverything "-DINCLUDE_EVERYTHING=ON"
++ lib.optional sharedLib "-DBUILD_SHARED_LIBS=ON";

View file

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "virglrenderer";
version = "0.9.1";
version = "0.10.0";
src = fetchurl {
url = "https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/virglrenderer-${version}/virglrenderer-virglrenderer-${version}.tar.bz2";
sha256 = "1h76a1ylhh4niq33sa5knx033sr4k2816vibh4m58j54y7qc6346";
sha256 = "tMLD6lu1NnKeoQQIzwhMypKdrW5alULod2cdb8+76iM=";
};
buildInputs = [ libGLU libepoxy libX11 libdrm mesa ];

View file

@ -0,0 +1,40 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, urllib3
, pyopenssl
, cryptography
, idna
, certifi
}:
buildPythonPackage rec {
pname = "domeneshop";
version = "0.4.2";
format = "setuptools";
disabled = pythonOlder "3.4";
src = fetchPypi {
inherit pname version;
sha256 = "tr3wsrscIU66kTz3nlvDHj2EXoEHCH3grD0yD7BU3Fc=";
};
propagatedBuildInputs = [
certifi
urllib3
] ++ urllib3.optional-dependencies.secure;
# There are none
doCheck = false;
pythonImportsCheck = [ "domeneshop" ];
meta = with lib; {
description = "Python library for working with the Domeneshop API";
homepage = "https://api.domeneshop.no/docs/";
license = licenses.mit;
maintainers = with maintainers; [ pbsds ];
};
}

View file

@ -1,5 +1,6 @@
{ lib
, buildPythonPackage
, setuptools-scm
, pythonOlder
, fetchFromGitHub
, pytestCheckHook
@ -11,8 +12,8 @@
buildPythonPackage rec {
pname = "galois";
version = "0.0.32";
format = "setuptools";
version = "0.1.1";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,9 +21,15 @@ buildPythonPackage rec {
owner = "mhostetter";
repo = "galois";
rev = "refs/tags/v${version}";
sha256 = "sha256-+cxRLrfqk3N9pWKCVsTxruZwMYZ5dQyKJRnrb8y+ECM=";
sha256 = "sha256-ekbebwsdGkINdOFI+LLdwTRBN6d8mlNmftkj5SNRKNI=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools-scm
];
propagatedBuildInputs = [
numpy
numba
@ -35,8 +42,9 @@ buildPythonPackage rec {
];
postPatch = ''
substituteInPlace setup.cfg \
--replace "numpy >= 1.18.4, < 1.23" "numpy >= 1.18.4"
substituteInPlace pyproject.toml \
--replace "numpy >= 1.18.4, < 1.24" "numpy >= 1.18.4" \
--replace "numba >= 0.53, < 0.57" "numba >= 0.53" \
'';
pythonImportsCheck = [ "galois" ];

View file

@ -4,26 +4,38 @@
, requests
, google-auth
, google-auth-oauthlib
, pythonOlder
}:
buildPythonPackage rec {
version = "5.4.0";
pname = "gspread";
version = "5.5.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-thcrYvqJnj5BmdLQ6hAItkMFVUugjT06lukSOCT97Eg=";
hash = "sha256-hiDph+U0AxXyuNjSbPl+RzaoSzMloXx9m8/3BSXcMAM=";
};
propagatedBuildInputs = [ requests google-auth google-auth-oauthlib ];
propagatedBuildInputs = [
requests
google-auth
google-auth-oauthlib
];
# No tests included
doCheck = false;
pythonImportsCheck = [
"gspread"
];
meta = with lib; {
description = "Google Spreadsheets client library";
homepage = "https://github.com/burnash/gspread";
license = licenses.mit;
maintainers = with maintainers; [ ];
};
# No tests included
doCheck = false;
}

View file

@ -7,13 +7,13 @@
buildPythonApplication rec {
pname = "mkdocs-redirects";
version = "1.0.4";
version = "1.1.0";
src = fetchFromGitHub {
owner = "mkdocs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-hdMfl8j+kZzePkSd/bBHKuVXAVA1sAt7DvPZj9x5i0c=";
rev = "refs/tags/v${version}";
sha256 = "sha256-iJmNh81VVqaPWHL3d8u+hESlW3AhlCr/Ax9n5nOTd0o=";
};
propagatedBuildInputs = [

View file

@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "nibabel";
version = "4.0.1";
version = "4.0.2";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Ih83OjgAWpEcViOWBw1ngu3zTuNsVguWrj/m3Q7VxGI=";
sha256 = "sha256-RcSbU0k1G0X2wEWpGqArTw02dob/MoRjLvlaxluTB4Y=";
};
propagatedBuildInputs = [ numpy scipy h5py packaging pydicom ];

View file

@ -0,0 +1,56 @@
{ lib
, stdenv
, buildPythonPackage
, pythonOlder
, fetchPypi
, fetchFromGitHub
, jinja2
, pygments
, markupsafe
, astunparse
, pytestCheckHook
, hypothesis
}:
buildPythonPackage rec {
pname = "pdoc";
version = "12.0.2";
disabled = pythonOlder "3.7";
# the Pypi version does not include tests
src = fetchFromGitHub {
owner = "mitmproxy";
repo = "pdoc";
rev = "v${version}";
sha256 = "FVfPO/QoHQQqg7QU05GMrrad0CbRR5AQVYUpBhZoRi0=";
};
propagatedBuildInputs = [
jinja2
pygments
markupsafe
] ++ lib.optional (pythonOlder "3.9") astunparse;
checkInputs = [
pytestCheckHook
hypothesis
];
disabledTests = [
# Failing "test_snapshots" parametrization: Output does not match the stored snapshot
# This test seems to be sensitive to ordering of dictionary items and the version of dependencies.
# the only difference between the stored snapshot and the produced documentation is a debug javascript comment
"html-demopackage_dir"
];
pytestFlagsArray = [
''-m "not slow"'' # skip tests marked slow
];
pythonImportsCheck = [ "pdoc" ];
meta = with lib; {
homepage = "https://pdoc.dev/";
description = "API Documentation for Python Projects";
license = licenses.unlicense;
maintainers = with maintainers; [ pbsds ];
};
}

View file

@ -24,13 +24,13 @@
}:
buildPythonPackage rec {
version = "3.5.3";
version = "3.5.4";
pname = "rpy2";
disabled = isPyPy;
src = fetchPypi {
inherit version pname;
sha256 = "sha256-U6CS1ItE9GQo+zDLMVVmTW0vevCOvExF35jfTEWkLMs=";
sha256 = "sha256-ugqHeyuW4n0gkTg9RlK4KqInHP9KUFJD1F2kMLcSqvU=";
};
patches = [

View file

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "dapper";
version = "0.5.8";
version = "0.6.0";
src = fetchFromGitHub {
owner = "rancher";
repo = "dapper";
rev = "v${version}";
sha256 = "sha256-t1w8bhwCjZHmvgBG6Tv8kgqTbC7v5P5QOvJGuTJUC04=";
sha256 = "sha256-V+lHnOmIWjI1qmoJ7+pp+cGmJAtSeY+r2I9zykswQzM=";
};
vendorSha256 = null;

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-udeps";
version = "0.1.30";
version = "0.1.32";
src = fetchFromGitHub {
owner = "est31";
repo = pname;
rev = "v${version}";
sha256 = "sha256-CTP8ENvaryZsoSp+9wx5SoWYXqMpwWfzjMn5kvL+gxk=";
sha256 = "sha256-Ev7hLtE5/PqeM39nyWaMyIhFsEZnXbdyU8Q5PET98lQ=";
};
cargoSha256 = "sha256-Dzbogu/VqaASz7FEACavvrOIGZK2vn84IjQlCIx/Ey4=";
cargoSha256 = "sha256-3+6hZCYiyG6fgyJpjCcY1dzDK0kwVjsyckPIq/8Zfm0=";
nativeBuildInputs = [ pkg-config ];

View file

@ -3,34 +3,15 @@
stdenv.mkDerivation rec {
pname = "freesweep";
version = "1.0.1";
version = "1.0.2";
src = fetchFromGitHub {
owner = "rwestlund";
repo = "freesweep";
rev = "v${version}";
sha256 = "0grkwmz9whg1vlnk6gbr0vv9i2zgbd036182pk0xj4cavaj9rpjb";
hash = "sha256-iuu81yHbNrjdPsimBrPK58PJ0d8i3ySM7rFUG/d8NJM";
};
patches = [
# Pull fix pending upstream inclusion for -fno-common toolchains
# like upstream gcc-10+ or clang-13:
# https://github.com/rwestlund/freesweep/pull/8
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/rwestlund/freesweep/commit/a86245df4f3ff276a393f799d737d28a5cb0a5a8.patch";
sha256 = "13gs3bjb68ixyn9micza7gjd489rd2f5pdrv6sip9fsa6ya29xky";
})
# Pull fix pending upstream inclusion for ncurses-6.3:
# https://github.com/rwestlund/freesweep/pull/10
(fetchpatch {
name = "ncurses-6.3.patch";
url = "https://github.com/rwestlund/freesweep/commit/b0aef2bd0b2409d1e859af7d29bf2d86fc7bcea7.patch";
sha256 = "1nzvmvxhjxgm8228h1zz16w62iy6lak5sibif1s1f6p1ssn659jp";
})
];
nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ];
buildInputs = [ ncurses ];
@ -38,6 +19,8 @@ stdenv.mkDerivation rec {
configureFlags="$configureFlags --with-prefsdir=$out/share"
'';
enableParallelBuilding = true;
installPhase = ''
runHook preInstall
install -D -m 0555 freesweep $out/bin/freesweep

View file

@ -2,7 +2,7 @@
let
name = "lunar-client";
version = "2.10.0";
version = "2.10.1";
desktopItem = makeDesktopItem {
name = "lunar-client";
@ -21,7 +21,7 @@ let
src = fetchurl {
url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage";
name = "lunar-client.AppImage";
sha256 = "1kfi3rgy401ll3gn9k30j0a1zds1ghl5g2ibfwlsnr826nckfmzw";
hash = "sha256-3h2FFpIIRta6hEsa/H0xo8+DUvhdQyBv9dqdd/vlwZ4=";
};
in
appimageTools.wrapType1 rec {

View file

@ -0,0 +1,46 @@
{ lib
, fetchzip
, stdenvNoCC
, makeWrapper
}:
stdenvNoCC.mkDerivation rec {
pname = "swiftbar";
version = "1.4.3";
src = fetchzip {
url = "https://github.com/swiftbar/SwiftBar/releases/download/v${version}/SwiftBar.zip";
sha256 = "sha256-Ut+lr1E7bMp8Uz1aL7EV0ZsfdTh9t7zUjDU/DScRpHY=";
stripRoot = false;
};
dontConfigure = true;
dontBuild = true;
nativeBuildInputs = [
makeWrapper
];
installPhase = ''
runHook preInstall
mkdir -p $out/{Applications,bin}
cp -r ./SwiftBar.app $out/Applications
# Symlinking doesnt work; The auto-updater will fail to start which renders the app useless
makeWrapper $out/Applications/SwiftBar.app/Contents/MacOS/SwiftBar $out/bin/SwiftBar
runHook postInstall
'';
meta = with lib; {
description = "Powerful macOS menu bar customization tool";
homepage = "https://swiftbar.app";
changelog = "https://github.com/swiftbar/SwiftBar/releases/tag/v${version}";
mainProgram = "SwiftBar";
license = licenses.mit;
platforms = platforms.darwin;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
maintainers = with maintainers; [ ivar ];
};
}

View file

@ -0,0 +1,29 @@
{ fetchzip, lib, stdenvNoCC }:
stdenvNoCC.mkDerivation rec {
pname = "swiftdefaultapps";
version = "2.0.1";
# Fetch the release which includes the prebuild binary since this is a Swift project and nixpkgs
# doesn't currently have the ability to build Swift projects.
src = fetchzip {
url = "https://github.com/Lord-Kamina/SwiftDefaultApps/releases/download/v${version}/SwiftDefaultApps-v${version}.zip";
stripRoot = false;
sha256 = "sha256-0HsHjZBPUzmdvHy7E9EdZj6zwaXjSX2u5aj8pij0u3E=";
};
installPhase = ''
runHook preInstall
install -D './swda' "$out/bin/swda"
runHook postInstall
'';
meta = with lib; {
description = "View and change the default application for url schemes and UTIs";
homepage = "https://github.com/Lord-Kamina/SwiftDefaultApps";
license = licenses.beerware;
maintainers = [ maintainers.malo ];
platforms = platforms.darwin;
mainProgram = "swda";
};
}

File diff suppressed because it is too large Load diff

View file

@ -1,32 +1,32 @@
# DO NOT EDIT! This file is generated automatically by update.sh
{ }:
{
version = "397.0.0";
version = "400.0.0";
googleCloudSdkPkgs = {
x86_64-linux =
{
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-397.0.0-linux-x86_64.tar.gz";
sha256 = "1b7ggqc43xyszb583paky4gvph4ncvvwpdy1037dj1ckrd53bg00";
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-400.0.0-linux-x86_64.tar.gz";
sha256 = "0i9xvg26d4rl3nas49rmxbmbwq127nwvgp0di7rszddj63wj7py9";
};
x86_64-darwin =
{
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-397.0.0-darwin-x86_64.tar.gz";
sha256 = "0iiyga7b4axkprif5gyqnr8sjkv9nap5lvabgfx5845br7hzr5ps";
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-400.0.0-darwin-x86_64.tar.gz";
sha256 = "0ajywp16105yhxs5hv4cz7vg3jr9wqggb0fcimb23qpvn3xqh6xw";
};
aarch64-linux =
{
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-397.0.0-linux-arm.tar.gz";
sha256 = "102vw2f2q28c54hvn4hlp2da3zsib16z6hkz41079c1pmiybysi1";
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-400.0.0-linux-arm.tar.gz";
sha256 = "0dpl7cd1z05q0mgp5qxn23jjsvjhbfxhpjbd4pmhl62qp8x4m5mm";
};
aarch64-darwin =
{
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-397.0.0-darwin-arm.tar.gz";
sha256 = "0hp60fpmsvhn046sp0wb52xszkmin5v235khbxb82wr0vsgnqd7z";
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-400.0.0-darwin-arm.tar.gz";
sha256 = "16lxw3vrydzn36zwvl74akfgxx6m7mrjfd3dc8kvl1wvbbdqqz3j";
};
i686-linux =
{
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-397.0.0-linux-x86.tar.gz";
sha256 = "1xw4jzl85didin26q9sg7j1pip4bmap5d0ac9ywbj0vni71mqx26";
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-400.0.0-linux-x86.tar.gz";
sha256 = "09mn21ii17h8rfcmkwgmm3wpkiykgw9kc1dxjpaazxvxbmx0bi2y";
};
};
}

View file

@ -6,7 +6,7 @@ BASE_URL="$CHANNEL_URL/downloads/google-cloud-sdk"
# Version of Google Cloud SDK from
# https://cloud.google.com/sdk/docs/release-notes
VERSION="397.0.0"
VERSION="400.0.0"
function genMainSrc() {
local url="${BASE_URL}-${VERSION}-${1}-${2}.tar.gz"
@ -47,4 +47,4 @@ EOF
} >data.nix
curl "${CHANNEL_URL}/components-v${VERSION}.json" > components.json
curl "${CHANNEL_URL}/components-v${VERSION}.json" -w "\n" > components.json

View file

@ -7,13 +7,13 @@
buildPythonApplication rec {
pname = "catcli";
version = "0.8.1";
version = "0.8.2";
src = fetchFromGitHub {
owner = "deadc0de6";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-fnnioUMZZZOydpZixiTOHAL2fSA6TOE4AO9Gff5SDxY=";
sha256 = "sha256-IHHlxF/7U7C+wO6YicesZPFV6BSBmdkPWaZn7awplNk=";
};
propagatedBuildInputs = [ docopt anytree ];

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation {
pname = "footswitch";
version = "unstable-20201-03-17";
version = "unstable-2022-04-12";
src = fetchFromGitHub {
owner = "rgerganov";
repo = "footswitch";
rev = "aa0b10f00d3e76dac27b55b88c8d44c0c406f7f0";
sha256 = "sha256-SikYiBN7jbH5I1x5wPCF+buwFp1dt35cVxAN6lWkTN0=";
rev = "1cf63643e18e688e4ebe96451db24edf52338cc0";
sha256 = "0gfvi2wgrljndyz889cjjh2q13994fnaf11n7hpdd82c4wgg06kj";
};
nativeBuildInputs = [ pkg-config ];
@ -18,7 +18,7 @@ stdenv.mkDerivation {
substituteInPlace Makefile \
--replace /usr/local $out \
--replace /usr/bin/install install \
--replace /etc/udev/rules.d $out/lib/udev/rules.d
--replace /etc/udev $out/lib/udev
'';
preInstall = ''

View file

@ -0,0 +1,31 @@
{ lib
, fetchFromSourcehut
, makeWrapper
, rustPlatform
, wayland
}:
rustPlatform.buildRustPackage rec {
pname = "waylevel";
version = "1.0.0";
src = fetchFromSourcehut {
owner = "~shinyzenith";
repo = pname;
rev = version;
hash = "sha256-T2gqiRcKrKsvwGNnWrxR1Ga/VX4AyllYn1H25aIKt5s=";
};
cargoHash = "sha256-gw5m1/btJ5zZP04C7BCnHqEOUBoeu0whK8W7xA+xSQo=";
postFixup = ''
patchelf --set-rpath ${lib.makeLibraryPath [wayland]} $out/bin/waylevel
'';
meta = with lib; {
description = "A tool to print wayland toplevels and other compositor info";
homepage = "https://git.sr.ht/~shinyzenith/waylevel";
license = licenses.bsd2;
maintainers = with maintainers; [ dit7ya ];
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,22 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "pingu";
version = "0.0.3";
src = fetchFromGitHub {
owner = "sheepla";
repo = "pingu";
rev = "v${version}";
sha256 = "sha256-KYCG3L5x0ZdcyseffB0GoKpLZ/VG/qjMDh10qrLn62Y=";
};
vendorSha256 = "sha256-HkESF/aADGPixOeh+osFnjzhpz+/4NIsJOjpyyFF9Eg=";
meta = with lib; {
description = "Ping command implementation in Go but with colorful output and pingu ascii art";
homepage = "https://github.com/sheepla/pingu/";
license = licenses.mit;
maintainers = with maintainers; [ CactiChameleon9 ];
};
}

View file

@ -0,0 +1,29 @@
{ stdenv
, e2fsprogs
, fetchFromGitHub
, lib
}:
stdenv.mkDerivation rec {
pname = "ufiformat";
version = "0.9.9";
buildInputs = [
e2fsprogs
];
src = fetchFromGitHub {
owner = "tedigh";
repo = "ufiformat";
rev = "v${version}";
sha256 = "heFETZj9migz2s9kvmw0ZQ1ieNpU4V4Lwfp91ek2cS4=";
};
meta = with lib; {
homepage = "https://github.com/tedigh/ufiformat";
description = "Low-level disk formatting utility for USB floppy drives";
maintainers = [ maintainers.amarshall ];
platforms = platforms.linux;
license = licenses.gpl2Plus;
};
}

View file

@ -9913,6 +9913,8 @@ with pkgs;
pingtcp = callPackage ../tools/networking/pingtcp { };
pingu = callPackage ../tools/networking/pingu { };
pinnwand = callPackage ../servers/pinnwand { };
pinsel = callPackage ../tools/misc/pinsel { };
@ -11331,6 +11333,8 @@ with pkgs;
swaks = callPackage ../tools/networking/swaks { };
swiftbar = callPackage ../os-specific/darwin/swiftbar { };
swiften = callPackage ../development/libraries/swiften { };
squeekboard = callPackage ../applications/accessibility/squeekboard { };
@ -24895,6 +24899,8 @@ with pkgs;
statifier = callPackage ../os-specific/linux/statifier { };
swiftdefaultapps = callPackage ../os-specific/darwin/swiftdefaultapps { };
sysdig = callPackage ../os-specific/linux/sysdig {
openssl = openssl_1_1;
kernel = null;
@ -28476,6 +28482,8 @@ with pkgs;
wayshot = callPackage ../tools/misc/wayshot { };
waylevel = callPackage ../tools/misc/waylevel { };
wbg = callPackage ../applications/misc/wbg { };
hikari = callPackage ../applications/window-managers/hikari {
@ -34212,6 +34220,8 @@ with pkgs;
inormalize = callPackage ../applications/science/biology/inormalize { };
iqtree = callPackage ../applications/science/biology/iqtree { };
itsx = callPackage ../applications/science/biology/itsx { };
iv = callPackage ../applications/science/biology/iv {
@ -36250,6 +36260,8 @@ with pkgs;
uacme = callPackage ../tools/admin/uacme { };
ufiformat = callPackage ../tools/system/ufiformat { };
ums = callPackage ../servers/ums { };
unityhub = callPackage ../development/tools/unityhub { };

View file

@ -2721,6 +2721,8 @@ in {
doit-py = callPackage ../development/python-modules/doit-py { };
domeneshop = callPackage ../development/python-modules/domeneshop { };
dominate = callPackage ../development/python-modules/dominate { };
doorbirdpy = callPackage ../development/python-modules/doorbirdpy { };
@ -6638,6 +6640,8 @@ in {
pdm-pep517 = callPackage ../development/python-modules/pdm-pep517 { };
pdoc = callPackage ../development/python-modules/pdoc { };
pdoc3 = callPackage ../development/python-modules/pdoc3 { };
peaqevcore = callPackage ../development/python-modules/peaqevcore { };