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: 736025e23430
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: 3d3e5cafa762
Choose a head ref
  • 17 commits
  • 11 files changed
  • 7 contributors

Commits on Mar 1, 2019

  1. pythonPackages.asttokens: init at 1.1.13

    @leenaars
    leenaars committed Mar 1, 2019
    Copy the full SHA
    ca9af55 View commit details

  2. thonny: 3.0.5 -> 3.1.2

    @leenaars
    leenaars committed Mar 1, 2019
    Copy the full SHA
    3cf1813 View commit details

Commits on Mar 2, 2019

  1. fava: 1.9 -> 1.10 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/fava/versions
    @r-ryantm
    r-ryantm committed Mar 2, 2019
    Copy the full SHA
    5d8f93a View commit details

  2. gnome3.gdm: 3.30.2 -> 3.30.3 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gdm/versions
    @r-ryantm
    r-ryantm committed Mar 2, 2019
    Copy the full SHA
    15ad7d3 View commit details

  3. grim: 1.0 -> 1.1 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/grim/versions
    @r-ryantm
    r-ryantm committed Mar 2, 2019
    Copy the full SHA
    bf1b3e1 View commit details

  4. gnome3.gnome-remote-desktop: 0.1.6 -> 0.1.7

    @jtojnar
    jtojnar committed Mar 2, 2019
    Copy the full SHA
    beb3758 View commit details

  5. Merge pull request #56642 from r-ryantm/auto-update/fava 

    fava: 1.9 -> 1.10
    @ryantm
    ryantm authored Mar 2, 2019
    Copy the full SHA
    48c6005 View commit details

  6. ibus-engines.typing-booster-unwrapped: 2.5.0 -> 2.5.3 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ibus-typing-booster/versions
    @r-ryantm
    r-ryantm committed Mar 2, 2019
    Copy the full SHA
    6766409 View commit details

  7. Merge pull request #56668 from r-ryantm/auto-update/gdm 

    gnome3.gdm: 3.30.2 -> 3.30.3
    @ryantm
    ryantm authored Mar 2, 2019
    Copy the full SHA
    4f9d57a View commit details

  8. Merge pull request #56679 from r-ryantm/auto-update/gnome-remote-desktop 

    gnome3.gnome-remote-desktop: 0.1.6 -> 0.1.7
    @jtojnar
    jtojnar authored Mar 2, 2019
    Copy the full SHA
    300a4a6 View commit details

  9. Merge pull request #56434 from leenaars/thonny 

    Thonny: 3.0.5 -> 3.1.2
    @ryantm
    ryantm authored Mar 2, 2019
    Copy the full SHA
    d6b632e View commit details

  10. Merge pull request #56691 from r-ryantm/auto-update/grim 

    grim: 1.0 -> 1.1
    @ryantm
    ryantm authored Mar 2, 2019
    Copy the full SHA
    e76edae View commit details

  11. apache-jena-fuseki: 3.9.0 -> 3.10.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/apache-jena-fuseki/versions
    @r-ryantm
    r-ryantm committed Mar 2, 2019
    Copy the full SHA
    46d3464 View commit details

  12. Merge pull request #56701 from r-ryantm/auto-update/ibus-typing-booster 

    ibus-engines.typing-booster-unwrapped: 2.5.0 -> 2.5.3
    @Ma27
    Ma27 authored Mar 2, 2019
    Copy the full SHA
    7a20d7c View commit details

  13. hledger-interest: add a top-level alias for the Haskell program

    @peti
    peti committed Mar 2, 2019
    Copy the full SHA
    120f191 View commit details

  14. Merge pull request #56711 from r-ryantm/auto-update/apache-jena-fuseki 

    apache-jena-fuseki: 3.9.0 -> 3.10.0
    @7c6f434c
    7c6f434c authored Mar 2, 2019
    Copy the full SHA
    3630a55 View commit details

  15. hackage-packages.nix: automatic Haskell package set update 

    This update was generated by hackage2nix v2.14.1-6-gd2bed2e from Hackage revision
commercialhaskell/all-cabal-hashes@e78602c.
    @peti
    peti committed Mar 2, 2019
    Copy the full SHA
    3d3e5ca View commit details
13 changes: 7 additions & 6 deletions pkgs/applications/editors/thonny/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{ stdenv, fetchFromBitbucket, python3 }:
{ stdenv, fetchFromGitHub, python3 }:

with python3.pkgs;

buildPythonApplication rec {
pname = "thonny";
version = "3.0.5";
version = "3.1.2";

src = fetchFromBitbucket {
owner = "plas";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "e5a1ad4ae9d24066a769489b1e168b4bd6e00b03";
sha256 = "1lrl5pj9dpw9i5ij863hd47gfd15nmvglqkl2ldwgfn7kgpsdkz5";
rev = "v${version}";
sha256 = "1simqqxm72k5zhavhllkinsyw8ggy6fjs5ppj82g3l5g3919pfna";
};

propagatedBuildInputs = with python3.pkgs; [
@@ -21,6 +21,7 @@ buildPythonApplication rec {
pylint
mypy
pyperclip
asttokens
];

preInstall = ''
4 changes: 2 additions & 2 deletions pkgs/applications/office/fava/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,11 +5,11 @@ let
in
buildPythonApplication rec {
pname = "fava";
version = "1.9";
version = "1.10";

src = fetchPypi {
inherit pname version;
sha256 = "115r99l6xfliafgkpcf0mndqrvijix5mflg2i56s7xwqr3ch8z9k";
sha256 = "145995nzgr06qsn619zap0xqa8ckfrp5azga41smyszq97pd01sj";
};

doCheck = false;
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/gdm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,11 +5,11 @@

stdenv.mkDerivation rec {
name = "gdm-${version}";
version = "3.30.2";
version = "3.30.3";

src = fetchurl {
url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1handy65r1n0zby09jr492b3643wszzigdkxp7q2ypgxb3hyv45y";
sha256 = "15f7lz7z75krgbq8vb800afj96h8mw2fpy1s28za2911x5vgq0ak";
};

# Only needed to make it build
8 changes: 3 additions & 5 deletions pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@
, glib, pipewire, systemd, libvncserver, libsecret, libnotify, gdk_pixbuf, gnome3 }:

stdenv.mkDerivation rec {
name = "gnome-remote-desktop-${version}";
version = "0.1.6";
pname = "gnome-remote-desktop";
version = "0.1.7";

src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "jadahl";
repo = "gnome-remote-desktop";
rev = version;
sha256 = "1d49kxhi1bn8ssh6nybg7d6zajqwc653czbsms2d59dbhj8mn75f";
sha256 = "0gmazc8ww0lyhx9iclhi982bkpjsnflrzv4qfm3q6hcy0il21fsc";
};

nativeBuildInputs = [ meson ninja pkgconfig python3 wrapGAppsHook ];
@@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
];

postPatch = ''
substituteInPlace meson.build --replace pipewire-0.1 pipewire-0.2
chmod +x meson_post_install.py # patchShebangs requires executable file
patchShebangs meson_post_install.py
'';
Loading