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: 02591d02a910
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: 12e255f39596
Choose a head ref
  • 5 commits
  • 3 files changed
  • 3 contributors

Commits on Jul 8, 2020

  1. asymptote: 2.65 -> 2.66

    @r-ryantm
    r-ryantm committed Jul 8, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: FE918C3A98C1030F
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8ffc596 View commit details

  2. dash: 0.5.11 -> 0.5.11.1

    @r-ryantm
    r-ryantm committed Jul 8, 2020
    Copy the full SHA
    0eb7b32 View commit details

Commits on Jul 9, 2020

  1. gnome3.eog: 3.36.2 -> 3.36.3

    @r-ryantm @jtojnar
    r-ryantm authored and jtojnar committed Jul 9, 2020
    Copy the full SHA
    12f0b7f View commit details

  2. Merge pull request #92750 from r-ryantm/auto-update/asymptote 

    asymptote: 2.65 -> 2.66
    @7c6f434c
    7c6f434c authored Jul 9, 2020
    Copy the full SHA
    e57a102 View commit details

  3. Merge pull request #92754 from r-ryantm/auto-update/dash 

    dash: 0.5.11 -> 0.5.11.1
    @danieldk
    danieldk authored Jul 9, 2020
    Copy the full SHA
    12e255f View commit details
Showing with 6 additions and 6 deletions.
  1. +2 −2 pkgs/desktops/gnome-3/core/eog/default.nix
  2. +2 −2 pkgs/shells/dash/default.nix
  3. +2 −2 pkgs/tools/graphics/asymptote/default.nix
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/eog/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@

let
pname = "eog";
version = "3.36.2";
version = "3.36.3";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "135pw7ifr585grz1rbmynyyrmhd8w880pilg7c4nvq58jl16n1aw";
sha256 = "1p1lrnsgk5iyw7h02qzax4s74dqqsh5lk85b0qsj7hwx91qm61xp";
};

nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobject-introspection python3 ];
4 changes: 2 additions & 2 deletions pkgs/shells/dash/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:

stdenv.mkDerivation rec {
name = "dash-0.5.11";
name = "dash-0.5.11.1";

src = fetchurl {
url = "http://gondor.apana.org.au/~herbert/dash/files/${name}.tar.gz";
sha256 = "1jwilfsy249d3q7fagg1ga4bgc2bg1fzw63r2nan0m77bznsdnad";
sha256 = "048n1rbw3v1ffzsw5mkc6zzvvf1csq7pcri7jraaqag38vqq3j3k";
};

hardeningDisable = [ "format" ];
4 changes: 2 additions & 2 deletions pkgs/tools/graphics/asymptote/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,14 +9,14 @@
}:

stdenv.mkDerivation rec {
version = "2.65";
version = "2.66";
pname = "asymptote";

src = fetchFromGitHub {
owner = "vectorgraphics";
repo = pname;
rev = version;
sha256 = "1b40khffrvwm3nd5nx1iybhkc25zs6whrb3wynw7y3i87p3palyz";
sha256 = "0c445j950n6nxgr1zxj7a26daa5d9f3i91506b7r7627s943b1kd";
};

nativeBuildInputs = [