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: 9dcc876b37ca
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: 6e982c4c3288
Choose a head ref
  • 7 commits
  • 4 files changed
  • 7 contributors

Commits on Mar 2, 2019

  1. irssi: 1.1.2 -> 1.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/irssi/versions
    @r-ryantm
    r-ryantm committed Mar 2, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    gaborbernat Bernát Gábor
    GPG key ID: EEDA44E02406AF79
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4c34b62 View commit details

Commits on Mar 16, 2019

  1. mg: use build system pkg-config

    @illegalprime
    illegalprime committed Mar 16, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    gaborbernat Bernát Gábor
    GPG key ID: EEDA44E02406AF79
    Verified
    Learn about vigilant mode
    Copy the full SHA
    39e0e07 View commit details

Commits on Mar 20, 2019

  1. shades-of-gray-theme: 1.1.5 -> 1.1.6

    @romildo
    romildo committed Mar 20, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    gaborbernat Bernát Gábor
    GPG key ID: EEDA44E02406AF79
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0dfa84f View commit details

Commits on Mar 21, 2019

  1. Merge pull request #57985 from romildo/upd.shades-of-gray-theme 

    shades-of-gray-theme: 1.1.5 -> 1.1.6
    @worldofpeace
    worldofpeace authored Mar 21, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    427d13b View commit details

  2. atlassian-confluence: 6.14.1 -> 6.14.2 

    CVE-2019-3395, CVE-2019-3396
    @ciil @globin
    ciil authored and globin committed Mar 21, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5b00f65 View commit details

  3. Merge pull request #57814 from illegalprime/fix/mg-cross 

    mg: use build system pkg-config
    @matthewbauer
    matthewbauer authored Mar 21, 2019
    Copy the full SHA
    b59aac0 View commit details

  4. Merge pull request #56708 from r-ryantm/auto-update/irssi 

    irssi: 1.1.2 -> 1.2.0
    @ryantm
    ryantm authored Mar 21, 2019
    Copy the full SHA
    6e982c4 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/editors/mg/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, libbsd, ncurses }:
{ stdenv, fetchurl, pkgconfig, libbsd, ncurses, buildPackages }:

stdenv.mkDerivation rec {
name = "mg-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {

enableParallelBuilding = true;

makeFlags = [ "PKG_CONFIG=${pkgconfig}/bin/pkg-config" ];
makeFlags = [ "PKG_CONFIG=${buildPackages.pkgconfig}/bin/pkg-config" ];

installPhase = ''
install -m 555 -Dt $out/bin mg
4 changes: 2 additions & 2 deletions pkgs/applications/networking/irc/irssi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintl }:

stdenv.mkDerivation rec {
version = "1.1.2";
version = "1.2.0";
name = "irssi-${version}";

src = fetchurl {
url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz";
sha256 = "0jbhd4aad3bn61svnb2rwa4dwj8qyrb2dmzribi2hfn1f719wzfv";
sha256 = "1sp3fc5fkdx0mmllvag94xaifnqbj1k09nl235pix26vv1gzq39m";
};

nativeBuildInputs = [ pkgconfig ];
8 changes: 4 additions & 4 deletions pkgs/data/themes/shades-of-gray/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, gtk_engines, gtk-engine-murrine }:

stdenv.mkDerivation rec {
name = "shades-of-gray-theme-${version}";
version = "1.1.5";
pname = "shades-of-gray-theme";
version = "1.1.6";

src = fetchFromGitHub {
owner = "WernerFP";
repo = "Shades-of-gray-theme";
repo = pname;
rev = version;
sha256 = "1ql8rkbm5l94b842hg53cwf02vbw2785rlrs4cr60d4kn2c0lj2y";
sha256 = "0jp4p0wdmac5dkz1hqhzqmn59zgxqd77gn0napy3wbqr5yc60pp1";
};

buildInputs = [ gtk_engines ];
4 changes: 2 additions & 2 deletions pkgs/servers/atlassian/confluence.nix
View file
Original file line number Diff line number Diff line change
@@ -5,11 +5,11 @@

stdenv.mkDerivation rec {
name = "atlassian-confluence-${version}";
version = "6.14.1";
version = "6.14.2";

src = fetchurl {
url = "https://product-downloads.atlassian.com/software/confluence/downloads/${name}.tar.gz";
sha256 = "1pmxfikkydfi2m0bx1rgaj1ijhwh84zwwxkpw1f0vryvkl7av2gz";
sha256 = "012lh2838l2n7wkj42isxspxw3ix54467vnzvxbsq8wnf2m367ln";
};

buildPhase = ''