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: 8a74c091b256
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8b6bfda0cf98
Choose a head ref

Commits on Oct 24, 2019

  1. x42-plugins: 20190820 -> 20191013

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/x42-plugins/versions
    r-ryantm committed Oct 24, 2019
    Copy the full SHA
    629b449 View commit details
  2. exercism: 3.0.12 -> 3.0.13

    NobbZ committed Oct 24, 2019
    Copy the full SHA
    f03715c View commit details
  3. xmrig-proxy: 3.1.1 -> 3.2.0

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/xmrig-proxy/versions
    r-ryantm committed Oct 24, 2019
    Copy the full SHA
    156ee56 View commit details

Commits on Oct 25, 2019

  1. Copy the full SHA
    d2282cc View commit details
  2. Copy the full SHA
    d384987 View commit details
  3. coq_8_10: 8.10.0 → 8.10.1

    vbgl committed Oct 25, 2019
    Copy the full SHA
    a8892b0 View commit details
  4. Copy the full SHA
    74f56f4 View commit details
  5. pass-checkup: init at 0.2.0

    etu authored and Jon committed Oct 25, 2019
    Copy the full SHA
    e8a36cd View commit details
  6. Copy the full SHA
    bd5e8c8 View commit details
  7. scalafmt: 2.0.1 -> 2.2.1

    Tomahna committed Oct 25, 2019
    Copy the full SHA
    a48709b View commit details
  8. gzdoom: 4.2.1 -> 4.2.3

    Lassulus committed Oct 25, 2019
    Copy the full SHA
    12b5da2 View commit details
  9. Merge pull request #71979 from romildo/upd.qogir-theme

    qogir-theme: 2019-08-31 -> 2019-10-25
    rasendubi authored Oct 25, 2019
    Copy the full SHA
    67f080c View commit details
  10. Merge pull request #71360 from Ma27/bump-matrix-synapse

    matrix-synapse: 1.4.0 -> 1.4.1
    Ekleog authored Oct 25, 2019
    Copy the full SHA
    b262fef View commit details
  11. Merge pull request #71980 from Tomahna/scalafmt

    scalafmt: 2.0.1 -> 2.2.1
    globin authored Oct 25, 2019
    Copy the full SHA
    b047445 View commit details
  12. Merge pull request #71973 from Lassulus/gzdoom

    gzdoom: 4.2.1 -> 4.2.3
    globin authored Oct 25, 2019
    Copy the full SHA
    639ca92 View commit details
  13. Merge pull request #71971 from vbgl/coq-8.10.1

    coq_8_10: 8.10.0 → 8.10.1
    globin authored Oct 25, 2019
    Copy the full SHA
    9db9719 View commit details
  14. Merge pull request #71964 from arthurl/wt-PR

    wt: Allow optional library harfbuzz to be overriden with null
    globin authored Oct 25, 2019
    Copy the full SHA
    48a22a0 View commit details
  15. Merge pull request #71941 from r-ryantm/auto-update/xmrig-proxy

    xmrig-proxy: 3.1.1 -> 3.2.0
    rasendubi authored Oct 25, 2019
    Copy the full SHA
    3778be4 View commit details
  16. transgui: 5.17.0 -> 5.18.0

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/transgui/versions
    r-ryantm authored and Lassulus committed Oct 25, 2019
    Copy the full SHA
    f118648 View commit details
  17. Merge pull request #71932 from r-ryantm/auto-update/x42-plugins

    x42-plugins: 20190820 -> 20191013
    rasendubi authored Oct 25, 2019
    Copy the full SHA
    58cfd06 View commit details
  18. Merge pull request #71974 from seqizz/g_vimwiki_markdown

    vimwiki-markdown: init at 0.2.0
    rasendubi authored Oct 25, 2019
    Copy the full SHA
    9e5e9db View commit details
  19. python3.pkgs.python-dbusmock: fix build

    The test_code codestyle test failed because of the lines being too long.
    We added --ignore=E501 to fix this, which makes it ignore checking
    line length.
    worldofpeace committed Oct 25, 2019
    Copy the full SHA
    b9f2c7d View commit details
  20. Merge pull request #71937 from NobbZ/exercism-3.0.13

    exercism: 3.0.12 -> 3.0.13
    rasendubi authored Oct 25, 2019
    Copy the full SHA
    8b6bfda View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/audio/x42-plugins/default.nix
