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: 3d085a399c43
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: 4eba7020b9ec
Choose a head ref
Loading
4 changes: 2 additions & 2 deletions pkgs/applications/networking/nextcloud-client/default.nix
Original file line number Diff line number Diff line change
@@ -17,13 +17,13 @@

mkDerivation rec {
pname = "nextcloud-client";
version = "2.6.1";
version = "2.6.2";

src = fetchFromGitHub {
owner = "nextcloud";
repo = "desktop";
rev = "v${version}";
sha256 = "18318j488pxksf4zc6zag8pdpyaks55yivn91nx3x458ax6albkz";
sha256 = "1adicl0msjwbvvi0nxqb1zmka51nn2b88plsynrap5fm0xp40j39";
};

patches = [
4 changes: 2 additions & 2 deletions pkgs/applications/video/mpv/default.nix
Original file line number Diff line number Diff line change
@@ -105,13 +105,13 @@ let

in stdenv.mkDerivation rec {
pname = "mpv";
version = "0.31.0";
version = "0.32.0";

src = fetchFromGitHub {
owner = "mpv-player";
repo = "mpv";
rev = "v${version}";
sha256 = "138m09l4wi6ifbi15z76j578plmxkclhlzfryasfcdp8hswhs59r";
sha256 = "0kmy1q0hp87vq4rpv7py04x8bpg1wmlzaibavmkf713jqp6qy596";
};

postPatch = ''
9 changes: 8 additions & 1 deletion pkgs/data/icons/bibata-cursors/default.nix
Original file line number Diff line number Diff line change
@@ -16,6 +16,11 @@ in stdenvNoCC.mkDerivation rec {
postPatch = ''
patchShebangs .
substituteInPlace build.sh --replace "sudo" ""
# Don't generate windows cursors,
# they aren't used and aren't installed
# by the project's install script anyway.
echo "exit 0" > w32-make.sh
'';

nativeBuildInputs = [
@@ -31,7 +36,9 @@ in stdenvNoCC.mkDerivation rec {

installPhase = ''
install -dm 0755 $out/share/icons
cp -pr Bibata_* $out/share/icons/
for x in Bibata_*; do
cp -pr $x/out/X11/$x $out/share/icons/
done
'';

meta = with stdenvNoCC.lib; {
26 changes: 18 additions & 8 deletions pkgs/data/icons/bibata-cursors/extra.nix
Original file line number Diff line number Diff line change
@@ -1,25 +1,33 @@
{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen }:
{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen, python3 }:

stdenvNoCC.mkDerivation rec {
let
py = python3.withPackages(ps: [ ps.pillow ]);
in stdenvNoCC.mkDerivation rec {
pname = "bibata-extra-cursors";
version = "unstable-2018-10-28";
version = "0.3";

src = fetchFromGitHub {
owner = "KaizIqbal";
repo = "Bibata_Extra_Cursor";
rev = "66fb64b8dbe830e3f7ba2c2bdc4dacae7c438789";
sha256 = "1xb7v06sbxbwzd7cnghv9c55lpbbkcaf1nswdrqy87gd0bnpdd2n";
rev = "v${version}";
sha256 = "1bh945hvakbh985jkr6g6x0myw3k49pvn24m1clvqdv35v65nfxk";
};

postPatch = ''
patchShebangs .
substituteInPlace build.sh --replace "gksu " ""
substituteInPlace build.sh --replace "sudo" ""
# Don't generate windows cursors,
# they aren't used and aren't installed
# by the project's install script anyway.
echo "exit 0" > w32-make.sh
'';

nativeBuildInputs = [
gnome-themes-extra
inkscape
xcursorgen
py
];

buildPhase = ''
@@ -28,7 +36,9 @@ stdenvNoCC.mkDerivation rec {

installPhase = ''
install -dm 0755 $out/share/icons
cp -pr Bibata_* $out/share/icons/
for x in Bibata_*; do
cp -pr $x/out/X11/$x $out/share/icons/
done
'';

meta = with stdenvNoCC.lib; {
4 changes: 2 additions & 2 deletions pkgs/development/compilers/iasl/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "iasl";
version = "20191213";
version = "20200110";

src = fetchurl {
url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
sha256 = "1ip684is3dplf7snkn024vv6bg3dv5msx8v7pz6x9lrnk3gk0j9h";
sha256 = "1cb6aa6acrixmdzvj9vv4qs9lmlsbkd27pjlz14i1kq1x3xn0gwx";
};

NIX_CFLAGS_COMPILE = "-O3";
40 changes: 28 additions & 12 deletions pkgs/development/libraries/libfprint/default.nix
Original file line number Diff line number Diff line change
@@ -1,27 +1,41 @@
{ stdenv
{ thinkpad ? false
, stdenv
, fetchFromGitHub
, fetchurl
, pkgconfig
, meson
, ninja
, gusb
, libusb
, pixman
, glib
, nss
, gobject-introspection
, gtk3
, coreutils
, gtk-doc
, docbook_xsl
, docbook_xml_dtd_43
, openssl ? null
}:

assert thinkpad -> openssl != null;

stdenv.mkDerivation rec {
pname = "libfprint";
version = "1.90";
pname = "libfprint" + stdenv.lib.optionalString thinkpad "-thinkpad";
version = "1.0";

src = fetchurl {
url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/1bba17b5daa130aa548bc7ea96dc58c4/libfprint-1.90.0.tar.xz";
sha256 = "930f530df369ff874d7971f0b7c7bdb7c81597e91af4668694b98fe30b4b3371";
};
src = {
libfprint-thinkpad =
fetchFromGitHub {
owner = "3v1n0";
repo = "libfprint";
rev = "2e2e3821717e9042e93a995bdbd3d00f2df0be9c";
sha256 = "1vps1wrp7hskf13f7jrv0dwry2fcid76x2w463wplngp63cj7b3b";
};
libfprint = fetchurl {
url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/aff93e9921d1cff53d7c070944952ff9/libfprint-${version}.tar.xz";
sha256 = "0v84pd12v016m8iimhq39fgzamlarqccsr7d98cvrrwrzrgcixrd";
};
}.${pname};

nativeBuildInputs = [
pkgconfig
@@ -30,15 +44,17 @@ stdenv.mkDerivation rec {
gtk-doc
docbook_xsl
docbook_xml_dtd_43
gobject-introspection
];

buildInputs = [
gusb
libusb
pixman
glib
nss
];
gtk3
]
++ stdenv.lib.optional thinkpad openssl
;

mesonFlags = [
"-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d"
26 changes: 20 additions & 6 deletions pkgs/development/libraries/libsecret/default.nix
Original file line number Diff line number Diff line change
@@ -1,23 +1,35 @@
{ stdenv, fetchurl, glib, pkgconfig, gettext, libxslt, python3, docbook_xsl, docbook_xml_dtd_42
, libgcrypt, gobject-introspection, vala, gtk-doc, gnome3, gjs, libintl, dbus, xvfb_run }:
{ stdenv, fetchurl, fetchpatch, glib, pkgconfig, gettext, libxslt, python3
, docbook_xsl, docbook_xml_dtd_42 , libgcrypt, gobject-introspection, vala
, gtk-doc, gnome3, gjs, libintl, dbus, xvfb_run }:

stdenv.mkDerivation rec {
pname = "libsecret";
version = "0.19.1";
version = "0.20.0";

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

patches = [
(fetchpatch {
name = "rename-internal-functions-to-avoid-conflicts-and-fix-build.patch";
url = "https://gitlab.gnome.org/GNOME/libsecret/commit/cf21ad50b62f7c8e4b22ef374f0a73290a99bdb8.patch";
sha256 = "1n9nyzq5qrvw7s6sj5gzj33ia3rrx719jpys1cfhfbayg2sxyd4n";
})
];

postPatch = ''
patchShebangs .
'';

outputs = [ "out" "dev" "devdoc" ];

propagatedBuildInputs = [ glib ];
nativeBuildInputs = [ pkgconfig gettext libxslt docbook_xsl docbook_xml_dtd_42 libintl gobject-introspection vala gtk-doc ];
nativeBuildInputs = [
pkgconfig gettext libxslt docbook_xsl docbook_xml_dtd_42 libintl
gobject-introspection vala gtk-doc
];
buildInputs = [ libgcrypt ];
# optional: build docs with gtk-doc? (probably needs a flag as well)

@@ -27,7 +39,9 @@ stdenv.mkDerivation rec {

enableParallelBuilding = true;

installCheckInputs = [ python3 python3.pkgs.dbus-python python3.pkgs.pygobject3 xvfb_run dbus gjs ];
installCheckInputs = [
python3 python3.pkgs.dbus-python python3.pkgs.pygobject3 xvfb_run dbus gjs
];

# needs to run after install because typelibs point to absolute paths
doInstallCheck = false; # Failed to load shared library '/force/shared/libmock_service.so.0' referenced by the typelib
4 changes: 2 additions & 2 deletions pkgs/development/libraries/science/math/brial/default.nix
Original file line number Diff line number Diff line change
@@ -8,14 +8,14 @@
}:

stdenv.mkDerivation rec {
version = "1.2.6";
version = "1.2.7";
pname = "brial";

src = fetchFromGitHub {
owner = "BRiAl";
repo = "BRiAl";
rev = version;
sha256 = "1mc1zjr3mxcx6bg0js5k9jx65japg7644b0aj1al75m4nwh2ygab";
sha256 = "1s0wmbb42sq6a5kxgzsz5srphclmfa4cvxdx2h9kzp0da2zcp3cm";
};

# FIXME package boost-test and enable checks
4 changes: 2 additions & 2 deletions pkgs/development/tools/analysis/tfsec/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

buildGoPackage rec {
pname = "tfsec";
version = "0.13.0";
version = "0.19.0";

src = fetchFromGitHub {
owner = "liamg";
repo = pname;
rev = "v${version}";
sha256 = "1nv7wdchbgf3y265kghhy8rbyvbs03ys5gv9622v0f2kswscy9xl";
sha256 = "1ddyvkv0949p0b6m1rwai5r87mca5xwyjwsjq7gbyqz9h10bv7nf";
};

goPackagePath = "github.com/liamg/tfsec";
5 changes: 3 additions & 2 deletions pkgs/development/tools/buildpack/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

buildGoPackage rec {
pname = "pack";
version = "0.6.0";
version = "0.7.0";

src = fetchFromGitHub {
owner = "buildpacks";
repo = pname;
rev = "v${version}";
sha256 = "00v4kb9cv6nn7vrybjkv0kgcvfm5dsg0168dv253mrp9xmv8kd9l";
sha256 = "0glfxrw3x35m4nmhr9xwlc14y5g9zni85rcrcn3dvkvgh4m6ipaj";
};

goPackagePath = "github.com/buildpacks/pack";
@@ -19,6 +19,7 @@ buildGoPackage rec {

meta = with lib; {
homepage = "https://buildpacks.io/";
changelog = "https://github.com/buildpacks/pack/releases/tag/v${version}";
description = "Local CLI for building apps using Cloud Native Buildpacks";
license = licenses.asl20;
maintainers = [ maintainers.marsam ];
10 changes: 5 additions & 5 deletions pkgs/development/tools/cargo-flamegraph/default.nix
Original file line number Diff line number Diff line change
@@ -4,16 +4,16 @@

rustPlatform.buildRustPackage rec {
pname = "cargo-flamegraph";
version = "0.1.13";
version = "0.2.0";

src = fetchFromGitHub {
owner = "ferrous-systems";
owner = "flamegraph-rs";
repo = "flamegraph";
rev = version;
sha256 = "1s0jnj78fqz5hlgq656rr2s9ykmia51b89iffadiw6c2aw4fhv1a";
rev = "v${version}";
sha256 = "1avjq36wnm0gd5zkkv1c8hj8j51ah1prlifadjhpaf788rsng9w1";
};

cargoSha256 = "0kmw2n4j5bisac0bv3npbwfz2z00ncd6w8ichwaz5hac5mi1a72f";
cargoSha256 = "1kmxpzgv24hf66gzyapxy48gzwqi0p0jvzv829sfdlp00qgj1kp4";

nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];
buildInputs = lib.optionals stdenv.isDarwin [
5 changes: 3 additions & 2 deletions pkgs/development/tools/pgformatter/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

perlPackages.buildPerlPackage rec {
pname = "pgformatter";
version = "4.1";
version = "4.2";

src = fetchFromGitHub {
owner = "darold";
repo = "pgFormatter";
rev = "v${version}";
sha256 = "1xp26p70zn7mh4qg4w74a690ww43b1csgl92ak9fg8kidgwcbprd";
sha256 = "1fqhbs7q3nxda7acbcx8dyjh99d0mv485dpmiczxia7cy1xqi63g";
};

outputs = [ "out" ];
@@ -34,6 +34,7 @@ perlPackages.buildPerlPackage rec {
meta = with stdenv.lib; {
description = "A PostgreSQL SQL syntax beautifier that can work as a console program or as a CGI";
homepage = "https://github.com/darold/pgFormatter";
changelog = "https://github.com/darold/pgFormatter/releases/tag/v${version}";
maintainers = [ maintainers.marsam ];
license = [ licenses.postgresql licenses.artistic2 ];
};
Loading