Commit 9e0000be authored by K900's avatar K900
Browse files

Merge branch 'master' into staging-next

parents c1dce2f6 8694fb41

pkgs/applications/audio/easyabc/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ let 
    packageOverrides = self: super: {

      # currently broken with 4.2.1

      # https://github.com/jwdj/EasyABC/issues/75

      wxPython_4_2 = super.wxPython_4_2.overrideAttrs (args: rec {

      wxpython = super.wxpython.overrideAttrs (args: rec {

        version = "4.2.0";

        src = fetchPypi {

          inherit version;
@@ -32,7 +32,7 @@ in python.pkgs.buildPythonApplication { 


  propagatedBuildInputs = with python.pkgs; [

    cx-freeze

    wxPython_4_2

    wxpython

    pygame

  ];

pkgs/applications/editors/okteta/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -4,11 +4,11 @@ 


mkDerivation rec {

  pname = "okteta";

  version = "0.26.14";

  version = "0.26.15";



  src = fetchurl {

    url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz";

    sha256 = "sha256-2bvspG3lecKlcN/+YPRmFKQCu/jhckafeSo272iE+9k=";

    sha256 = "sha256-BTNQDvcGjBJG4hj1N69yboNth4/ydeOS7T2KiqbPfGM=";

  };



  nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ];

pkgs/applications/gis/grass/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { 
    libmysqlclient # for `mysql_config`

    netcdf # for `nc-config`

    pkg-config

  ] ++ (with python3Packages; [ python-dateutil numpy wxPython_4_2 ]);

  ] ++ (with python3Packages; [ python-dateutil numpy wxpython ]);



  buildInputs = [

    blas

pkgs/applications/graphics/displaycal/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { 
  propagatedBuildInputs = with python3.pkgs; [

    build

    certifi

    wxPython_4_2

    wxpython

    dbus-python

    distro

    numpy

pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication rec { 
    python3.pkgs.lxml

    python3.pkgs.inkex

    python3.pkgs.matplotlib

    python3.pkgs.wxPython_4_2

    python3.pkgs.wxpython

    python3.pkgs.xmltodict

  ];