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: d881de1e9641
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: 8b44e6b1eecf
Choose a head ref

Commits on Feb 13, 2020

  1. maintainers: add mothsart

    mothsART committed Feb 13, 2020
    Copy the full SHA
    f1d1cae View commit details

Commits on Feb 24, 2020

  1. drawing: init at 0.4.11

    mothsART committed Feb 24, 2020
    Copy the full SHA
    e3c1092 View commit details

Commits on Mar 1, 2020

  1. Verified

    This commit was signed with the committer’s verified signature.
    lovesegfault Bernardo Meurer
    Copy the full SHA
    33c04ea View commit details

Commits on Mar 2, 2020

  1. travis: 1.8.10 -> 1.8.11

    Moredread committed Mar 2, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Moredread André-Patrick Bubel
    Copy the full SHA
    bfbf3c5 View commit details

Commits on Mar 3, 2020

  1. howard-hinnant-date: allow access to zoneinfo

    This fixes the situtation where, if `/usr/share/zoneinfo` was
    inaccessible/didn't otherwise exist, `howard-hinnant-date` would
    download and drop a `~/Downloads/tzdata` directory containing some
    timezone information from IANA [1]. To avoid this, we make use of the
    `tzdata`'s `zoneinfo`, preventing the dropping of random directories and
    files.
    
    [1] https://data.iana.org/time-zones/releases/tzdata2019c.tar.gz
    cole-h committed Mar 3, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    cole-h Cole Helbling
    Copy the full SHA
    2505796 View commit details
  2. Copy the full SHA
    b46c48c View commit details
  3. Copy the full SHA
    3867188 View commit details
  4. Copy the full SHA
    66bd71c View commit details
  5. hugo: 0.65.3 -> 0.66.0

    Frostman committed Mar 3, 2020
    Copy the full SHA
    7a74970 View commit details

