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: a838caa33a78
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: d7e20ee25ed8
Choose a head ref
  • 6 commits
  • 21 files changed
  • 5 contributors

Commits on Jul 18, 2020

  1. python27Packages.ipympl: 0.5.6 -> 0.5.7

    @r-ryantm
    r-ryantm committed Jul 18, 2020
    Copy the full SHA
    1e1ef0d View commit details

  2. python37Packages.pylint-django: 2.0.15 -> 2.1.0

    @r-ryantm
    r-ryantm committed Jul 18, 2020
    Copy the full SHA
    d867a5a View commit details

  3. Merge pull request #93393 from r-ryantm/auto-update/python3.7-pylint-… 

    …django

python37Packages.pylint-django: 2.0.15 -> 2.1.0
    @lsix
    lsix authored Jul 18, 2020
    Copy the full SHA
    9b195c5 View commit details

  4. gnomeExtensions: add runHook to {build,install}Phase

    @zowoq
    zowoq committed Jul 18, 2020
    Copy the full SHA
    8f2d4f9 View commit details

  5. Merge pull request #93409 from zowoq/gnome-ext-hooks 

    gnomeExtensions: add runHook to {build,install}Phase
    @jtojnar
    jtojnar authored Jul 18, 2020
    Copy the full SHA
    ceb1527 View commit details

  6. Merge pull request #93387 from r-ryantm/auto-update/python2.7-ipympl 

    python27Packages.ipympl: 0.5.6 -> 0.5.7
    @marsam
    marsam authored Jul 18, 2020
    Copy the full SHA
    d7e20ee View commit details
Showing with 50 additions and 4 deletions.
  1. +2 −0 pkgs/desktops/gnome-3/extensions/appindicator/default.nix
  2. +2 −0 pkgs/desktops/gnome-3/extensions/battery-status/default.nix
  3. +4 −0 pkgs/desktops/gnome-3/extensions/caffeine/default.nix
  4. +2 −0 pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix
  5. +2 −0 pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix
  6. +2 −0 pkgs/desktops/gnome-3/extensions/icon-hider/default.nix
  7. +4 −0 pkgs/desktops/gnome-3/extensions/impatience/default.nix
  8. +2 −0 pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix
  9. +2 −0 pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix
  10. +2 −0 pkgs/desktops/gnome-3/extensions/paperwm/default.nix
  11. +2 −0 pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix
  12. +2 −0 pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix
  13. +2 −0 pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix
  14. +4 −0 pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
  15. +4 −0 pkgs/desktops/gnome-3/extensions/tilingnome/default.nix
  16. +2 −0 pkgs/desktops/gnome-3/extensions/timepp/default.nix
  17. +2 −0 pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix
  18. +2 −0 pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix
  19. +2 −0 pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix
  20. +2 −2 pkgs/development/python-modules/ipympl/default.nix
  21. +2 −2 pkgs/development/python-modules/pylint-django/default.nix
