Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 53cad65edcc7
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ca60cd0fb60f
Choose a head ref
  • 13 commits
  • 12 files changed
  • 7 contributors

Commits on Jul 11, 2019

  1. soundtouch: 2.0.0 -> 2.1.2

    mmahut committed Jul 11, 2019
    Copy the full SHA
    1fb1d81 View commit details
  2. Copy the full SHA
    6a1de54 View commit details
  3. Merge pull request #63957 from aanderse/trac-httpd

    nixos/httpd: remove broken trac subservice
    aanderse authored Jul 11, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    4346674 View commit details
  4. Copy the full SHA
    649ec93 View commit details

Commits on Jul 12, 2019

  1. Merge pull request #63949 from aanderse/foswiki

    foswiki: drop package & httpd subservice
    aanderse authored Jul 12, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    e61dd66 View commit details
  2. pythonPackages.fasttext: 0.2.0 -> 0.9.1

    Changes:
    
    - Refactoring of internal classes.
    - Better unicode handling.
    - New Python API: https://fasttext.cc/docs/en/python-module.html
    
    https://github.com/facebookresearch/fastText/releases/tag/v0.9.1
    danieldk authored and Matthieu Coudron committed Jul 12, 2019
    Copy the full SHA
    f4ecf17 View commit details
  3. fasttext: 0.2.0 -> 0.9.1

    Changes:
    
    - Refactoring of internal classes.
    - Better unicode handling.
    
    https://github.com/facebookresearch/fastText/releases/tag/v0.9.1
    danieldk authored and Matthieu Coudron committed Jul 12, 2019
    Copy the full SHA
    3a4ba91 View commit details
  4. maintainers: add pradyuman

    pradyuman committed Jul 12, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    pradyuman Pradyuman Vig
    Copy the full SHA
    6d3021f View commit details
  5. grpcui: init at 0.2.0

    pradyuman committed Jul 12, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    pradyuman Pradyuman Vig
    Copy the full SHA
    d4858a0 View commit details
  6. Merge pull request #64409 from mmahut/soundtouch_update

    soundtouch: 2.0.0 -> 2.1.2
    worldofpeace authored Jul 12, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    d032000 View commit details
  7. distgen: init at 1.3

    This tool is mainly used in openshift to build source to image containers.
    bachp authored and worldofpeace committed Jul 12, 2019
    Copy the full SHA
    195e30b View commit details
  8. Merge pull request #63636 from bachp/distgen

    distgen: init at 1.3
    worldofpeace authored Jul 12, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    f91c86d View commit details
  9. Merge pull request #64644 from pradyuman/pradyuman/add-grpcui

    grpcui: init at 0.2.0
    kalbasit authored Jul 12, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    ca60cd0 View commit details
10 changes: 10 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
@@ -4080,6 +4080,16 @@
github = "pradeepchhetri";
name = "Pradeep Chhetri";
};
pradyuman = {
email = "me@pradyuman.co";
github = "pradyuman";
name = "Pradyuman Vig";
keys = [
{ longkeyid = "rsa4096/4F74D5361C4CA31E";
fingerprint = "240B 57DE 4271 2480 7CE3 EAC8 4F74 D536 1C4C A31E";
}
];
};
prikhi = {
email = "pavan.rikhi@gmail.com";
github = "prikhi";
11 changes: 11 additions & 0 deletions nixos/doc/manual/release-notes/rl-1909.xml
Original file line number Diff line number Diff line change
@@ -318,6 +318,17 @@
The <literal>mercurial</literal> <literal>httpd.extraSubservice</literal> has been removed from nixpkgs due to lack of maintainer.
</para>
</listitem>
<listitem>
<para>
The <literal>trac</literal> <literal>httpd.extraSubservice</literal> has been removed from nixpkgs because it was unmaintained.
</para>
</listitem>
<listitem>
<para>
The <literal>foswiki</literal> package and associated <literal>httpd.extraSubservice</literal> have been removed
from nixpkgs due to lack of maintainer.
</para>
</listitem>
</itemizedlist>
</section>
</section>
78 changes: 0 additions & 78 deletions nixos/modules/services/web-servers/apache-httpd/foswiki.nix

This file was deleted.

121 changes: 0 additions & 121 deletions nixos/modules/services/web-servers/apache-httpd/trac.nix

This file was deleted.

74 changes: 0 additions & 74 deletions nixos/tests/trac.nix

This file was deleted.

Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "fasttext";
version = "0.2.0";
version = "0.9.1";

src = fetchFromGitHub {
owner = "facebookresearch";
repo = "fastText";
rev = version;
sha256 = "1fcrz648r2s80bf7vc0l371xillz5jk3ldaiv9jb7wnsyri831b4";
rev = "v${version}";
sha256 = "1cbzz98qn8aypp4r5kwwwc9wiq5bwzv51kcsb15xjfs9lz8h3rii";
};

nativeBuildInputs = [ cmake ];
28 changes: 15 additions & 13 deletions pkgs/development/libraries/soundtouch/default.nix
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
{stdenv, fetchurl, autoconf, automake, libtool}:
{stdenv, lib, fetchFromGitLab, autoconf, automake, libtool}:

stdenv.mkDerivation rec {
pName = "soundtouch";
name = "${pName}-2.0.0";
src = fetchurl {
url = "https://www.surina.net/soundtouch/${name}.tar.gz";
sha256 = "09cxr02mfyj2bg731bj0i9hh565x8l9p91aclxs8wpqv8b8zf96j";
pname = "soundtouch";
version = "2.1.2";

src = fetchFromGitLab {
owner = pname;
repo = pname;
rev = version;
sha256 = "174wgm3s0inmbnkrlnspxjwm2014qhjhkbdqa5r8rbfi0nzqxzsz";
};

buildInputs = [ autoconf automake libtool ];
nativeBuildInputs = [ autoconf automake libtool ];

preConfigure = "./bootstrap";

meta = {
description = "A program and library for changing the tempo, pitch and playback rate of audio";
homepage = http://www.surina.net/soundtouch/;
downloadPage = http://www.surina.net/soundtouch/sourcecode.html;
license = stdenv.lib.licenses.lgpl21;
platforms = stdenv.lib.platforms.all;
meta = with lib; {
description = "A program and library for changing the tempo, pitch and playback rate of audio";
homepage = "http://www.surina.net/soundtouch/";
license = licenses.lgpl21;
platforms = platforms.all;
};
}
6 changes: 3 additions & 3 deletions pkgs/development/python-modules/fasttext/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

buildPythonPackage rec {
pname = "fasttext";
version = "0.2.0";
version = "0.9.1";

src = fetchFromGitHub {
owner = "facebookresearch";
repo = "fastText";
rev = version;
sha256 = "1fcrz648r2s80bf7vc0l371xillz5jk3ldaiv9jb7wnsyri831b4";
rev = "v${version}";
sha256 = "1cbzz98qn8aypp4r5kwwwc9wiq5bwzv51kcsb15xjfs9lz8h3rii";
};

buildInputs = [ pybind11 ];
Loading