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: 2a361e57d0b6
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: beb9ffe3d7bd
Choose a head ref

Commits on Dec 15, 2019

  1. mopidy-iris: 3.42.2 -> 3.43.0

    Tomahna committed Dec 15, 2019
    Copy the full SHA
    73d577b View commit details

Commits on Dec 17, 2019

  1. manual: specify interpreter in virtualenv shell

    Without this virtualenv might try to setup an environment for a
    different version of python then the one specified in the expression.
    LnL7 committed Dec 17, 2019
    Copy the full SHA
    0159151 View commit details
  2. restic: 0.9.5 -> 0.9.6

    cust0dian committed Dec 17, 2019
    Copy the full SHA
    f9b7209 View commit details

Commits on Dec 18, 2019

  1. slirp4netns: v0.4.2 -> v0.4.3

    Signed-off-by: Sascha Grunert <sgrunert@suse.com>
    saschagrunert committed Dec 18, 2019
    Copy the full SHA
    0e18200 View commit details
  2. ripgrep-all: add missing dependencies

    This change adds additional dependencies so that the program's full
    functionality is available by simply installing this package.
    
    Closes #75735
    emmanuelrosa committed Dec 18, 2019
    Copy the full SHA
    727b097 View commit details
  3. Copy the full SHA
    f1acc6e View commit details
  4. yarn: 1.19.2 -> 1.21.1

    BSKY committed Dec 18, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    5b29c8d View commit details
  5. ripgrep-all: add checkInstall test

    This change adds a checkInstallPhase which runs a couple of queries
    to smoke-test the ripgrep-all adapters. The queries are intended to
    ensure that the dependencies needed by the adapters are included in
    the package's dependencies.
    emmanuelrosa committed Dec 18, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    c3c072a View commit details
  6. Copy the full SHA
    cc99d54 View commit details
  7. Copy the full SHA
    55eb76a View commit details
  8. Merge pull request #75824 from imbsky/patch-1

    yarn: 1.19.2 -> 1.21.1
    marsam authored Dec 18, 2019
    Copy the full SHA
    9c764c3 View commit details
  9. Merge pull request #75854 from saschagrunert/slirp

    slirp4netns: v0.4.2 -> v0.4.3
    marsam authored Dec 18, 2019
    Copy the full SHA
    cb5f27d View commit details
  10. Merge pull request #75826 from cust0dian/restic-0.9.6

    restic: 0.9.5 -> 0.9.6
    marsam authored Dec 18, 2019
    Copy the full SHA
    0fc6870 View commit details
  11. Merge pull request #75712 from Tomahna/mopidy-iris

    mopidy-iris: 3.42.2 -> 3.43.0
    marsam authored Dec 18, 2019
    Copy the full SHA
    41fed73 View commit details
  12. Merge pull request #75860 from Ma27/bump-matrix-synapse

    matrix-synapse: 1.7.0 -> 1.7.1
    WilliButz authored Dec 18, 2019
    Copy the full SHA
    ad7c7cf View commit details

Commits on Dec 19, 2019

  1. Merge pull request #75787 from chkno/see-also-man-configuration-dot-nix

    nixos/nixos-option: "See also configuration.nix manpage" in nixos-option manpage
    Ma27 authored Dec 19, 2019
    Copy the full SHA
    4b51d13 View commit details
  2. Merge pull request #75874 from emmanuelrosa/ripgrep-all-deps

    ripgrep-all: add missing dependencies
    Ma27 authored Dec 19, 2019
    Copy the full SHA
    b7d46b9 View commit details
  3. Merge pull request #75822 from LnL7/manual-python-virtualenv

    manual: specify interpreter in virtualenv shell
    Ma27 authored Dec 19, 2019
    Copy the full SHA
    a417db6 View commit details
  4. Merge pull request #75895 from marsam/update-lab

    gitAndTools.lab: 0.17.1 -> 0.17.2
    Ma27 authored Dec 19, 2019
    Copy the full SHA
    67a4013 View commit details
  5. vimPlugins: Update

    poliez authored and Jon committed Dec 19, 2019
    Copy the full SHA
    2ce5e5b View commit details
  6. vimPlugins.vim-elm-syntax: init at 2019-11-28

    poliez authored and Jon committed Dec 19, 2019
    Copy the full SHA
    7af70d8 View commit details
  7. Copy the full SHA
    4e421ae View commit details
  8. Merge pull request #75914 from grahamc/python3/ki18n

    kdeFrameworks.ki18n: python2 -> python3
    worldofpeace authored Dec 19, 2019
    Copy the full SHA
    beb9ffe View commit details
