diff options
25 files changed, 342 insertions, 113 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 14c94dee57e..d6e6c0dc83b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9684,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"; diff --git a/pkgs/applications/blockchains/alfis/default.nix b/pkgs/applications/blockchains/alfis/default.nix new file mode 100644 index 00000000000..7a808d2c72e --- /dev/null +++ b/pkgs/applications/blockchains/alfis/default.nix @@ -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; + }; +} diff --git a/pkgs/applications/misc/jiten/default.nix b/pkgs/applications/misc/jiten/default.nix index 5447a2b3050..efd28fabae3 100644 --- a/pkgs/applications/misc/jiten/default.nix +++ b/pkgs/applications/misc/jiten/default.nix @@ -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; }; } diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index dba21d2f21c..ad58a048c3e 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -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 = '' diff --git a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix index 83f261cd483..b932e699ac6 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix @@ -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"; }; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index a9de901cd87..9357a02a640 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -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 = [ diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index ffe5d69ec90..4bda09670ab 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -132,6 +132,7 @@ rec { cp ${./tarsum.go} tarsum.go export GOPATH=$(pwd) export GOCACHE="$TMPDIR/go-cache" + export GO111MODULE=off mkdir -p src/github.com/docker/docker/pkg ln -sT ${docker.moby-src}/pkg/tarsum src/github.com/docker/docker/pkg/tarsum go build diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index 4e9461dc743..7635e46237b 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -12,8 +12,9 @@ let }); }); }; -in rebar3Relx { - name = "erlang-ls"; +in +rebar3Relx { + pname = "erlang-ls"; inherit version; src = fetchFromGitHub { inherit owner repo; diff --git a/pkgs/development/beam-modules/erlfmt/default.nix b/pkgs/development/beam-modules/erlfmt/default.nix index c903906802e..da577f2264c 100644 --- a/pkgs/development/beam-modules/erlfmt/default.nix +++ b/pkgs/development/beam-modules/erlfmt/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, rebar3Relx, lib }: rebar3Relx rec { - name = "erlfmt"; + pname = "erlfmt"; version = "1.0.0"; releaseType = "escript"; src = fetchFromGitHub { diff --git a/pkgs/development/beam-modules/rebar3-release.nix b/pkgs/development/beam-modules/rebar3-release.nix index 16344f2f194..59771c34029 100644 --- a/pkgs/development/beam-modules/rebar3-release.nix +++ b/pkgs/development/beam-modules/rebar3-release.nix @@ -1,28 +1,34 @@ -{ stdenv, erlang, rebar3WithPlugins, openssl, - lib }: - -{ name, version +{ stdenv +, erlang +, rebar3WithPlugins +, openssl +, lib +}: + +{ 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; - - buildInputs = buildInputs ++ [ erlang rebar3 openssl ] ++ beamDeps; - - # ensure we strip any native binaries (eg. NIFs, ports) - stripDebugList = lib.optional (releaseType == "release") "rel"; - - inherit src; - - REBAR_IGNORE_DEPS = beamDeps != [ ]; - - 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 - ''; - - 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-*/}" + name = "${pname}-${version}"; + inherit version pname; + + buildInputs = buildInputs ++ [ erlang rebar3 openssl ] ++ beamDeps; + + # ensure we strip any native binaries (eg. NIFs, ports) + stripDebugList = lib.optional (releaseType == "release") "rel"; + + inherit src; + + REBAR_IGNORE_DEPS = beamDeps != [ ]; + + 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 + ''; + + 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-*/}" + done done - done - ''; - - meta = { - inherit (erlang.meta) platforms; - } // meta; - - passthru = ({ - packageName = name; - env = shell self; - } // (if attrs ? passthru then attrs.passthru else {})); - } // customPhases); + ''; + + meta = { + inherit (erlang.meta) platforms; + } // meta; + + passthru = ({ + packageName = pname; + env = shell self; + } // (if attrs ? passthru then attrs.passthru else { })); + } // customPhases); in - fix pkg +fix pkg diff --git a/pkgs/development/interpreters/luajit/2.0.nix b/pkgs/development/interpreters/luajit/2.0.nix index 528c14a8b24..153b11aaa5f 100644 --- a/pkgs/development/interpreters/luajit/2.0.nix +++ b/pkgs/development/interpreters/luajit/2.0.nix @@ -1,10 +1,10 @@ { self, callPackage, lib }: callPackage ./default.nix { inherit self; - version = "2.0.5-2021-05-29"; - rev = "c2cfa04231785116d9d198462830f41ef94147c0"; + version = "2.0.5-2021-06-08"; + rev = "98f95f69180d48ce49289d6428b46a9ccdd67a46"; isStable = true; - sha256 = "1fw64pv0dvzb9bgr2zwcv9q8gqgsmfnvrcrmrdfgj4ncamgdnilj"; + sha256 = "1pdmhk5syp0nir80xcnkf6xy2w5rwslak8hgmjpgaxzlnrjcgs7p"; extraMeta = { # this isn't precise but it at least stops the useless Hydra build platforms = with lib; filter (p: p != "aarch64-linux") (platforms.linux ++ platforms.darwin); diff --git a/pkgs/development/interpreters/luajit/2.1.nix b/pkgs/development/interpreters/luajit/2.1.nix index f85fc0932cc..d11514c07c6 100644 --- a/pkgs/development/interpreters/luajit/2.1.nix +++ b/pkgs/development/interpreters/luajit/2.1.nix @@ -1,8 +1,8 @@ { self, callPackage }: callPackage ./default.nix { inherit self; - version = "2.1.0-2021-05-29"; - rev = "839fb5bd72341d8e67b6cfc2053e2acffdb75567"; + version = "2.1.0-2021-06-25"; + rev = "e957737650e060d5bf1c2909b741cc3dffe073ac"; isStable = false; - sha256 = "1gyzq4n0fwah0245wazv4c43q9in1mwbk3dhh6cb1ijnjcxp2bb6"; + sha256 = "04i7n5xdd1nci4mv2p6bv71fq5b1nkswz12hcgirsxqbnkrlbbcj"; } diff --git a/pkgs/development/libraries/libuldaq/0001-uldaq.patch b/pkgs/development/libraries/libuldaq/0001-uldaq.patch new file mode 100644 index 00000000000..97375283cd6 --- /dev/null +++ b/pkgs/development/libraries/libuldaq/0001-uldaq.patch @@ -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 "" diff --git a/pkgs/development/libraries/libuldaq/default.nix b/pkgs/development/libraries/libuldaq/default.nix new file mode 100644 index 00000000000..2f8f7fbb30e --- /dev/null +++ b/pkgs/development/libraries/libuldaq/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 299e2af2f95..c629e2d9451 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.10.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = pname; repo = "python-plugwise"; rev = version; - sha256 = "sha256-M0Zwao8I8PRxxF9xvtzFeCFK9+eMlXYcWJarfHSGAlw="; + sha256 = "sha256-b00jfPZTVRI7BRpUHI2NjcydkykC/1HjmVzDaIech8c="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyfronius/default.nix b/pkgs/development/python-modules/pyfronius/default.nix new file mode 100644 index 00000000000..be226d744b8 --- /dev/null +++ b/pkgs/development/python-modules/pyfronius/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/development/python-modules/pyftdi/default.nix b/pkgs/development/python-modules/pyftdi/default.nix index eb7d9a623d4..aee3ede4fcc 100644 --- a/pkgs/development/python-modules/pyftdi/default.nix +++ b/pkgs/development/python-modules/pyftdi/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyftdi"; - version = "0.53.1"; + version = "0.53.2"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "eblot"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lpNe+8DhyfVuClGcjWIA6pnfh+NwdlBGffjRH62K4uw="; + sha256 = "sha256-6cTQlYG/z8ZulMZLggGQ+PhuOOclWM0/+cfy0SF6dls="; }; propagatedBuildInputs = [ pyusb pyserial ]; diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index 030200e47a8..f48c6f9e0b6 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -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=" ]; diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index fbb9bf93ed5..04c17eac255 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,8 +1,8 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.13.0"; - suffix = "xanmod2-cacule"; + version = "5.13.1"; + suffix = "xanmod1-cacule"; in buildLinux (args // rec { inherit version; @@ -12,7 +12,7 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-q+m1Ys/Gfr56cihoX8LS/w7icNcM3oefcXRtvzgx3cM="; + sha256 = "sha256-QC2BgsbytpKQs7TyuXt4aan8hUwd43pHj2ApYXv0HAA="; }; structuredExtraConfig = with lib.kernel; { diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index dbe9c938c67..123984e66a4 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -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 ]; diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index b5438d84ba8..c51cd9117a4 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -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 ]; diff --git a/pkgs/tools/misc/infracost/default.nix b/pkgs/tools/misc/infracost/default.nix index abe1872c67f..764e9ff5d77 100644 --- a/pkgs/tools/misc/infracost/default.nix +++ b/pkgs/tools/misc/infracost/default.nix @@ -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"; diff --git a/pkgs/tools/package-management/micromamba/default.nix b/pkgs/tools/package-management/micromamba/default.nix new file mode 100644 index 00000000000..a7e563ce67e --- /dev/null +++ b/pkgs/tools/package-management/micromamba/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a167c89fb39..f113de0cf0a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -363,7 +363,6 @@ in grsync = callPackage ../applications/misc/grsync { }; dockerTools = callPackage ../build-support/docker { - go = buildPackages.go_1_15; writePython3 = buildPackages.writers.writePython3; }; @@ -17088,6 +17087,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 @@ -28329,6 +28330,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; }; @@ -30973,6 +30981,8 @@ in mas = callPackage ../os-specific/darwin/mas { }; + micromamba = callPackage ../tools/package-management/micromamba { }; + moltengamepad = callPackage ../misc/drivers/moltengamepad { }; openzwave = callPackage ../development/libraries/openzwave { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f77b3f265a5..c8d101cc282 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5952,6 +5952,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 { }; |