Original file line number Diff line number Diff line change
@@ -3,12 +3,12 @@
, libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }:

stdenv.mkDerivation rec {
version = "20190820";
version = "20191013";
pname = "x42-plugins";

src = fetchurl {
url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz";
sha256 = "0dqsa5yxm3nx50j9k28iillj4sx2mjndzyspymxx0ghir1qmi4vh";
sha256 = "18kn1bmc0s6dp834kc51ibifzzn3bxwya4p8s8yq9f4mpmkghi24";
};

nativeBuildInputs = [ pkgconfig ];
4 changes: 2 additions & 2 deletions pkgs/applications/misc/exercism/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

buildGoModule rec {
pname = "exercism";
version = "3.0.12";
version = "3.0.13";

src = fetchFromGitHub {
owner = "exercism";
repo = "cli";
rev = "v${version}";
sha256 = "1xvxcl7j5izx5lgmjd97zd28lg2sydwgbgn2cnisz5r0d27pj3ra";
sha256 = "17gvz9a0sn4p36hf4l77bxhhfipf4x998iay31layqwbnzmb4xy7";
};

modSha256 = "0pg0hxrr6jjd03wbjn5y65x02md3h352mnm1gr6vyiv7hn4ws14m";
4 changes: 2 additions & 2 deletions pkgs/applications/misc/xmrig/proxy.nix
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@

stdenv.mkDerivation rec {
pname = "xmrig-proxy";
version = "3.1.1";
version = "3.2.0";

src = fetchFromGitHub {
owner = "xmrig";
repo = "xmrig-proxy";
rev = "v${version}";
sha256 = "1qiwarf0bqc17w3r88ysxxpm71gm861zx1fnzp0xi4q3rbh3nfmd";
sha256 = "0scz78cc5zcdd6z4gm0zqsb36jf0z8fyn2ki52814ndxrk7nr4xg";
};

nativeBuildInputs = [ cmake ];
4 changes: 2 additions & 2 deletions pkgs/applications/networking/p2p/transgui/default.nix
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@ libX11, glib, gtk2, gdk-pixbuf, pango, atk, cairo, openssl }:

stdenv.mkDerivation rec {
pname = "transgui";
version = "5.17.0";
version = "5.18.0";

src = fetchFromGitHub {
owner = "transmission-remote-gui";
repo = "transgui";
rev = "v${version}";
sha256 = "0p76vavny5asi5naa4jn67raxlarsmrkbchfn96y6gh5p2vzwpl7";
sha256 = "1dyx778756zhvz5sxgdvy49p2c0x44w4nmcfd90wqrmgfknncnf5";
};

nativeBuildInputs = [ pkgconfig ];
1 change: 1 addition & 0 deletions pkgs/applications/science/logic/coq/default.nix
Original file line number Diff line number Diff line change
@@ -30,6 +30,7 @@ let
"8.9.0" = "1dkgdjc4n1m15m1p724hhi5cyxpqbjw6rxc5na6fl3v4qjjfnizh";
"8.9.1" = "1xrq6mkhpq994bncmnijf8jwmwn961kkpl4mwwlv7j3dgnysrcv2";
"8.10.0" = "138jw94wp4mg5dgjc2asn8ng09ayz1mxdznq342n0m469j803gzg";
"8.10.1" = "072v2zkjzf7gj48137wpr3c9j0hg9pdhlr5l8jrgrwynld8fp7i4";
}.${version};
coq-version = stdenv.lib.versions.majorMinor version;
versionAtLeast = stdenv.lib.versionAtLeast coq-version;
6 changes: 3 additions & 3 deletions pkgs/data/themes/qogir/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "qogir-theme";
version = "2019-08-31";
version = "2019-10-25";

src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
sha256 = "1pqfnqc2c6f5cidg6c3y492hqlyn5ma4b7ra2lchw7g2dxfvq8w1";
sha256 = "027c9pbfv5flqrjcvmbyjrfi37nzq33z19bai4zjjxjvryfqpmlm";
};

buildInputs = [ gdk-pixbuf librsvg ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
'';

meta = with stdenv.lib; {
description = "A flat Design theme for GTK based desktop environments";
description = "Flat Design theme for GTK based desktop environments";
homepage = https://vinceliuice.github.io/Qogir-theme;
license = licenses.gpl3;
platforms = platforms.unix;
3 changes: 2 additions & 1 deletion pkgs/development/libraries/wt/default.nix
Original file line number Diff line number Diff line change
@@ -28,13 +28,14 @@ let

cmakeFlags = [
"-DWT_CPP_11_MODE=-std=c++11"
"-DHARFBUZZ_INCLUDE_DIR=${harfbuzz.dev}/include"
"--no-warn-unused-cli"
]
++ stdenv.lib.optionals (graphicsmagick != null) [
"-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick"
"-DGM_PREFIX=${graphicsmagick}"
]
++ stdenv.lib.optional (harfbuzz != null)
"-DHARFBUZZ_INCLUDE_DIR=${harfbuzz.dev}/include"
++ stdenv.lib.optional (libmysqlclient != null)
"-DMYSQL_PREFIX=${libmysqlclient}";

7 changes: 5 additions & 2 deletions pkgs/development/python-modules/python-dbusmock/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi,
{ lib, buildPythonPackage, fetchPypi, runtimeShell,
nose, dbus, dbus-python, pygobject3,
which, pyflakes, pycodestyle, bluez, networkmanager
}:
@@ -13,7 +13,10 @@ buildPythonPackage rec {
};

prePatch = ''
sed -i -e 's|pyflakes3|pyflakes|g' tests/test_code.py;
substituteInPlace tests/test_code.py \
--replace "pyflakes3" "pyflakes" \
--replace "/bin/bash" "${runtimeShell}" \
--replace "--ignore=E124,E402,E731,W504" "--ignore=E124,E402,E731,W504,E501" # ignore long lines too
'';

# TODO: Get the rest of these tests running?
4 changes: 2 additions & 2 deletions pkgs/development/tools/scalafmt/default.nix
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

let
baseName = "scalafmt";
version = "2.0.1";
version = "2.2.1";
deps = stdenv.mkDerivation {
name = "${baseName}-deps-${version}";
buildCommand = ''
@@ -13,7 +13,7 @@ let
'';
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "1k5qn0w6hqql8yqhlma67ilp8hf0xwxwkzvwg8bkky1jvsapjsl5";
outputHash = "0wk43kmzwr49i3fl4vc0lhxcxc62ssaw1yap9g856vg33m95azl1";
};
in
stdenv.mkDerivation {
6 changes: 3 additions & 3 deletions pkgs/games/gzdoom/default.nix
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@

stdenv.mkDerivation rec {
pname = "gzdoom";
version = "4.2.1";
version = "4.2.3";

src = fetchFromGitHub {
owner = "coelckers";
repo = "gzdoom";
rev = "g${version}";
sha256 = "1fak8bmsb3jqcx28hr60yj3dd3khzhjw1kgq6q7piwnmgr27ibgd";
sha256 = "06fy4ksn1n745y86s6rlnamkfyqi0894aznf6s56ff6hz2pngsfc";
};

nativeBuildInputs = [ cmake makeWrapper ];
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
sed -i \
-e "s@/usr/share/sounds/sf2/@${soundfont-fluid}/share/soundfonts/@g" \
-e "s@FluidR3_GM.sf2@FluidR3_GM2-2.sf2@g" \
src/sound/mididevices/music_fluidsynth_mididevice.cpp
libraries/zmusic/mididevices/music_fluidsynth_mididevice.cpp
'';

installPhase = ''
6 changes: 4 additions & 2 deletions pkgs/servers/matrix-synapse/default.nix
Original file line number Diff line number Diff line change
@@ -23,11 +23,11 @@ let

in buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.4.0";
version = "1.4.1";

src = fetchPypi {
inherit pname version;
sha256 = "1y8yhzsf2lk2d7v4l61rpy4918c0qz276j79q88l9yazb6gw5pkk";
sha256 = "10vfjf5f4micqwpxnw2dliq4y0j0mqj0087p6kgnfi5w9syz8g75";
};

patches = [
@@ -75,6 +75,8 @@ in buildPythonApplication rec {

checkInputs = [ mock parameterized openssl ];

doCheck = !stdenv.isDarwin;

checkPhase = ''
PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial tests
'';
28 changes: 28 additions & 0 deletions pkgs/tools/misc/vimwiki-markdown/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{ stdenv
, buildPythonApplication
, fetchPypi
, markdown
, pygments
}:

buildPythonApplication rec {
version = "0.2.0";
pname = "vimwiki-markdown";

src = fetchPypi {
inherit version pname;
sha256 = "0k7srlglhq4bm85kgd5ismslrk1fk8v16mm41a8k0kmcr9k4vi4a";
};

propagatedBuildInputs= [
markdown
pygments
];

meta = with stdenv.lib; {
description = "Vimwiki markdown plugin";
homepage = https://github.com/WnP/vimwiki_markdown;
license = licenses.mit;
maintainers = with maintainers; [ seqizz ];
};
}
34 changes: 34 additions & 0 deletions pkgs/tools/security/pass/extensions/checkup.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{ stdenv, fetchFromGitHub
, curl, findutils, gnugrep, gnused }:

stdenv.mkDerivation rec {
pname = "pass-checkup";
version = "0.2.0";

src = fetchFromGitHub {
owner = "etu";
repo = "pass-checkup";
rev = version;
sha256 = "17fyf8zj535fg43yddjww1jhxfb3nbdkn622wjxaai2nf46jzh7y";
};

patchPhase = ''
substituteInPlace checkup.bash \
--replace curl ${curl}/bin/curl \
--replace find ${findutils}/bin/find \
--replace grep ${gnugrep}/bin/grep \
--replace sed ${gnused}/bin/sed
'';

installPhase = ''
install -D -m755 checkup.bash $out/lib/password-store/extensions/checkup.bash
'';

meta = with stdenv.lib; {
description = "A pass extension to check against the Have I been pwned API to see if your passwords are publicly leaked or not.";
homepage = "https://github.com/etu/pass-checkup";
license = licenses.gpl3;
maintainers = with maintainers; [ etu ];
platforms = platforms.unix;
};
}
1 change: 1 addition & 0 deletions pkgs/tools/security/pass/extensions/default.nix
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@ with pkgs;
pass-audit = callPackage ./audit.nix {
pythonPackages = python3Packages;
};
pass-checkup = callPackage ./checkup.nix {};
pass-import = callPackage ./import.nix {
pythonPackages = python3Packages;
};
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -6807,6 +6807,8 @@ in
vimpager = callPackage ../tools/misc/vimpager { };
vimpager-latest = callPackage ../tools/misc/vimpager/latest.nix { };

vimwiki-markdown = python3Packages.callPackage ../tools/misc/vimwiki-markdown { };

visidata = (newScope python3Packages) ../applications/misc/visidata {
};

2 changes: 1 addition & 1 deletion pkgs/top-level/coq-packages.nix
Original file line number Diff line number Diff line change
@@ -128,7 +128,7 @@ in rec {
version = "8.9.1";
};
coq_8_10 = callPackage ../applications/science/logic/coq {
version = "8.10.0";
version = "8.10.1";
};

coqPackages_8_5 = mkCoqPackages coq_8_5;