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: fd81a2ecb6b8
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: 315a47d24910
Choose a head ref

Commits on Jul 21, 2018

  1. poppler_utils: 0.66.0 -> 0.67.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/poppler-utils/versions.
    R. RyanTM committed Jul 21, 2018
    Copy the full SHA
    7d01650 View commit details
  2. xfce4-13.xfce4-battery-plugin: init at 1.1.0

    volth committed Jul 21, 2018
    Copy the full SHA
    b07de4c View commit details
  3. Copy the full SHA
    e87a1a5 View commit details

Commits on Jul 26, 2018

  1. kicad: 4.0.7 -> 5.0.0

    bgamari committed Jul 26, 2018
    Copy the full SHA
    a4c932f View commit details

Commits on Jul 30, 2018

  1. Copy the full SHA
    906d376 View commit details

Commits on Jul 31, 2018

  1. browsh: init at 1.4.10

    closes #43283
    kalbasit committed Jul 31, 2018
    Copy the full SHA
    446b72e View commit details
  2. stumpish: init at 0.0.1

    Rommel MARTINEZ committed Jul 31, 2018
    Copy the full SHA
    a2fafda View commit details
  3. pulseeffects: 4.1.7 → 4.2.3

    jtojnar committed Jul 31, 2018
    Copy the full SHA
    504c40f View commit details
  4. amtk: 4.99.1 → 5.0.0

    jtojnar committed Jul 31, 2018
    Copy the full SHA
    c7c4e6c View commit details
  5. Copy the full SHA
    e0d8c80 View commit details
  6. tepl: 4.1.1 → 4.2.0

    jtojnar committed Jul 31, 2018
    Copy the full SHA
    d152d6d View commit details
  7. Copy the full SHA
    8fe7dd5 View commit details
  8. Merge pull request #43915 from r-ryantm/auto-update/poppler-utils

    poppler_utils: 0.66.0 -> 0.67.0
    xeji authored Jul 31, 2018
    Copy the full SHA
    d68430d View commit details
  9. makemkv: 1.12.2 -> 1.12.3 (#44252)

    Daniël de Kok authored and xeji committed Jul 31, 2018
    Copy the full SHA
    8b33abd View commit details
  10. ponyc: 0.24.2 -> 0.24.4 (#44258)

    kamilchm authored and xeji committed Jul 31, 2018
    Copy the full SHA
    ffae2f8 View commit details
  11. Copy the full SHA
    30f4073 View commit details
  12. Copy the full SHA
    135c085 View commit details
  13. Merge pull request #44251 from kalbasit/add-browsh

    browsh: init at 1.4.10
    Mic92 authored Jul 31, 2018
    Copy the full SHA
    94cbb8e View commit details
  14. Merge pull request #44016 from ebzzry/master

    stumpish: init at 0.0.1
    jtojnar authored Jul 31, 2018
    Copy the full SHA
    a81f73d View commit details
  15. Copy the full SHA
    632d3b5 View commit details
  16. Copy the full SHA
    a1f03c0 View commit details
  17. Copy the full SHA
    eed74d1 View commit details
  18. Copy the full SHA
    339f789 View commit details
  19. maintainers: add @borisbabic

    borisbabic committed Jul 31, 2018
    Copy the full SHA
    37bfdc1 View commit details
  20. Copy the full SHA
    2ea26fb View commit details
  21. gitAndTools.pre-commit: init at 1.10.4

    borisbabic authored and Robert Schütz committed Jul 31, 2018
    Copy the full SHA
    585b0ac View commit details
  22. Merge pull request #44239 from borisbabic/feature/init-pre-commit

    gitAndTools.pre-commit: init at 1.10.4
    dotlambda authored Jul 31, 2018
    Copy the full SHA
    e858b28 View commit details
  23. kicad: properly wrap wxPython

    Mic92 committed Jul 31, 2018
    Copy the full SHA
    611f0ed View commit details
  24. Copy the full SHA
    71b579f View commit details
  25. Merge pull request #44122 from bgamari/kicad-0.5

    kicad: 4.0.7 -> 5.0.0
    Mic92 authored Jul 31, 2018
    Copy the full SHA
    9cff865 View commit details
  26. Copy the full SHA
    0f3eaa0 View commit details
  27. Merge pull request #43927 from volth/xfce4-battery-plugin-1.1.0

    xfce4-13.xfce4-battery-plugin: init at 1.1.0
    xeji authored Jul 31, 2018
    Copy the full SHA
    315a47d View commit details
Showing with 760 additions and 103 deletions.
  1. +5 −0 maintainers/maintainer-list.nix
  2. +6 −2 pkgs/applications/audio/pulseeffects/default.nix
  3. +2 −2 pkgs/applications/editors/gnome-latex/default.nix
  4. +60 −0 pkgs/applications/networking/browsers/browsh/default.nix
  5. +272 −0 pkgs/applications/networking/browsers/browsh/deps.nix
  6. +54 −53 pkgs/applications/science/electronics/kicad/default.nix
  7. +2 −0 pkgs/applications/version-management/git-and-tools/default.nix
  8. +31 −0 pkgs/applications/version-management/git-and-tools/pre-commit/default.nix
  9. +3 −3 pkgs/applications/video/makemkv/default.nix
  10. +44 −0 pkgs/applications/window-managers/stumpish/default.nix
  11. +87 −0 pkgs/applications/window-managers/stumpish/paths.patch
  12. +13 −6 pkgs/desktops/gnome-3/devtools/devhelp/default.nix
  13. +2 −0 pkgs/desktops/xfce4-13/default.nix
  14. +4 −4 pkgs/desktops/xfce4-13/mkXfceDerivation.nix
  15. +11 −0 pkgs/desktops/xfce4-13/xfce4-battery-plugin/default.nix
  16. +7 −7 pkgs/development/compilers/crystal/default.nix
  17. +1 −1 pkgs/development/compilers/mint/crystal2nix.cr
  18. +3 −3 pkgs/development/compilers/mint/default.nix
  19. +18 −6 pkgs/development/compilers/mint/shards.nix
  20. +2 −2 pkgs/development/compilers/ponyc/default.nix
  21. +2 −2 pkgs/development/interpreters/clojure/default.nix
  22. +2 −2 pkgs/development/libraries/amtk/default.nix
  23. +3 −8 pkgs/development/libraries/poppler/default.nix
  24. +2 −2 pkgs/development/libraries/tepl/default.nix
  25. +22 −0 pkgs/development/python-modules/aspy.yaml/default.nix
  26. +22 −0 pkgs/development/python-modules/cfgv/default.nix
  27. +20 −0 pkgs/development/python-modules/identify/default.nix
  28. +20 −0 pkgs/development/python-modules/nodeenv/default.nix
  29. +26 −0 pkgs/tools/networking/p2p/bittornado/default.nix
  30. +6 −0 pkgs/top-level/all-packages.nix
  31. +8 −0 pkgs/top-level/python-packages.nix
5 changes: 5 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
@@ -539,6 +539,11 @@
github = "boothead";
name = "Ben Ford";
};
borisbabic = {
email = "boris.ivan.babic@gmail.com";
github = "borisbabic";
name = "Boris Babić";
};
bosu = {
email = "boriss@gmail.com";
github = "bosu";
8 changes: 6 additions & 2 deletions pkgs/applications/audio/pulseeffects/default.nix
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@
, meson
, ninja
, pkgconfig
, itstool
, libxml2
, desktop-file-utils
, wrapGAppsHook
@@ -20,6 +21,7 @@
, libbs2b
, libsamplerate
, libsndfile
, libebur128
, boost
, fftwFloat
, calf
@@ -40,20 +42,21 @@ let
];
in stdenv.mkDerivation rec {
name = "pulseeffects-${version}";
version = "4.1.7";
version = "4.2.3";

src = fetchFromGitHub {
owner = "wwmm";
repo = "pulseeffects";
rev = "v${version}";
sha256 = "13yj1958jsz76zxi3ag133i4337cicvm5b58l22g2xvbqa5vraq9";
sha256 = "0s3lc0xkr48wzk0b6akq4yw19n0iwfi9jyji8bpdgj5y7kjg5mqm";
};

nativeBuildInputs = [
meson
ninja
pkgconfig
libxml2
itstool
desktop-file-utils
wrapGAppsHook
];
@@ -70,6 +73,7 @@ in stdenv.mkDerivation rec {
gst_all_1.gst-plugins-bad
lilv lv2 serd sord sratom
libbs2b
libebur128
libsamplerate
libsndfile
boost
4 changes: 2 additions & 2 deletions pkgs/applications/editors/gnome-latex/default.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, wrapGAppsHook
, tepl, amtk, gnome3, glib, pkgconfig, intltool, itstool, libxml2 }:
let
version = "3.28.1";
version = "3.30.1";
pname = "gnome-latex";
in stdenv.mkDerivation {
name = "${pname}-${version}";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1z481izrx057wraphnr82kxnpmmi8nvl7jswyylzm22kfs0mw402";
sha256 = "0yvkp311ikmiypzj2q6ypvyw5migxiqp8lwhyl3qq6mk6p0x66w8";
};

NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
60 changes: 60 additions & 0 deletions pkgs/applications/networking/browsers/browsh/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
{ stdenv, buildGoPackage, fetchurl, fetchFromGitHub, go-bindata }:

let
version = "1.4.10";

# TODO: must build the extension instead of downloading it. But since it's
# literally an asset that is indifferent regardless of the platform, this
# might be just enough.
webext = fetchurl {
url = "https://github.com/browsh-org/browsh/releases/download/v${version}/browsh-${version}-an.fx.xpi";
sha256 = "0rgwzv1qahqy52q7zz4dklnwx7w4x3gj92ka8n0ypgf9fjjnmqas";
};

in buildGoPackage rec {
inherit version;

name = "browsh-${version}";

goPackagePath = "browsh";

src = fetchFromGitHub {
owner = "browsh-org";
repo = "browsh";
rev = "v${version}";
sha256 = "0lvb20zziknlbgy509ccpvlc21sqjc53xar26blmb6sdl6yqkj0w";
};

buildInputs = [ go-bindata ];

# embed the web extension in a go file and place it where it's supposed to
# be. See
# https://github.com/browsh-org/browsh/blob/9abc3aaa3f575ca6ec9a483408d9fdfcf76300fa/interfacer/contrib/xpi2bin.sh
preBuild = ''
xpiprefix="$(mktemp -d)"
cp "${webext}" "$xpiprefix/browsh.xpi"
go-bindata \
-prefix "$xpiprefix" \
-pkg browsh \
-o "$NIX_BUILD_TOP/go/src/${goPackagePath}/interfacer/src/browsh/webextension.go" \
"$xpiprefix/browsh.xpi"
sed \
-e 's:Asset("/browsh.xpi"):Asset("browsh.xpi"):g' \
-i "$NIX_BUILD_TOP/go/src/${goPackagePath}/interfacer/src/browsh/firefox.go"
'';

postBuild = ''
mv "$NIX_BUILD_TOP/go/bin/src" "$NIX_BUILD_TOP/go/bin/browsh"
'';

goDeps = ./deps.nix;

meta = with stdenv.lib; {
description = "A fully-modern text-based browser, rendering to TTY and browsers";
homepage = https://www.brow.sh/;
maintainers = [ maintainers.kalbasit ];
license = stdenv.lib.licenses.lgpl21;
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
};
}
Loading