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: 7f5a8599066b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f5e39b2c26d3
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Jan 10, 2018

  1. pythonPackages.salmon: bec795cd -> 3.0.0

    @jluttine
    jluttine committed Jan 10, 2018
    Copy the full SHA
    7140c4b View commit details

Commits on Jan 11, 2018

  1. pythonPackages.salmon-mail: rename from salmon

    @jluttine
    jluttine committed Jan 11, 2018
    Copy the full SHA
    1f2e247 View commit details

  2. Merge pull request #33727 from jluttine/update-salmon 

    pythonPackages.salmon: bec795cd -> 3.0.0
    @adisbladis
    adisbladis authored Jan 11, 2018
    Copy the full SHA
    f5e39b2 View commit details
Showing with 24 additions and 30 deletions.
  1. +23 −0 pkgs/development/python-modules/salmon-mail/default.nix
  2. +0 −29 pkgs/development/python-modules/salmon/default.nix
  3. +1 −1 pkgs/top-level/python-packages.nix
23 changes: 23 additions & 0 deletions pkgs/development/python-modules/salmon-mail/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, nose, dnspython
, chardet, lmtpd, pythondaemon, six, jinja2, mock }:

buildPythonPackage rec {
name = "${pname}-${version}";
pname = "salmon-mail";
version = "3.0.0";

src = fetchPypi {
inherit pname version;
sha256 = "1smggsnkwiqy8zjq604dkm5g0np27pdnj3szsbn8v4ja84nncq18";
};

checkInputs = [ nose jinja2 mock ];
propagatedBuildInputs = [ chardet dnspython lmtpd pythondaemon six ];

meta = with stdenv.lib; {
homepage = http://salmon-mail.readthedocs.org/;
description = "Pythonic mail application server";
license = licenses.gpl3;
maintainers = with maintainers; [ jluttine ];
};
}
29 changes: 0 additions & 29 deletions pkgs/development/python-modules/salmon/default.nix
View file

This file was deleted.

2 changes: 1 addition & 1 deletion pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -362,7 +362,7 @@ in {

rhpl = disabledIf isPy3k (callPackage ../development/python-modules/rhpl {});

salmon = callPackage ../development/python-modules/salmon { };
salmon-mail = callPackage ../development/python-modules/salmon-mail { };

simpleeval = callPackage ../development/python-modules/simpleeval { };