13 changes: 7 additions & 6 deletions doc/languages-frameworks/python.section.md
Original file line number Diff line number Diff line change
@@ -1034,7 +1034,10 @@ Create this `default.nix` file, together with a `requirements.txt` and simply ex

```nix
with import <nixpkgs> {};
with python27Packages;
let
pythonPackages = python27Packages;
in
stdenv.mkDerivation {
name = "impurePythonEnv";
@@ -1044,9 +1047,8 @@ stdenv.mkDerivation {
buildInputs = [
# these packages are required for virtualenv and pip to work:
#
python27Full
python27Packages.virtualenv
python27Packages.pip
pythonPackages.virtualenv
pythonPackages.pip
# the following packages are related to the dependencies of your python
# project.
# In this particular example the python modules listed in the
@@ -1059,14 +1061,13 @@ stdenv.mkDerivation {
libxml2
libxslt
libzip
stdenv
zlib
];
shellHook = ''
# set SOURCE_DATE_EPOCH so that we can use python wheels
SOURCE_DATE_EPOCH=$(date +%s)
virtualenv --no-setuptools venv
virtualenv --python=${pythonPackages.python.interpreter} --no-setuptools venv
export PATH=$PWD/venv/bin:$PATH
pip install -r requirements.txt
'';
9 changes: 9 additions & 0 deletions nixos/doc/manual/man-nixos-option.xml
Original file line number Diff line number Diff line change
@@ -119,4 +119,13 @@ Defined by:
bug, please report to Nicolas Pierron.
</para>
</refsection>
<refsection>
<title>See also</title>
<para>
<citerefentry>
<refentrytitle>configuration.nix</refentrytitle>
<manvolnum>5</manvolnum>
</citerefentry>
</para>
</refsection>
</refentry>
4 changes: 2 additions & 2 deletions pkgs/applications/audio/mopidy/iris.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

pythonPackages.buildPythonApplication rec {
pname = "Mopidy-Iris";
version = "3.42.2";
version = "3.43.0";

src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "1v1dy857kxxn1si0x7p3qz63l1af5pln1jji1f7fis6id8iy7wfm";
sha256 = "1qg9xyjf27dp0810h4kdliyfb8r3kvi37lq8r93d01xwfphdzs05";
};

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

buildGoModule rec {
pname = "lab";
version = "0.17.1";
version = "0.17.2";

src = fetchFromGitHub {
owner = "zaquestion";
repo = "lab";
rev = "v${version}";
sha256 = "1z83v1dl9c5f99jvvc23ijkwrfrv489la05rlsrc3r4zzza1hx1f";
sha256 = "0zkwvmzgj7h8lc8jkg2a81392b28c8hkwqzj6dds6q4asbmymx5c";
};

subPackages = [ "." ];
4 changes: 2 additions & 2 deletions pkgs/development/libraries/kde-frameworks/ki18n.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
mkDerivation, lib,
extra-cmake-modules, gettext, python,
extra-cmake-modules, gettext, python3,
qtbase, qtdeclarative, qtscript,
}:

@@ -11,6 +11,6 @@ mkDerivation {
broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
propagatedNativeBuildInputs = [ gettext python ];
propagatedNativeBuildInputs = [ gettext python3 ];
buildInputs = [ qtdeclarative qtscript ];
}
4 changes: 2 additions & 2 deletions pkgs/development/tools/yarn/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "yarn";
version = "1.19.2";
version = "1.21.1";

src = fetchzip {
url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz";
sha256 = "05sjf7pgdj3hh92j2xxl683frrkiw1rqxs72z3an4gb83nllvi0n";
sha256 = "1yw3v62a6309f9hr189870i9jw2a15pkians1nnfjqczzh7r5pih";
};

buildInputs = [ nodejs ];
113 changes: 62 additions & 51 deletions pkgs/misc/vim-plugins/generated.nix
Original file line number Diff line number Diff line change
@@ -380,12 +380,12 @@ let

coc-java = buildVimPluginFrom2Nix {
pname = "coc-java";
version = "2019-10-31";
version = "2019-12-17";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-java";
rev = "77f7ecd8e6cc0af7a0cf293616b9f66a61a41f44";
sha256 = "13qhw4gdl5p4imzmgickay6lc4hlnw5fsc46zw5qyqq7p88wgym9";
rev = "4be4a57ad8f888ef92974ccb6e685358498863f1";
sha256 = "15175bphaiih5j63bigj5sblcyqjj68g3k81wn7dwgwdpglf1mwf";
};
};

@@ -733,12 +733,12 @@ let

csv-vim = buildVimPluginFrom2Nix {
pname = "csv-vim";
version = "2019-12-11";
version = "2019-12-17";
src = fetchFromGitHub {
owner = "chrisbra";
repo = "csv.vim";
rev = "3128891191d7e363d39cbe70b96281ec8d897bcb";
sha256 = "1qapfsk4z637rqi9mppac50gliyi957cvl2dfknq0dy856a11274";
rev = "012cd2637d48aa33541078451d70d66930e03e0f";
sha256 = "1gaqxhpzskcc28qma6vcjwig8v3q3a8sf7b2ckm14i7cb4c1lyh5";
};
};

@@ -843,12 +843,12 @@ let

denite-nvim = buildVimPluginFrom2Nix {
pname = "denite-nvim";
version = "2019-12-13";
version = "2019-12-16";
src = fetchFromGitHub {
owner = "Shougo";
repo = "denite.nvim";
rev = "13c8542818f418d1207c368f0072072c793f58c1";
sha256 = "1xrpmrr6wmy88s23j4cxcpsj9wlw7ak48sg3hjqpni9w231kp7a9";
rev = "35ceadf33e1248caead987fc83f01336b81d98fb";
sha256 = "1bazm1n2hqgg13yp5gywzghq310qhkbfqg1v42lyvc0gax8dngzj";
};
};

@@ -899,12 +899,12 @@ let

deoplete-go = buildVimPluginFrom2Nix {
pname = "deoplete-go";
version = "2019-12-13";
version = "2019-12-17";
src = fetchFromGitHub {
owner = "zchee";
repo = "deoplete-go";
rev = "a3ac3f53f0af482095ebcf09af8ca1d1edce45bc";
sha256 = "19xgsm5mbfcpdb0csckbwi83gl3b4wqdn8vchbv8j9faf10qnf2b";
rev = "dffbe97e48e09e9e1cd3c5fed7365b8117e2df25";
sha256 = "12p40sr6r9l7ngqynylffpms3cznym12djgbm4448kqcymj2imnz";
fetchSubmodules = true;
};
};
@@ -989,12 +989,12 @@ let

deoplete-nvim = buildVimPluginFrom2Nix {
pname = "deoplete-nvim";
version = "2019-12-10";
version = "2019-12-18";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deoplete.nvim";
rev = "e9aad25f28b68581cea2d94400b9fa64b724773b";
sha256 = "0wy5qapj6hfxj4ir38lb823zsgj6nqhi4r2sv0bm23g25sykg6ry";
rev = "18681650e81e809cd56e1006cf92cd7f9108266b";
sha256 = "0rlh97bdmiagrxs9gqjvrimpqcj9w0ys77l0kyxb111zcgcr8s9s";
};
};

@@ -1212,12 +1212,12 @@ let

fzf-vim = buildVimPluginFrom2Nix {
pname = "fzf-vim";
version = "2019-11-24";
version = "2019-12-18";
src = fetchFromGitHub {
owner = "junegunn";
repo = "fzf.vim";
rev = "65edb6ad99b51514aaf29afc25e35ce5f05281ba";
sha256 = "1d40whzc21c4zbzssjwvhzddyb0a106ib8r4zzzdd61s1935z4xr";
rev = "f71f4808d966da8be760f94fda131bc7d29f7d8f";
sha256 = "1l34yz0cwgxsacscmasj634jg6hfhpial4m1a7j9c907ljdkabpr";
};
};

@@ -2027,12 +2027,12 @@ let

nord-vim = buildVimPluginFrom2Nix {
pname = "nord-vim";
version = "2019-05-25";
version = "2019-12-17";
src = fetchFromGitHub {
owner = "arcticicestudio";
repo = "nord-vim";
rev = "9f7ce848723f69e33792e5606091bbfd5739d253";
sha256 = "1n6kdnll5jh92kfbwwm8544mpp7c2awqsaps91agqjd3nwa5x27x";
rev = "f06189a4c054fe8c22e46aca4d451e03456f2283";
sha256 = "0gk4zq0gz3nnwfkldswg9bjpk0gf6d6mgfzcgvj0pnlbja6ass81";
};
};

@@ -2820,12 +2820,12 @@ let

typescript-vim = buildVimPluginFrom2Nix {
pname = "typescript-vim";
version = "2019-06-23";
version = "2019-12-17";
src = fetchFromGitHub {
owner = "leafgarland";
repo = "typescript-vim";
rev = "5a319ea5504e18215d155576c78d1b7fb8e22c8f";
sha256 = "1hz42blc1sshkms9ramdhzwnphqs26p83q8smw5y14blp1zdb628";
rev = "2ca6afd1c05e89164bb29aaad82da35d5cf582a3";
sha256 = "0jvyi4gy9pc2kd0b1yc118f16p1qrjphxvpa0bl7q2rvyk49742s";
};
};

@@ -3150,34 +3150,34 @@ let

vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline";
version = "2019-12-15";
version = "2019-12-17";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline";
rev = "929cf2e21f84e989da2abd9aa5102848db61565b";
sha256 = "1rp2m5qpc763plybp1arzgrrmn8kg21sgnwac62k98w2s1c0x4jd";
rev = "98326670b604f522741b02baee82bf25141fbbc4";
sha256 = "0n7avla6z8dnixbr1rc505yyb4bfc3sr69wnv6fj15j4kkx4k319";
};
};

vim-airline-themes = buildVimPluginFrom2Nix {
pname = "vim-airline-themes";
version = "2019-12-13";
version = "2019-12-17";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline-themes";
rev = "67512f5e81b8ad088a8cbfe8b95f9e495bc81cf3";
sha256 = "049lnixxcvvnkq5bfwpmclw1k73xyf5gqfpw78rkzsbg9milyr74";
rev = "1eecd5b1c02c88ad2f8303757f453e2d7f0bd414";
sha256 = "08rjqjl0v5nsq8nf7ajv60jx41pmc5ym8mjbndlycz22hrsw8aq8";
};
};

vim-android = buildVimPluginFrom2Nix {
pname = "vim-android";
version = "2019-11-01";
version = "2019-12-17";
src = fetchFromGitHub {
owner = "hsanson";
repo = "vim-android";
rev = "928a7ba76ee7b48a715b397543f21ee28a9959da";
sha256 = "1cdjjyzmclzc32i1wcc5k67laz75yvi4jj2yc1fxa95bbq9zi0h5";
rev = "0849bcb6523d17a753fcaff8d40cbeed2d09cf65";
sha256 = "1z3x72aprp950chk754h0qpf5lxh2svzk39flks5fanxaggkpkng";
};
};

@@ -3502,12 +3502,12 @@ let

vim-dirvish = buildVimPluginFrom2Nix {
pname = "vim-dirvish";
version = "2019-11-16";
version = "2019-12-17";
src = fetchFromGitHub {
owner = "justinmk";
repo = "vim-dirvish";
rev = "4d7b4d4e2db72e95ea03c6ef757b01cbc128179e";
sha256 = "0ab7ivgkfaji0yl6mcx03nmr304vmdwxwiw0an94fa6wbhk0y9yl";
rev = "9c12328df924ddb875ee1e5c9fc0f939b62d6a6c";
sha256 = "1kpkwqrhix7whd00pcbanf3ij55x34cqc6qz3r2xshcmydk5vqxn";
};
};

@@ -3610,6 +3610,17 @@ let
};
};

vim-elm-syntax = buildVimPluginFrom2Nix {
pname = "vim-elm-syntax";
version = "2019-11-28";
src = fetchFromGitHub {
owner = "andys8";
repo = "vim-elm-syntax";
rev = "7ed55d9bc2c0cfd023d7cc6541634bcbf36430b5";
sha256 = "1kq7qcw9l41q646a2ilwy94lj1qz9as14aqfmzkbi938yij18zpx";
};
};

vim-eunuch = buildVimPluginFrom2Nix {
pname = "vim-eunuch";
version = "2019-11-13";
@@ -3832,12 +3843,12 @@ let

vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
version = "2019-12-16";
version = "2019-12-18";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
rev = "0e33a2334d5cafc9754cc78c079ded7efbedc3fa";
sha256 = "1phsnha6m7h5nd9smjij7xr7v5wqs2dza7bvdy18fjlv0rlfcgzc";
rev = "9d912c9d908a45f8a583679753a480e6a0461da3";
sha256 = "1z002n6mryhk2hi0arqyqaiayd6i14w2l5b2bmzj0g8vkk1kr41n";
};
};

@@ -4107,12 +4118,12 @@ let

vim-javacomplete2 = buildVimPluginFrom2Nix {
pname = "vim-javacomplete2";
version = "2019-12-07";
version = "2019-12-17";
src = fetchFromGitHub {
owner = "artur-shaik";
repo = "vim-javacomplete2";
rev = "f2c7ab94d29604128a38cb6626dac03e7cad5418";
sha256 = "1bgg9jy61ygyrx16n20xvyp1wnqfgk857dc5jw2mwv9iq1hg0lvn";
rev = "dc7951895a98c49c39622f65cdd7b39374c348bc";
sha256 = "1d8xiiwfg5wz57jyy7ahbi2bl5sjkhkpkqm2qbhsn7cd9vk36sxy";
};
};

@@ -4317,12 +4328,12 @@ let

vim-lsc = buildVimPluginFrom2Nix {
pname = "vim-lsc";
version = "2019-12-16";
version = "2019-12-17";
src = fetchFromGitHub {
owner = "natebosch";
repo = "vim-lsc";
rev = "64fa57aca10345031fab6db0065cf758f3dc1bdb";
sha256 = "1cxif26wn7qjplikbfdbkrj94mcpf9fk02gik2qfwicib0p83bfi";
rev = "0fd38b8a93ab16d380aed8467a5059e5b3932a2e";
sha256 = "06jz7f5npwm2iknpfmzz5x8lw5377hzc5kpg6n5p2icjwzaha6mz";
};
};

@@ -5142,12 +5153,12 @@ let

vim-table-mode = buildVimPluginFrom2Nix {
pname = "vim-table-mode";
version = "2019-12-10";
version = "2019-12-17";
src = fetchFromGitHub {
owner = "dhruvasagar";
repo = "vim-table-mode";
rev = "5ac34a22dbf70e3c8afd7cc69726cec89655c4ad";
sha256 = "1rs68islvz2rd3ahgfk06q9ydr3ph25zh4amg8vk1svqhk1vh0mp";
rev = "0af25d72ebc0271648c8f91c0ce5c59174d2761b";
sha256 = "1wqfc8bilknz1j1spk3iag99hmz5f1w87v95rb3cyp46ymrf9dcv";
};
};

@@ -5395,12 +5406,12 @@ let

vim-visual-multi = buildVimPluginFrom2Nix {
pname = "vim-visual-multi";
version = "2019-11-29";
version = "2019-12-17";
src = fetchFromGitHub {
owner = "mg979";
repo = "vim-visual-multi";
rev = "7c1934f91b33f64836d0e0d27e08481849831266";
sha256 = "1ga0skivc5p09d29k4gx2gdisalcl9514062ckddphynqn69ghi9";
rev = "9b06b851a7e822f3a2604a5d1505e387b62f3827";
sha256 = "0g1wf5p905y653vl0cxb6idbr8panvj10hwz7hl50dybfc0zky7m";
};
};

Loading