Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-07-08 18:01:04 +00:00 committed by GitHub
commit e15847d168
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 386 additions and 110 deletions

View file

@ -5677,6 +5677,12 @@
githubId = 735008;
name = "Louis Taylor";
};
kranzes = {
email = "personal@ilanjoselevich.com";
github = "Kranzes";
githubId = 56614642;
name = "Ilan Joselevich";
};
krav = {
email = "kristoffer@microdisko.no";
github = "krav";
@ -9678,6 +9684,12 @@
githubId = 11135311;
name = "Simon Chatterjee";
};
simonkampe = {
email = "simon.kampe+nix@gmail.com";
github = "simonkampe";
githubId = 254799;
name = "Simon Kämpe";
};
simonvandel = {
email = "simon.vandel@gmail.com";
github = "simonvandel";

View file

@ -0,0 +1,41 @@
{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config
, withGui ? true, webkitgtk, Cocoa, WebKit
}:
rustPlatform.buildRustPackage rec {
pname = "alfis";
version = "0.6.5";
src = fetchFromGitHub {
owner = "Revertron";
repo = "Alfis";
rev = "v${version}";
sha256 = "1g95yvkvlj78bqrk3p2xbhrmg1hrlgbyr1a4s7vg45y60zys2c2j";
};
cargoSha256 = "1n7kb1lyghpkgdgd58pw8ldvfps30rnv5niwx35pkdg74h59hqgj";
cargoBuildFlags = [ "--no-default-features" ]
++ lib.optional withGui "--features webgui";
cargoTestFlags = [ "--no-default-features" ]
++ lib.optional withGui "--features webgui";
checkFlags = [
# these want internet access, disable them
"--skip=dns::client::tests::test_tcp_client"
"--skip=dns::client::tests::test_udp_client"
];
nativeBuildInputs = [ pkg-config ];
buildInputs = lib.optional (withGui && stdenv.isLinux) webkitgtk
++ lib.optionals (withGui && stdenv.isDarwin) [ Cocoa WebKit ];
meta = with lib; {
description = "Alternative Free Identity System";
homepage = "https://alfis.name";
license = licenses.agpl3Only;
maintainers = with maintainers; [ misuzu ];
platforms = platforms.unix;
};
}

View file

@ -6,13 +6,13 @@
python3Packages.buildPythonApplication rec {
pname = "chia";
version = "1.1.7";
version = "1.2.0";
src = fetchFromGitHub {
owner = "Chia-Network";
repo = "chia-blockchain";
rev = version;
sha256 = "05hcckkv3vhz172w9kp5lh4srakizx1l383dijs50vgx2bj30m8v";
sha256 = "sha256-P5oWOQgyj+/Ia21R4PB6ID/iUPKBnW9/X5EF6RZjzS8=";
};
patches = [
@ -70,8 +70,8 @@ python3Packages.buildPythonApplication rec {
--replace "aiohttp==3.7.4" "aiohttp>=3.7.4" \
--replace "sortedcontainers==2.3.0" "sortedcontainers>=2.3.0" \
--replace "click==7.1.2" "click>=7.1.2" \
--replace "clvm_rs==0.1.7" "clvm_rs>=0.1.7" \
--replace "clvm==0.9.6" "clvm>=0.9.6" \
--replace "clvm_rs==0.1.8" "clvm_rs>=0.1.8" \
--replace "clvm==0.9.7" "clvm>=0.9.7" \
'';
preCheck = ''

View file

@ -1,26 +1,35 @@
{ lib
, fetchFromGitHub
, python3Packages
, python3
, bash
, makeWrapper
, kanjidraw
, pcre
, sqlite
, nodejs
}:
python3Packages.buildPythonApplication rec {
python3.pkgs.buildPythonApplication rec {
pname = "jiten";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "obfusk";
repo = "jiten";
rev = "v${version}";
sha256 = "1lg1n7f4383jdlkbma0q65yl6l159wgh886admcq7l7ap26zpqd2";
sha256 = "13bdx136sirbhxdhvpq5kf0r6q1xvm5zyzp454z51gy0v6rn0qrp";
};
nonFreeData = fetchFromGitHub {
owner = "obfusk";
repo = "jiten-nonfree-data";
rev = "v${version}";
sha256 = "16sz8i0sw7ggy6kijcx4qyl2zr6xj789x4iav0yyllx12dfgp5b1";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ pcre sqlite ];
propagatedBuildInputs = with python3Packages; [ click flask ];
propagatedBuildInputs = with python3.pkgs; [ click flask kanjidraw ];
checkInputs = [ nodejs ];
preBuild = ''
@ -29,11 +38,16 @@ python3Packages.buildPythonApplication rec {
'';
postPatch = ''
substituteInPlace Makefile --replace /bin/bash "$(command -v bash)"
substituteInPlace jiten/res/jmdict/Makefile --replace /bin/bash "$(command -v bash)"
rmdir nonfree-data
ln -s ${nonFreeData} nonfree-data
substituteInPlace Makefile --replace /bin/bash ${bash}/bin/bash
substituteInPlace jiten/res/jmdict/Makefile \
--replace /bin/bash ${bash}/bin/bash
'';
checkPhase = "make test";
checkPhase = ''
make test
'';
postInstall = ''
# requires pywebview
@ -59,7 +73,8 @@ python3Packages.buildPythonApplication rec {
readings (romaji optional), meanings (english), jmdict entries, radicals & more
search using SKIP codes
search by radical
browse by frequency/level/jlpt
handwritten kanji recognition
browse by frequency/level/jlpt/SKIP
Example sentences (from Tatoeba)
with english, dutch, german, french and/or spanish translation
@ -83,9 +98,8 @@ python3Packages.buildPythonApplication rec {
license = with licenses; [
agpl3Plus # code
cc-by-sa-30 # jmdict/kanjidic
unfreeRedistributable # pitch data from wadoku is non-commercial :(
unfreeRedistributable # pitch data & audio are non-commercial
];
maintainers = [ maintainers.obfusk ];
platforms = platforms.unix;
};
}

View file

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

View file

@ -11,11 +11,11 @@ let
in
stdenv.mkDerivation rec {
pname = "jitsi-meet-electron";
version = "2.8.7";
version = "2.8.8";
src = fetchurl {
url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage";
sha256 = "sha256-2VjYXDTb+u3gVM4FPwFzwyUj3O1t7fHpOrNU5Z+Hq2E=";
sha256 = "sha256-ORj0xSFzdyOVuybaDyTrawsVkJymKEHLbFxGUgzXNWY=";
name = "${pname}-${version}.AppImage";
};

View file

@ -28,7 +28,7 @@ let
else "");
in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "5.7.1"; # Please backport all updates to the stable channel.
version = "5.8.0"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@ -38,7 +38,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "1hjykjqf3n20aab9g3bwk5w8x8v61320xv6z4iqrwwdzfkb3ly20";
sha256 = "0icwmlnnnlsj2g1p2q4lf7hlhys3rakaim7bah5qkmhwkrzkk30y";
};
nativeBuildInputs = [

View file

@ -21,13 +21,13 @@
mkDerivation rec {
pname = "nextcloud-client";
version = "3.2.3";
version = "3.2.4";
src = fetchFromGitHub {
owner = "nextcloud";
repo = "desktop";
rev = "v${version}";
sha256 = "sha256-NE0P6bG/msoP29c/1r/fTC5vDcqgkQuqfRK+IDftMqY=";
sha256 = "sha256-+APRR3Qj8jdDG2wc4hXFF40aTeoLGAXlsCsB4zKDI3Q=";
};
patches = [

View file

@ -12,8 +12,9 @@ let
});
});
};
in rebar3Relx {
name = "erlang-ls";
in
rebar3Relx {
pname = "erlang-ls";
inherit version;
src = fetchFromGitHub {
inherit owner repo;

View file

@ -1,7 +1,7 @@
{ fetchFromGitHub, rebar3Relx, lib }:
rebar3Relx rec {
name = "erlfmt";
pname = "erlfmt";
version = "1.0.0";
releaseType = "escript";
src = fetchFromGitHub {

View file

@ -1,28 +1,34 @@
{ stdenv, erlang, rebar3WithPlugins, openssl,
lib }:
{ stdenv
, erlang
, rebar3WithPlugins
, openssl
, lib
}:
{ name, version
{ pname
, version
, src
, beamDeps ? []
, buildPlugins ? []
, beamDeps ? [ ]
, buildPlugins ? [ ]
, checkouts ? null
, releaseType
, buildInputs ? []
, buildInputs ? [ ]
, setupHook ? null
, profile ? "default"
, installPhase ? null
, buildPhase ? null
, configurePhase ? null
, meta ? {}
, ... }@attrs:
, meta ? { }
, ...
}@attrs:
with lib;
let
shell = drv: stdenv.mkDerivation {
name = "interactive-shell-${drv.name}";
buildInputs = [ drv ];
};
name = "interactive-shell-${drv.pname}";
buildInputs = [ drv ];
};
customPhases = filterAttrs
(_: v: v != null)
@ -38,65 +44,65 @@ let
};
pkg =
assert beamDeps != [] -> checkouts == null;
assert beamDeps != [ ] -> checkouts == null;
self: stdenv.mkDerivation (attrs // {
name = "${name}-${version}";
inherit version;
name = "${pname}-${version}";
inherit version pname;
buildInputs = buildInputs ++ [ erlang rebar3 openssl ] ++ beamDeps;
buildInputs = buildInputs ++ [ erlang rebar3 openssl ] ++ beamDeps;
# ensure we strip any native binaries (eg. NIFs, ports)
stripDebugList = lib.optional (releaseType == "release") "rel";
# ensure we strip any native binaries (eg. NIFs, ports)
stripDebugList = lib.optional (releaseType == "release") "rel";
inherit src;
inherit src;
REBAR_IGNORE_DEPS = beamDeps != [ ];
REBAR_IGNORE_DEPS = beamDeps != [ ];
configurePhase = ''
runHook preConfigure
${lib.optionalString (checkouts != null)
"cp --no-preserve=all -R ${checkouts}/_checkouts ."}
runHook postConfigure
'';
configurePhase = ''
runHook preConfigure
${lib.optionalString (checkouts != null)
"cp --no-preserve=all -R ${checkouts}/_checkouts ."}
runHook postConfigure
'';
buildPhase = ''
runHook preBuild
HOME=. DEBUG=1 rebar3 as ${profile} ${if releaseType == "escript"
then "escriptize"
else "release"}
runHook postBuild
'';
buildPhase = ''
runHook preBuild
HOME=. DEBUG=1 rebar3 as ${profile} ${if releaseType == "escript"
then "escriptize"
else "release"}
runHook postBuild
'';
installPhase = ''
runHook preInstall
dir=${if releaseType == "escript"
then "bin"
else "rel"}
mkdir -p "$out/$dir" "$out/bin"
cp -R --preserve=mode "_build/${profile}/$dir" "$out"
${lib.optionalString (releaseType == "release")
"find $out/rel/*/bin -type f -executable -exec ln -s -t $out/bin {} \\;"}
runHook postInstall
'';
installPhase = ''
runHook preInstall
dir=${if releaseType == "escript"
then "bin"
else "rel"}
mkdir -p "$out/$dir" "$out/bin"
cp -R --preserve=mode "_build/${profile}/$dir" "$out"
${lib.optionalString (releaseType == "release")
"find $out/rel/*/bin -type f -executable -exec ln -s -t $out/bin {} \\;"}
runHook postInstall
'';
postInstall = ''
for dir in $out/rel/*/erts-*; do
echo "ERTS found in $dir - removing references to erlang to reduce closure size"
for f in $dir/bin/{erl,start}; do
substituteInPlace "$f" --replace "${erlang}/lib/erlang" "''${dir/\/erts-*/}"
postInstall = ''
for dir in $out/rel/*/erts-*; do
echo "ERTS found in $dir - removing references to erlang to reduce closure size"
for f in $dir/bin/{erl,start}; do
substituteInPlace "$f" --replace "${erlang}/lib/erlang" "''${dir/\/erts-*/}"
done
done
done
'';
'';
meta = {
inherit (erlang.meta) platforms;
} // meta;
meta = {
inherit (erlang.meta) platforms;
} // meta;
passthru = ({
packageName = name;
env = shell self;
} // (if attrs ? passthru then attrs.passthru else {}));
} // customPhases);
passthru = ({
packageName = pname;
env = shell self;
} // (if attrs ? passthru then attrs.passthru else { }));
} // customPhases);
in
fix pkg
fix pkg

View file

@ -0,0 +1,28 @@
diff --git a/Makefile.am b/Makefile.am
index 0e69cd4..b4a1f1a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,7 @@ dist_pkgconfig_DATA=libuldaq.pc
# fpga/USB_DIO32HS.bin
if OS_LINUX
-rulesdatadir=/lib/udev/rules.d/
+rulesdatadir=$(libdir)/udev/rules.d/
dist_rulesdata_DATA=rules/50-uldaq.rules
endif
@@ -42,14 +42,6 @@ dist-up: dist
mkdir -p $(reldir)
cp $(distdir).tar.bz2 $(reldir)
-if OS_LINUX
-install-data-hook:
- udevadm control --reload-rules && \
- test -f "/etc/redhat-release" && echo "/usr/local/lib" > /etc/ld.so.conf.d/uldaq.conf || echo "" && \
- test -f "/etc/arch-release" && echo "/usr/local/lib" > /etc/ld.so.conf.d/uldaq.conf || echo "" && \
- ldconfig
-endif
-
if OS_LINUX
uninstall-hook:
test -f "/etc/ld.so.conf.d/uldaq.conf" && rm "/etc/ld.so.conf.d/uldaq.conf" || echo ""

View file

@ -0,0 +1,34 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, libusb1, ...}:
stdenv.mkDerivation rec {
pname = "libuldaq";
version = "1.2.0";
src = fetchFromGitHub {
owner = "mccdaq";
repo = "uldaq";
rev = "v${version}";
sha256 = "0l9ima8ac99yd9vvjvdrmacm95ghv687wiy39zxm00cmghcfv3vj";
};
patches = [
# Patch needed for `make install` to succeed
./0001-uldaq.patch
];
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ libusb1 ];
meta = with lib; {
description = "Library to talk to uldaq devices";
longDescription = ''
Library used to communicate with USB data acquisition (DAQ)
devices from Measurement Computing
'';
homepage = "https://github.com/mccdaq/uldaq";
license = licenses.mit;
platforms = platforms.linux;
maintainers = [ maintainers.simonkampe ];
};
}

View file

@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "chiapos";
version = "1.0.2";
version = "1.0.3";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "09mwj9m9rcvcb3zn6v2xykgd4a9lpwl6c86nwl8d1iqr82gb5hb5";
sha256 = "sha256-2Ye0gaOsv/Hg1363E6+NmezsK9EcLEZVKKUHikM2hr0=";
};
patches = [

View file

@ -23,7 +23,7 @@ index 9b4a2f5..86f849c 100644
FetchContent_Declare(
gulrak
- GIT_REPOSITORY https://github.com/gulrak/filesystem.git
- GIT_TAG v1.5.4
- GIT_TAG v1.5.6
+ SOURCE_DIR @ghc_filesystem@
)
FetchContent_MakeAvailable(gulrak)

View file

@ -14,12 +14,12 @@
buildPythonPackage rec {
pname = "chiavdf";
version = "1.0.1";
version = "1.0.2";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-z0od/VrH580+9641lKNI7jbVMlJZKCWnoT+GljnFxmU=";
hash = "sha256-YSG4Aj9gd72NOgDSYU0kPn/nZz9Pza9FE9WoG/H4PWw=";
};
patches = [

View file

@ -37,6 +37,11 @@ buildPythonPackage rec {
checkInputs = [ pytestCheckHook ];
postPatch = ''
substituteInPlace setup.py \
--replace "json5==0.9.5" "json5>=0.9.5"
'';
pythonImportsCheck = [ "graphtage" ];
meta = with lib; {

View file

@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "json5";
version = "0.9.5";
version = "0.9.6";
src = fetchFromGitHub {
owner = "dpranke";
repo = "pyjson5";
rev = "v${version}";
sha256 = "sha256-VkJnZG1BuC49/jJuwObbqAF48CtbWU9rDEYW4Dg0w4U=";
sha256 = "sha256-RJj5KvLKq43tRuTwxq/mB+sU35xTQwZqg/jpdYcMP6A=";
};
checkInputs = [
@ -21,6 +21,8 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [ "json5" ];
meta = with lib; {
homepage = "https://github.com/dpranke/pyjson5";
description = "A Python implementation of the JSON5 data format";

View file

@ -5,14 +5,14 @@
buildPythonPackage rec {
pname = "minidb";
version = "2.0.4";
version = "2.0.5";
disabled = !isPy3k;
src = fetchFromGitHub {
owner = "thp";
repo = "minidb";
rev = version;
sha256 = "0i607rkfx0rkyllcx4vf3w2z0wxzs1gqigfw87q90pjrbbh2q4sb";
sha256 = "sha256-aUXsp0E89OxCgTaz7MpKmqTHZfnjDcyHa8Ckzof9rfg=";
};
# module imports are incompatible with python2

View file

@ -0,0 +1,37 @@
{ lib
, aiohttp
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "pyfronius";
version = "0.5.2";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "nielstron";
repo = pname;
rev = version;
sha256 = "013nlxbpicm4d07q8cjkbwh6xbji8am5la9vv5iqjyk0h4c2hgr7";
};
propagatedBuildInputs = [
aiohttp
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "pyfronius" ];
meta = with lib; {
description = "Python module to communicate with Fronius Symo";
homepage = "https://github.com/nielstron/pyfronius";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -10,13 +10,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "apksigcopier";
version = "1.0.0";
version = "1.0.1";
src = fetchFromGitHub {
owner = "obfusk";
repo = "apksigcopier";
rev = "v${version}";
sha256 = "1la1ml91jvqc1zakbqfpayjbs67pi3i18bsgz3mf11rxgphd3fpk";
sha256 = "07ldq3q1x2lpb15q5s5i1pbg89sn6ah45amskm9pndqlh16z9k2x";
};
nativeBuildInputs = [ installShellFiles pandoc ];
@ -42,12 +42,11 @@ python3.pkgs.buildPythonApplication rec {
'';
meta = with lib; {
description = "Copy/extract/patch apk signatures & compare apks";
description = "Copy/extract/patch android apk signatures & compare apks";
longDescription = ''
apksigcopier is a tool for copying APK signatures from a signed APK
to an unsigned one (in order to verify reproducible builds). It can
also be used to compare two APKs with different signatures. Its
command-line tool offers four operations:
apksigcopier is a tool for copying android APK signatures from a signed APK to an unsigned one (in order to verify reproducible builds).
It can also be used to compare two APKs with different signatures.
Its command-line tool offers four operations:
* copy signatures directly from a signed to an unsigned APK
* extract signatures from a signed APK to a directory

View file

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "terraform-ls";
version = "0.18.2";
version = "0.19.0";
src = fetchFromGitHub {
owner = "hashicorp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-d/dn77pV9qxzAm6NVOM5KhFxYi2/xEK02zMl2TTB5rA=";
sha256 = "sha256-q97N9I1EzpcFlMuHe3X5rfZHt6XTytYO1inpGEvv1IQ=";
};
vendorSha256 = "sha256-0PcMxotUEys+jGDFEEz6owbtTGAac+RwoBWEHP5ifKQ=";
vendorSha256 = "sha256-7XcAt0+slNIjxxf7pUl7XO/PAN2z8WmzTuI0FsjgrBM=";
ldflags = [ "-s" "-w" "-X main.version=v${version}" "-X main.prerelease=" ];

View file

@ -287,7 +287,7 @@
"fritzbox" = ps: with ps; [ pyfritzhome ];
"fritzbox_callmonitor" = ps: with ps; [ fritzconnection ];
"fritzbox_netmonitor" = ps: with ps; [ fritzconnection ];
"fronius" = ps: with ps; [ ]; # missing inputs: pyfronius
"fronius" = ps: with ps; [ pyfronius ];
"frontend" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow ];
"frontier_silicon" = ps: with ps; [ ]; # missing inputs: afsapi
"futurenow" = ps: with ps; [ pyfnip ];

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pg_auto_failover";
version = "1.5.2";
version = "1.6.1";
src = fetchFromGitHub {
owner = "citusdata";
repo = pname;
rev = "v${version}";
sha256 = "1svzln0dc1vidb9qmg4m881pvmqqjq8d43ghb8yjl7shirawqkqx";
sha256 = "0bg1qxjszqnv0c5k5vf60sh8lcfagp9d66sprkf0d83yjh5qpwlm";
};
buildInputs = [ postgresql openssl zlib readline libkrb5 ];

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "infracost";
version = "0.9.2";
version = "0.9.3";
src = fetchFromGitHub {
owner = "infracost";
rev = "v${version}";
repo = "infracost";
sha256 = "sha256-TM+7Am5hoiRk/StAwCh5yAN1GKv3oPun38pvhArBoJg=";
sha256 = "sha256-3AH/VUKIno/jObep5GNfIpyOW5TcfZ5UZyornJWTGOw=";
};
vendorSha256 = "sha256-6sMtM7MTFTDXwH8AKr5Dxq8rPqE92xzcWqBTixcPi+8=";
vendorSha256 = "sha256-zMEtVPyzwW4SrbpydDFDqgHEC0/khkrSxlEnQ5I0he8=";
checkInputs = [ terraform ];
checkPhase = "make test";

View file

@ -0,0 +1,33 @@
{ lib, fetchurl, appimageTools }:
let
name = "vial-${version}";
version = "0.3";
pname = "Vial";
src = fetchurl {
url = "https://github.com/vial-kb/vial-gui/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage";
sha256 = "sha256-hUwVp2tpKelbISQU/Q30yUeQfWp56dtgtfF/rpq1h5M=";
};
appimageContents = appimageTools.extractType2 { inherit name src; };
in
appimageTools.wrapType2 {
inherit name src;
extraInstallCommands = ''
mv $out/bin/${name} $out/bin/${pname}
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
cp -r ${appimageContents}/usr/share/icons $out/share
mkdir -p $out/etc/udev/rules.d/ # https://get.vial.today/getting-started/linux-udev.html
echo 'KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0666", TAG+="uaccess", TAG+="udev-acl"' > $out/etc/udev/rules.d/92-viia.rules
'';
meta = with lib; {
description = "An Open-source cross-platform (Windows, Linux and Mac) GUI and a QMK fork for configuring your keyboard in real time";
homepage = "https://get.vial.today";
license = licenses.gpl2Only;
maintainers = with maintainers; [ kranzes ];
platforms = [ "x86_64-linux" ];
};
}

View file

@ -0,0 +1,49 @@
{ lib, stdenv, fetchFromGitHub, cmake
, cli11, nlohmann_json, curl, libarchive, libyamlcpp, libsolv, reproc
}:
let
libsolv' = libsolv.overrideAttrs (oldAttrs: {
cmakeFlags = oldAttrs.cmakeFlags ++ [
"-DENABLE_CONDA=true" # Maybe enable this in the original libsolv package? No idea about the implications.
];
});
in
stdenv.mkDerivation rec {
pname = "micromamba";
version = "0.14.1";
src = fetchFromGitHub {
owner = "mamba-org";
repo = "mamba";
rev = version;
sha256 = "0a5kmwk44ll4d8b2akjc0vm6ap9jfxclcw4fclvjxr2in3am9256";
};
nativeBuildInputs = [ cmake ];
buildInputs = [
cli11
nlohmann_json
curl
libarchive
libyamlcpp
libsolv'
reproc
# python3Packages.pybind11 # Would be necessary if someone wants to build with bindings I guess.
];
cmakeFlags = [
"-DBUILD_BINDINGS=OFF" # Fails to build, I don't think it's necessary for now.
"-DBUILD_EXE=ON"
];
CXXFLAGS = "-DMAMBA_USE_STD_FS";
meta = with lib; {
description = "Reimplementation of the conda package manager";
homepage = "https://github.com/mamba-org/mamba";
license = licenses.bsd3;
maintainers = with maintainers; [ mausch ];
};
}

View file

@ -9614,6 +9614,8 @@ in
via = callPackage ../tools/misc/via {};
vial = callPackage ../tools/misc/vial {};
viking = callPackage ../applications/misc/viking { };
vim-vint = callPackage ../development/tools/vim-vint { };
@ -17077,6 +17079,8 @@ in
libutempter = callPackage ../development/libraries/libutempter { };
libuldaq = callPackage ../development/libraries/libuldaq { };
libunwind =
if stdenv.isDarwin then darwin.libunwind
else if stdenv.hostPlatform.isRiscV then llvmPackages_latest.libunwind
@ -28318,6 +28322,13 @@ in
aeon = callPackage ../applications/blockchains/aeon { };
alfis = callPackage ../applications/blockchains/alfis {
inherit (darwin.apple_sdk.frameworks) Cocoa WebKit;
};
alfis-nogui = alfis.override {
withGui = false;
};
balanceofsatoshis = nodePackages.balanceofsatoshis;
bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin.nix { miniupnpc = miniupnpc_2; withGui = true; };
@ -30962,6 +30973,8 @@ in
mas = callPackage ../os-specific/darwin/mas { };
micromamba = callPackage ../tools/package-management/micromamba { };
moltengamepad = callPackage ../misc/drivers/moltengamepad { };
openzwave = callPackage ../development/libraries/openzwave { };

View file

@ -5954,6 +5954,8 @@ in {
pyfritzhome = callPackage ../development/python-modules/pyfritzhome { };
pyfronius = callPackage ../development/python-modules/pyfronius { };
pyftdi = callPackage ../development/python-modules/pyftdi { };
pyftgl = callPackage ../development/python-modules/pyftgl { };