Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e4db75f46dc5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b442f8ea9f21
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Apr 19, 2020

  1. gmailieer: 1.0 -> 1.1, rename to lieer

    @kirelagin
    kirelagin committed Apr 19, 2020
    Copy the full SHA
    bff2c12 View commit details

Commits on Apr 20, 2020

  1. Merge pull request #85566 from kirelagin/lieer

    @Mic92
    Mic92 authored Apr 20, 2020
    Copy the full SHA
    b442f8e View commit details
Showing with 9 additions and 8 deletions.
  1. +6 −6 pkgs/applications/networking/{gmailieer → lieer}/default.nix
  2. +1 −0 pkgs/top-level/aliases.nix
  3. +2 −2 pkgs/top-level/all-packages.nix
12 changes: 6 additions & 6 deletions ...ications/networking/gmailieer/default.nix → ...applications/networking/lieer/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, python3Packages }:

python3Packages.buildPythonApplication rec {
name = "gmailieer-${version}";
version = "1.0";
pname = "lieer";
version = "1.1";

src = fetchFromGitHub {
owner = "gauteh";
repo = "gmailieer";
repo = "lieer";
rev = "v${version}";
sha256 = "1zzylv8xbcrh34bz0s29dawzcyx39lai8y8wk0bl4x75v1jfynvf";
sha256 = "19jx3sm925nrzl26km1bxbp6y5gk1mzwadd79vip2jl70b3xk9f8";
};

propagatedBuildInputs = with python3Packages; [
@@ -27,8 +27,8 @@ python3Packages.buildPythonApplication rec {
tags in the notmuch database may be pushed back remotely to your
GMail account.
'';
homepage = "https://github.com/gauteh/gmailieer";
repositories.git = "https://github.com/gauteh/gmailieer.git";
homepage = "https://lieer.gaute.vetsj.com/";
repositories.git = "https://github.com/gauteh/lieer.git";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ kaiha ];
};
1 change: 1 addition & 0 deletions pkgs/top-level/aliases.nix
View file
Original file line number Diff line number Diff line change
@@ -152,6 +152,7 @@ mapAliases ({
gettextWithExpat = gettext; # 2016-02-19
git-hub = gitAndTools.git-hub; # added 2016-04-29
glib_networking = glib-networking; # added 2018-02-25
gmailieer = lieer; # added 2020-04-19
gnome-mpv = celluloid; # added 2019-08-22
gnome15 = throw "gnome15 has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # added 2019-12-10
gmic_krita_qt = gmic-qt-krita; # added 2019-09-07
4 changes: 2 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -16473,8 +16473,6 @@ in

gfxtablet = callPackage ../os-specific/linux/gfxtablet {};

gmailieer = callPackage ../applications/networking/gmailieer {};

gmailctl = callPackage ../applications/networking/gmailctl {};

gpm = callPackage ../servers/gpm {
@@ -16581,6 +16579,8 @@ in

libnl = callPackage ../os-specific/linux/libnl { };

lieer = callPackage ../applications/networking/lieer {};

linuxConsoleTools = callPackage ../os-specific/linux/consoletools { };

openelec-dvb-firmware = callPackage ../os-specific/linux/firmware/openelec-dvb-firmware { };