Commits on Mar 4, 2020

  1. act: 0.2.4 -> 0.2.5

    r-ryantm authored and marsam committed Mar 4, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    Copy the full SHA
    5e75ba3 View commit details
  2. Copy the full SHA
    50ad33c View commit details
  3. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    b2f7754 View commit details
  4. Merge pull request #80323 from worldofpeace/gnome-tour

    gnome-tour: init at 0.0.1
    worldofpeace authored Mar 4, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    66c169a View commit details
  5. checkstyle: 8.29 -> 8.30

    r-ryantm committed Mar 4, 2020
    Copy the full SHA
    98bf3a9 View commit details
  6. Copy the full SHA
    f50cedf View commit details
  7. Merge pull request #81650 from Frostman/hugo-0.66.0

    hugo: 0.65.3 -> 0.66.0
    marsam authored Mar 4, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    29150a2 View commit details
  8. Merge pull request #81555 from Moredread/travis

    travis: 1.8.10 -> 1.8.11
    marsam authored Mar 4, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    8198f4e View commit details
  9. Merge pull request #81457 from lovesegfault/zoom-qtdep

    zoom-us: add qtgraphicaleffects dependency
    worldofpeace authored Mar 4, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    75f9212 View commit details
  10. Merge pull request #81615 from AndersonTorres/update-mednafen

    Update mednafen and mednaffe
    AndersonTorres authored Mar 4, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    2e00119 View commit details
  11. Merge pull request #81663 from r-ryantm/auto-update/act

    act: 0.2.4 -> 0.2.5
    marsam authored Mar 4, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    5acc635 View commit details
  12. Merge pull request #81594 from cole-h/hhdate-use-sys-tzdb

    howard-hinnant-date: allow access to zoneinfo
    worldofpeace authored Mar 4, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    d86a414 View commit details
  13. flow: 0.119.0 -> 0.119.1

    r-ryantm committed Mar 4, 2020
    Copy the full SHA
    2cb7cd6 View commit details
  14. fluent-bit: 1.3.8 -> 1.3.9

    r-ryantm committed Mar 4, 2020
    Copy the full SHA
    fb2f9d8 View commit details
  15. Merge pull request #81674 from r-ryantm/auto-update/cmake-format

    cmake-format: 0.6.8 -> 0.6.9
    marsam authored Mar 4, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    9a97f6a View commit details
  16. Merge pull request #81673 from r-ryantm/auto-update/checkstyle

    checkstyle: 8.29 -> 8.30
    marsam authored Mar 4, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    167bec9 View commit details
  17. Merge pull request #81682 from r-ryantm/auto-update/flow

    flow: 0.119.0 -> 0.119.1
    marsam authored Mar 4, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    1fcc960 View commit details
  18. Merge pull request #81683 from r-ryantm/auto-update/fluent-bit

    fluent-bit: 1.3.8 -> 1.3.9
    marsam authored Mar 4, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    8b44e6b View commit details
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
@@ -4949,6 +4949,12 @@
githubId = 118035;
name = "Corbin Simpson";
};
mothsart = {
email = "jerem.ferry@gmail.com";
github = "mothsart";
githubId = 10601196;
name = "Jérémie Ferry";
};
mounium = {
email = "muoniurn@gmail.com";
github = "mounium";
69 changes: 69 additions & 0 deletions pkgs/applications/graphics/drawing/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
{ lib
, fetchFromGitHub
, meson
, ninja
, pkgconfig
, python3
, gtk3
, appstream-glib
, desktop-file-utils
, gobject-introspection
, wrapGAppsHook
, glib
, gdk-pixbuf
, pango
, gettext
}:

python3.pkgs.buildPythonApplication rec {
pname = "drawing";
version = "0.4.11";

format = "other";

src = fetchFromGitHub {
owner = "maoschanz";
repo = pname;
rev = version;
sha256 = "00c1h6jns11rmsg35gy40fb6ahvik80wpbm2133bjcqxfwwnlal6";
};

nativeBuildInputs = [
appstream-glib
desktop-file-utils
gobject-introspection
meson
ninja
pkgconfig
wrapGAppsHook
glib
gettext
];

buildInputs = [
glib
gtk3
gdk-pixbuf
pango
];

propagatedBuildInputs = with python3.pkgs; [
pycairo
pygobject3
];

postPatch = ''
chmod +x build-aux/meson/postinstall.py # patchShebangs requires executable file
patchShebangs build-aux/meson/postinstall.py
'';

strictDeps = false;

meta = with lib; {
description = "A free basic image editor, similar to Microsoft Paint, but aiming at the GNOME desktop";
homepage = "https://maoschanz.github.io/drawing/";
maintainers = with maintainers; [ mothsart ];
license = licenses.gpl3Plus;
platforms = platforms.linux;
};
}
4 changes: 2 additions & 2 deletions pkgs/applications/misc/hugo/default.nix
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

buildGoModule rec {
pname = "hugo";
version = "0.65.3";
version = "0.66.0";

goPackagePath = "github.com/gohugoio/hugo";

src = fetchFromGitHub {
owner = "gohugoio";
repo = pname;
rev = "v${version}";
sha256 = "1m0xhzm1w6y778x3fplzr9dif7lcqlkfvk4b7plywrisv3ic8yqs";
sha256 = "177vqxzmldpkpaj7giqlbl39091fa2ga2pnshdj6gc393rw52f0a";
};

modSha256 = "1f320zbqnv2ybsp3qmlgn3rsjgp2zdb24qjd3gcys30mw48cx3na";
Original file line number Diff line number Diff line change
@@ -2,8 +2,9 @@
, fetchFromGitHub
# Dynamic libraries
, dbus, glib, libGL, libX11, libXfixes, libuuid, libxcb, qtbase, qtdeclarative
, qtimageformats, qtlocation, qtquickcontrols, qtquickcontrols2, qtscript, qtsvg
, qttools, qtwayland, qtwebchannel, qtwebengine
, qtgraphicaleffects, qtimageformats, qtlocation, qtquickcontrols
, qtquickcontrols2, qtscript, qtsvg , qttools, qtwayland, qtwebchannel
, qtwebengine
# Runtime
, coreutils, libjpeg_turbo, pciutils, procps, utillinux
, pulseaudioSupport ? true, libpulseaudio ? null
@@ -39,9 +40,9 @@ in mkDerivation {
nativeBuildInputs = [ autoPatchelfHook ];

buildInputs = [
dbus glib libGL libX11 libXfixes libuuid libxcb libjpeg_turbo
qtbase qtdeclarative qtlocation qtquickcontrols qtquickcontrols2 qtscript
qtwebchannel qtwebengine qtimageformats qtsvg qttools qtwayland
dbus glib libGL libX11 libXfixes libuuid libxcb libjpeg_turbo qtbase
qtdeclarative qtgraphicaleffects qtlocation qtquickcontrols qtquickcontrols2
qtscript qtwebchannel qtwebengine qtimageformats qtsvg qttools qtwayland
];

runtimeDependencies = optional pulseaudioSupport libpulseaudio;
81 changes: 81 additions & 0 deletions pkgs/desktops/gnome-3/core/gnome-tour/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
{ stdenv
, rustPlatform
, gettext
, meson
, ninja
, fetchFromGitLab
, pkg-config
, gtk3
, glib
, gdk-pixbuf
, desktop-file-utils
, appstream-glib
, wrapGAppsHook
, python3
, gnome3
, config
}:

rustPlatform.buildRustPackage rec {
pname = "gnome-tour";
version = "0.0.1";

# We don't use the uploaded tar.xz because it comes pre-vendored
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "gnome-tour";
rev = version;
sha256 = "0lbkspnlziq3z177071w3jpghmdwflzra1krdwchzmkfmrhy50ch";
};

cargoSha256 = "0k1wp9wswr57fv2d9bysxn97fchd4vz29n5r8gfyp0gcm8rclmij";

mesonFlags = [
"-Ddistro_name=NixOS"
"-Ddistro_icon_name=nix-snowflake"
"-Ddistro_version=20.09"
];

nativeBuildInputs = [
appstream-glib
desktop-file-utils
gettext
meson
ninja
pkg-config
python3
wrapGAppsHook
];

buildInputs = [
gdk-pixbuf
glib
gtk3
];

# Don't use buildRustPackage phases, only use it for rust deps setup
configurePhase = null;
buildPhase = null;
checkPhase = null;
installPhase = null;

postPatch = ''
chmod +x build-aux/meson_post_install.py
patchShebangs build-aux/meson_post_install.py
'';

# passthru = {
# updateScript = gnome3.updateScript {
# packageName = pname;
# };
# };

meta = with stdenv.lib; {
homepage = "https://gitlab.gnome.org/GNOME/gnome-tour";
description = "GNOME Greeter & Tour";
maintainers = gnome3.maintainers;
license = licenses.gpl3Plus;
platforms = platforms.linux;
};
}
10 changes: 9 additions & 1 deletion pkgs/development/libraries/howard-hinnant-date/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, curl, fetchpatch }:
{ stdenv, fetchFromGitHub, cmake, curl, tzdata, fetchpatch, substituteAll }:

stdenv.mkDerivation rec {
pname = "howard-hinnant-date-unstable";
@@ -16,6 +16,13 @@ stdenv.mkDerivation rec {
url = "https://github.com/HowardHinnant/date/commit/e56b2dce7e89a92e1b9b35caa13b3e938c4cedea.patch";
sha256 = "0m3qbhq7kmm9qa3jm6d2px7c1dxdj5k9lffgdvqnrwmhxwj1p9n2";
})
# Without this patch, this library will drop a `tzdata` directory into
# `~/Downloads` if it cannot find `/usr/share/zoneinfo`. Make the path it
# searches for `zoneinfo` be the one from the `tzdata` package.
(substituteAll {
src = ./make-zoneinfo-available.diff;
inherit tzdata;
})
];

