public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2021-05-07 12:23:21 +00:00
committed by GitHub
parent eb47bbf4ac db767c789d
commit 12193913a1
283 changed files with 3454 additions and 1327 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/audio/mousai/default.nix
+2 -2
View File
@@ -18,7 +18,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "mousai";
version = "0.3.1";
version = "0.3.2";
format = "other";
@@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "SeaDve";
repo = "Mousai";
rev = "v${version}";
sha256 = "0x57dci0prhlj79h74yh79cazn48rn0bckz5j3z4njk4fwc3fvfx";
sha256 = "sha256-sBB2kqlC+2qPgQinhGxY8lq9unxgQoOOhDP5o1pUWMo=";
};
postPatch = ''
pkgs/applications/audio/sound-juicer/default.nix
+48 -18
View File
@@ -1,28 +1,58 @@
{ lib, stdenv, fetchurl, pkg-config, glib, gtk3, intltool, itstool, libxml2, brasero
, libcanberra-gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes
, gsettings-desktop-schemas, wrapGAppsHook }:
{ lib
, stdenv
, fetchurl
, meson
, ninja
, pkg-config
, glib
, gtk3
, itstool
, libxml2
, brasero
, libcanberra-gtk3
, gnome3
, gst_all_1
, libmusicbrainz5
, libdiscid
, isocodes
, gsettings-desktop-schemas
, wrapGAppsHook
}:
let
stdenv.mkDerivation rec {
pname = "sound-juicer";
version = "3.24.0";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "19qg4xv0f9rkq34lragkmhii1llxsa87llbl28i759b0ks4f6sny";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "08d5d81rz9sj3m5paw8fwbgxmhlbr7bcjdzpmzj832qvg8smydxf";
};
nativeBuildInputs = [ pkg-config intltool itstool libxml2 wrapGAppsHook ];
buildInputs = [
glib gtk3 brasero libcanberra-gtk3 gnome3.adwaita-icon-theme
gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes
gst_all_1.gstreamer gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
gst_all_1.gst-libav
nativeBuildInputs = [
meson
ninja
pkg-config
itstool
libxml2
wrapGAppsHook
];
NIX_CFLAGS_COMPILE="-Wno-error=format-nonliteral";
buildInputs = [
glib
gtk3
brasero
libcanberra-gtk3
gnome3.adwaita-icon-theme
gsettings-desktop-schemas
libmusicbrainz5
libdiscid
isocodes
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-bad
gst_all_1.gst-libav
];
passthru = {
updateScript = gnome3.updateScript {
@@ -34,7 +64,7 @@ in stdenv.mkDerivation rec {
description = "A Gnome CD Ripper";
homepage = "https://wiki.gnome.org/Apps/SoundJuicer";
maintainers = [ maintainers.bdimcheff ];
license = licenses.gpl2;
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
}
pkgs/applications/audio/sublime-music/default.nix
+2 -13
View File
@@ -1,5 +1,4 @@
{ fetchFromGitLab
, fetchpatch
, lib
, python3Packages
, gobject-introspection
@@ -16,26 +15,16 @@
python3Packages.buildPythonApplication rec {
pname = "sublime-music";
version = "0.11.11";
version = "0.11.12";
format = "pyproject";
src = fetchFromGitLab {
owner = "sublime-music";
repo = pname;
rev = "v${version}";
sha256 = "sha256-r4Tn/7CGDny8Aa4kF4PM5ZKMYthMJ7801X3zPdvXh4Q=";
sha256 = "sha256-fcEdpht+xKJRTaD3gKoRdf6O2SAPlZHZ61Jy8bdTKjs=";
};
patches = [
# Switch to poetry-core:
# https://gitlab.com/sublime-music/sublime-music/-/merge_requests/60
(fetchpatch {
name = "use-poetry-core.patch";
url = "https://gitlab.com/sublime-music/sublime-music/-/commit/9b0af19dbdfdcc5a0fa23e73bb34c7135a8c2855.patch";
sha256 = "sha256-cXG0RvrnBpme6yKWM0nfqMqoK0qPT6spflJ9AaaslVg=";
})
];
nativeBuildInputs = [
gobject-introspection
python3Packages.poetry-core
pkgs/applications/audio/sunvox/default.nix
+1 -3
View File
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://www.warmplace.ru/soft/sunvox/sunvox-${version}.zip";
sha256 = "0lqzr68n2c6aifw2vbyars91wn1chmgb9xfdk463g4vjqiava3ih";
sha256 = "10lqbm1grw0sqasx7i6528cishv5ksdf9zbb3ygxd8c1iwaxzhb9";
};
nativeBuildInputs = [ unzip ];
@@ -44,7 +44,5 @@ stdenv.mkDerivation rec {
homepage = "http://www.warmplace.ru/soft/sunvox/";
maintainers = with maintainers; [ puffnfresh ];
platforms = [ "i686-linux" "x86_64-linux" ];
# hash mismatch
broken = true;
};
}
pkgs/applications/backup/deja-dup/default.nix
+4 -4
View File
@@ -12,7 +12,7 @@
, coreutils
, libsoup
, libsecret
, libhandy_0
, libhandy
, wrapGAppsHook
, libgpgerror
, json-glib
@@ -21,14 +21,14 @@
stdenv.mkDerivation rec {
pname = "deja-dup";
version = "42.6";
version = "42.7";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = pname;
rev = version;
sha256 = "0grwlfakrnr9ij7h8lsfazlws6qix8pl50dr94cpxnnbjga9xn9z";
sha256 = "1q66wccnph78cp1r5mln2iq4bcqdrrchxq3c1pjrzkmzwc6l93gz";
};
patches = [
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
glib
gtk3
libsecret
libhandy_0
libhandy
libgpgerror
json-glib
];
pkgs/applications/editors/emacs/generic.nix
+3 -3
View File
@@ -94,8 +94,8 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp {
]));
in ''
substituteInPlace lisp/emacs-lisp/comp.el --replace \
"(defcustom comp-native-driver-options nil" \
"(defcustom comp-native-driver-options '(${backendPath})"
"(defcustom native-comp-driver-options nil" \
"(defcustom native-comp-driver-options '(${backendPath})"
''))
""
];
@@ -175,7 +175,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp {
(comp-trampoline-compile (intern (pop argv))))"
mkdir -p $out/share/emacs/native-lisp
$out/bin/emacs --batch \
--eval "(add-to-list 'comp-eln-load-path \"$out/share/emacs/native-lisp\")" \
--eval "(add-to-list 'native-comp-eln-load-path \"$out/share/emacs/native-lisp\")" \
-f batch-native-compile $out/share/emacs/site-lisp/site-start.el
'';
pkgs/applications/editors/emacs/site-start.el
+2 -2
View File
@@ -47,11 +47,11 @@ least specific (the system profile)"
;;; Set up native-comp load path.
(when (featurep 'comp)
;; Append native-comp subdirectories from `NIX_PROFILES'.
(setq comp-eln-load-path
(setq native-comp-eln-load-path
(append (mapcar (lambda (profile-dir)
(concat profile-dir "/share/emacs/native-lisp/"))
(nix--profile-paths))
comp-eln-load-path)))
native-comp-eln-load-path)))
;;; Make `woman' find the man pages
(defvar woman-manpath)
pkgs/applications/editors/gnome-builder/default.nix
+6 -4
View File
@@ -39,11 +39,11 @@
stdenv.mkDerivation rec {
pname = "gnome-builder";
version = "3.38.2";
version = "3.40.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "jFNco64yoZC1TZbTIHGVf+wBYYQHo2JRiMZFHngzYTs=";
sha256 = "16kikslvcfjqj4q3j857mq9i8cyd965b3lvfzcwijc91x3ylr15j";
};
nativeBuildInputs = [
@@ -99,7 +99,6 @@ stdenv.mkDerivation rec {
'';
mesonFlags = [
"-Dpython_libprefix=${python3.libPrefix}"
"-Ddocs=true"
# Making the build system correctly detect clang header and library paths
@@ -135,7 +134,10 @@ stdenv.mkDerivation rec {
done
'';
passthru.updateScript = gnome3.updateScript { packageName = pname; };
passthru.updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
meta = with lib; {
description = "An IDE for writing GNOME-based software";
pkgs/applications/editors/gnome-latex/default.nix
+45 -8
View File
@@ -1,21 +1,49 @@
{ lib, stdenv, fetchurl, wrapGAppsHook, gsettings-desktop-schemas, gspell, gtksourceview4, libgee
, tepl, amtk, gnome3, glib, pkg-config, intltool, itstool, libxml2 }:
let
{ lib
, stdenv
, fetchurl
, fetchpatch
, autoreconfHook
, gtk-doc
, vala
, gobject-introspection
, wrapGAppsHook
, gsettings-desktop-schemas
, gspell
, gtksourceview4
, libgee
, tepl
, amtk
, gnome3
, glib
, pkg-config
, intltool
, itstool
, libxml2
}:
stdenv.mkDerivation rec {
version = "3.38.0";
pname = "gnome-latex";
in stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0xqd49pgi82dygqnxj08i1v22b0vwwhx3zvdinhrx4jny339yam8";
};
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
configureFlags = ["--disable-dconf-migration"];
patches = [
# Fix build with latest tepl.
(fetchpatch {
url = "https://gitlab.gnome.org/Archive/gnome-latex/commit/e1b01186f8a4e5d3fee4c9ccfbedd6d098517df9.patch";
sha256 = "H8cbp5hDZoXytEdKE2D/oYHNKIbEFwxQoEaC4JMfGHY=";
})
];
nativeBuildInputs = [
pkg-config
autoreconfHook
gtk-doc
vala
gobject-introspection
wrapGAppsHook
itstool
intltool
@@ -33,9 +61,18 @@ in stdenv.mkDerivation {
tepl
];
configureFlags = [
"--disable-dconf-migration"
];
doCheck = true;
passthru.updateScript = gnome3.updateScript { packageName = pname; };
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
passthru.updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
meta = with lib; {
homepage = "https://wiki.gnome.org/Apps/GNOME-LaTeX";
pkgs/applications/graphics/ImageMagick/7.0.nix
+9 -1
View File
@@ -2,6 +2,8 @@
, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre
, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif
, ApplicationServices
, Foundation
, testVersion, imagemagick
}:
let
@@ -50,7 +52,10 @@ stdenv.mkDerivation rec {
]
++ lib.optionals (!stdenv.hostPlatform.isMinGW)
[ openexr librsvg openjpeg ]
++ lib.optional stdenv.isDarwin ApplicationServices;
++ lib.optionals stdenv.isDarwin [
ApplicationServices
Foundation
];
propagatedBuildInputs =
[ bzip2 freetype libjpeg lcms2 ]
@@ -72,6 +77,9 @@ stdenv.mkDerivation rec {
done
'';
passthru.tests.version =
testVersion { package = imagemagick; };
meta = with lib; {
homepage = "http://www.imagemagick.org/";
description = "A software suite to create, edit, compose, or convert bitmap images";
pkgs/applications/graphics/gimp/default.nix
+4 -9
View File
@@ -1,7 +1,6 @@
{ stdenv
, lib
, fetchurl
, fetchpatch
, substituteAll
, autoreconfHook
, pkg-config
@@ -34,6 +33,7 @@
, libexif
, gettext
, makeWrapper
, gtk-doc
, xorg
, glib-networking
, libmypaint
@@ -53,13 +53,13 @@ let
python = python2.withPackages (pp: [ pp.pygtk ]);
in stdenv.mkDerivation rec {
pname = "gimp";
version = "2.10.22";
version = "2.10.24";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "1fqqyshakvdarf1jipk2n33ibqr23ni22z3d8srq13bpydblpf1d";
sha256 = "17lq6ns5qhspd171zqh76yf98xnn5n0hcl7hbhbx63cc6ribf6xx";
};
patches = [
@@ -73,12 +73,6 @@ in stdenv.mkDerivation rec {
# Use absolute paths instead of relying on PATH
# to make sure plug-ins are loaded by the correct interpreter.
./hardcode-plugin-interpreters.patch
# Fix crash without dot.
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/f83fd22c4b8701ffc4ce14383e5e22756a4bce04.patch";
sha256 = "POuvBhOSStO7hBGp4HgNx5F9pElFRoqN3W+i3u4zOnk=";
})
];
nativeBuildInputs = [
@@ -87,6 +81,7 @@ in stdenv.mkDerivation rec {
intltool
gettext
makeWrapper
gtk-doc
];
buildInputs = [
pkgs/applications/graphics/gnome-photos/default.nix
+5 -19
View File
@@ -1,6 +1,5 @@
{ lib, stdenv
, fetchurl
, fetchpatch
, at-spi2-core
, babl
, dbus
@@ -22,6 +21,7 @@
, gtk3
, itstool
, libdazzle
, libhandy
, libgdata
, libxml2
, meson
@@ -36,32 +36,17 @@
stdenv.mkDerivation rec {
pname = "gnome-photos";
version = "3.38.0";
version = "40.0";
outputs = [ "out" "installedTests" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1i64w69kk3sdf9vn7npnwrhy8qjwn0vizq200x3pgmbrfm3kjzv6";
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "1bzi79plw6ji6qlckhxnwfnswy6jpnhzmmyanml2i2xg73hp6bg0";
};
patches = [
./installed-tests-path.patch
# Port to Tracker 3
# https://gitlab.gnome.org/GNOME/gnome-photos/-/merge_requests/135
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-photos/commit/f39a85bb1a82093f4ba615494ff7e95609674fc2.patch";
sha256 = "M5r5WuB1JpUBVN3KxNvpMiPWj0pIpT+ImQMOiGtUgT4=";
})
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-photos/commit/3d847ff80d429cadf0bc59aa50caa37bf27c0201.patch";
sha256 = "zGjSL1qpWVJ/5Ifgh2CbhFSBR/WDAra8F+YUOemyxyU=";
})
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-photos/commit/2eb923726147b05c936dee64b205d833525db1df.patch";
sha256 = "vCA6NXHzmNf2GoLqzWwIyziC6puJgJ0QTLeKWsAEFAE=";
})
];
nativeBuildInputs = [
@@ -99,6 +84,7 @@ stdenv.mkDerivation rec {
gsettings-desktop-schemas
gtk3
libdazzle
libhandy
libgdata
tracker
tracker-miners # For 'org.freedesktop.Tracker.Miner.Files' GSettings schema
pkgs/applications/graphics/gthumb/default.nix
+3 -2
View File
@@ -32,11 +32,11 @@
stdenv.mkDerivation rec {
pname = "gthumb";
version = "3.10.2";
version = "3.11.3";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "/erkKBg3j5s8qwBgTu61t8Cnpez+ad4IuZOGd0ZDXJM=";
sha256 = "11bvcimamdcksgqj1ymh54yzhpwc5j8glda8brqqhwq3h2wj0j9d";
};
nativeBuildInputs = [
@@ -97,6 +97,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/applications/graphics/inkscape/default.nix
+8
View File
@@ -5,6 +5,7 @@
, cmake
, double-conversion
, fetchurl
, fetchpatch
, gettext
, gdl
, ghostscript
@@ -71,6 +72,13 @@ stdenv.mkDerivation rec {
# e.g., those from the "Effects" menu.
python3 = "${python3Env}/bin/python";
})
# Fix build with glib 2.68
# https://gitlab.com/inkscape/inkscape/-/merge_requests/2790
(fetchpatch {
url = "https://gitlab.com/inkscape/inkscape/-/commit/eb24388f1730918edd9565d9e5d09340ec0b3b08.patch";
sha256 = "d2FHRWcOzi0Vsr6t0MuLu3rWpvhFKuuvoXd4/NKUSJI=";
})
];
postPatch = ''
pkgs/applications/misc/font-manager/default.nix
+53 -6
View File
@@ -1,20 +1,61 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, gettext, python3,
pkg-config, libxml2, json-glib , sqlite, itstool, yelp-tools,
vala, gtk3, gnome3, desktop-file-utils, wrapGAppsHook, gobject-introspection,
libsoup, webkitgtk
{ lib
, stdenv
, fetchFromGitHub
, meson
, fetchpatch
, ninja
, gettext
, python3
, pkg-config
, libxml2
, json-glib
, sqlite
, itstool
, yelp-tools
, vala
, gsettings-desktop-schemas
, gtk3
, gnome3
, desktop-file-utils
, wrapGAppsHook
, gobject-introspection
, libsoup
, glib-networking
, webkitgtk
}:
stdenv.mkDerivation rec {
pname = "font-manager";
version = "0.8.5-1";
version = "0.8.6";
src = fetchFromGitHub {
owner = "FontManager";
repo = "master";
rev = version;
sha256 = "1p0hfnf06892hn25a6zv8fnhbh4ln11nn2fv1vjqs63rr59fprbk";
sha256 = "0a18rbdy9d0fj0vnsc2rm7xlh17vjqn4kdyrq0ldzlzkb6zbdk2k";
};
patches = [
# Fix some Desktop Settings with GNOME 40.
# https://github.com/FontManager/font-manager/issues/215
(fetchpatch {
url = "https://github.com/FontManager/font-manager/commit/b28f325d7951a66ebf1a2a432ee09fd22048a033.patch";
sha256 = "dKbrXGb9a4JuG/4x9vprMlh5J17HKJFifRWq9BWp1ow=";
})
(fetchpatch {
url = "https://github.com/FontManager/font-manager/commit/2147204d4c4c6b58161230500186c3a5d4eeb1c1.patch";
sha256 = "2/PFLwf7h76fIIN4+lyjg/L0KVU1hhRQCfwCAGDpb00=";
})
(fetchpatch {
url = "https://github.com/FontManager/font-manager/commit/3abc541ef8606727c72af7631c021809600336ac.patch";
sha256 = "rJPnW+7uuFLxTf5tk+Rzo+xkw2+uzU6BkzPXLeR/RGc=";
})
(fetchpatch {
url = "https://github.com/FontManager/font-manager/commit/03a822f0d7b72442cd2ffcc8668da265d3535e0d.patch";
sha256 = "3Z2UqK5VV2bIwpGd1tA7fivd7ooIuV6CxTJhzgOAkIM=";
})
];
nativeBuildInputs = [
pkg-config
meson
@@ -34,12 +75,18 @@ stdenv.mkDerivation rec {
libxml2
json-glib
sqlite
gsettings-desktop-schemas # for font settings
gtk3
gnome3.adwaita-icon-theme
libsoup
glib-networking # for SSL so that Google Fonts can load
webkitgtk
];
mesonFlags = [
"-Dreproducible=true" # Do not hardcode build directory…
];
postPatch = ''
chmod +x meson_post_install.py
patchShebangs meson_post_install.py
pkgs/applications/misc/gnome-multi-writer/default.nix
+2 -2
View File
@@ -19,11 +19,11 @@
stdenv.mkDerivation rec {
pname = "gnome-multi-writer";
version = "3.32.1";
version = "3.35.90";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1apdd8yi12zagf82k376a9wmdm27wzwdxpm2wf2pnwkaf786rmdw";
sha256 = "07vgzjjdrxcp7h73z13h9agafxb4vmqx5i81bcfyw0ilw9kkdzmp";
};
nativeBuildInputs = [
pkgs/applications/misc/hello/default.nix
+9 -1
View File
@@ -1,4 +1,9 @@
{ lib, stdenv, fetchurl }:
{ lib
, stdenv
, fetchurl
, testVersion
, hello
}:
stdenv.mkDerivation rec {
pname = "hello";
@@ -11,6 +16,9 @@ stdenv.mkDerivation rec {
doCheck = true;
passthru.tests.version =
testVersion { package = hello; };
meta = with lib; {
description = "A program that produces a familiar, friendly greeting";
longDescription = ''
pkgs/applications/misc/kratos/default.nix
+42
View File
@@ -0,0 +1,42 @@
{ fetchFromGitHub, buildGoModule, lib, stdenv }:
buildGoModule rec {
pname = "kratos";
version = "0.6.0-alpha.1";
src = fetchFromGitHub {
owner = "ory";
repo = "kratos";
rev = "v${version}";
sha256 = "0lnrm7ma203b5a0vxgm9zqsbs3nigx0kng5zymrjvrzll1gd79wm";
};
vendorSha256 = "16qg44k97l6719hib8vbv0j15x6gvs9d6738d2y990a2qiqbsqpw";
subPackages = [ "." ];
buildFlags = [ "-tags sqlite" ];
doCheck = false;
preBuild = ''
# Patch shebangs
files=(
test/e2e/run.sh
script/testenv.sh
script/test-envs.sh
persistence/sql/migratest/update_fixtures.sh
)
patchShebangs "''${files[@]}"
# patchShebangs doesn't work for this Makefile, do it manually
substituteInPlace Makefile --replace '/bin/bash' '${stdenv.shell}'
'';
meta = with lib; {
maintainers = with maintainers; [ mrmebelman ];
homepage = "https://www.ory.sh/kratos/";
license = licenses.asl20;
description = "An API-first Identity and User Management system that is built according to cloud architecture best practices";
};
}
pkgs/applications/misc/orca/default.nix
+3 -3
View File
@@ -35,13 +35,13 @@
buildPythonApplication rec {
pname = "orca";
version = "3.38.2";
version = "40.0";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "UAX/LhHdH3E/WswZA6JwEZvFjDD9uMn4K8rHFJfGwjw=";
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "0hq0zdcn80ficpcffbk667907v6m7dih3dhyc7ss01mrj3iyw000";
};
patches = [
pkgs/applications/misc/orca/fix-paths.patch
+16 -10
View File
@@ -1,6 +1,8 @@
diff --git a/src/orca/debug.py b/src/orca/debug.py
index e79482ed4..cbf3a24ec 100644
--- a/src/orca/debug.py
+++ b/src/orca/debug.py
@@ -474,7 +474,7 @@
@@ -502,7 +502,7 @@ def traceit(frame, event, arg):
return traceit
def getOpenFDCount(pid):
@@ -9,7 +11,7 @@
procs = procs.decode('UTF-8').split('\n')
files = list(filter(lambda s: s and s[0] == 'f' and s[1:].isdigit(), procs))
@@ -482,7 +482,7 @@
@@ -510,7 +510,7 @@ def getOpenFDCount(pid):
def getCmdline(pid):
try:
@@ -18,7 +20,7 @@
cmdline = openFile.read()
openFile.close()
except:
@@ -492,7 +492,7 @@
@@ -520,7 +520,7 @@ def getCmdline(pid):
return cmdline
def pidOf(procName):
@@ -27,9 +29,11 @@
shell=True,
stdout=subprocess.PIPE).stdout
pids = openFile.read()
diff --git a/src/orca/orca.py b/src/orca/orca.py
index 2fe0a0bf2..087526556 100644
--- a/src/orca/orca.py
+++ b/src/orca/orca.py
@@ -239,7 +239,7 @@
@@ -285,7 +285,7 @@ def updateKeyMap(keyboardEvent):
def _setXmodmap(xkbmap):
"""Set the keyboard map using xkbcomp."""
@@ -38,7 +42,7 @@
stdin=subprocess.PIPE, stdout=None, stderr=None)
p.communicate(xkbmap)
@@ -297,7 +297,7 @@
@@ -363,7 +363,7 @@ def _storeXmodmap(keyList):
"""
global _originalXmodmap
@@ -47,7 +51,7 @@
def _restoreXmodmap(keyList=[]):
"""Restore the original xmodmap values for the keys in keyList.
@@ -309,7 +309,7 @@
@@ -375,7 +375,7 @@ def _restoreXmodmap(keyList=[]):
global _capsLockCleared
_capsLockCleared = False
@@ -56,9 +60,11 @@
stdin=subprocess.PIPE, stdout=None, stderr=None)
p.communicate(_originalXmodmap)
diff --git a/src/orca/orca_bin.py.in b/src/orca/orca_bin.py.in
index 8c9d40153..eec0d5437 100644
--- a/src/orca/orca_bin.py.in
+++ b/src/orca/orca_bin.py.in
@@ -59,7 +59,7 @@
@@ -62,7 +62,7 @@ class ListApps(argparse.Action):
name = "[DEAD]"
try:
@@ -67,12 +73,12 @@
except:
cmdline = '(exception encountered)'
else:
@@ -192,7 +192,7 @@
@@ -197,7 +197,7 @@ def inGraphicalDesktop():
def otherOrcas():
"""Returns the pid of any other instances of Orca owned by this user."""
- openFile = subprocess.Popen('pgrep -u %s orca' % os.getuid(),
+ openFile = subprocess.Popen('@pgrep@ -u %s orca' % os.getuid(),
- openFile = subprocess.Popen('pgrep -u %s -x orca' % os.getuid(),
+ openFile = subprocess.Popen('@pgrep@ -u %s -x orca' % os.getuid(),
shell=True,
stdout=subprocess.PIPE).stdout
pids = openFile.read()
pkgs/applications/networking/calls/default.nix
+2
View File
@@ -17,6 +17,7 @@
, desktop-file-utils
, appstream-glib
, libpeas
, libgdata
, dbus
, vala
, wrapGAppsHook
@@ -65,6 +66,7 @@ stdenv.mkDerivation rec {
callaudiod
gtk3
libpeas
libgdata # required by some dependency transitively
];
checkInputs = [
pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
+15 -1
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pidgin, intltool, libxml2, gmime, nss }:
{ lib, stdenv, fetchurl, fetchpatch, pidgin, intltool, libxml2, gmime, nss }:
stdenv.mkDerivation rec {
pname = "pidgin-sipe";
@@ -9,6 +9,20 @@ stdenv.mkDerivation rec {
sha256 = "0262sz00iqxylx0xfyr48xikhiqzr8pg7b4b7vwj5iv4qxpxv939";
};
patches = [
# add sipe_utils_memdup() function
(fetchpatch {
url = "https://repo.or.cz/siplcs.git/patch/567d0ddc0692adfef5f15d0d383825a9b2ea4b49";
sha256 = "24L8ZfoOGc3JoTCGxuTNjuHzt5QgFDu1+vSoJpGvde4=";
})
# replace g_memdup() with sipe_utils_memdup()
# g_memdup is deprecatein newer Glib
(fetchpatch {
url = "https://repo.or.cz/siplcs.git/patch/583a734e63833f03d11798b7b0d59a17d08ae60f";
sha256 = "Ai6Czpy/FYvBi4GZR7yzch6OcouJgfreI9HcojhGVV4=";
})
];
nativeBuildInputs = [ intltool ];
buildInputs = [ pidgin gmime libxml2 nss ];
enableParallelBuilding = true;
pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix
+6 -12
View File
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "evolution-ews";
version = "3.38.3";
version = "3.40.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1s2jpviliazmhnpkh8dc57ga3c3612f2rnc0nfya5ndbi6lpzxhi";
sha256 = "1kgxdacqqcq8yfkij6vyqlk5r4yqvw7gh7mxqii670hrn1mb2s50";
};
nativeBuildInputs = [ cmake gettext intltool pkg-config ];
@@ -19,23 +19,17 @@ stdenv.mkDerivation rec {
libmspack
];
# Building with libmspack as reccommended: https://wiki.gnome.org/Apps/Evolution/Building#Build_evolution-ews
cmakeFlags = [
# Building with libmspack as recommended: https://wiki.gnome.org/Apps/Evolution/Building#Build_evolution-ews
"-DWITH_MSPACK=ON"
# don't try to install into ${evolution}
"-DFORCE_INSTALL_PREFIX=ON"
];
PKG_CONFIG_EVOLUTION_SHELL_3_0_ERRORDIR = "${placeholder "out"}/share/evolution/errors";
PKG_CONFIG_EVOLUTION_SHELL_3_0_PRIVLIBDIR = "${placeholder "out"}/lib/evolution";
PKG_CONFIG_CAMEL_1_2_CAMEL_PROVIDERDIR = "${placeholder "out"}/lib/evolution-data-server/camel-providers";
PKG_CONFIG_LIBEDATA_BOOK_1_2_BACKENDDIR = "${placeholder "out"}/lib/evolution-data-server/addressbook-backends";
PKG_CONFIG_LIBEDATA_CAL_2_0_BACKENDDIR = "${placeholder "out"}/lib/evolution-data-server/calendar-backends";
PKG_CONFIG_LIBEBACKEND_1_2_MODULEDIR = "${placeholder "out"}/lib/evolution-data-server/registry-modules";
PKG_CONFIG_EVOLUTION_SHELL_3_0_MODULEDIR = "${placeholder "out"}/lib/evolution/modules";
PKG_CONFIG_EVOLUTION_DATA_SERVER_1_2_PRIVDATADIR = "${placeholder "out"}/share/evolution-data-server";
passthru = {
updateScript = gnome3.updateScript {
packageName = "evolution-ews";
versionPolicy = "odd-unstable";
};
};
pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
+3 -6
View File
@@ -42,11 +42,11 @@
stdenv.mkDerivation rec {
pname = "evolution";
version = "3.38.4";
version = "3.40.1";
src = fetchurl {
url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "NB+S0k4rRMJ4mwA38aiU/xZUh9qksAuA+uMTii4Fr9Q=";
sha256 = "07n4sbgsh0y9hrn52ymvy45ah65ll55gglgvqqi3h9nhkyy64y9g";
};
nativeBuildInputs = [
@@ -114,13 +114,10 @@ stdenv.mkDerivation rec {
doCheck = true;
patches = [
./moduledir_from_env.patch
];
passthru = {
updateScript = gnome3.updateScript {
packageName = "evolution";
versionPolicy = "odd-unstable";
};
};
pkgs/applications/networking/mailreaders/evolution/evolution/moduledir_from_env.patch
-21
View File
@@ -1,21 +0,0 @@
diff --git a/src/shell/main.c b/src/shell/main.c
index 5d089225ca..030908d684 100644
--- a/src/shell/main.c
+++ b/src/shell/main.c
@@ -407,7 +407,15 @@ create_default_shell (void)
}
/* Load all shared library modules. */
- module_types = e_module_load_all_in_directory (EVOLUTION_MODULEDIR);
+ const gchar *modules_directory = EVOLUTION_MODULEDIR;
+ const gchar *modules_directory_env;
+
+ modules_directory_env = g_getenv ("EVOLUTION_MODULEDIR");
+ if (modules_directory_env &&
+ g_file_test (modules_directory_env, G_FILE_TEST_IS_DIR))
+ modules_directory = g_strdup (modules_directory_env);
+
+ module_types = e_module_load_all_in_directory (modules_directory);
g_list_free_full (module_types, (GDestroyNotify) g_type_module_unuse);
flags = G_APPLICATION_HANDLES_OPEN |
pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix
+1 -7
View File
@@ -10,13 +10,7 @@ symlinkJoin {
for i in $out/bin/* $out/libexec/**; do
if [ ! -d $i ]; then
echo wrapping $i
wrapProgram $i \
--set LD_LIBRARY_PATH "$out/lib" \
--set EDS_ADDRESS_BOOK_MODULES "$out/lib/evolution-data-server/addressbook-backends/" \
--set EDS_CALENDAR_MODULES "$out/lib/evolution-data-server/calendar-backends/" \
--set EDS_CAMEL_PROVIDER_DIR "$out/lib/evolution-data-server/camel-providers/" \
--set EDS_REGISTRY_MODULES "$out/lib/evolution-data-server/registry-modules/" \
--set EVOLUTION_MODULEDIR "$out/lib/evolution/modules"
wrapProgram $i --set EDS_EXTRA_PREFIXES "${lib.concatStringsSep ":" plugins}"
fi
done
pkgs/applications/networking/seaweedfs/default.nix
+3 -5
View File
@@ -1,7 +1,7 @@
{ lib
, fetchFromGitHub
, buildGoModule
, runCommand
, testVersion
, seaweedfs
}:
@@ -20,10 +20,8 @@ buildGoModule rec {
subPackages = [ "weed" ];
passthru.tests.check-version = runCommand "weed-version" { meta.timeout = 3; } ''
${seaweedfs}/bin/weed version | grep -Fw ${version}
touch $out
'';
passthru.tests.version =
testVersion { package = seaweedfs; command = "weed version"; };
meta = with lib; {
description = "Simple and highly scalable distributed file system";
pkgs/applications/office/elementary-planner/default.nix
+2
View File
@@ -15,6 +15,7 @@
, glib-networking
, sqlite
, libsoup
, libgdata
, gtk3
, pantheon /* granite, icons, maintainers */
, webkitgtk
@@ -56,6 +57,7 @@ stdenv.mkDerivation rec {
pantheon.granite
sqlite
webkitgtk
libgdata # required by some dependency transitively
];
postPatch = ''
pkgs/applications/office/gnucash/default.nix
+11 -3
View File
@@ -1,4 +1,4 @@
{ fetchurl, lib, stdenv, pkg-config, makeWrapper, cmake, gtest
{ fetchurl, fetchpatch, lib, stdenv, pkg-config, makeWrapper, cmake, gtest
, boost, icu, libxml2, libxslt, gettext, swig, isocodes, gtk3, glibcLocales
, webkitgtk, dconf, hicolor-icon-theme, libofx, aqbanking, gwenhywfar, libdbi
, libdbiDrivers, guile, perl, perlPackages
@@ -25,13 +25,21 @@ in
stdenv.mkDerivation rec {
pname = "gnucash";
version = "4.4";
version = "4.5";
src = fetchurl {
url = "mirror://sourceforge/gnucash/${pname}-${version}.tar.bz2";
sha256 = "sha256-2R4NEmtGHXHeG8GyDZzxQnBDU97AfT5lmdE4QidZ5no=";
sha256 = "sha256-vB9IqEU0iKLp9rg7aGE6pVyuvk0pg0YL2sfghLRs/9w=";
};
patches = [
# Fix build with GLib 2.68.
(fetchpatch {
url = "https://github.com/Gnucash/gnucash/commit/bbb4113a5a996dcd7bb3494e0be900b275b49a4f.patch";
sha256 = "Pnvwoq5zutFw7ByduEEANiLM2J50WiXpm2aZ8B2MDMQ=";
})
];
nativeBuildInputs = [ pkg-config makeWrapper cmake gtest ];
buildInputs = [
pkgs/applications/office/gnumeric/default.nix
+1
View File
@@ -29,6 +29,7 @@ in stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/applications/science/logic/key/default.nix
+8 -5
View File
@@ -5,7 +5,7 @@
, ant
, jre
, makeWrapper
, runCommand
, testVersion
, key
}:
@@ -51,10 +51,13 @@ in stdenv.mkDerivation rec {
--add-flags "-cp $out/share/java/KeY.jar de.uka.ilkd.key.core.Main"
'';
passthru.tests.check-version = runCommand "key-help" {} ''
${key}/bin/KeY --help | grep 2.5 # Wrong version in the code. On next version change to ${version}
touch $out
'';
passthru.tests.version =
testVersion {
package = key;
command = "KeY --help";
# Wrong '2.5' version in the code. On next version change to ${version}
version = "2.5";
};
meta = with lib; {
description = "Java formal verification tool";
pkgs/applications/version-management/meld/default.nix
+1
View File
@@ -59,6 +59,7 @@ python3.pkgs.buildPythonApplication rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/applications/video/pitivi/default.nix
+3 -3
View File
@@ -21,13 +21,13 @@
python3Packages.buildPythonApplication rec {
pname = "pitivi";
version = "2020.09.2";
version = "2021.01";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/pitivi/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0hzvv4wia4rk0kvq16y27imq2qd4q5lg3vx99hdcjdb1x3zqqfg0";
url = "mirror://gnome/sources/pitivi/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "0krzsrv19v3mwhbsm72ica6m3p8ijy0lbd0c3s87yd7pmbwld2c1";
};
patches = [