diff options
81 files changed, 1485 insertions, 351 deletions
diff --git a/doc/languages-frameworks/dotnet.section.md b/doc/languages-frameworks/dotnet.section.md index f2a5efd05db6c..f3d9fb8757349 100644 --- a/doc/languages-frameworks/dotnet.section.md +++ b/doc/languages-frameworks/dotnet.section.md @@ -71,7 +71,7 @@ The `dotnetCorePackages.sdk` contains both a runtime and the full sdk of a given To package Dotnet applications, you can use `buildDotnetModule`. This has similar arguments to `stdenv.mkDerivation`, with the following additions: -* `projectFile` has to be used for specifying the dotnet project file relative to the source root. These usually have `.sln` or `.csproj` file extensions. +* `projectFile` has to be used for specifying the dotnet project file relative to the source root. These usually have `.sln` or `.csproj` file extensions. This can be an array of multiple projects as well. * `nugetDeps` has to be used to specify the NuGet dependency file. Unfortunately, these cannot be deterministically fetched without a lockfile. This file should be generated using `nuget-to-nix` tool, which is available in nixpkgs. * `executables` is used to specify which executables get wrapped to `$out/bin`, relative to `$out/lib/$pname`. If this is unset, all executables generated will get installed. If you do not want to install any, set this to `[]`. * `runtimeDeps` is used to wrap libraries into `LD_LIBRARY_PATH`. This is how dotnet usually handles runtime dependencies. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index efcb9eb7509ff..3cb4c652e1806 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5081,7 +5081,7 @@ }]; }; ivankovnatsky = { - email = "ikovnatsky@protonmail.ch"; + email = "75213+ivankovnatsky@users.noreply.github.com"; github = "ivankovnatsky"; githubId = 75213; name = "Ivan Kovnatsky"; diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix index 220c571b927e5..b2147c1bbfc93 100644 --- a/nixos/modules/services/backup/borgbackup.nix +++ b/nixos/modules/services/backup/borgbackup.nix @@ -152,6 +152,7 @@ let serviceConfig = { # The service's only task is to ensure that the specified path exists Type = "oneshot"; + WorkingDirectory = cfg.path; }; wantedBy = [ "multi-user.target" ]; }; diff --git a/nixos/modules/services/misc/gollum.nix b/nixos/modules/services/misc/gollum.nix index 4053afa69be56..cad73a871ba6b 100644 --- a/nixos/modules/services/misc/gollum.nix +++ b/nixos/modules/services/misc/gollum.nix @@ -100,6 +100,7 @@ in serviceConfig = { User = config.users.users.gollum.name; Group = config.users.groups.gollum.name; + WorkingDirectory = cfg.stateDir; ExecStart = '' ${pkgs.gollum}/bin/gollum \ --port ${toString cfg.port} \ diff --git a/nixos/modules/services/networking/radicale.nix b/nixos/modules/services/networking/radicale.nix index c121008d5294d..c6c40777ed7cf 100644 --- a/nixos/modules/services/networking/radicale.nix +++ b/nixos/modules/services/networking/radicale.nix @@ -195,6 +195,7 @@ in { SystemCallArchitectures = "native"; SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ]; UMask = "0027"; + WorkingDirectory = "/var/lib/radicale"; }; }; }; diff --git a/nixos/modules/services/web-apps/moodle.nix b/nixos/modules/services/web-apps/moodle.nix index 6f5cfa2e34815..19f3e754691e0 100644 --- a/nixos/modules/services/web-apps/moodle.nix +++ b/nixos/modules/services/web-apps/moodle.nix @@ -57,7 +57,7 @@ let pgsqlLocal = cfg.database.createLocally && cfg.database.type == "pgsql"; phpExt = pkgs.php74.withExtensions - ({ enabled, all }: with all; [ iconv mbstring curl openssl tokenizer xmlrpc soap ctype zip gd simplexml dom intl json sqlite3 pgsql pdo_sqlite pdo_pgsql pdo_odbc pdo_mysql pdo mysqli session zlib xmlreader fileinfo filter ]); + ({ enabled, all }: with all; [ iconv mbstring curl openssl tokenizer xmlrpc soap ctype zip gd simplexml dom intl json sqlite3 pgsql pdo_sqlite pdo_pgsql pdo_odbc pdo_mysql pdo mysqli session zlib xmlreader fileinfo filter opcache ]); in { # interface diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix index 6aa0d5f76f264..a8f38046137a6 100644 --- a/nixos/modules/services/x11/window-managers/xmonad.nix +++ b/nixos/modules/services/x11/window-managers/xmonad.nix @@ -29,7 +29,6 @@ let } '' install -D ${xmonadEnv}/share/man/man1/xmonad.1.gz $out/share/man/man1/xmonad.1.gz makeWrapper ${configured}/bin/xmonad $out/bin/xmonad \ - --set NIX_GHC "${xmonadEnv}/bin/ghc" \ --set XMONAD_XMESSAGE "${pkgs.xorg.xmessage}/bin/xmessage" ''; @@ -93,6 +92,8 @@ in { <literal>(restart "xmonad" True)</literal> instead, which will just restart xmonad from PATH. This allows e.g. switching to the new xmonad binary after rebuilding your system with nixos-rebuild. + For the same reason, ghc is not added to the environment when this + option is set. If you actually want to run xmonad with a config specified here, but also be able to recompile and restart it from a copy of that source in diff --git a/pkgs/applications/graphics/pixeluvo/default.nix b/pkgs/applications/graphics/pixeluvo/default.nix new file mode 100644 index 0000000000000..d88be43698446 --- /dev/null +++ b/pkgs/applications/graphics/pixeluvo/default.nix @@ -0,0 +1,55 @@ +{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper +, gtk3-x11 }: + +stdenv.mkDerivation rec { + pname = "pixeluvo"; + version = "1.6.0-2"; + + src = fetchurl { + url = "http://www.pixeluvo.com/downloads/${pname}_${version}_amd64.deb"; + sha256 = "sha256-QYSuD6o3kHg0DrFihYEcf9e3b8U1bu4Zf78+Akmm8yo="; + }; + + nativeBuildInputs = [ + dpkg + makeWrapper + autoPatchelfHook + ]; + + buildInputs = [ + gtk3-x11 + stdenv.cc.cc + ]; + + libPath = lib.makeLibraryPath buildInputs; + + dontBuild = true; + dontConfigure = true; + + unpackPhase = '' + dpkg-deb -x ${src} ./ + ''; + + installPhase = '' + runHook preInstall + + mv usr $out + mv opt $out + install -Dm644 $out/opt/pixeluvo/pixeluvo.png -t $out/share/pixmaps/ + + substituteInPlace $out/share/applications/pixeluvo.desktop \ + --replace '/opt/pixeluvo/pixeluvo.png' pixeluvo + + makeWrapper $out/opt/pixeluvo/bin/Pixeluvo64 $out/bin/pixeluvo \ + --prefix LD_LIBRARY_PATH : ${libPath} + + runHook postInstall + ''; + + meta = with lib; { + description = "A Beautifully Designed Image and Photo Editor for Windows and Linux"; + homepage = "http://www.pixeluvo.com/"; + license = licenses.unfree; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix index 97613b21957b2..1a590af94655b 100644 --- a/pkgs/applications/misc/phoc/default.nix +++ b/pkgs/applications/misc/phoc/default.nix @@ -32,11 +32,24 @@ let url = "https://github.com/swaywm/wlroots/commit/e18599b05e0f0cbeba11adbd489e801285470eab.patch"; sha256 = "17ax4dyk0584yhs3lq8ija5bkainjf7psx9c9r50cr4jm9c0i37l"; }) + + # xwayland: Allow to retrieve _NET_STARTUP_ID + (fetchpatch { + name = "allow-to-retrieve-net-startup-id.patch"; + url = "https://github.com/swaywm/wlroots/commit/66593071bc90a1cccaeedc636eb6f33c973f5362.patch"; + sha256 = "sha256-yKf/twdUzrII5IakH7AH6LGyPDo9Nl/gIB0pTThSTfY="; + }) + # xwayland: Allow to retrieve startup-id via _NET_STARTUP_INFO + (fetchpatch { + name = "allow-to-retrieve-startup-id-via-net-startup-info.patch"; + url = "https://github.com/swaywm/wlroots/commit/235bb6f2fcb8ee4174215ba74b5bc2f191c5960a.patch"; + sha256 = "sha256-7AWBq12tF/781CmgvTaOvTIiiJMywxRn6eWp+jacdak="; + }) ]; }); in stdenv.mkDerivation rec { pname = "phoc"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -44,7 +57,7 @@ in stdenv.mkDerivation rec { owner = "Phosh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QAnJlpFjWJvwxGyenmN4IaI9VFn2jwdXpa8VqAmH7Xw="; + sha256 = "sha256-qd1ZETM2/AjU5nKQIqh0Q+SboLNr+NncvSHgLv2S3KI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/thedesk/default.nix b/pkgs/applications/misc/thedesk/default.nix new file mode 100644 index 0000000000000..42f4d36eea5d5 --- /dev/null +++ b/pkgs/applications/misc/thedesk/default.nix @@ -0,0 +1,50 @@ +{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron +, alsa-lib, gtk3, libxshmfence, mesa, nss }: + +stdenv.mkDerivation rec { + pname = "thedesk"; + version = "22.3.1"; + + src = fetchurl { + url = "https://github.com/cutls/TheDesk/releases/download/v${version}/${pname}_${version}_amd64.deb"; + sha256 = "sha256-5KB88zMgwfObgmcMTe6R+oG48qLHrMht6vM1EvI+QFY="; + }; + + nativeBuildInputs = [ + dpkg + autoPatchelfHook + makeWrapper + ]; + + buildInputs = [ alsa-lib gtk3 libxshmfence mesa nss ]; + + dontBuild = true; + dontConfigure = true; + + unpackPhase = '' + dpkg-deb -x ${src} ./ + ''; + + installPhase = '' + runHook preInstall + + mv usr $out + mv opt $out + + substituteInPlace $out/share/applications/thedesk.desktop \ + --replace '/opt/TheDesk' $out/bin + + makeWrapper ${electron}/bin/electron $out/bin/thedesk \ + --add-flags $out/opt/TheDesk/resources/app.asar + + runHook postInstall + ''; + + meta = with lib; { + description = "Mastodon/Misskey Client for PC"; + homepage = "https://thedesk.top"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ wolfangaukang ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 338d0b3b9f34c..54bf0641fc825 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2021.10.5"; + version = "2021.11.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "sha256-vz7S6Qzr10Idy83ogMIHEHrjxGxxjtFnzNsuhbZqUnA="; + sha256 = "sha256-amwzMSPMaXbIj95RhSVnl0kwHnEluKj4L7q4Zu2HPgE="; }; vendorSha256 = null; @@ -22,6 +22,6 @@ buildGoModule rec { homepage = "https://www.cloudflare.com/products/argo-tunnel"; license = licenses.unfree; platforms = platforms.unix; - maintainers = [ maintainers.thoughtpolice maintainers.enorris ]; + maintainers = with maintainers; [ bbigras enorris thoughtpolice ]; }; } diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix new file mode 100644 index 0000000000000..215bcba832ec8 --- /dev/null +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, makeWrapper +, kubectl +}: + +buildGoModule rec { + pname = "arkade"; + version = "0.8.9"; + + src = fetchFromGitHub { + owner = "alexellis"; + repo = "arkade"; + rev = version; + sha256 = "0jv6pip3ywx8bx7m25fby6kl5irnjxvlpss2wkm615gv9ari21aq"; + }; + + CGO_ENABLED = 0; + + vendorSha256 = "05zdd5c2x4k4myxmgj32md8wq08i543l8q81rabqgyd3r9nwv4lx"; + + # Exclude pkg/get: tests downloading of binaries which fail when sandbox=true + subPackages = [ + "." + "cmd" + "pkg/apps" + "pkg/archive" + "pkg/config" + "pkg/env" + "pkg/helm" + "pkg/k8s" + "pkg/types" + ]; + + ldflags = [ + "-s" "-w" + "-X github.com/alexellis/arkade/cmd.GitCommit=ref/tags/${version}" + "-X github.com/alexellis/arkade/cmd.Version=${version}" + ]; + + buildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram "$out/bin/arkade" \ + --prefix PATH : ${lib.makeBinPath [ kubectl ]} + ''; + + meta = with lib; { + homepage = "https://github.com/alexellis/arkade"; + description = "Open Source Kubernetes Marketplace"; + license = licenses.mit; + maintainers = with maintainers; [ welteki ]; + }; +} diff --git a/pkgs/applications/networking/cluster/driftctl/default.nix b/pkgs/applications/networking/cluster/driftctl/default.nix new file mode 100644 index 0000000000000..c42fb87d8079b --- /dev/null +++ b/pkgs/applications/networking/cluster/driftctl/default.nix @@ -0,0 +1,56 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "driftctl"; + version = "0.15.0"; + + src = fetchFromGitHub { + owner = "cloudskiff"; + repo = "driftctl"; + rev = "v${version}"; + sha256 = "sha256-rWC4jqquVWJmHV/dnH+DsxlNiAY01xnq9z0/owS4Yis="; + }; + + vendorSha256 = "sha256-d8vASP8KnUeUkaHRU8kCE7FCt2QLGu5ET5BN3GM2O9c="; + + postUnpack = '' + # Without this, tests fail to locate aws/3.19.0.json + for prefix in / \ + /pkg \ + /pkg/analyser \ + /pkg/alerter \ + /pkg/remote \ + /pkg/middlewares \ + /pkg/cmd/scan/output \ + /pkg/iac/terraform/state \ + /pkg/iac/supplier ; do + mkdir -p ./source/$prefix/github.com/cloudskiff + ln -sf $PWD/source ./source/$prefix/github.com/cloudskiff/driftctl + done + + # Disable check for latest version and telemetry, which are opt-out. + # Making it out-in is quite a job, and why bother? + find -name '*.go' \ + | xargs sed -i 's,https://2lvzgmrf2e.execute-api.eu-west-3.amazonaws.com/,https://0.0.0.0/,g' + + # and remove corresponding flags from --help, so things look tidy. + find -name driftctl.go | \ + xargs sed -i -e '/("no-version-check"/ d' -e '/("disable-telemetry"/ d' + + # Presumably it can be done with ldflags, but I failed to find incantation + # that would work, we here we go old-school. + find -name version.go | xargs sed -i -e 's/"dev"/"${version}"/' + find -name build.go | xargs sed -i -e 's/"dev"/"release"/' + + # Fix the tests that checks for dev-dev. + find -name version_test.go | xargs sed -i -e 's/"dev-dev/"${version}/' + find -name driftctl_test.go | xargs sed -i -e 's/"dev-dev/"${version}/' + ''; + + meta = with lib; { + description = "Tool to track infrastructure drift"; + homepage = "https://github.com/cloudskiff/driftctl"; + license = licenses.asl20; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/pkgs/applications/networking/cluster/krane/Gemfile.lock b/pkgs/applications/networking/cluster/krane/Gemfile.lock index c70d4b79e1449..23ff2202704bf 100644 --- a/pkgs/applications/networking/cluster/krane/Gemfile.lock +++ b/pkgs/applications/networking/cluster/krane/Gemfile.lock @@ -61,7 +61,7 @@ GEM multi_json to_regexp (~> 0.2.1) jwt (2.3.0) - krane (2.3.1) + krane (2.3.2) activesupport (>= 5.0) colorize (~> 0.8) concurrent-ruby (~> 1.1) @@ -77,7 +77,7 @@ GEM recursive-open-struct (~> 1.1, >= 1.1.1) rest-client (~> 2.0) memoist (0.16.2) - mime-types (3.4.0) + mime-types (3.4.1) mime-types-data (~> 3.2015) mime-types-data (3.2021.1115) minitest (5.14.4) diff --git a/pkgs/applications/networking/cluster/krane/gemset.nix b/pkgs/applications/networking/cluster/krane/gemset.nix index a9a8620911d93..d66f0e4cb09a8 100644 --- a/pkgs/applications/networking/cluster/krane/gemset.nix +++ b/pkgs/applications/networking/cluster/krane/gemset.nix @@ -276,10 +276,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k1lwg0d2phs9n9zdx7nv5rv2p2vipm9jgzalr8x9nrq1is6wgvr"; + sha256 = "0x908645i92w012xglc07lb6k2irn1zpzwgn1n99h2x54qk1pz4v"; type = "gem"; }; - version = "2.3.1"; + version = "2.3.2"; }; kubeclient = { dependencies = ["http" "recursive-open-struct" "rest-client"]; @@ -308,10 +308,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wvbwlkf6i17xvxx70cffw26ijvcc400vfhpbnvd8mmx556cnb4g"; + sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb"; type = "gem"; }; - version = "3.4.0"; + version = "3.4.1"; }; mime-types-data = { groups = ["default"]; diff --git a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix index 089f0b7bd974e..b5c732282b9a9 100644 --- a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix +++ b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = "https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-working-with-install-plugin.html"; description = "Amazon SSM Session Manager Plugin"; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; license = licenses.unfree; maintainers = with maintainers; [ mbaillie ]; }; diff --git a/pkgs/applications/networking/feedreaders/indigenous-desktop/default.nix b/pkgs/applications/networking/feedreaders/indigenous-desktop/default.nix new file mode 100644 index 0000000000000..9bb34ffbbd709 --- /dev/null +++ b/pkgs/applications/networking/feedreaders/indigenous-desktop/default.nix @@ -0,0 +1,54 @@ +{ stdenv, lib, fetchurl, unzip, makeDesktopItem, copyDesktopItems +, makeWrapper, electron }: + +stdenv.mkDerivation rec { + pname = "indigenous-desktop"; + version = "1.3.0"; + + src = fetchurl { + url = "https://github.com/marksuth/indigenous-desktop/releases/download/v${version}/indigenous-linux-x64-${version}.zip"; + sha256 = "sha256-1nqj9N5RQE0PogJSULu75CTVLHeQsHIimtFXSCP6SPA="; + }; + + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + unzip + ]; + + desktopItems = [ + (makeDesktopItem { + name = pname; + exec = "indigenous-desktop"; + icon = "indigenous-desktop"; + comment = meta.description; + desktopName = "Indigenous"; + genericName = "Feed Reader"; + }) + ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/opt/indigenous $out/share/indigenous $out/share/pixmaps + cp -r ./ $out/opt/indigenous + mv $out/opt/indigenous/{locales,resources} $out/share/indigenous + mv $out/share/indigenous/resources/app/images/icon.png $out/share/pixmaps/indigenous-desktop.png + + makeWrapper ${electron}/bin/electron $out/bin/indigenous-desktop \ + --add-flags $out/share/indigenous/resources/app + + runHook postInstall + ''; + + meta = with lib; { + description = "IndieWeb app with extensions for sharing to/reading from micropub endpoints"; + homepage = "https://indigenous.realize.be/indigenous-desktop"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ wolfangaukang ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/office/zk/default.nix b/pkgs/applications/office/zk/default.nix index 9da6073ff42f5..bfb97d88e86b0 100644 --- a/pkgs/applications/office/zk/default.nix +++ b/pkgs/applications/office/zk/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "zk"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "mickael-menu"; repo = "zk"; rev = "v${version}"; - sha256 = "sha256-C3/V4v8lH4F3S51egEw5d51AI0n5xzBQjwhrI64FEGA="; + sha256 = "sha256-lTg5jB3krZWmCn3wWoAwzqBji1AyTTTVf/BphC7Mr5s="; }; vendorSha256 = "sha256-m7QGv8Vx776TsN7QHXtO+yl3U1D573UMZVyg1B4UeIk="; diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index 2e4b3b30d225c..b10d817d9e494 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -4,11 +4,11 @@ }: python2.pkgs.buildPythonApplication rec { pname = "chirp-daily"; - version = "20210724"; + version = "20211016"; src = fetchurl { url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz"; - sha256 = "0wddzls7r0l5b8vvljnmrj5lmmp7zkzl4h73pyigyf9nbhaklybb"; + sha256 = "13xzqnhvnw6yipv4izkq0s9ykyl9pc5ifpr1ii8xfp28ch706qyw"; }; propagatedBuildInputs = with python2.pkgs; [ diff --git a/pkgs/applications/version-management/git-and-tools/glitter/default.nix b/pkgs/applications/version-management/git-and-tools/glitter/default.nix index 65f6e3912efc1..89419605b3ba6 100644 --- a/pkgs/applications/version-management/git-and-tools/glitter/default.nix +++ b/pkgs/applications/version-management/git-and-tools/glitter/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "glitter"; - version = "1.5.5"; + version = "1.5.6"; src = fetchFromGitHub { owner = "milo123459"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4BN2kE9PkPFnFuk2Hl2WAhbvdkiO9yg4i0422ZQhJig="; + sha256 = "sha256-RP/8E2wqEFArWrZ1nfDhTKt2Ak1bl6PhalaHcQobfTk="; }; - cargoSha256 = "sha256-b+xd7Uq6sVcvbILEWKRylEnfNbQkeO/T2IoWzoReEM8="; + cargoSha256 = "sha256-6OGkcTGKCMgxMFDJ625NeVmKjRRwiRkQdE+oXRN3FHw="; # tests require it to be in a git repository preCheck = '' diff --git a/pkgs/applications/video/kooha/default.nix b/pkgs/applications/video/kooha/default.nix index 6203041ed63eb..f5be866473903 100644 --- a/pkgs/applications/video/kooha/default.nix +++ b/pkgs/applications/video/kooha/default.nix @@ -1,28 +1,40 @@ -{ lib, fetchFromGitHub, appstream-glib, desktop-file-utils, glib -, gobject-introspection, gst_all_1, gtk4, libadwaita, librsvg, meson, ninja -, pkg-config, python3, wrapGAppsHook }: +{ lib +, stdenv +, fetchFromGitHub +, appstream-glib +, desktop-file-utils +, glib +, gobject-introspection +, gst_all_1 +, gtk4 +, libadwaita +, libpulseaudio +, librsvg +, meson +, ninja +, pkg-config +, python3 +, rustPlatform +, wayland +, wrapGAppsHook +}: -python3.pkgs.buildPythonApplication rec { +stdenv.mkDerivation rec { pname = "kooha"; - version = "1.2.1"; - format = "other"; + version = "2.0.1"; src = fetchFromGitHub { owner = "SeaDve"; repo = "Kooha"; rev = "v${version}"; - sha256 = "1qwbzdn0n1nxcfci1bhhkfchdhw5yz74fdvsa84cznyyx2jils8w"; + sha256 = "05ynpwjdpl7zp9f17zhhvb59rbz3gd7hc0amla1g85ldgfxbgl00"; }; - buildInputs = [ - glib - gobject-introspection - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gtk4 - libadwaita - librsvg - ]; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256:16zf6vb001z7xdv2g4kpmb2vqsmaql2cpsx1rl9zrfhpl2z6frs9"; + }; nativeBuildInputs = [ appstream-glib @@ -31,21 +43,31 @@ python3.pkgs.buildPythonApplication rec { ninja python3 pkg-config + rustPlatform.cargoSetupHook + rustPlatform.rust.cargo + rustPlatform.rust.rustc + wayland wrapGAppsHook ]; + buildInputs = [ + glib + gobject-introspection + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gtk4 + libadwaita + libpulseaudio + librsvg + ]; + propagatedBuildInputs = [ python3.pkgs.pygobject3 ]; strictDeps = false; - buildPhase = '' - export GST_PLUGIN_SYSTEM_PATH_1_0="$out/lib/gstreamer-1.0/:$GST_PLUGIN_SYSTEM_PATH_1_0" - ''; - # Fixes https://github.com/NixOS/nixpkgs/issues/31168 postPatch = '' - chmod +x build-aux/meson/postinstall.py - patchShebangs build-aux/meson/postinstall.py + patchShebangs build-aux/meson_post_install.py ''; installCheckPhase = '' diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index 0a16bfc8842b5..2971bdeb57c1c 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pname = "phosh"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects - sha256 = "sha256-dKQK4mGe/dvNlca/XMDeq1Q4dH/WBF/rtiUh8RssF5c="; + sha256 = "sha256-pN2IWJDsQoTSOUki5gKhIucFYlYchzrqKHQYq6o4EkI="; }; nativeBuildInputs = [ diff --git a/pkgs/build-support/build-dotnet-module/default.nix b/pkgs/build-support/build-dotnet-module/default.nix index 6a7b70e070b0c..5178e08a9c736 100644 --- a/pkgs/build-support/build-dotnet-module/default.nix +++ b/pkgs/build-support/build-dotnet-module/default.nix @@ -21,7 +21,7 @@ # Unfortunately, dotnet has no method for doing this automatically. # If unset, all executables in the projects root will get installed. This may cause bloat! , executables ? null -# The packages project file, which contains instructions on how to compile it. +# The packages project file, which contains instructions on how to compile it. This can be an array of multiple project files as well. , projectFile ? null # The NuGet dependency file. This locks all NuGet dependency versions, as otherwise they cannot be deterministically fetched. # This can be generated using the `nuget-to-nix` tool. @@ -102,13 +102,15 @@ let export HOME=$(mktemp -d) - dotnet restore "$projectFile" \ - ${lib.optionalString (!enableParallelBuilding) "--disable-parallel"} \ - -p:ContinuousIntegrationBuild=true \ - -p:Deterministic=true \ - --source "${nuget-source}/lib" \ - "''${dotnetRestoreFlags[@]}" \ - "''${dotnetFlags[@]}" + for project in ''${projectFile[@]}; do + dotnet restore "$project" \ + ${lib.optionalString (!enableParallelBuilding) "--disable-parallel"} \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + --source "${nuget-source}/lib" \ + "''${dotnetRestoreFlags[@]}" \ + "''${dotnetFlags[@]}" + done runHook postConfigure ''; @@ -116,16 +118,18 @@ let buildPhase = args.buildPhase or '' runHook preBuild - dotnet build "$projectFile" \ - -maxcpucount:${if enableParallelBuilding then "$NIX_BUILD_CORES" else "1"} \ - -p:BuildInParallel=${if enableParallelBuilding then "true" else "false"} \ - -p:ContinuousIntegrationBuild=true \ - -p:Deterministic=true \ - -p:Version=${args.version} \ - --configuration "$buildType" \ - --no-restore \ - "''${dotnetBuildFlags[@]}" \ - "''${dotnetFlags[@]}" + for project in ''${projectFile[@]}; do + dotnet build "$project" \ + -maxcpucount:${if enableParallelBuilding then "$NIX_BUILD_CORES" else "1"} \ + -p:BuildInParallel=${if enableParallelBuilding then "true" else "false"} \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + -p:Version=${args.version} \ + --configuration "$buildType" \ + --no-restore \ + "''${dotnetBuildFlags[@]}" \ + "''${dotnetFlags[@]}" + done runHook postBuild ''; @@ -133,16 +137,18 @@ let checkPhase = args.checkPhase or '' runHook preCheck - ${lib.getBin dotnet-test-sdk}/bin/dotnet test "$testProjectFile" \ - -maxcpucount:${if enableParallelBuilding then "$NIX_BUILD_CORES" else "1"} \ - -p:ContinuousIntegrationBuild=true \ - -p:Deterministic=true \ - --configuration "$buildType" \ - --no-build \ - --logger "console;verbosity=normal" \ - ${lib.optionalString (disabledTests != []) "--filter \"FullyQualifiedName!=${lib.concatStringsSep "|FullyQualifiedName!=" disabledTests}\""} \ - "''${dotnetTestFlags[@]}" \ - "''${dotnetFlags[@]}" + for project in ''${testProjectFile[@]}; do + ${lib.getBin dotnet-test-sdk}/bin/dotnet test "$project" \ + -maxcpucount:${if enableParallelBuilding then "$NIX_BUILD_CORES" else "1"} \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + --configuration "$buildType" \ + --no-build \ + --logger "console;verbosity=normal" \ + ${lib.optionalString (disabledTests != []) "--filter \"FullyQualifiedName!=${lib.concatStringsSep "&FullyQualifiedName!=" disabledTests}\""} \ + "''${dotnetTestFlags[@]}" \ + "''${dotnetFlags[@]}" + done runHook postCheck ''; @@ -150,15 +156,17 @@ let installPhase = args.installPhase or '' runHook preInstall - dotnet publish "$projectFile" \ - -p:ContinuousIntegrationBuild=true \ - -p:Deterministic=true \ - --output $out/lib/${args.pname} \ - --configuration "$buildType" \ - --no-build \ - --no-self-contained \ - "''${dotnetInstallFlags[@]}" \ - "''${dotnetFlags[@]}" + for project in ''${projectFile[@]}; do + dotnet publish "$project" \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + --output $out/lib/${args.pname} \ + --configuration "$buildType" \ + --no-build \ + --no-self-contained \ + "''${dotnetInstallFlags[@]}" \ + "''${dotnetFlags[@]}" + done '' + (if executables != null then '' for executable in $executables; do execPath="$out/lib/${args.pname}/$executable" diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index bff703563d4b4..c0a41a39cd2b4 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20211103073737"; + version = "20211119143108"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - sha256 = "sha256-NYgEXbow16w+XMRjbQG1cIn/BjPbbcj+uzb4kcVR6eI="; + sha256 = "sha256-CJMINkutaUI/Eka0OJTjeG3weTMYaNKdB2BWOxFgI3s="; }; vendorSha256 = "sha256-JuLU9v1ukVfAEtz07tGk66st1+sO4SBz83BlK3IPQwU="; meta = with lib; { diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index aaf59ca1ef57c..b92a7b5d1910e 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -1,15 +1,14 @@ -{ - stdenv, - clangStdenv, - fetchgit, - fetchpatch, - libuuid, - python3, - bc, - clang_9, - llvmPackages_9, - overrideCC, - lib, +{ stdenv +, clangStdenv +, fetchFromGitHub +, fetchpatch +, libuuid +, python3 +, bc +, clang_9 +, llvmPackages_9 +, overrideCC +, lib }: let @@ -39,12 +38,26 @@ edk2 = buildStdenv.mkDerivation { version = "202108"; # submodules - src = fetchgit { - url = "https://github.com/tianocore/edk2"; + src = fetchFromGitHub { + owner = "tianocore"; + repo = "edk2"; rev = "edk2-stable${edk2.version}"; + fetchSubmodules = true; sha256 = "1ps244f7y43afxxw6z95xscy24f9mpp8g0mfn90rd4229f193ba2"; }; + patches = [ + # Pull upstream fix for gcc-11 build. + (fetchpatch { + name = "gcc-11-vla.patch"; + url = "https://github.com/google/brotli/commit/0a3944c8c99b8d10cc4325f721b7c273d2b41f7b.patch"; + sha256 = "10c6ibnxh4f8lrh9i498nywgva32jxy2c1zzvr9mcqgblf9d19pj"; + # Apply submodule patch to subdirectory: "a/" -> "BaseTools/Source/C/BrotliCompress/brotli/" + stripLen = 1; + extraPrefix = "BaseTools/Source/C/BrotliCompress/brotli/"; + }) + ]; + buildInputs = [ libuuid pythonEnv ]; makeFlags = [ "-C BaseTools" ] diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix index ec4e54c339b08..6406dad7d6cc8 100644 --- a/pkgs/development/libraries/gss/default.nix +++ b/pkgs/development/libraries/gss/default.nix @@ -1,21 +1,20 @@ { lib, stdenv, fetchurl -, withShishi ? !stdenv.isDarwin, shishi ? null +, withShishi ? !stdenv.isDarwin, shishi }: -assert withShishi -> shishi != null; - stdenv.mkDerivation rec { - name = "gss-1.0.3"; + pname = "gss"; + version = "1.0.3"; src = fetchurl { - url = "mirror://gnu/gss/${name}.tar.gz"; + url = "mirror://gnu/gss/${pname}-${version}.tar.gz"; sha256 = "1syyvh3k659xf1hdv9pilnnhbbhs6vfapayp4xgdcc8mfgf9v4gz"; }; buildInputs = lib.optional withShishi shishi; configureFlags = [ - "--${if withShishi != null then "enable" else "disable"}-kereberos5" + "--${if withShishi then "enable" else "disable"}-kerberos5" ]; doCheck = true; diff --git a/pkgs/development/python-modules/afsapi/default.nix b/pkgs/development/python-modules/afsapi/default.nix new file mode 100644 index 0000000000000..8ad6fa98ff6e9 --- /dev/null +++ b/pkgs/development/python-modules/afsapi/default.nix @@ -0,0 +1,49 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, lxml +, pytest-aiohttp +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "afsapi"; + version = "0.0.4"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "zhelev"; + repo = "python-afsapi"; + rev = version; + sha256 = "aevxhHuRedDs0JxeMlYSKHDQwcIs7miRm4FCtssdE0w="; + }; + + propagatedBuildInputs = [ + aiohttp + lxml + ]; + + checkInputs = [ + pytest-aiohttp + pytestCheckHook + ]; + + pytestFlagsArray = [ + "async_tests.py" + ]; + + pythonImportsCheck = [ + "afsapi" + ]; + + meta = with lib; { + description = "Python implementation of the Frontier Silicon API"; + homepage = "https://github.com/zhelev/python-afsapi"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index 814444e63533d..f3bb26c2780ed 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -3,17 +3,21 @@ , buildPythonPackage , fetchFromGitHub , netifaces +, pythonOlder }: buildPythonPackage rec { pname = "aioshelly"; - version = "1.0.4"; + version = "1.0.5"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "sha256-Om+v+cGisfx2PkH/J08loZioUO6y9wi5+6kd2T+dfOo="; + sha256 = "sha256-AaEnVMup/sGR3ENtN6NF/CzG05P4Er5LI8mG5LNVzAo="; }; propagatedBuildInputs = [ @@ -23,7 +27,10 @@ buildPythonPackage rec { # Project has no test doCheck = false; - pythonImportsCheck = [ "aioshelly" ]; + + pythonImportsCheck = [ + "aioshelly" + ]; meta = with lib; { description = "Python library to control Shelly"; diff --git a/pkgs/development/python-modules/eliqonline/default.nix b/pkgs/development/python-modules/eliqonline/default.nix new file mode 100644 index 0000000000000..b972d6addd258 --- /dev/null +++ b/pkgs/development/python-modules/eliqonline/default.nix @@ -0,0 +1,41 @@ +{ lib +, aiohttp +, buildPythonPackage +, docopt +, fetchPypi +, pythonOlder +, pyyaml +}: + +buildPythonPackage rec { + pname = "eliqonline"; + version = "1.2.2"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "hOUN4cA4pKVioIrfJM02GOnZdDRc7xbNtvHfoD3//bM="; + }; + + propagatedBuildInputs = [ + aiohttp + docopt + pyyaml + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "eliqonline" + ]; + + meta = with lib; { + description = "Python client to the Eliq Online API"; + homepage = "https://github.com/molobrakos/eliqonline"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/goodwe/default.nix b/pkgs/development/python-modules/goodwe/default.nix new file mode 100644 index 0000000000000..185562844fb44 --- /dev/null +++ b/pkgs/development/python-modules/goodwe/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "goodwe"; + version = "0.2.7"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "marcelblijleven"; + repo = pname; + rev = "v${version}"; + sha256 = "6/JAp7zK60+om4l14sLn+pUki0Q/5XwCJSawOf1q2q0="; + }; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "'marcelblijleven@gmail.com" "marcelblijleven@gmail.com" \ + --replace "version: file: VERSION" "version = ${version}" + ''; + + pythonImportsCheck = [ + "goodwe" + ]; + + meta = with lib; { + description = "Python library for connecting to GoodWe inverter"; + homepage = "https://github.com/marcelblijleven/goodwe"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/halohome/default.nix b/pkgs/development/python-modules/halohome/default.nix new file mode 100644 index 0000000000000..b87b59a46ec02 --- /dev/null +++ b/pkgs/development/python-modules/halohome/default.nix @@ -0,0 +1,42 @@ +{ lib +, aiohttp +, bleak +, buildPythonPackage +, csrmesh +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "halohome"; + version = "0.4.0"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "nayaverdier"; + repo = pname; + rev = version; + sha256 = "W7cqBJmoBUT0VvXeNKxUK0FfAuprjfvFv6rgyL2gqYQ="; + }; + + propagatedBuildInputs = [ + aiohttp + bleak + csrmesh + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "halohome" + ]; + + meta = with lib; { + description = "Python library to control Eaton HALO Home Smart Lights"; + homepage = "https://github.com/nayaverdier/halohome"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index d018b626996f3..686be89d2a7e9 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "3.1.18"; + version = "3.2.3"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "a43733acc3729557fc4758cff55652e52896e42c64c1f12540656ae7f298b806"; + sha256 = "7d74593e52d4dbfacbb98e14cac4bc765ea2cffb1b980675f44930d622871705"; }; nativeBuildInputs = [ jupyter-packaging ]; diff --git a/pkgs/development/python-modules/knack/default.nix b/pkgs/development/python-modules/knack/default.nix index 5a05449e610b6..be5cfc14e1317 100644 --- a/pkgs/development/python-modules/knack/default.nix +++ b/pkgs/development/python-modules/knack/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "knack"; - version = "0.8.2"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "4eaa50a1c5e79d1c5c8e5e1705b661721b0b83a089695e59e229cc26c64963b9"; + sha256 = "7fcab17585c0236885eaef311c01a1e626d84c982aabcac81703afda3f89c81f"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix new file mode 100644 index 0000000000000..6f6c5d3f0cf9d --- /dev/null +++ b/pkgs/development/python-modules/levenshtein/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, rapidfuzz +}: + +buildPythonPackage rec { + pname = "levenshtein"; + version = "0.16.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "maxbachmann"; + repo = "Levenshtein"; + rev = "v${version}"; + sha256 = "agshUVkkqogj4FbonFd/rrGisMOomS62NND66YKZvjg="; + }; + + propagatedBuildInputs = [ + rapidfuzz + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "Levenshtein" + ]; + + meta = with lib; { + description = "Functions for fast computation of Levenshtein distance and string similarity"; + homepage = "https://github.com/maxbachmann/Levenshtein"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/libpyvivotek/default.nix b/pkgs/development/python-modules/libpyvivotek/default.nix new file mode 100644 index 0000000000000..db9f14a5a80a7 --- /dev/null +++ b/pkgs/development/python-modules/libpyvivotek/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, requests +, vcrpy +}: + +buildPythonPackage rec { + pname = "libpyvivotek"; + version = "0.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "HarlemSquirrel"; + repo = "python-vivotek"; + rev = "v${version}"; + sha256 = "pNlnGpDjdYE7Lxog8GGZV+UZZmfmt5bwHof5LngPQjg="; + }; + + propagatedBuildInputs = [ + requests + ]; + + checkInputs = [ + pytestCheckHook + vcrpy + ]; + + pythonImportsCheck = [ + "libpyvivotek" + ]; + + meta = with lib; { + description = "Python Library for Vivotek IP Cameras"; + homepage = "https://github.com/HarlemSquirrel/python-vivotek"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/life360/default.nix b/pkgs/development/python-modules/life360/default.nix new file mode 100644 index 0000000000000..1739881ea96d0 --- /dev/null +++ b/pkgs/development/python-modules/life360/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "life360"; + version = "4.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "pnbruckner"; + repo = pname; + rev = "v${version}"; + sha256 = "v+j0DBWQb1JdOu+uxJAdWhzef5zB62z+NSQ+WxpsinA="; + }; + + propagatedBuildInputs = [ + requests + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "life360" + ]; + + meta = with lib; { + description = "Python module to interact with Life360"; + homepage = "https://github.com/pnbruckner/life360"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/oemthermostat/default.nix b/pkgs/development/python-modules/oemthermostat/default.nix new file mode 100644 index 0000000000000..7a2ecfc26c03d --- /dev/null +++ b/pkgs/development/python-modules/oemthermostat/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, requests +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "oemthermostat"; + version = "1.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "Cadair"; + repo = "openenergymonitor_thermostat"; + rev = "v${version}"; + sha256 = "vrMw3/X8MtejO1WyUA1DOlfVCPTCPgcK5p3+OlTWcM4="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + requests + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "oemthermostat" + ]; + + meta = with lib; { + description = "Python module to interact with OpenEnergyMonitor thermostats"; + homepage = "https://github.com/Cadair/openenergymonitor_thermostat"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pkginfo/default.nix b/pkgs/development/python-modules/pkginfo/default.nix index 6bfed6305a8a4..87f11d9123459 100644 --- a/pkgs/development/python-modules/pkginfo/default.nix +++ b/pkgs/development/python-modules/pkginfo/default.nix @@ -1,21 +1,30 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: buildPythonPackage rec { pname = "pkginfo"; - version = "1.7.1"; + version = "1.8.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "e7432f81d08adec7297633191bbf0bd47faf13cd8724c3a13250e51d542635bd"; + sha256 = "sha256-ZRdf+iyAciBnOkHDcVc6yaHqGxn/1e75FiePQoMZk08="; }; - doCheck = false; # I don't know why, but with doCheck = true it fails. + checkInputs = [ + pytestCheckHook + ]; - meta = with lib; { - homepage = "https://pypi.python.org/pypi/pkginfo"; - license = licenses.mit; - description = "Query metadatdata from sdists / bdists / installed packages"; + pythonImportsCheck = [ + "pkginfo" + ]; + meta = with lib; { + description = "Query metadatdata from sdists, bdists or installed packages"; + homepage = "https://pythonhosted.org/pkginfo/"; longDescription = '' This package provides an API for querying the distutils metadata written in the PKG-INFO file inside a source distriubtion (an sdist) @@ -24,5 +33,7 @@ buildPythonPackage rec { *.egg-info stored in a “development checkout” (e.g, created by running setup.py develop). ''; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index 66e16d7e87626..8c0bd2d07e809 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -9,7 +9,8 @@ buildPythonPackage rec { pname = "plexapi"; - version = "4.7.2"; + version = "4.8.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +18,7 @@ buildPythonPackage rec { owner = "pkkid"; repo = "python-plexapi"; rev = version; - sha256 = "sha256-v12CL2VR9QAoj44F8V1qw/qflzQ1WRi1cvWn/U/wW/E="; + sha256 = "sha256-e+nZi84mF9Z/gbFyhmE9TlntkTyrfoNr3U/fwH55fjw="; }; propagatedBuildInputs = [ @@ -29,7 +30,9 @@ buildPythonPackage rec { # Tests require a running Plex instance doCheck = false; - pythonImportsCheck = [ "plexapi" ]; + pythonImportsCheck = [ + "plexapi" + ]; meta = with lib; { description = "Python bindings for the Plex API"; diff --git a/pkgs/development/python-modules/py-zabbix/default.nix b/pkgs/development/python-modules/py-zabbix/default.nix new file mode 100644 index 0000000000000..410068f452379 --- /dev/null +++ b/pkgs/development/python-modules/py-zabbix/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "py-zabbix"; + version = "1.1.7"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "adubkov"; + repo = "py-zabbix"; + rev = version; + sha256 = "aPQc188pszfDQvNtsGYlRLHS5CG5VyqptSoe4/GJVvE="; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pyzabbix" + ]; + + meta = with lib; { + description = "Python module to interact with Zabbix"; + homepage = "https://github.com/adubkov/py-zabbix"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyephember/default.nix b/pkgs/development/python-modules/pyephember/default.nix new file mode 100644 index 0000000000000..a6f8d405f617c --- /dev/null +++ b/pkgs/development/python-modules/pyephember/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "pyephember"; + version = "0.3.1"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "3eMdkP7u3TTg1AUK4OR7AGZkD0FxUUPp/etvZ2Rw74E="; + }; + + propagatedBuildInputs = [ + requests + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "pyephember" + ]; + + meta = with lib; { + description = "Python client to the EPH Control Systems Ember API"; + homepage = "https://github.com/ttroy50/pyephember"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index f4eb29bedc0be..c46ecd69721de 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -21,11 +21,11 @@ buildPythonPackage rec { pname = "pymatgen"; - version = "2022.0.14"; + version = "2022.0.16"; src = fetchPypi { inherit pname version; - sha256 = "03d24ebafc21becab376c26de09437dd5cfb7bda7099046194e95b4c9fa35209"; + sha256 = "fb4db7d547f062266a1a113d898fb0626ded5a1f9101ef79681e171b7e45fad0"; }; nativeBuildInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/pynina/default.nix b/pkgs/development/python-modules/pynina/default.nix new file mode 100644 index 0000000000000..b9e026886c867 --- /dev/null +++ b/pkgs/development/python-modules/pynina/default.nix @@ -0,0 +1,39 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitLab +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pynina"; + version = "unstable-2021-11-11"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitLab { + owner = "DeerMaximum"; + repo = pname; + rev = "0ac42b28d48af7bcd9c83f5d425b5b23c4c19f02"; + sha256 = "FSrFCs/4tfYcSPz9cgR+LFsRbWIHE1X+ZUl8BWSEaWQ="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "pynina" + ]; + + meta = with lib; { + description = "Python API wrapper to retrieve warnings from the german NINA app"; + homepage = "https://gitlab.com/DeerMaximum/pynina"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pysecuritas/default.nix b/pkgs/development/python-modules/pysecuritas/default.nix new file mode 100644 index 0000000000000..7579e014b69cd --- /dev/null +++ b/pkgs/development/python-modules/pysecuritas/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, requests +, xmltodict +}: + +buildPythonPackage rec { + pname = "pysecuritas"; + version = "0.1.6"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "W3DLZCXUH9y5NPipFEu6URmKN+oVXMgeDF1rfKtxRng="; + }; + + propagatedBuildInputs = [ + xmltodict + requests + ]; + + # Project doesn't ship tests with PyPI releases + # https://github.com/Cebeerre/pysecuritas/issues/13 + doCheck = false; + + pythonImportsCheck = [ + "pysecuritas" + ]; + + meta = with lib; { + description = "Python client to access Securitas Direct Mobile API"; + homepage = "https://github.com/Cebeerre/pysecuritas"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyskyqhub/default.nix b/pkgs/development/python-modules/pyskyqhub/default.nix new file mode 100644 index 0000000000000..1f3ad1874621b --- /dev/null +++ b/pkgs/development/python-modules/pyskyqhub/default.nix @@ -0,0 +1,39 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyskyqhub"; + version = "0.1.4"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "RogerSelwyn"; + repo = "skyq_hub"; + rev = version; + sha256 = "EVkTvynMPmCr7DPuDqfpMvVPCvpPpJHfqsNjD3tn8zg="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # Tests require phyiscal hardware + doCheck = false; + + pythonImportsCheck = [ + "pyskyqhub" + ]; + + meta = with lib; { + description = "Python module for accessing SkyQ Hub"; + homepage = "https://github.com/RogerSelwyn/skyq_hub"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/python-levenshtein/default.nix b/pkgs/development/python-modules/python-levenshtein/default.nix index d208f2c6bdd12..9795c27d99018 100644 --- a/pkgs/development/python-modules/python-levenshtein/default.nix +++ b/pkgs/development/python-modules/python-levenshtein/default.nix @@ -4,8 +4,9 @@ }: buildPythonPackage rec { - pname = "python-Levenshtein"; + pname = "python-levenshtein"; version = "0.12.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; @@ -15,11 +16,14 @@ buildPythonPackage rec { # No tests included in archive doCheck = false; + pythonImportsCheck = [ + "Levenshtein" + ]; + meta = with lib; { description = "Functions for fast computation of Levenshtein distance and string similarity"; - homepage = "https://github.com/ztane/python-Levenshtein"; - license = licenses.gpl2; + homepage = "https://github.com/ztane/python-Levenshtein"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ aske ]; }; - } diff --git a/pkgs/development/python-modules/pyversasense/default.nix b/pkgs/development/python-modules/pyversasense/default.nix new file mode 100644 index 0000000000000..f462deedd48c9 --- /dev/null +++ b/pkgs/development/python-modules/pyversasense/default.nix @@ -0,0 +1,57 @@ +{ lib +, aiohttp +, asynctest +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyversasense"; + version = "0.0.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "imstevenxyz"; + repo = pname; + rev = "v${version}"; + sha256 = "vTaDEwImWDMInwti0Jj+j+RFEtXOOKtiH5wOMD6ZmJk="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + asynctest + pytest-asyncio + pytestCheckHook + ]; + + pytestFlagsArray = [ + "tests/test.py" + ]; + + disabledTests = [ + # Tests are not properly mocking network requests + "test_device_mac" + "test_peripheral_id" + "test_peripheral_measurements" + "test_samples" + ]; + + pythonImportsCheck = [ + "pyversasense" + ]; + + meta = with lib; { + description = "Python library to communicate with the VersaSense API"; + homepage = "https://github.com/imstevenxyz/pyversasense"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/qnap-qsw/default.nix b/pkgs/development/python-modules/qnap-qsw/default.nix new file mode 100644 index 0000000000000..f4e9a1cdf8b82 --- /dev/null +++ b/pkgs/development/python-modules/qnap-qsw/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "qnap-qsw"; + version = "0.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "Noltari"; + repo = "python-qnap-qsw"; + rev = version; + sha256 = "WP1bGt7aAtSVFOMJgPXKqVSbi5zj9K7qoIVrYCrPGqk="; + }; + + propagatedBuildInputs = [ + requests + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "qnap_qsw" + ]; + + meta = with lib; { + description = "Python library to interact with the QNAP QSW API"; + homepage = "https://github.com/Noltari/python-qnap-qsw"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/qtawesome/default.nix b/pkgs/development/python-modules/qtawesome/default.nix index 0a024faf919f8..19de7a689cee6 100644 --- a/pkgs/development/python-modules/qtawesome/default.nix +++ b/pkgs/development/python-modules/qtawesome/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "QtAwesome"; - version = "1.0.3"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "d37bbeb69ddc591e5ff036b741bda8d1d92133811f1f5a7150021506f70b8e6e"; + sha256 = "3fc6eb9327f96ded8e0d291dad4f7a543394c53bff8f9f4badd7433181581a8b"; }; propagatedBuildInputs = [ qtpy six ]; diff --git a/pkgs/development/python-modules/ritassist/default.nix b/pkgs/development/python-modules/ritassist/default.nix new file mode 100644 index 0000000000000..a23bb3df5deee --- /dev/null +++ b/pkgs/development/python-modules/ritassist/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, ciso8601 +, fetchPypi +, geopy +, pythonOlder +, requests +, sseclient +}: + +buildPythonPackage rec { + pname = "ritassist"; + version = "0.9.3"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "1JCKWb+3mdQYnL250Ml+kFkx6VAlBC7FL6XcQlQ+kC4="; + }; + + propagatedBuildInputs = [ + ciso8601 + geopy + requests + sseclient + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "ritassist" + ]; + + meta = with lib; { + description = "Python client to access RitAssist and FleetGO API"; + homepage = "https://github.com/depl0y/ritassist-py"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix index 54f7e6ddf9ca0..1bbac9ce9da19 100644 --- a/pkgs/development/python-modules/toggl-cli/default.nix +++ b/pkgs/development/python-modules/toggl-cli/default.nix @@ -1,12 +1,29 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, click -, click-completion, factory_boy, faker, inquirer, notify-py, pbr, pendulum -, ptable, pytestCheckHook, pytest-cov, pytest-mock, requests, twine -, validate-email }: +{ lib +, buildPythonPackage +, click +, click-completion +, factory_boy +, faker +, fetchPypi +, inquirer +, notify-py +, pbr +, pendulum +, ptable +, pytest-mock +, pytestCheckHook +, pythonOlder +, requests +, twine +, validate-email +}: buildPythonPackage rec { pname = "toggl-cli"; version = "2.4.2"; - disabled = pythonOlder "3.5"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { pname = "togglCli"; @@ -14,14 +31,39 @@ buildPythonPackage rec { sha256 = "1wgh231r16jyvaj1ch1pajvl9szflb4srs505pfdwdlqvz7rzww8"; }; + nativeBuildInputs = [ + pbr + twine + ]; + + propagatedBuildInputs = [ + click + click-completion + inquirer + notify-py + pbr + pendulum + ptable + requests + validate-email + ]; + + checkInputs = [ + pytestCheckHook + pytest-mock + faker + factory_boy + ]; + postPatch = '' substituteInPlace requirements.txt \ - --replace "notify-py==0.3.1" "notify-py>=0.3.1" + --replace "notify-py==0.3.1" "notify-py>=0.3.1" \ + --replace "click==7.1.2" "click>=7.1.2" \ + --replace "pbr==5.5.1" "pbr>=5.5.1" + substituteInPlace pytest.ini \ + --replace ' --cov toggl -m "not premium"' "" ''; - nativeBuildInputs = [ pbr twine ]; - checkInputs = [ pbr pytestCheckHook pytest-cov pytest-mock faker factory_boy ]; - preCheck = '' export TOGGL_API_TOKEN=your_api_token export TOGGL_PASSWORD=toggl_password @@ -36,22 +78,14 @@ buildPythonPackage rec { "test_now" ]; - propagatedBuildInputs = [ - click - click-completion - inquirer - notify-py - pendulum - ptable - requests - pbr - validate-email + pythonImportsCheck = [ + "toggl" ]; meta = with lib; { - homepage = "https://toggl.uhlir.dev/"; description = "Command line tool and set of Python wrapper classes for interacting with toggl's API"; + homepage = "https://toggl.uhlir.dev/"; license = licenses.mit; - maintainers = [ maintainers.mmahut ]; + maintainers = with maintainers; [ mmahut ]; }; } diff --git a/pkgs/development/python-modules/typecode/default.nix b/pkgs/development/python-modules/typecode/default.nix index fbd907365c226..16ee927e849b0 100644 --- a/pkgs/development/python-modules/typecode/default.nix +++ b/pkgs/development/python-modules/typecode/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { pname = "typecode"; version = "21.6.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; @@ -43,6 +44,8 @@ buildPythonPackage rec { disabledTests = [ "TestFileTypesDataDriven" + # AssertionError: assert 'application/x-bytecode.python'... + "test_compiled_python_1" ]; pythonImportsCheck = [ diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 421d9cb8c1ee4..307a64ce37773 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -56,13 +56,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.594"; + version = "2.0.595"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - sha256 = "sha256-wbqFEeqe0RXLfiaIIG6UyBLgFOG3kUWKLVoeKoSktuI="; + sha256 = "sha256-KWT3KczjDtDfgcct7YfmmM9oLhPnAvVd9mC+GTQCTsw="; }; nativeBuildInputs = with py.pkgs; [ diff --git a/pkgs/development/tools/azure-functions-core-tools/default.nix b/pkgs/development/tools/azure-functions-core-tools/default.nix index f72c875e65e7b..55720d2831103 100644 --- a/pkgs/development/tools/azure-functions-core-tools/default.nix +++ b/pkgs/development/tools/azure-functions-core-tools/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp -prd * $out/bin + cp -prd *.dll *.so gozip func $out/bin patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${libPath}" "$out/bin/func" diff --git a/pkgs/development/tools/rust/probe-run/default.nix b/pkgs/development/tools/rust/probe-run/default.nix index 4980baf85e2a7..6f9cb007b9041 100644 --- a/pkgs/development/tools/rust/probe-run/default.nix +++ b/pkgs/development/tools/rust/probe-run/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "probe-run"; - version = "0.2.5"; + version = "0.3.0"; src = fetchFromGitHub { owner = "knurling-rs"; repo = pname; rev = "v${version}"; - sha256 = "0bj5arngc49mdz1i7bbg4l7rb741x7dhalpdxrn55vzlvgbig8fv"; + sha256 = "0qlpvy62wqc8k9sww6pbiqv0yrjwpnai1vgrijw5285qpvrdsdw2"; }; - cargoSha256 = "1kqgl1f91aa7kz1yprpyf9pl1vp4ahhw8ka5hrvfvk5i5i54pigz"; + cargoSha256 = "10ybgzvv2iy5bjmmw48gmgvsx6rfqclsysyfbhd820dg2lshgi44"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ] @@ -21,6 +21,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Run embedded programs just like native ones."; homepage = "https://github.com/knurling-rs/probe-run"; + changelog = "https://github.com/knurling-rs/probe-run/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ hoverbear ]; }; diff --git a/pkgs/misc/emulators/duckstation/default.nix b/pkgs/misc/emulators/duckstation/default.nix index eacbc28890196..267da15400d6a 100644 --- a/pkgs/misc/emulators/duckstation/default.nix +++ b/pkgs/misc/emulators/duckstation/default.nix @@ -20,13 +20,13 @@ }: mkDerivation rec { pname = "duckstation"; - version = "unstable-2021-10-19"; + version = "unstable-2021-10-29"; src = fetchFromGitHub { owner = "stenzek"; repo = pname; - rev = "96f4fdf8d88ff3a120f3bc409a6a6487cdcbd55f"; - sha256 = "sha256-WWsi7kmFEYES2BoNKIFF1+lKHJGP3hbTZ9o3eWp+EcE="; + rev = "287b1e1abc98ef3f01d8530e0b428b58d8e77e96"; + sha256 = "sha256-1s7oBdOOkK6a3DKCZ70dAilFzlzrURwhx+MRTmOPWJE="; }; nativeBuildInputs = [ cmake ninja pkg-config extra-cmake-modules wrapQtAppsHook qttools ]; @@ -45,7 +45,7 @@ mkDerivation rec { ]; cmakeFlags = [ - #"-DUSE_DRMKMS=ON" # Broken in combination with Wayland, https://github.com/stenzek/duckstation/issues/2630 + "-DUSE_DRMKMS=ON" # Broken in combination with Wayland, https://github.com/stenzek/duckstation/issues/2630 "-DUSE_WAYLAND=ON" ]; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index ca190ee2b2b4d..a877297d1b4e3 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -3250,6 +3250,18 @@ final: prev: meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; + luatab-nvim = buildVimPluginFrom2Nix { + pname = "luatab.nvim"; + version = "2021-11-08"; + src = fetchFromGitHub { + owner = "alvarosevilla95"; + repo = "luatab.nvim"; + rev = "05eacdfd818741ff3f92bae6213c026a91711be4"; + sha256 = "0iy45hmn6f6dp3pym0yl091kngnrg25hrk5dlm93mj3yxbmgss4r"; + }; + meta.homepage = "https://github.com/alvarosevilla95/luatab.nvim/"; + }; + lush-nvim = buildVimPluginFrom2Nix { pname = "lush.nvim"; version = "2021-11-06"; @@ -5809,6 +5821,18 @@ final: prev: meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; + tabline-nvim = buildVimPluginFrom2Nix { + pname = "tabline.nvim"; + version = "2021-11-10"; + src = fetchFromGitHub { + owner = "kdheepak"; + repo = "tabline.nvim"; + rev = "3bac71db4e99b5af9a5fbfd1d134031aea4f01ab"; + sha256 = "1fzmcfvp7bxskmb18885pmnyyfcir7z20zgz7ffw98rq97rdf02r"; + }; + meta.homepage = "https://github.com/kdheepak/tabline.nvim/"; + }; + tabmerge = buildVimPluginFrom2Nix { pname = "tabmerge"; version = "2010-10-18"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 1e08534ec619e..b5a293df7cf68 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -12,6 +12,7 @@ aklt/plantuml-syntax allendang/nvim-expand-expr@main altercation/vim-colors-solarized alvan/vim-closetag +alvarosevilla95/luatab.nvim alx741/vim-hindent alx741/vim-stylishask amiorin/ctrlp-z @@ -344,6 +345,7 @@ kbenzie/vim-spirv kchmck/vim-coffee-script kdheepak/cmp-latex-symbols@main kdheepak/lazygit.nvim +kdheepak/tabline.nvim@main KeitaNakamura/neodark.vim keith/investigate.vim keith/rspec.vim diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 5fd9bbc51a0f1..b438ea98a2662 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -966,7 +966,15 @@ in lib.makeScopeWithSplicing noCC = true; version = "9.2"; sha256 = "1l4lmj4kmg8dl86x94sr45w0xdnkz8dn4zjx0ipgr9bnq98663zl"; - makeFlags = defaultMakeFlags ++ [ "FILESDIR=$(out)/share" ]; + # man0 generates a man.pdf using ps2pdf, but doesn't install it later, + # so we can avoid the dependency on ghostscript + postPatch = '' + substituteInPlace man0/Makefile --replace "ps2pdf" "echo noop " + ''; + makeFlags = defaultMakeFlags ++ [ + "FILESDIR=$(out)/share" + "MKRUMP=no" # would require to have additional path sys/rump/share/man + ]; }; # # END MISCELLANEOUS diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 431e0ed58b1f0..e6c246de0d27c 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { inherit libsOnly; unpackPhase = '' - undmg < "${src}" + undmg "${src}" export sourceRoot=prl-tools-build 7z x "Parallels Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso" -o$sourceRoot diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix index 27ee57ba75537..75e12a1b7a46c 100644 --- a/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rtl8821ce"; - version = "${kernel.version}-unstable-2021-05-28"; + version = "${kernel.version}-unstable-2021-11-19"; src = fetchFromGitHub { owner = "tomaspinho"; repo = "rtl8821ce"; - rev = "f93db734666f75ebf65e44ceb943c19b598b1647"; - sha256 = "sha256-cqXV52U+6Jl9Jje1nEOYDvmH4rgA1QdrwNCfYeul3hU="; + rev = "ca204c60724d23ab10244f920d4e50759ed1affb"; + sha256 = "18ma8a8h1l90dss0k6al7q6plwr57jc9g67p22g9917k1jfbhm97"; }; hardeningDisable = [ "pic" ]; @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; platforms = platforms.linux; broken = stdenv.isAarch64; - maintainers = with maintainers; [ hhm ]; + maintainers = with maintainers; [ hhm ivar ]; }; } diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 8331f888b4674..a16b0232dbba8 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "21.08.3.1"; + version = "21.08.4.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "0riynmdmq44hqjdfd8acvc14miy5yqbwvsmbm1xcgsjdxjan8l2z"; + sha256 = "0xaswxm54lxahjn5pkm8b1x1ny3iclyp07h7fzhadgbqmla26np2"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/duckling-proxy/default.nix b/pkgs/servers/duckling-proxy/default.nix new file mode 100644 index 0000000000000..445e78234fbba --- /dev/null +++ b/pkgs/servers/duckling-proxy/default.nix @@ -0,0 +1,21 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule { + pname = "duckling-proxy"; + version = "2021-07-23-unstable"; + + src = fetchFromGitHub { + owner = "LukeEmmet"; + repo = "duckling-proxy"; + rev = "e2bfd73a60d7afa43f13a9d420d514131fee8fd1"; + sha256 = "134hnfa4f5sb1z1j5684wmqzascsrlagx8z36i1470yggb00j4hr"; + }; + vendorSha256 = "0wxk1a5gn9a7q2kgq11a783rl5cziipzhndgp71i365y3p1ssqyf"; + + meta = with lib; { + description = "Gemini proxy to access the Small Web"; + homepage = "https://github.com/LukeEmmet/duckling-proxy"; + license = licenses.mit; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 1d10fa3f796e6..a5526e92015de 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -220,7 +220,7 @@ "egardia" = ps: with ps; [ pythonegardia ]; "eight_sleep" = ps: with ps; [ pyeight ]; "elgato" = ps: with ps; [ elgato ]; - "eliqonline" = ps: with ps; [ ]; # missing inputs: eliqonline + "eliqonline" = ps: with ps; [ eliqonline ]; "elkm1" = ps: with ps; [ elkm1-lib ]; "elv" = ps: with ps; [ pypca ]; "emby" = ps: with ps; [ pyemby ]; @@ -238,7 +238,7 @@ "environment_canada" = ps: with ps; [ env-canada ]; "envirophat" = ps: with ps; [ smbus-cffi ]; # missing inputs: envirophat "envisalink" = ps: with ps; [ pyenvisalink ]; - "ephember" = ps: with ps; [ ]; # missing inputs: pyephember + "ephember" = ps: with ps; [ pyephember ]; "epson" = ps: with ps; [ epson-projector ]; "epsonworkforce" = ps: with ps; [ ]; # missing inputs: epsonprinter "eq3btsmart" = ps: with ps; [ construct ]; # missing inputs: python-eq3bt @@ -270,7 +270,7 @@ "fitbit" = ps: with ps; [ aiohttp-cors fitbit ]; "fixer" = ps: with ps; [ fixerio ]; "fjaraskupan" = ps: with ps; [ fjaraskupan ]; - "fleetgo" = ps: with ps; [ ]; # missing inputs: ritassist + "fleetgo" = ps: with ps; [ ritassist ]; "flexit" = ps: with ps; [ pymodbus ]; "flic" = ps: with ps; [ pyflic ]; "flick_electric" = ps: with ps; [ pyflick ]; @@ -298,7 +298,7 @@ "fritzbox_callmonitor" = ps: with ps; [ fritzconnection ]; "fronius" = ps: with ps; [ pyfronius ]; "frontend" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ]; - "frontier_silicon" = ps: with ps; [ ]; # missing inputs: afsapi + "frontier_silicon" = ps: with ps; [ afsapi ]; "futurenow" = ps: with ps; [ pyfnip ]; "garadget" = ps: with ps; [ ]; "garages_amsterdam" = ps: with ps; [ garages-amsterdam ]; @@ -452,7 +452,7 @@ "lcn" = ps: with ps; [ pypck ]; "lg_netcast" = ps: with ps; [ pylgnetcast ]; "lg_soundbar" = ps: with ps; [ ]; # missing inputs: temescal - "life360" = ps: with ps; [ ]; # missing inputs: life360 + "life360" = ps: with ps; [ life360 ]; "lifx" = ps: with ps; [ aiolifx aiolifx-effects ]; "lifx_cloud" = ps: with ps; [ ]; "light" = ps: with ps; [ ]; @@ -597,7 +597,7 @@ "oasa_telematics" = ps: with ps; [ ]; # missing inputs: oasatelematics "obihai" = ps: with ps; [ pyobihai ]; "octoprint" = ps: with ps; [ ]; # missing inputs: pyoctoprintapi - "oem" = ps: with ps; [ ]; # missing inputs: oemthermostat + "oem" = ps: with ps; [ oemthermostat ]; "ohmconnect" = ps: with ps; [ defusedxml ]; "ombi" = ps: with ps; [ pyombi ]; "omnilogic" = ps: with ps; [ omnilogic ]; @@ -773,7 +773,7 @@ "sinch" = ps: with ps; [ ]; # missing inputs: clx-sdk-xms "siren" = ps: with ps; [ ]; "sisyphus" = ps: with ps; [ ]; # missing inputs: sisyphus-control - "sky_hub" = ps: with ps; [ ]; # missing inputs: pyskyqhub + "sky_hub" = ps: with ps; [ pyskyqhub ]; "skybeacon" = ps: with ps; [ pygatt ]; "skybell" = ps: with ps; [ skybellpy ]; "slack" = ps: with ps; [ slackclient ]; @@ -936,13 +936,13 @@ "venstar" = ps: with ps; [ venstarcolortouch ]; "vera" = ps: with ps; [ pyvera ]; "verisure" = ps: with ps; [ vsure ]; - "versasense" = ps: with ps; [ ]; # missing inputs: pyversasense + "versasense" = ps: with ps; [ pyversasense ]; "version" = ps: with ps; [ pyhaversion ]; "vesync" = ps: with ps; [ pyvesync ]; "viaggiatreno" = ps: with ps; [ ]; "vicare" = ps: with ps; [ pyvicare ]; "vilfo" = ps: with ps; [ vilfo-api-client ]; - "vivotek" = ps: with ps; [ ]; # missing inputs: libpyvivotek + "vivotek" = ps: with ps; [ libpyvivotek ]; "vizio" = ps: with ps; [ pyvizio ]; "vlc" = ps: with ps; [ python-vlc ]; "vlc_telnet" = ps: with ps; [ aiovlc ]; @@ -999,7 +999,7 @@ "yeelightsunflower" = ps: with ps; [ ]; # missing inputs: yeelightsunflower "yi" = ps: with ps; [ aioftp ha-ffmpeg ]; "youless" = ps: with ps; [ youless-api ]; - "zabbix" = ps: with ps; [ ]; # missing inputs: py-zabbix + "zabbix" = ps: with ps; [ py-zabbix ]; "zamg" = ps: with ps; [ ]; "zengge" = ps: with ps; [ ]; # missing inputs: zengge "zeroconf" = ps: with ps; [ aiohttp-cors ifaddr zeroconf ]; diff --git a/pkgs/servers/http/trafficserver/default.nix b/pkgs/servers/http/trafficserver/default.nix index eb4af7bf49184..9058a4cbda75d 100644 --- a/pkgs/servers/http/trafficserver/default.nix +++ b/pkgs/servers/http/trafficserver/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchurl +, fetchzip , fetchpatch , makeWrapper , nixosTests @@ -49,11 +49,11 @@ stdenv.mkDerivation rec { pname = "trafficserver"; - version = "9.0.2"; + version = "9.1.1"; - src = fetchurl { + src = fetchzip { url = "mirror://apache/trafficserver/trafficserver-${version}.tar.bz2"; - sha256 = "0r05iqmnnjq259nsibncgfrfsr0l4h3hsafizvgfl9zgmrkm6izz"; + sha256 = "sha256-oicRqKFE6hOpcNG9o3BmrMujtEzi4hrPhBWaljOW+VI="; }; patches = [ diff --git a/pkgs/tools/X11/opentabletdriver/default.nix b/pkgs/tools/X11/opentabletdriver/default.nix index b205f959ee35a..de3b983c91da9 100644 --- a/pkgs/tools/X11/opentabletdriver/default.nix +++ b/pkgs/tools/X11/opentabletdriver/default.nix @@ -1,11 +1,8 @@ -{ stdenv -, lib +{ lib +, buildDotnetModule , fetchFromGitHub , fetchurl -, linkFarmFromDrvs , dotnetCorePackages -, dotnetPackages -, dpkg , gtk3 , libX11 , libXrandr @@ -15,16 +12,12 @@ , udev , copyDesktopItems , makeDesktopItem -, makeWrapper , nixosTests , wrapGAppsHook +, dpkg }: -let - dotnet-sdk = dotnetCorePackages.sdk_5_0; - dotnet-runtime = dotnetCorePackages.runtime_5_0; -in -stdenv.mkDerivation rec { +buildDotnetModule rec { pname = "OpenTabletDriver"; version = "0.5.3.3"; @@ -40,23 +33,22 @@ stdenv.mkDerivation rec { sha256 = "0v03qiiz28k1yzgxf5qc1mdg2n7kjx6h8vpx9dxz342wwbgqg6ic"; }; + dotnet-sdk = dotnetCorePackages.sdk_5_0; + dotnet-runtime = dotnetCorePackages.runtime_5_0; + + dotnetInstallFlags = [ "--framework=net5" ]; + + projectFile = [ "OpenTabletDriver.Console" "OpenTabletDriver.Daemon" "OpenTabletDriver.UX.Gtk" ]; + nugetDeps = ./deps.nix; + + executables = [ "OpenTabletDriver.Console" "OpenTabletDriver.Daemon" "OpenTabletDriver.UX.Gtk" ]; + nativeBuildInputs = [ - dotnet-sdk - dotnetPackages.Nuget - dpkg copyDesktopItems - makeWrapper wrapGAppsHook + dpkg ]; - nugetDeps = linkFarmFromDrvs "${pname}-nuget-deps" (import ./deps.nix { - fetchNuGet = { name, version, sha256 }: fetchurl { - name = "nuget-${name}-${version}.nupkg"; - url = "https://www.nuget.org/api/v2/package/${name}/${version}"; - inherit sha256; - }; - }); - runtimeDeps = [ gtk3 libX11 @@ -67,80 +59,18 @@ stdenv.mkDerivation rec { udev ]; - configurePhase = '' - runHook preConfigure - - export HOME=$(mktemp -d) - export DOTNET_CLI_TELEMETRY_OPTOUT=1 - export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 - - nuget sources Add -Name nixos -Source "$PWD/nixos" - nuget init "$nugetDeps" "$PWD/nixos" - - # FIXME: https://github.com/NuGet/Home/issues/4413 - mkdir -p $HOME/.nuget/NuGet - cp $HOME/.config/NuGet/NuGet.Config $HOME/.nuget/NuGet - - for project in OpenTabletDriver.{Console,Daemon,UX.Gtk}; do - dotnet restore --source "$PWD/nixos" $project - done - - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - - for project in OpenTabletDriver.{Console,Daemon,UX.Gtk}; do - dotnet build $project \ - --no-restore \ - --configuration Release \ - --framework net5 - done - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - for project in OpenTabletDriver.{Console,Daemon,UX.Gtk}; do - dotnet publish $project \ - --no-build \ - --no-self-contained \ - --configuration Release \ - --framework net5 \ - --output $out/lib - done - + postInstall = '' # Give a more "*nix" name to the binaries - makeWrapper $out/lib/OpenTabletDriver.Console $out/bin/otd \ - "''${gappsWrapperArgs[@]}" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ - --set DOTNET_ROOT "${dotnet-runtime}" \ - --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" - - makeWrapper $out/lib/OpenTabletDriver.Daemon $out/bin/otd-daemon \ - "''${gappsWrapperArgs[@]}" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ - --set DOTNET_ROOT "${dotnet-runtime}" \ - --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" - - makeWrapper $out/lib/OpenTabletDriver.UX.Gtk $out/bin/otd-gui \ - "''${gappsWrapperArgs[@]}" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ - --set DOTNET_ROOT "${dotnet-runtime}" \ - --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" - - mkdir -p $out/lib/OpenTabletDriver - cp -rv ./OpenTabletDriver/Configurations $out/lib/OpenTabletDriver + mv $out/bin/OpenTabletDriver.Console $out/bin/otd + mv $out/bin/OpenTabletDriver.Daemon $out/bin/otd-daemon + mv $out/bin/OpenTabletDriver.UX.Gtk $out/bin/otd-gui + + cp -r ./OpenTabletDriver/Configurations $out/lib/${pname} install -Dm644 $src/OpenTabletDriver.UX/Assets/otd.png -t $out/share/pixmaps # TODO: Ideally this should be build from OpenTabletDriver/OpenTabletDriver-udev instead dpkg-deb --fsys-tarfile ${debPkg} | tar xf - ./usr/lib/udev/rules.d/99-opentabletdriver.rules install -Dm644 ./usr/lib/udev/rules.d/99-opentabletdriver.rules -t $out/lib/udev/rules.d - - runHook postInstall ''; desktopItems = [ @@ -156,7 +86,6 @@ stdenv.mkDerivation rec { ]; dontWrapGApps = true; - dontStrip = true; passthru = { updateScript = ./update.sh; diff --git a/pkgs/tools/X11/opentabletdriver/shell.nix b/pkgs/tools/X11/opentabletdriver/shell.nix deleted file mode 100644 index bb60dfd503973..0000000000000 --- a/pkgs/tools/X11/opentabletdriver/shell.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ pkgs ? import ../../../../. { } }: - -with pkgs; - -mkShell { - packages = [ - common-updater-scripts - nuget-to-nix - curl - dotnetCorePackages.sdk_5_0 - jq - ]; -} diff --git a/pkgs/tools/X11/opentabletdriver/update.sh b/pkgs/tools/X11/opentabletdriver/update.sh index b73a5a4b7ca96..b18bddd75aa95 100755 --- a/pkgs/tools/X11/opentabletdriver/update.sh +++ b/pkgs/tools/X11/opentabletdriver/update.sh @@ -1,16 +1,15 @@ #!/usr/bin/env nix-shell -#!nix-shell shell.nix -i bash - +#!nix-shell -i bash -p curl gnused jq common-updater-scripts nuget-to-nix dotnet-sdk_5 set -eo pipefail - cd "$(dirname "${BASH_SOURCE[0]}")" deps_file="$(realpath "./deps.nix")" -new_version="$(curl -s "https://api.github.com/repos/OpenTabletDriver/OpenTabletDriver/releases" | jq -r '.[0].tag_name' | sed 's|[^0-9.]||g')" +new_version="$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s "https://api.github.com/repos/OpenTabletDriver/OpenTabletDriver/releases" | jq -r 'map(select(.prerelease == false)) | .[0].tag_name' | cut -c2-)" old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" + if [[ "$new_version" == "$old_version" ]]; then - echo "Up to date" + echo "Already up to date!" [[ "${1}" != "--force" ]] && exit 0 fi @@ -22,37 +21,22 @@ newDebSha256=$(nix-prefetch-url "$newDebPkgUrl") echo "oldDebSha256: $oldDebSha256 newDebSha256: $newDebSha256" sed -i ./default.nix -re "s|\"$oldDebSha256\"|\"$newDebSha256\"|" -cd ../../../.. +pushd ../../../.. update-source-version opentabletdriver "$new_version" -store_src="$(nix-build . -A opentabletdriver.src --no-out-link)" +store_src="$(nix-build -A opentabletdriver.src --no-out-link)" src="$(mktemp -d /tmp/opentabletdriver-src.XXX)" -echo "Temp src dir: $src" cp -rT "$store_src" "$src" chmod -R +w "$src" pushd "$src" +trap "rm -rf $src" EXIT -# Setup empty nuget package folder to force reinstall. -mkdir ./nuget_tmp.packages -cat >./nuget_tmp.config <<EOF -<?xml version="1.0" encoding="utf-8"?> -<configuration> - <packageSources> - <add key="nuget" value="https://api.nuget.org/v3/index.json" /> - </packageSources> - <config> - <add key="globalPackagesFolder" value="$(realpath ./nuget_tmp.packages)" /> - </config> -</configuration> -EOF - +export DOTNET_NOLOGO=1 export DOTNET_CLI_TELEMETRY_OPTOUT=1 +mkdir ./nuget_pkgs for project in OpenTabletDriver.{Console,Daemon,UX.Gtk}; do - dotnet restore $project --configfile ./nuget_tmp.config + dotnet restore $project --packages ./nuget_pkgs done -nuget-to-nix ./nuget_tmp.packages > "$deps_file" - -popd -rm -r "$src" +nuget-to-nix ./nuget_pkgs > "$deps_file" diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix index 00b2c71037a82..187fe71896d67 100644 --- a/pkgs/tools/backup/burp/default.nix +++ b/pkgs/tools/backup/burp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config , acl, librsync, ncurses, openssl, zlib, uthash }: stdenv.mkDerivation rec { @@ -12,6 +12,15 @@ stdenv.mkDerivation rec { sha256 = "1zhq240kz881vs2s620qp0kifmgr582caalm85ls789w9rmdkhjl"; }; + patches = [ + # Pull upstream fix for ncurses-6.3 support + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/grke/burp/commit/1d6c931af7c11f164cf7ad3479781e8f03413496.patch"; + sha256 = "14sfbfahlankz3xg6v10i8fnmpnmqpp73q9xm0l0hnjh25igv6bl"; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ librsync ncurses openssl zlib uthash ] ++ lib.optional (!stdenv.isDarwin) acl; diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix index 9c3e4fca95deb..5ea220f9e255f 100644 --- a/pkgs/tools/backup/znapzend/default.nix +++ b/pkgs/tools/backup/znapzend/default.nix @@ -2,32 +2,32 @@ let # when upgrade znapzend, check versions of Perl libs here: https://github.com/oetiker/znapzend/blob/master/cpanfile - # pinned versions are listed at https://github.com/oetiker/znapzend/blob/master/thirdparty/cpanfile-5.26.1.snapshot - Mojolicious-8-35 = perlPackages.buildPerlPackage rec { + # pinned versions are listed at https://github.com/oetiker/znapzend/blob/master/thirdparty/cpanfile-5.30.snapshot + Mojolicious' = perlPackages.buildPerlPackage rec { pname = "Mojolicious"; - version = "8.35"; + version = "8.73"; src = fetchurl { url = "mirror://cpan/authors/id/S/SR/SRI/${pname}-${version}.tar.gz"; - sha256 = "1bll0ahh5v1y3x0ql29klwsa68cj46wzqc385srsnn2m8kh2ak8h"; + sha256 = "118y2264f89bbp5ly2dh36xjq25jk85s2ssxa3y4gsgsk6sjzzk1"; }; }; - MojoIOLoopForkCall-0-20 = perlPackages.buildPerlModule rec { + MojoIOLoopForkCall' = perlPackages.buildPerlModule rec { pname = "Mojo-IOLoop-ForkCall"; version = "0.20"; src = fetchurl { url = "mirror://cpan/authors/id/J/JB/JBERGER/${pname}-${version}.tar.gz"; sha256 = "19pih5x0ayxs2m8j29qwdpi6ky3w4ghv6vrmax3ix9r59hj6569b"; }; - propagatedBuildInputs = [ perlPackages.IOPipely Mojolicious-8-35 ]; + propagatedBuildInputs = [ perlPackages.IOPipely Mojolicious' ]; }; perl' = perl.withPackages (p: - [ MojoIOLoopForkCall-0-20 + [ MojoIOLoopForkCall' p.TAPParserSourceHandlerpgTAP ]); - version = "0.20.0"; - checksum = "15lb5qwksa508m9bj6d3n4rrjpakfaas9qxspg408bcqfp7pqjw3"; + version = "0.21.0"; + sha256 = "1lg46rf2ahlclan29zx8ag5k4fjp28sc9l02z76f0pvdlj4qnihl"; in stdenv.mkDerivation { pname = "znapzend"; @@ -37,7 +37,7 @@ stdenv.mkDerivation { owner = "oetiker"; repo = "znapzend"; rev = "v${version}"; - sha256 = checksum; + inherit sha256; }; buildInputs = [ wget perl' ]; diff --git a/pkgs/tools/graphics/wdisplays/default.nix b/pkgs/tools/graphics/wdisplays/default.nix index 073a3b1b6d476..08607c4b46be0 100644 --- a/pkgs/tools/graphics/wdisplays/default.nix +++ b/pkgs/tools/graphics/wdisplays/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ lheckemann ma27 ]; license = licenses.gpl3Plus; platforms = platforms.linux; + mainProgram = "wdisplays"; }; } diff --git a/pkgs/tools/misc/antimicroX/default.nix b/pkgs/tools/misc/antimicrox/default.nix index 452906a1cf812..e248ac4a0c787 100644 --- a/pkgs/tools/misc/antimicroX/default.nix +++ b/pkgs/tools/misc/antimicrox/default.nix @@ -4,40 +4,39 @@ , extra-cmake-modules , pkg-config , SDL2 -, qtbase , qttools -, qtx11extras , xorg , fetchFromGitHub , itstool }: mkDerivation rec { - pname = "antimicroX"; - version = "3.0.1"; + pname = "antimicrox"; + version = "3.2.0"; src = fetchFromGitHub { - owner = "juliagoda"; - repo = "antimicroX"; + owner = "AntiMicroX"; + repo = pname; rev = version; - sha256 = "05asxlkgb4cgvpcyksw1cx8cz8nzi8hmw8b91lw92892j7a2r7wj"; + sha256 = "sha256-brG3DTpWRYmDemTeteuuNbF0JoDAXdcFwO12JC6/0/Q="; }; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config itstool ]; buildInputs = [ SDL2 - qtbase qttools - qtx11extras - xorg.libX11 xorg.libXtst - xorg.libXi ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "/usr/lib/udev/rules.d/" "$out/lib/udev/rules.d/" + ''; + meta = with lib; { description = "GUI for mapping keyboard and mouse controls to a gamepad"; inherit (src.meta) homepage; - maintainers = with maintainers; [ jb55 ]; + maintainers = with maintainers; [ jb55 sbruder ]; license = licenses.gpl3Plus; platforms = with platforms; linux; }; diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix index 3304d3c191202..b551d16480d44 100644 --- a/pkgs/tools/misc/multitail/default.nix +++ b/pkgs/tools/misc/multitail/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ncurses, pkg-config }: +{ lib, stdenv, fetchurl, fetchpatch, ncurses, pkg-config }: stdenv.mkDerivation rec { version = "6.5.0"; @@ -9,6 +9,16 @@ stdenv.mkDerivation rec { sha256 = "1vd9vdxyxsccl64ilx542ya5vlw2bpg6gnkq1x8cfqy6vxvmx7dj"; }; + patches = [ + # Fix pending upstream inclusion for ncurses-6.3: + # https://github.com/halturin/multitail/pull/4 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/halturin/multitail/commit/d7d10f3bce261074c116eba9f924b61f43777662.patch"; + sha256 = "0kyp9l6v92mz6d3h34j11gs5kh3sf2nv76mygqfxb800vd8r0cgg"; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ]; @@ -21,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://www.vanheusden.com/multitail/"; + homepage = "https://github.com/halturin/multitail"; description = "tail on Steroids"; maintainers = with lib.maintainers; [ matthiasbeyer ]; platforms = lib.platforms.unix; diff --git a/pkgs/tools/misc/stderred/default.nix b/pkgs/tools/misc/stderred/default.nix new file mode 100644 index 0000000000000..f159e4328c9c4 --- /dev/null +++ b/pkgs/tools/misc/stderred/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, fetchFromGitHub +, cmake +, lib +}: + +stdenv.mkDerivation rec { + pname = "stderred"; + version = "unstable-2021-04-28"; + + src = fetchFromGitHub { + owner = "sickill"; + repo = "stderred"; + rev = "b2238f7c72afb89ca9aaa2944d7f4db8141057ea"; + sha256 = "sha256-k/EA327AsRHgUYu7QqSF5yzOyO6h5XcE9Uv4l1VcIPI="; + }; + + nativeBuildInputs = [ + cmake + ]; + + sourceRoot = "${src.name}/src"; + + meta = with lib; { + description = "stderr in red"; + homepage = "https://github.com/sickill/stderred"; + license = licenses.mit; + maintainers = with maintainers; [ vojta001 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/networking/jnettop/default.nix b/pkgs/tools/networking/jnettop/default.nix index 91f92236ecf83..2c002843eca1f 100644 --- a/pkgs/tools/networking/jnettop/default.nix +++ b/pkgs/tools/networking/jnettop/default.nix @@ -18,6 +18,14 @@ stdenv.mkDerivation rec { url = "https://sources.debian.net/data/main/j/jnettop/0.13.0-1/debian/patches/0001-Use-64-bit-integers-for-byte-totals-support-bigger-u.patch"; sha256 = "1b0alc12sj8pzcb66f8xslbqlbsvq28kz34v6jfhbb1q25hyr7jg"; }) + + # Fix pending upstream inclusion for ncurses-6.3: + # https://sourceforge.net/p/jnettop/patches/5/ + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://sourceforge.net/p/jnettop/patches/5/attachment/jnettop-0.13.0-ncurses-6.3.patch"; + sha256 = "1a0g3bal6f2fh1sq9q5kfwljrnskfvrhdzhjadcds34gzsr26v7x"; + }) ]; preConfigure = "autoconf "; @@ -31,7 +39,7 @@ stdenv.mkDerivation rec { by bandwidth they use. ''; - homepage = "http://jnettop.kubs.info/"; + homepage = "https://sourceforge.net/projects/jnettop/"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; }; diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index 5df98954ae16c..c57b1eb569698 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -37,8 +37,11 @@ stdenv.mkDerivation rec { substituteInPlace $out/lib/systemd/system/wg-quick@.service \ --replace /usr/bin $out/bin '' + lib.optionalString stdenv.isLinux '' + # we want to allow users to provide their own resolvconf implementation, i.e. the one provided by systemd-resolved for f in $out/bin/*; do - wrapProgram $f --prefix PATH : ${lib.makeBinPath [ procps iproute2 iptables openresolv ]} + wrapProgram $f \ + --prefix PATH : ${lib.makeBinPath [ procps iproute2 iptables ]} \ + --suffix PATH : ${lib.makeBinPath [ openresolv ]} done '' + lib.optionalString stdenv.isDarwin '' for f in $out/bin/*; do diff --git a/pkgs/tools/networking/zap/default.nix b/pkgs/tools/networking/zap/default.nix index bccc840a27a46..69c5f165b2762 100644 --- a/pkgs/tools/networking/zap/default.nix +++ b/pkgs/tools/networking/zap/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "zap"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { url = "https://github.com/zaproxy/zaproxy/releases/download/v${version}/ZAP_${version}_Linux.tar.gz"; - sha256 = "1mz9s56pbs62g4pnd1ml8y6jpf9ilisdwwvjv5kn6yxrcdi2zzqh"; + sha256 = "sha256-wr64T3+ps5r2V72z4NDbqWQlJX6kjg6LIu7szY1VaB4="; }; buildInputs = [ jre ]; diff --git a/pkgs/tools/package-management/cargo-about/default.nix b/pkgs/tools/package-management/cargo-about/default.nix index cf72bd85c083a..ac9249b3a9beb 100644 --- a/pkgs/tools/package-management/cargo-about/default.nix +++ b/pkgs/tools/package-management/cargo-about/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-about"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-about"; rev = version; - sha256 = "sha256-Am0VwF37fYsZvUogxnSlP/kwy20J7maFu3Is8f/1b1E="; + sha256 = "sha256-QLPqvlMwCdMfUGCVibCGQdI7UkHV1WBfpBi2Kwi3b1Q="; }; - cargoSha256 = "sha256-gf5OtRGjXmGbnXA4ZYOys6JU+JkF+rYnRSnjy3JE7c0="; + cargoSha256 = "sha256-x9hx9wJlcrGo1zuugPYY4G4Os5x8tIOICKnKq8TuevI="; meta = with lib; { description = "Cargo plugin to generate list of all licenses for a crate"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 99e365540a518..b47be646672de 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -54,7 +54,8 @@ mapAliases ({ ammonite-repl = ammonite; # added 2017-05-02 amsn = throw "amsn has been removed due to being unmaintained."; # added 2020-12-09 angelfish = libsForQt5.plasmaMobileGear.angelfish; # added 2021-10-06 - antimicro = throw "antimicro has been removed as it was broken, see antimicroX instead."; # added 2020-08-06 + antimicro = throw "antimicro has been removed as it was broken, see antimicrox instead."; # added 2020-08-06 + antimicroX = antimicrox; # added 2021-10-31 arduino_core = arduino-core; # added 2015-02-04 ardour_5 = throw "ardour_5 has been removed. see https://github.com/NixOS/nixpkgs/issues/139549"; # added 2021-09-28 arora = throw "arora has been removed."; # added 2020-09-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eaf92ebfeffa3..b36f2f8da7f67 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4640,6 +4640,8 @@ with pkgs; driftnet = callPackage ../tools/networking/driftnet {}; + driftctl = callPackage ../applications/networking/cluster/driftctl { }; + drill = callPackage ../tools/networking/drill { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -9610,6 +9612,8 @@ with pkgs; stdman = callPackage ../data/documentation/stdman { }; + stderred = callPackage ../tools/misc/stderred { }; + steck = callPackage ../servers/pinnwand/steck.nix { }; stenc = callPackage ../tools/backup/stenc { }; @@ -9961,6 +9965,10 @@ with pkgs; thc-ipv6 = callPackage ../tools/security/thc-ipv6 { }; + thedesk = callPackage ../applications/misc/thedesk { + electron = electron_12; + }; + theharvester = callPackage ../tools/security/theharvester { }; inherit (nodePackages) thelounge; @@ -21543,6 +21551,8 @@ with pkgs; squid = callPackage ../servers/squid { }; + duckling-proxy = callPackage ../servers/duckling-proxy { }; + sslh = callPackage ../servers/sslh { }; thttpd = callPackage ../servers/http/thttpd { }; @@ -23993,6 +24003,8 @@ with pkgs; arion = callPackage ../applications/virtualization/arion { }; + arkade = callPackage ../applications/networking/cluster/arkade { }; + asuka = callPackage ../applications/networking/browsers/asuka { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -25773,6 +25785,8 @@ with pkgs; hyperledger-fabric = callPackage ../tools/misc/hyperledger-fabric { }; + indigenous-desktop = callPackage ../applications/networking/feedreaders/indigenous-desktop { }; + jackline = callPackage ../applications/networking/instant-messengers/jackline { ocamlPackages = ocaml-ng.ocamlPackages_4_08; }; @@ -25797,6 +25811,8 @@ with pkgs; pixelnuke = callPackage ../applications/graphics/pixelnuke { }; + pixeluvo = callPackage ../applications/graphics/pixeluvo { }; + pmbootstrap = python3Packages.callPackage ../tools/misc/pmbootstrap { }; shepherd = nodePackages."@nerdwallet/shepherd"; @@ -32001,7 +32017,7 @@ with pkgs; android-file-transfer = libsForQt5.callPackage ../tools/filesystems/android-file-transfer { }; - antimicroX = libsForQt5.callPackage ../tools/misc/antimicroX { }; + antimicrox = libsForQt5.callPackage ../tools/misc/antimicrox { }; atari800 = callPackage ../misc/emulators/atari800 { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eb9e8bf2ec5c0..9916b8250e9c8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -221,6 +221,8 @@ in { affine = callPackage ../development/python-modules/affine { }; + afsapi = callPackage ../development/python-modules/afsapi { }; + agate = callPackage ../development/python-modules/agate { }; agate-dbf = callPackage ../development/python-modules/agate-dbf { }; @@ -2438,6 +2440,8 @@ in { eliot = callPackage ../development/python-modules/eliot { }; + eliqonline = callPackage ../development/python-modules/eliqonline { }; + elmax = callPackage ../development/python-modules/elmax { }; emailthreads = callPackage ../development/python-modules/emailthreads { }; @@ -3156,6 +3160,8 @@ in { goocalendar = callPackage ../development/python-modules/goocalendar { }; + goodwe = callPackage ../development/python-modules/goodwe { }; + google-api-core = callPackage ../development/python-modules/google-api-core { }; google-api-python-client = callPackage ../development/python-modules/google-api-python-client { }; @@ -3460,6 +3466,8 @@ in { halo = callPackage ../development/python-modules/halo { }; + halohome = callPackage ../development/python-modules/halohome { }; + handout = callPackage ../development/python-modules/handout { }; hangups = callPackage ../development/python-modules/hangups { }; @@ -4284,6 +4292,8 @@ in { leveldb = callPackage ../development/python-modules/leveldb { }; + levenshtein = callPackage ../development/python-modules/levenshtein { }; + lexid = callPackage ../development/python-modules/lexid { }; lhapdf = toPythonModule (pkgs.lhapdf.override { @@ -4362,6 +4372,8 @@ in { libpyfoscam = callPackage ../development/python-modules/libpyfoscam { }; + libpyvivotek = callPackage ../development/python-modules/libpyvivotek { }; + libredwg = toPythonModule (pkgs.libredwg.override { enablePython = true; inherit (self) python libxml2; @@ -4438,6 +4450,8 @@ in { inherit python; })).py; + life360 = callPackage ../development/python-modules/life360 { }; + lightgbm = callPackage ../development/python-modules/lightgbm { }; lightning = callPackage ../development/python-modules/lightning { }; @@ -5303,6 +5317,8 @@ in { ofxtools = callPackage ../development/python-modules/ofxtools { }; + oemthermostat = callPackage ../development/python-modules/oemthermostat { }; + olefile = callPackage ../development/python-modules/olefile { }; omegaconf = callPackage ../development/python-modules/omegaconf { }; @@ -5803,6 +5819,8 @@ in { pysiaalarm = callPackage ../development/python-modules/pysiaalarm { }; + pyskyqhub = callPackage ../development/python-modules/pyskyqhub { }; + pysyncthru = callPackage ../development/python-modules/pysyncthru { }; python-codon-tables = callPackage ../development/python-modules/python-codon-tables { }; @@ -6139,6 +6157,8 @@ in { py-ubjson = callPackage ../development/python-modules/py-ubjson { }; + py-zabbix = callPackage ../development/python-modules/py-zabbix { }; + py17track = callPackage ../development/python-modules/py17track { }; py2bit = callPackage ../development/python-modules/py2bit { }; @@ -6414,6 +6434,8 @@ in { pyenvisalink = callPackage ../development/python-modules/pyenvisalink { }; + pyephember = callPackage ../development/python-modules/pyephember { }; + pyepsg = callPackage ../development/python-modules/pyepsg { }; pyerfa = callPackage ../development/python-modules/pyerfa { }; @@ -6808,6 +6830,8 @@ in { pynetdicom = callPackage ../development/python-modules/pynetdicom { }; + pynina = callPackage ../development/python-modules/pynina { }; + pynisher = callPackage ../development/python-modules/pynisher { }; pynmea2 = callPackage ../development/python-modules/pynmea2 { }; @@ -7089,6 +7113,8 @@ in { pysearpc = toPythonModule pkgs.libsearpc; + pysecuritas = callPackage ../development/python-modules/pysecuritas { }; + pysendfile = callPackage ../development/python-modules/pysendfile { }; pysensors = callPackage ../development/python-modules/pysensors { }; @@ -7857,6 +7883,8 @@ in { pyverilog = callPackage ../development/python-modules/pyverilog { }; + pyversasense = callPackage ../development/python-modules/pyversasense { }; + pyvesync = callPackage ../development/python-modules/pyvesync { }; pyvex = callPackage ../development/python-modules/pyvex { }; @@ -7979,6 +8007,8 @@ in { qiskit-terra = callPackage ../development/python-modules/qiskit-terra { }; + qnap-qsw = callPackage ../development/python-modules/qnap-qsw{ }; + qrcode = callPackage ../development/python-modules/qrcode { }; qreactor = callPackage ../development/python-modules/qreactor { }; @@ -8224,6 +8254,8 @@ in { rising = callPackage ../development/python-modules/rising { }; + ritassist = callPackage ../development/python-modules/ritassist { }; + rivet = toPythonModule (pkgs.rivet.override { python3 = python; }); |