nativeBuildInputs = [ cmake ];
@@ -24,6 +31,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DBUILD_TZ_LIB=true"
"-DBUILD_SHARED_LIBS=true"
"-DUSE_SYSTEM_TZ_DB=true"
];

outputs = [ "out" "dev" ];
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/src/tz.cpp b/src/tz.cpp
index 68436c3..2bfe19e 100644
--- a/src/tz.cpp
+++ b/src/tz.cpp
@@ -349,7 +349,7 @@ discover_tz_dir()
struct stat sb;
using namespace std;
# ifndef __APPLE__
- CONSTDATA auto tz_dir_default = "/usr/share/zoneinfo";
+ CONSTDATA auto tz_dir_default = "@tzdata@/share/zoneinfo";
CONSTDATA auto tz_dir_buildroot = "/usr/share/zoneinfo/uclibc";

// Check special path which is valid for buildroot with uclibc builds
6 changes: 3 additions & 3 deletions pkgs/development/tools/analysis/checkstyle/default.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, jre }:

stdenv.mkDerivation rec {
version = "8.29";
version = "8.30";
pname = "checkstyle";

src = fetchurl {
url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
sha256 = "1rbipf4031inv34ci0rczz7dipi3b12cpn45h949i095gdh37pgh";
sha256 = "1wsgpfdqasfz6chhy0w5pdjm4by6ih2g0l44lxwks9kik2lrs4av";
};

nativeBuildInputs = [ makeWrapper ];
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
adheres to a coding standard. By default it supports the Sun Code
Conventions, but is highly configurable.
'';
homepage = http://checkstyle.sourceforge.net/;
homepage = "http://checkstyle.sourceforge.net/";
license = licenses.lgpl21;
maintainers = with maintainers; [ pSub ];
platforms = jre.meta.platforms;
6 changes: 3 additions & 3 deletions pkgs/development/tools/analysis/flow/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "flow";
version = "0.119.0";
version = "0.119.1";

src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "refs/tags/v${version}";
sha256 = "0myvhdanhwljqa3irmkkdchd81416xnh9w0mgdajyh4az4safc1k";
sha256 = "1p3kjdm4lsbc2lzab3kj1fjvccv8p47bj4s3jnfp2n7qppy7sbbf";
};

