Unverified Commit a996545f authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 3d5144e3 46285d50
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -16176,6 +16176,12 @@
    githubId = 15697697;
    name = "Kasper Gałkowski";
  };
  utkarshgupta137 = {
    email = "utkarshgupta137@gmail.com";
    github = "utkarshgupta137";
    githubId = 5155100;
    name = "Utkarsh Gupta";
  };
  uvnikita = {
    email = "uv.nikita@gmail.com";
    github = "uvNikita";
+38 −0
Original line number Diff line number Diff line
{ lib, appimageTools, fetchurl }:

let
  version = "1.6.4";
  pname = "lunatask";

  src = fetchurl {
    url = "https://lunatask.app/download/Lunatask-${version}.AppImage";
    sha256 = "sha256-rvjjzVgtDNryj7GO+ZfK92nZvWRnRPFoy9hEIGjviqQ=";
  };

  appimageContents = appimageTools.extractType2 {
    inherit pname version src;
  };

in appimageTools.wrapType2 rec {
  inherit pname version src;

  extraInstallCommands = ''
    install -m 444 -D ${appimageContents}/lunatask.desktop $out/share/applications/lunatask.desktop
    install -m 444 -D ${appimageContents}/lunatask.png $out/share/icons/hicolor/0x0/apps/lunatask.png
    substituteInPlace $out/share/applications/lunatask.desktop \
      --replace 'Exec=AppRun' 'Exec=${pname}'
  '';

  meta = with lib; {
    description = "An all-in-one encrypted todo list, notebook, habit and mood tracker, pomodoro timer, and journaling app";
    longDescription = ''
      Lunatask is an all-in-one encrypted todo list, notebook, habit and mood tracker, pomodoro timer, and journaling app. It remembers stuff for you and keeps track of your mental health.
    '';
    homepage = "https://lunatask.app";
    downloadPage = "https://lunatask.app/download";
    license = licenses.unfree;
    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
    maintainers = with maintainers; [ henkery ];
    platforms = [ "x86_64-linux" ];
  };
}
+3 −3
Original line number Diff line number Diff line
@@ -2,16 +2,16 @@

rustPlatform.buildRustPackage rec {
  pname = "rsClock";
  version = "0.1.4";
  version = "0.1.9";

  src = fetchFromGitHub {
    owner = "valebes";
    repo = pname;
    rev = "v${version}";
    sha256 = "1i93qkz6d8sbk78i4rvx099hnn4lklp4cjvanpm9ssv8na4rqvh2";
    sha256 = "sha256-HsHFlM5PHUIF8FbLMJpleAvgsXHP6IZLuiH+umK1V4M=";
  };

  cargoSha256 = "1vgizkdzi9mnan4rcswyv450y6a4b9l74d0siv1ix0nnlznnqyg1";
  cargoHash = "sha256-0bUKiKieIic+d3jEow887i7j2tp/ntYkXm6x08Df64M=";

  meta = with lib; {
    description = "A simple terminal clock written in Rust";
+11 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@
- Release updates: https://chromereleases.googleblog.com/
  - Available as Atom or RSS feed (filter for
    "Stable Channel Update for Desktop")
  - Channel overview: https://omahaproxy.appspot.com/
  - Release API: https://developer.chrome.com/docs/versionhistory/guide/
  - Release schedule: https://chromiumdash.appspot.com/schedule

# Updating Chromium
@@ -39,6 +39,16 @@ update `upstream-info.json`. After updates it is important to test at least
`nixosTests.chromium` (or basic manual testing) and `google-chrome` (which
reuses `upstream-info.json`).

Note: Due to the script downloading many large tarballs it might be
necessary to adjust the available tmpfs size (it defaults to 10% of the
systems memory)

```nix
services.logind.extraConfig = ''
  RuntimeDirectorySize=4G
'';
```

Note: The source tarball is often only available a few hours after the release
was announced. The CI/CD status can be tracked here:
- https://ci.chromium.org/p/infra/builders/cron/publish_tarball
+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ mkChromiumDerivation (base: rec {
      of source code for Google Chrome (which has some additional features).
    '';
    homepage = if ungoogled
      then "https://github.com/Eloston/ungoogled-chromium"
      then "https://github.com/ungoogled-software/ungoogled-chromium"
      else "https://www.chromium.org/";
    maintainers = with lib.maintainers; if ungoogled
      then [ squalus primeos michaeladler ]
Loading