2 changes: 2 additions & 0 deletions pkgs/desktops/gnome-3/extensions/appindicator/default.nix
View file
Original file line number Diff line number Diff line change
@@ -18,10 +18,12 @@ stdenv.mkDerivation rec {

uuid = "appindicatorsupport@rgcjonas.gmail.com";
installPhase = ''
runHook preInstall
mkdir -p $out/share/gnome-shell/extensions/${uuid}
cp *.js $out/share/gnome-shell/extensions/${uuid}
cp -r interfaces-xml $out/share/gnome-shell/extensions/${uuid}
cp metadata.json $out/share/gnome-shell/extensions/${uuid}
runHook postInstall
'';

meta = with stdenv.lib; {
2 changes: 2 additions & 0 deletions pkgs/desktops/gnome-3/extensions/battery-status/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,8 +14,10 @@ stdenv.mkDerivation rec {
uuid = "battery_status@milliburn.github.com";

installPhase = ''
runHook preInstall
mkdir -p $out/share/gnome-shell/extensions
cp -r ${uuid} $out/share/gnome-shell/extensions/
runHook postInstall
'';

meta = with stdenv.lib; {
4 changes: 4 additions & 0 deletions pkgs/desktops/gnome-3/extensions/caffeine/default.nix
View file
Original file line number Diff line number Diff line change
@@ -18,13 +18,17 @@ stdenv.mkDerivation rec {
];

buildPhase = ''
runHook preBuild
${bash}/bin/bash ./update-locale.sh
glib-compile-schemas --strict --targetdir=caffeine@patapon.info/schemas/ caffeine@patapon.info/schemas
runHook postBuild
'';

installPhase = ''
runHook preInstall
mkdir -p $out/share/gnome-shell/extensions
cp -r ${uuid} $out/share/gnome-shell/extensions
runHook postInstall
'';

meta = with stdenv.lib; {
2 changes: 2 additions & 0 deletions pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,8 +14,10 @@ stdenv.mkDerivation rec {
uuid = "clipboard-indicator@tudmotu.com";

installPhase = ''
runHook preInstall
mkdir -p $out/share/gnome-shell/extensions/${uuid}
cp -r * $out/share/gnome-shell/extensions/${uuid}
runHook postInstall
'';

meta = with stdenv.lib; {
2 changes: 2 additions & 0 deletions pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix
View file
Original file line number Diff line number Diff line change
@@ -21,8 +21,10 @@ stdenv.mkDerivation rec {
];

installPhase = ''
runHook preInstall
mkdir -p $out/share/gnome-shell/extensions
cp -r ${uuid} $out/share/gnome-shell/extensions/
runHook postInstall
'';

meta = with stdenv.lib; {
2 changes: 2 additions & 0 deletions pkgs/desktops/gnome-3/extensions/icon-hider/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,8 +14,10 @@ stdenv.mkDerivation rec {
uuid = "icon-hider@kalnitsky.org";

installPhase = ''
runHook preInstall
mkdir -p $out/share/gnome-shell/extensions
cp -r ${uuid} $out/share/gnome-shell/extensions
runHook postInstall
'';

meta = with stdenv.lib; {
4 changes: 4 additions & 0 deletions pkgs/desktops/gnome-3/extensions/impatience/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,12 +16,16 @@ stdenv.mkDerivation rec {
];

buildPhase = ''
runHook preBuild
make schemas
runHook postBuild
'';

installPhase = ''
runHook preInstall
mkdir -p $out/share/gnome-shell/extensions
cp -r impatience $out/share/gnome-shell/extensions/${uuid}
runHook postInstall
'';

uuid = "impatience@gfxmonk.net";
2 changes: 2 additions & 0 deletions pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix
View file
Original file line number Diff line number Diff line change
@@ -17,8 +17,10 @@ stdenv.mkDerivation rec {
uuid = "mprisindicatorbutton@JasonLG1979.github.io";

installPhase = ''
runHook preInstall
mkdir -p $out/share/gnome-shell/extensions
cp -r ${uuid} $out/share/gnome-shell/extensions
runHook postInstall
'';

meta = with stdenv.lib; {
2 changes: 2 additions & 0 deletions pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix
View file
Original file line number Diff line number Diff line change
@@ -18,8 +18,10 @@ stdenv.mkDerivation rec {
uuid = "nightthemeswitcher@romainvigier.fr";

installPhase = ''
runHook preInstall
mkdir -p $out/share/gnome-shell/extensions/
cp -r src/ $out/share/gnome-shell/extensions/${uuid}
runHook postInstall
'';

meta = with stdenv.lib; {
2 changes: 2 additions & 0 deletions pkgs/desktops/gnome-3/extensions/paperwm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,8 +16,10 @@ stdenv.mkDerivation rec {
dontBuild = true;

installPhase = ''
runHook preInstall
mkdir -p $out/share/gnome-shell/extensions/${uuid}
cp -r . $out/share/gnome-shell/extensions/${uuid}
runHook postInstall
'';

meta = with stdenv.lib; {
2 changes: 2 additions & 0 deletions pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,10 +15,12 @@ stdenv.mkDerivation rec {
dontBuild = true;

installPhase = ''
runHook preInstall
share_dir="$prefix/share"
extensions_dir="$share_dir/gnome-shell/extensions/pidgin@muffinmad"
mkdir -p "$extensions_dir"
mv *.js metadata.json dbus.xml schemas locale "$extensions_dir"
runHook postInstall
'';

uuid = "pidgin@muffinmad";
2 changes: 2 additions & 0 deletions pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix
View file
Original file line number Diff line number Diff line change
@@ -18,9 +18,11 @@ stdenv.mkDerivation rec {

uuid = "remove-dropdown-arrows@mpdeimos.com";
installPhase = ''
runHook preInstall
mkdir -p $out/share/gnome-shell/extensions/${uuid}
cp extension.js $out/share/gnome-shell/extensions/${uuid}
cp metadata.json $out/share/gnome-shell/extensions/${uuid}
runHook postInstall
'';

meta = with stdenv.lib; {
2 changes: 2 additions & 0 deletions pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix
View file
Original file line number Diff line number Diff line change
@@ -28,8 +28,10 @@ stdenv.mkDerivation rec {

uuid = "sound-output-device-chooser@kgshank.net";
installPhase = ''
runHook preInstall
mkdir -p $out/share/gnome-shell/extensions
cp -r ${uuid} $out/share/gnome-shell/extensions
runHook postInstall
'';

meta = with stdenv.lib; {
4 changes: 4 additions & 0 deletions pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
View file
Original file line number Diff line number Diff line change
@@ -27,12 +27,16 @@ stdenv.mkDerivation rec {
];

buildPhase = ''
runHook preBuild
glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas
runHook postBuild
'';

installPhase = ''
runHook preInstall
mkdir -p $out/share/gnome-shell/extensions
cp -r ${uuid} $out/share/gnome-shell/extensions
runHook postInstall
'';

uuid = "system-monitor@paradoxxx.zero.gmail.com";
4 changes: 4 additions & 0 deletions pkgs/desktops/gnome-3/extensions/tilingnome/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,12 +14,16 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ glib ];

buildPhase = ''
runHook preBuild
glib-compile-schemas .
runHook postBuild
'';

installPhase = ''
runHook preInstall
mkdir -p $out/share/gnome-shell/extensions/${uuid}
cp -r * $out/share/gnome-shell/extensions/${uuid}/
runHook postInstall
'';

uuid = "tilingnome@rliang.github.com";
2 changes: 2 additions & 0 deletions pkgs/desktops/gnome-3/extensions/timepp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,8 +13,10 @@ stdenv.mkDerivation rec {

uuid = "timepp@zagortenay333";
installPhase = ''
runHook preInstall
mkdir -p $out/share/gnome-shell/extensions/${uuid}
cp -r . $out/share/gnome-shell/extensions/${uuid}
runHook postInstall
'';

meta = with stdenv.lib; {
2 changes: 2 additions & 0 deletions pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,8 +15,10 @@ stdenv.mkDerivation rec {

uuid = "window-corner-preview@fabiomereu.it";
installPhase = ''
runHook preInstall
mkdir -p $out/share/gnome-shell/extensions
cp -r ${uuid} $out/share/gnome-shell/extensions
runHook postInstall
'';

meta = with stdenv.lib; {
2 changes: 2 additions & 0 deletions pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,8 +14,10 @@ stdenv.mkDerivation rec {
uuid = "windowIsReady_Remover@nunofarruca@gmail.com";

installPhase = ''
runHook preInstall
mkdir -p $out/share/gnome-shell/extensions/
cp -r ${uuid} $out/share/gnome-shell/extensions/${uuid}
runHook postInstall
'';

meta = with stdenv.lib; {
2 changes: 2 additions & 0 deletions pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -21,8 +21,10 @@ stdenv.mkDerivation rec {
buildFlags = "schemas";

installPhase = ''
runHook preInstall
mkdir -p $out/share/gnome-shell/extensions
cp -r ${uuid} $out/share/gnome-shell/extensions
runHook postInstall
'';

meta = with stdenv.lib; {
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/ipympl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

buildPythonPackage rec {
pname = "ipympl";
version = "0.5.6";
version = "0.5.7";

src = fetchPypi {
inherit pname version;
sha256 = "1sak58wcpikn4ww1k8gr2vf1hmwzfly31hzcnwiizp7l0vk40qh7";
sha256 = "0cjsabsbn02vpf3yl0x9xdqgf4f707mbnz2hp2bn6zp9qnyyirx5";
};

propagatedBuildInputs = [ ipywidgets matplotlib ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/pylint-django/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,14 +10,14 @@

buildPythonPackage rec {
pname = "pylint-django";
version = "2.0.15";
version = "2.1.0";
disabled = !isPy3k;

src = fetchFromGitHub {
owner = "PyCQA";
repo = pname;
rev = "v${version}";
sha256 = "0wpzd3j01njxfclbhxz31s5clc7il67nhm4lz89q2aaj19c0xzsa";
sha256 = "1gvbh2a480x3ddrq6xzray7kdsz8nb8n16xm2lf03w2nqnsdbkwy";
};

propagatedBuildInputs = [