installPhase = ''
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {

meta = with stdenv.lib; {
description = "A static type checker for JavaScript";
homepage = https://flow.org/;
homepage = "https://flow.org/";
changelog = "https://github.com/facebook/flow/releases/tag/v${version}";
license = licenses.mit;
platforms = ocamlPackages.ocaml.meta.platforms;
4 changes: 2 additions & 2 deletions pkgs/development/tools/cmake-format/default.nix
Original file line number Diff line number Diff line change
@@ -10,12 +10,12 @@

buildPythonApplication rec {
pname = "cmake-format";
version = "0.6.8";
version = "0.6.9";

src = fetchPypi {
inherit version;
pname = "cmake_format";
sha256 = "0zpx7g5j8wv52zj0s7bk7cj5v82icn4il0jfydc1cmg4p5krf5iy";
sha256 = "082d7949gsk5v72ap7k4p3vgmc126a0bfm195xpi4lb6khpbzy5j";
};

propagatedBuildInputs = [ autopep8 flake8 jinja2 pylint pyyaml ];
8 changes: 5 additions & 3 deletions pkgs/development/tools/misc/act/default.nix
Original file line number Diff line number Diff line change
@@ -2,20 +2,22 @@

buildGoModule rec {
pname = "act";
version = "0.2.4";
version = "0.2.5";

src = fetchFromGitHub {
owner = "nektos";
repo = pname;
rev = "v${version}";
sha256 = "1sn36686nfmqvhmippdapk0pxqx3x1q4dwdyhjr8j8scyfrk68iv";
sha256 = "00clafq3izvfwxkb85hf6s40yfw2hpsfz3xg4da28pgh1wlqb9ps";
};

modSha256 = "0ghp61m8fxg1iwq2ypmp99cqv3n16c06v2xzg9v34299vmd89gi2";

buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];

meta = with lib; {
description = "Run your GitHub Actions locally";
homepage = "https://circleci.com/";
homepage = "https://github.com/nektos/act";
license = licenses.mit;
maintainers = with maintainers; [ filalex77 ];
};
14 changes: 7 additions & 7 deletions pkgs/development/tools/misc/travis/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@ GEM
remote: https://rubygems.org/
specs:
addressable (2.4.0)
backports (3.15.0)
backports (3.16.1)
coderay (1.1.2)
ethon (0.12.0)
ffi (>= 1.3.0)
faraday (0.17.0)
faraday (0.17.3)
multipart-post (>= 1.2, < 3)
faraday_middleware (0.13.1)
faraday_middleware (0.14.0)
faraday (>= 0.7.4, < 1.0)
ffi (1.11.2)
ffi (1.12.2)
gh (0.15.1)
addressable (~> 2.4.0)
backports
@@ -19,7 +19,7 @@ GEM
net-http-persistent (~> 2.9)
net-http-pipeline
highline (1.7.10)
json (2.2.0)
json (2.3.0)
launchy (2.4.3)
addressable (~> 2.3)
method_source (0.9.2)
@@ -33,7 +33,7 @@ GEM
pusher-client (0.6.2)
json
websocket (~> 1.0)
travis (1.8.10)
travis (1.8.11)
backports
faraday (~> 0.9)
faraday_middleware (~> 0.9, >= 0.9.1)
@@ -54,4 +54,4 @@ DEPENDENCIES
travis

BUNDLED WITH
1.17.2
1.17.3
Loading