diff options
33 files changed, 362 insertions, 1063 deletions
diff --git a/nixos/modules/services/x11/compton.nix b/nixos/modules/services/x11/compton.nix index 8641c05de52e..cafd8d88ec4d 100644 --- a/nixos/modules/services/x11/compton.nix +++ b/nixos/modules/services/x11/compton.nix @@ -238,6 +238,12 @@ in { description = "Compton composite manager"; wantedBy = [ "graphical-session.target" ]; partOf = [ "graphical-session.target" ]; + + # Temporarily fixes corrupt colours with Mesa 18 + environment = mkIf (cfg.backend == "glx") { + allow_rgb10_configs = "false"; + }; + serviceConfig = { ExecStart = "${cfg.package}/bin/compton --config ${configFile}"; RestartSec = 3; diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index ec9122406993..e999672f4ab3 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -4,7 +4,7 @@ , gobjectIntrospection, wrapGAppsHook }: python3.pkgs.buildPythonApplication rec { - version = "0.9.604"; + version = "0.9.605"; name = "lollypop-${version}"; format = "other"; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "0pfljs5q0xzqll6dybslin4nr7w18bn1yi0xn79vh44zn3l0r8q4"; + sha256 = "10d9k7ssh4snrrjy1hb3y39by6175493cmn50aq88xby2mdy3p74"; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index 1f7ed9732bc7..91b1099bfb86 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -5,7 +5,7 @@ python3.pkgs.buildPythonApplication rec { name = "eolie-${version}"; - version = "0.9.41"; + version = "0.9.45"; format = "other"; doCheck = false; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/eolie"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "0qrbgyzhvh96d7h2rcz04m7am6av30pcvb3fwlrjx0c402rslsx8"; + sha256 = "0x6f2qqqxpjf28mqxs4jlrz2z8wa9nvb9h24nf8qwmzavjjbraqg"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 96aa037d35bf..e823977db204 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -1,16 +1,18 @@ { stdenv, fetchFromGitLab, cmake, pkgconfig, wrapGAppsHook -, glib, gtk3, gettext, libxkbfile, libgnome-keyring, libX11 +, glib, gtk3, gettext, libxkbfile, libX11 , freerdp, libssh, libgcrypt, gnutls, makeDesktopItem -, pcre, webkitgtk, libdbusmenu-gtk3, libappindicator-gtk3 +, pcre, libdbusmenu-gtk3, libappindicator-gtk3 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon -, libsecret, spice-protocol, spice-gtk, epoxy, at-spi2-core +, libsecret, libsoup, spice-protocol, spice-gtk, epoxy, at-spi2-core , openssl, gsettings-desktop-schemas, json-glib # The themes here are soft dependencies; only icons are missing without them. , hicolor-icon-theme, adwaita-icon-theme +, gnomeSupport ? true, libgnome-keyring }: +with stdenv.lib; + let - version = "1.2.32"; desktopItem = makeDesktopItem { name = "remmina"; @@ -22,8 +24,9 @@ let categories = "GTK;GNOME;X-GNOME-NetworkSettings;Network;"; }; -in stdenv.mkDerivation { +in stdenv.mkDerivation rec { name = "remmina-${version}"; + version = "1.2.32"; src = fetchFromGitLab { owner = "Remmina"; @@ -33,13 +36,21 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake wrapGAppsHook gsettings-desktop-schemas - glib gtk3 gettext libxkbfile libgnome-keyring libX11 - freerdp libssh libgcrypt gnutls - pcre webkitgtk libdbusmenu-gtk3 libappindicator-gtk3 - libvncserver libpthreadstubs libXdmcp libxkbcommon - libsecret spice-protocol spice-gtk epoxy at-spi2-core - openssl hicolor-icon-theme adwaita-icon-theme json-glib ]; + buildInputs = [ + cmake wrapGAppsHook gsettings-desktop-schemas + glib gtk3 gettext libxkbfile libX11 + freerdp libssh libgcrypt gnutls + pcre libdbusmenu-gtk3 libappindicator-gtk3 + libvncserver libpthreadstubs libXdmcp libxkbcommon + libsecret libsoup spice-protocol spice-gtk epoxy at-spi2-core + openssl hicolor-icon-theme adwaita-icon-theme json-glib + ] + ++ optional gnomeSupport libgnome-keyring; + + preConfigure = optionalString (!gnomeSupport) '' + substituteInPlace CMakeLists.txt \ + --replace "add_subdirectory(remmina-plugins-gnome)" "" + ''; cmakeFlags = [ "-DWITH_VTE=OFF" @@ -62,7 +73,7 @@ in stdenv.mkDerivation { cp ${desktopItem}/share/applications/* $out/share/applications ''; - meta = with stdenv.lib; { + meta = { license = stdenv.lib.licenses.gpl2; homepage = https://gitlab.com/Remmina/Remmina; description = "Remote desktop client written in GTK+"; diff --git a/pkgs/applications/science/math/sage/env-locations.nix b/pkgs/applications/science/math/sage/env-locations.nix index 288ffd6e0e1a..098ce3925cf3 100644 --- a/pkgs/applications/science/math/sage/env-locations.nix +++ b/pkgs/applications/science/math/sage/env-locations.nix @@ -38,6 +38,7 @@ writeTextFile rec { export COMBINATORIAL_DESIGN_DATA_DIR="${combinatorial_designs}/share/combinatorial_designs" export CREMONA_MINI_DATA_DIR="${elliptic_curves}/share/cremona" export JMOL_DIR="${jmol}" + export JSMOL_DIR="${jmol}/share/jsmol" export MATHJAX_DIR="${mathjax}/lib/node_modules/mathjax" export THREEJS_DIR="${three}/lib/node_modules/three" export SAGE_INCLUDE_DIRECTORIES="${cysignals}/lib/python2.7/site-packages" diff --git a/pkgs/applications/science/math/sage/patches/dochtml-optional.patch b/pkgs/applications/science/math/sage/patches/dochtml-optional.patch deleted file mode 100644 index a51e30312ed9..000000000000 --- a/pkgs/applications/science/math/sage/patches/dochtml-optional.patch +++ /dev/null @@ -1,127 +0,0 @@ -diff --git a/src/doc/common/conf.py b/src/doc/common/conf.py -index 25f94f7b7d..9f6139ea4a 100644 ---- a/src/doc/common/conf.py -+++ b/src/doc/common/conf.py -@@ -622,9 +622,9 @@ def call_intersphinx(app, env, node, contnode): - Check that the link from the thematic tutorials to the reference - manual is relative, see :trac:`20118`:: - -- sage: from sage.env import SAGE_DOC -- sage: thematic_index = os.path.join(SAGE_DOC, "html", "en", "thematic_tutorials", "index.html") -- sage: for line in open(thematic_index).readlines(): -+ sage: from sage.env import SAGE_DOC # optional - dochtml -+ sage: thematic_index = os.path.join(SAGE_DOC, "html", "en", "thematic_tutorials", "index.html") # optional - dochtml -+ sage: for line in open(thematic_index).readlines(): # optional - dochtml - ....: if "padics" in line: - ....: sys.stdout.write(line) - <li><a class="reference external" href="../reference/padics/sage/rings/padics/tutorial.html#sage-rings-padics-tutorial" title="(in Sage Reference Manual: p-Adics ...)"><span>Introduction to the -adics</span></a></li> -diff --git a/src/sage/doctest/control.py b/src/sage/doctest/control.py -index 4236fd05e0..8e499cbaf7 100644 ---- a/src/sage/doctest/control.py -+++ b/src/sage/doctest/control.py -@@ -87,7 +87,7 @@ class DocTestDefaults(SageObject): - self.sagenb = False - self.long = False - self.warn_long = None -- self.optional = set(['sage']) | auto_optional_tags -+ self.optional = set(['sage', 'dochtml']) | auto_optional_tags - self.randorder = None - self.global_iterations = 1 # sage-runtests default is 0 - self.file_iterations = 1 # sage-runtests default is 0 -@@ -343,7 +343,8 @@ class DocTestController(SageObject): - if not optionaltag_regex.search(o): - raise ValueError('invalid optional tag {!r}'.format(o)) - -- options.optional |= auto_optional_tags -+ if "sage" in options.optional: -+ options.optional |= auto_optional_tags - - self.options = options - self.files = args -@@ -741,7 +742,7 @@ class DocTestController(SageObject): - sage: DC = DocTestController(DD, [dirname]) - sage: DC.expand_files_into_sources() - sage: sorted(DC.sources[0].options.optional) # abs tol 1 -- ['guava', 'magma', 'py3'] -+ ['guava', 'magma'] - - We check that files are skipped appropriately:: - -@@ -968,7 +969,7 @@ class DocTestController(SageObject): - sage: from sage.doctest.control import DocTestDefaults, DocTestController - sage: DC = DocTestController(DocTestDefaults(), []) - sage: DC._optional_tags_string() -- 'sage' -+ 'dochtml,sage' - sage: DC = DocTestController(DocTestDefaults(optional="all,and,some,more"), []) - sage: DC._optional_tags_string() - 'all' -diff --git a/src/sage/misc/sagedoc.py b/src/sage/misc/sagedoc.py -index 9255aa848f..cc4712d3ec 100644 ---- a/src/sage/misc/sagedoc.py -+++ b/src/sage/misc/sagedoc.py -@@ -18,9 +18,9 @@ TESTS: - Check that argspecs of extension function/methods appear correctly, - see :trac:`12849`:: - -- sage: from sage.env import SAGE_DOC -- sage: docfilename = os.path.join(SAGE_DOC, 'html', 'en', 'reference', 'calculus', 'sage', 'symbolic', 'expression.html') -- sage: with open(docfilename) as fobj: -+ sage: from sage.env import SAGE_DOC # optional - dochtml -+ sage: docfilename = os.path.join(SAGE_DOC, 'html', 'en', 'reference', 'calculus', 'sage', 'symbolic', 'expression.html') # optional - dochtml -+ sage: with open(docfilename) as fobj: # optional - dochtml - ....: for line in fobj: - ....: if "#sage.symbolic.expression.Expression.numerical_approx" in line: - ....: print(line) -@@ -790,11 +790,12 @@ def _search_src_or_doc(what, string, extra1='', extra2='', extra3='', - - :: - -- sage: len(_search_src_or_doc('src', r'matrix\(', 'incidence_structures', 'self', 'combinat', interact=False).splitlines()) > 1 -+ sage: from sage.misc.sagedoc import _search_src_or_doc # optional - dochtml -+ sage: len(_search_src_or_doc('src', r'matrix\(', 'incidence_structures', 'self', 'combinat', interact=False).splitlines()) > 1 # optional - dochtml - True -- sage: 'abvar/homology' in _search_src_or_doc('doc', 'homology', 'variety', interact=False) # long time (4s on sage.math, 2012) -+ sage: 'abvar/homology' in _search_src_or_doc('doc', 'homology', 'variety', interact=False) # optional - dochtml, long time (4s on sage.math, 2012) - True -- sage: 'divisors' in _search_src_or_doc('src', '^ *def prime', interact=False) -+ sage: 'divisors' in _search_src_or_doc('src', '^ *def prime', interact=False) # optional - dochtml - True - """ - # process keywords -@@ -1160,9 +1161,9 @@ def search_doc(string, extra1='', extra2='', extra3='', extra4='', - counting the length of ``search_doc('tree', - interact=False).splitlines()`` gives the number of matches. :: - -- sage: len(search_doc('tree', interact=False).splitlines()) > 4000 # long time -+ sage: len(search_doc('tree', interact=False).splitlines()) > 4000 # optional - dochtml, long time - True -- sage: len(search_doc('tree', whole_word=True, interact=False).splitlines()) < 2000 # long time -+ sage: len(search_doc('tree', whole_word=True, interact=False).splitlines()) < 2000 # optional - dochtml, long time - True - """ - return _search_src_or_doc('doc', string, extra1=extra1, extra2=extra2, -@@ -1332,9 +1333,9 @@ class _sage_doc: - - EXAMPLES:: - -- sage: browse_sage_doc._open("reference", testing=True)[0] # indirect doctest -+ sage: browse_sage_doc._open("reference", testing=True)[0] # optional - dochtml, indirect doctest - 'http://localhost:8000/doc/live/reference/index.html' -- sage: browse_sage_doc(identity_matrix, 'rst')[-107:-47] -+ sage: browse_sage_doc(identity_matrix, 'rst')[-107:-47] # optional - dochtml - 'Full MatrixSpace of 3 by 3 sparse matrices over Integer Ring' - """ - def __init__(self): -@@ -1494,9 +1495,9 @@ class _sage_doc: - - EXAMPLES:: - -- sage: browse_sage_doc._open("reference", testing=True)[0] -+ sage: browse_sage_doc._open("reference", testing=True)[0] # optional - dochtml - 'http://localhost:8000/doc/live/reference/index.html' -- sage: browse_sage_doc._open("tutorial", testing=True)[1] -+ sage: browse_sage_doc._open("tutorial", testing=True)[1] # optional - dochtml - '.../html/en/tutorial/index.html' - """ - url = self._base_url + os.path.join(name, "index.html") diff --git a/pkgs/applications/science/math/sage/patches/eclib-20180710.patch b/pkgs/applications/science/math/sage/patches/eclib-20180710.patch index d06e1e6cedf2..986ae42aeb62 100644 --- a/pkgs/applications/science/math/sage/patches/eclib-20180710.patch +++ b/pkgs/applications/science/math/sage/patches/eclib-20180710.patch @@ -14,27 +14,3 @@ index 4417b59276..ae57ca2991 100644 """ global instances try: -diff --git a/src/sage/libs/eclib/wrap.cpp b/src/sage/libs/eclib/wrap.cpp -index 5fd5693b53..d12468faa8 100644 ---- a/src/sage/libs/eclib/wrap.cpp -+++ b/src/sage/libs/eclib/wrap.cpp -@@ -133,8 +133,8 @@ char* Curvedata_isogeny_class(struct Curvedata* E, int verbose) - - - int mw_process(struct Curvedata* curve, struct mw* m, -- const struct bigint* x, const struct bigint* y, -- const struct bigint* z, int sat) -+ const bigint* x, const bigint* y, -+ const bigint* z, int sat) - { - Point P(*curve, *x, *y, *z); - if (!P.isvalid()) -@@ -188,7 +188,7 @@ int mw_rank(struct mw* m) - } - - /* Returns index and unsat long array, which user must deallocate */ --int mw_saturate(struct mw* m, struct bigint* index, char** unsat, -+int mw_saturate(struct mw* m, bigint* index, char** unsat, - long sat_bd, int odd_primes_only) - { - vector<long> v; diff --git a/pkgs/applications/science/math/sage/patches/pari-no-threads.patch b/pkgs/applications/science/math/sage/patches/pari-no-threads.patch deleted file mode 100644 index 13b47dbdd31b..000000000000 --- a/pkgs/applications/science/math/sage/patches/pari-no-threads.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/sage/libs/pari/__init__.py b/src/sage/libs/pari/__init__.py -index e451766474..77eda66097 100644 ---- a/src/sage/libs/pari/__init__.py -+++ b/src/sage/libs/pari/__init__.py -@@ -205,6 +205,13 @@ def _get_pari_instance(): - # messages in Sage. - P.default("debugmem", 0) - -+ # Make sure pari doesn't use threads, regardless of how it was compiled. -+ # Threads cause some doctest failures (memory issues). Those could probably -+ # be solved without disabling threads. But that would require figuring out -+ # some sensible values for `threadsizemax`. See -+ # https://pari.math.u-bordeaux.fr/dochtml/html/GP_defaults.html -+ P.default("nbthreads", 1) -+ - return P - - pari = _get_pari_instance() diff --git a/pkgs/applications/science/math/sage/patches/singular-4.1.1p2.patch b/pkgs/applications/science/math/sage/patches/singular-4.1.1p2.patch deleted file mode 100644 index 4c8df92904ed..000000000000 --- a/pkgs/applications/science/math/sage/patches/singular-4.1.1p2.patch +++ /dev/null @@ -1,274 +0,0 @@ -diff --git a/src/sage/interfaces/singular.py b/src/sage/interfaces/singular.py -index 9d65c9fa6c..a028bbe719 100644 ---- a/src/sage/interfaces/singular.py -+++ b/src/sage/interfaces/singular.py -@@ -654,7 +654,7 @@ class Singular(ExtraTabCompletion, Expect): - - s = Expect.eval(self, x, **kwds) - -- if s.find("error") != -1 or s.find("Segment fault") != -1: -+ if s.find("error occurred") != -1 or s.find("Segment fault") != -1: - raise SingularError('Singular error:\n%s'%s) - - if get_verbose() > 0: -@@ -1079,7 +1079,7 @@ class Singular(ExtraTabCompletion, Expect): - sage: S = singular.ring('real', '(a,b)', 'lp') - sage: singular.current_ring() - polynomial ring, over a field, global ordering -- // coefficients: float -+ // coefficients: Float() - // number of vars : 2 - // block 1 : ordering lp - // : names a b -@@ -1157,7 +1157,7 @@ class Singular(ExtraTabCompletion, Expect): - sage: singular._tab_completion() - ['exteriorPower', - ... -- 'flintZ'] -+ 'crossprod'] - """ - p = re.compile("// *([a-z0-9A-Z_]*).*") #compiles regular expression - proclist = self.eval("listvar(proc)").splitlines() -@@ -1183,7 +1183,7 @@ class Singular(ExtraTabCompletion, Expect): - EXAMPLES:: - - sage: singular.version() -- "Singular ... version 4.1.0 ... -+ "Singular ... version 4... - """ - return singular_version() - -@@ -1562,7 +1562,7 @@ class SingularElement(ExtraTabCompletion, ExpectElement): - elif charstr[0] in ['0', 'QQ']: - from sage.all import QQ - br = QQ -- elif charstr[0]=='real': -+ elif charstr[0].startswith('Float'): - from sage.all import RealField, ceil, log - prec = singular.eval('ringlist(basering)[1][2][1]') - br = RealField(ceil((ZZ(prec)+1)/log(2,10))) -@@ -1750,7 +1750,7 @@ class SingularElement(ExtraTabCompletion, ExpectElement): - - # Singular 4 puts parentheses around floats and sign outside them - charstr = self.parent().eval('charstr(basering)').split(',',1) -- if charstr[0] in ['real', 'complex']: -+ if charstr[0]=='complex' or charstr[0].startswith('Float'): - for i in range(coeff_start, 2 * coeff_start): - singular_poly_list[i] = singular_poly_list[i].replace('(','').replace(')','') - -@@ -1992,7 +1992,7 @@ class SingularElement(ExtraTabCompletion, ExpectElement): - sage: S = singular.ring('real', '(a,b)', 'lp') - sage: singular.current_ring() - polynomial ring, over a field, global ordering -- // coefficients: float -+ // coefficients: Float() - // number of vars : 2 - // block 1 : ordering lp - // : names a b -@@ -2072,7 +2072,7 @@ class SingularElement(ExtraTabCompletion, ExpectElement): - sage: R._tab_completion() - ['exteriorPower', - ... -- 'flintZ'] -+ 'crossprod'] - """ - return self.parent()._tab_completion() - -@@ -2358,7 +2358,7 @@ def singular_version(): - EXAMPLES:: - - sage: singular.version() -- "Singular ... version 4.1.0 ... -+ "Singular ... version 4... - """ - return singular.eval('system("--version");') - -diff --git a/src/sage/libs/singular/decl.pxd b/src/sage/libs/singular/decl.pxd -index 4b658c4807..d863740419 100644 ---- a/src/sage/libs/singular/decl.pxd -+++ b/src/sage/libs/singular/decl.pxd -@@ -170,7 +170,7 @@ cdef extern from "singular/Singular/libsingular.h": - - int n_NumberOfParameters(const n_Procs_s* r) - -- ctypedef struct poly "polyrec": -+ ctypedef struct poly "spolyrec": - poly *next - number *coef - unsigned long exp[1] -@@ -630,9 +630,13 @@ cdef extern from "singular/Singular/libsingular.h": - # return p*q, destroys p and q - poly *p_Mult_q(poly *p, poly *q, ring *r) - -+ # polynomial division, ignoring the rest -+ # via singclap_pdivide resp. idLift, destroys p,q -+ poly *p_Divide(poly *p, poly *q, ring *r) -+ - # divide monomial p by monomial q, p,q const - -- poly *pDivide(poly *p,poly *q) -+ poly *pMDivide(poly *p,poly *q) - - # return the i-th power of p; p destroyed, requires global ring - -diff --git a/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx b/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx -index 2a8d9ae021..aeff53af6c 100644 ---- a/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx -+++ b/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx -@@ -190,8 +190,8 @@ from sage.libs.singular.decl cimport ( - n_IsUnit, n_Invers, - p_ISet, rChangeCurrRing, p_Copy, p_Init, p_SetCoeff, p_Setm, p_SetExp, p_Add_q, - p_NSet, p_GetCoeff, p_Delete, p_GetExp, pNext, rRingVar, omAlloc0, omStrDup, -- omFree, pDivide, p_SetCoeff0, n_Init, p_DivisibleBy, pLcm, p_LmDivisibleBy, -- pDivide, p_IsConstant, p_ExpVectorEqual, p_String, p_LmInit, n_Copy, -+ omFree, pMDivide, p_Divide, p_SetCoeff0, n_Init, p_DivisibleBy, pLcm, p_LmDivisibleBy, -+ pMDivide, p_IsConstant, p_ExpVectorEqual, p_String, p_LmInit, n_Copy, - p_IsUnit, p_Series, p_Head, idInit, fast_map_common_subexp, id_Delete, - p_IsHomogeneous, p_Homogen, p_Totaldegree,pLDeg1_Totaldegree, singclap_pdivide, singclap_factorize, - idLift, IDELEMS, On, Off, SW_USE_CHINREM_GCD, SW_USE_EZGCD, -@@ -1693,8 +1693,8 @@ cdef class MPolynomialRing_libsingular(MPolynomialRing_base): - if not g._poly: - raise ZeroDivisionError - -- if r!=currRing: rChangeCurrRing(r) # pDivide -- res = pDivide(f._poly, g._poly) -+ if r!=currRing: rChangeCurrRing(r) # pMDivide -+ res = pMDivide(f._poly, g._poly) - if coeff: - if r.cf.type == n_unknown or r.cf.cfDivBy(p_GetCoeff(f._poly, r), p_GetCoeff(g._poly, r), r.cf): - n = r.cf.cfDiv( p_GetCoeff(f._poly, r) , p_GetCoeff(g._poly, r), r.cf) -@@ -1853,8 +1853,8 @@ cdef class MPolynomialRing_libsingular(MPolynomialRing_base): - and (<MPolynomial_libsingular>g) \ - and g.parent() is self \ - and p_LmDivisibleBy((<MPolynomial_libsingular>g)._poly, m, r): -- if r!=currRing: rChangeCurrRing(r) # pDivide -- flt = pDivide(f._poly, (<MPolynomial_libsingular>g)._poly) -+ if r!=currRing: rChangeCurrRing(r) # pMDivide -+ flt = pMDivide(f._poly, (<MPolynomial_libsingular>g)._poly) - #p_SetCoeff(flt, n_Div( p_GetCoeff(f._poly, r) , p_GetCoeff((<MPolynomial_libsingular>g)._poly, r), r), r) - p_SetCoeff(flt, n_Init(1, r), r) - return new_MP(self,flt), g -@@ -4023,16 +4023,6 @@ cdef class MPolynomial_libsingular(MPolynomial): - Traceback (most recent call last): - ... - NotImplementedError: Division of multivariate polynomials over non fields by non-monomials not implemented. -- -- TESTS:: -- -- sage: P.<x,y> = ZZ[] -- sage: p = 3*(-x^8*y^2 - x*y^9 + 6*x^8*y + 17*x^2*y^6 - x^3*y^2) -- sage: q = 7*(x^2 + x*y + y^2 + 1) -- sage: p*q//q == p -- True -- sage: p*q//p == q -- True - """ - cdef MPolynomialRing_libsingular parent = self._parent - cdef ring *r = self._parent_ring -@@ -4052,13 +4042,18 @@ cdef class MPolynomial_libsingular(MPolynomial): - _right = <MPolynomial_libsingular>right - - if r.cf.type != n_unknown: -+ if r.cf.type == n_Z: -+ P = parent.change_ring(RationalField()) -+ f = P(self)//P(right) -+ CM = list(f) -+ return parent(sum([c.floor()*m for c,m in CM])) - if _right.is_monomial(): - p = _self._poly - quo = p_ISet(0,r) -- if r != currRing: rChangeCurrRing(r) # pDivide -+ if r != currRing: rChangeCurrRing(r) # pMDivide - while p: - if p_DivisibleBy(_right._poly, p, r): -- temp = pDivide(p, _right._poly) -+ temp = pMDivide(p, _right._poly) - p_SetCoeff0(temp, n_Copy(p_GetCoeff(p, r), r), r) - quo = p_Add_q(quo, temp, r) - p = pNext(p) -@@ -4794,6 +4789,8 @@ cdef class MPolynomial_libsingular(MPolynomial): - sage: p = -x*y + x*z + 54*x - 2 - sage: (5*p^2).lcm(3*p) == 15*p^2 - True -+ sage: lcm(2*x,2*x*y) -+ 2*x*y - """ - cdef ring *_ring = self._parent_ring - cdef poly *ret -@@ -4821,9 +4818,7 @@ cdef class MPolynomial_libsingular(MPolynomial): - if _ring!=currRing: rChangeCurrRing(_ring) # singclap_gcd - gcd = singclap_gcd(p_Copy(self._poly, _ring), p_Copy(_g._poly, _ring), _ring ) - prod = pp_Mult_qq(self._poly, _g._poly, _ring) -- ret = singclap_pdivide(prod , gcd , _ring) -- p_Delete(&prod, _ring) -- p_Delete(&gcd, _ring) -+ ret = p_Divide(prod, gcd, _ring) - if count >= 20: - sig_off() - return new_MP(self._parent, ret) -@@ -4866,7 +4861,7 @@ cdef class MPolynomial_libsingular(MPolynomial): - sage: f.quo_rem(y) - (2*x^2, x + 1) - sage: f.quo_rem(3*x) -- (2*x*y + 1, -4*x^2*y - 2*x + 1) -+ (0, 2*x^2*y + x + 1) - - TESTS:: - -@@ -4888,7 +4883,7 @@ cdef class MPolynomial_libsingular(MPolynomial): - if right.is_zero(): - raise ZeroDivisionError - -- if not self._parent._base.is_field() and not is_IntegerRing(self._parent._base): -+ if not self._parent._base.is_field(): - py_quo = self//right - py_rem = self - right*py_quo - return py_quo, py_rem -diff --git a/src/sage/rings/polynomial/plural.pyx b/src/sage/rings/polynomial/plural.pyx -index d5439f7f08..ad20ebcca0 100644 ---- a/src/sage/rings/polynomial/plural.pyx -+++ b/src/sage/rings/polynomial/plural.pyx -@@ -998,7 +998,7 @@ cdef class NCPolynomialRing_plural(Ring): - if not g._poly: - raise ZeroDivisionError - -- res = pDivide(f._poly,g._poly) -+ res = pMDivide(f._poly,g._poly) - if coeff: - if (r.cf.type == n_unknown) or r.cf.cfDivBy(p_GetCoeff(f._poly, r), p_GetCoeff(g._poly, r), r.cf): - n = r.cf.cfDiv( p_GetCoeff(f._poly, r) , p_GetCoeff(g._poly, r), r.cf) -@@ -1193,7 +1193,7 @@ cdef class NCPolynomialRing_plural(Ring): - if isinstance(g, NCPolynomial_plural) \ - and (<NCPolynomial_plural>g) \ - and p_LmDivisibleBy((<NCPolynomial_plural>g)._poly, m, r): -- flt = pDivide(f._poly, (<NCPolynomial_plural>g)._poly) -+ flt = pMDivide(f._poly, (<NCPolynomial_plural>g)._poly) - #p_SetCoeff(flt, n_Div( p_GetCoeff(f._poly, r) , p_GetCoeff((<NCPolynomial_plural>g)._poly, r), r), r) - p_SetCoeff(flt, n_Init(1, r), r) - return new_NCP(self,flt), g -diff --git a/src/sage/rings/polynomial/polynomial_singular_interface.py b/src/sage/rings/polynomial/polynomial_singular_interface.py -index 9331169f8b..f753610fd3 100644 ---- a/src/sage/rings/polynomial/polynomial_singular_interface.py -+++ b/src/sage/rings/polynomial/polynomial_singular_interface.py -@@ -81,8 +81,8 @@ class PolynomialRing_singular_repr: - sage: R.<x,y> = PolynomialRing(CC) - sage: singular(R) - polynomial ring, over a field, global ordering -- // coefficients: float[I](complex:15 digits, additional 0 digits)/(I^2+1) -- // number of vars : 2 -+ // coefficients: real[I](complex:15 digits, additional 0 digits)/(I^2+1) -+ // number of vars : 2 - // block 1 : ordering dp - // : names x y - // block 2 : ordering C -@@ -90,8 +90,8 @@ class PolynomialRing_singular_repr: - sage: R.<x,y> = PolynomialRing(RealField(100)) - sage: singular(R) - polynomial ring, over a field, global ordering -- // coefficients: float -- // number of vars : 2 -+ // coefficients: Float() -+ // number of vars : 2 - // block 1 : ordering dp - // : names x y - // block 2 : ordering C diff --git a/pkgs/applications/science/math/sage/patches/spkg-scripts.patch b/pkgs/applications/science/math/sage/patches/spkg-scripts.patch deleted file mode 100644 index 4d37998b288b..000000000000 --- a/pkgs/applications/science/math/sage/patches/spkg-scripts.patch +++ /dev/null @@ -1,46 +0,0 @@ -commit f02714d4aea80e17cb8df62bab75d7c1a1b61a8e -Author: Timo Kaufmann <timokau@zoho.com> -Date: Mon Jul 9 18:26:18 2018 +0200 - - Don't attempt to create dirs when showing pkg info - - The script dir cannot be assumed to be writeable after installation. - -diff --git a/build/bin/sage-spkg b/build/bin/sage-spkg -index f3e02aeae5..190d558ad1 100755 ---- a/build/bin/sage-spkg -+++ b/build/bin/sage-spkg -@@ -167,14 +167,6 @@ if [ -z "$SAGE_BUILD_DIR" ]; then - export SAGE_BUILD_DIR="$SAGE_LOCAL/var/tmp/sage/build" - fi - --for dir in "$SAGE_SPKG_INST" "$SAGE_SPKG_SCRIPTS"; do -- mkdir -p "$dir" -- if [ $? -ne 0 ]; then -- error_msg "Error creating directory $dir" -- exit 1 -- fi --done -- - - # Remove '.' from PYTHONPATH, which may also come from SAGE_PATH, to avoid - # trouble with setuptools / easy_install (cf. #10192, #10176): -@@ -563,11 +555,13 @@ fi - # Setup directories - ################################################################## - --mkdir -p "$SAGE_BUILD_DIR" --if [ $? -ne 0 ]; then -- error_msg "Error creating directory $SAGE_BUILD_DIR" -- exit 1 --fi -+for dir in "$SAGE_SPKG_INST" "$SAGE_SPKG_SCRIPTS" "$SAGE_BUILD_DIR"; do -+ mkdir -p "$dir" -+ if [ $? -ne 0 ]; then -+ error_msg "Error creating directory $dir" -+ exit 1 -+ fi -+done - - # Trac #5852: check write permissions - if [ ! -w "$SAGE_BUILD_DIR" ]; then diff --git a/pkgs/applications/science/math/sage/patches/test-in-tmpdir.patch b/pkgs/applications/science/math/sage/patches/test-in-tmpdir.patch deleted file mode 100644 index febab3702771..000000000000 --- a/pkgs/applications/science/math/sage/patches/test-in-tmpdir.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/src/sage/repl/ipython_kernel/install.py b/src/sage/repl/ipython_kernel/install.py -index aa23c8405d..8a87de0591 100644 ---- a/src/sage/repl/ipython_kernel/install.py -+++ b/src/sage/repl/ipython_kernel/install.py -@@ -112,7 +112,7 @@ class SageKernelSpec(object): - EXAMPLES:: - - sage: from sage.repl.ipython_kernel.install import SageKernelSpec -- sage: spec = SageKernelSpec() -+ sage: spec = SageKernelSpec(prefix = tmp_dir()) - sage: spec.use_local_mathjax() - sage: mathjax = os.path.join(spec.nbextensions_dir, 'mathjax') - sage: os.path.isdir(mathjax) -@@ -129,7 +129,7 @@ class SageKernelSpec(object): - EXAMPLES:: - - sage: from sage.repl.ipython_kernel.install import SageKernelSpec -- sage: spec = SageKernelSpec() -+ sage: spec = SageKernelSpec(prefix = tmp_dir()) - sage: spec.use_local_jsmol() - sage: jsmol = os.path.join(spec.nbextensions_dir, 'jsmol') - sage: os.path.isdir(jsmol) -@@ -146,7 +146,7 @@ class SageKernelSpec(object): - EXAMPLES:: - - sage: from sage.repl.ipython_kernel.install import SageKernelSpec -- sage: spec = SageKernelSpec() -+ sage: spec = SageKernelSpec(prefix = tmp_dir()) - sage: spec.use_local_threejs() - sage: threejs = os.path.join(spec.nbextensions_dir, 'threejs') - sage: os.path.isdir(threejs) diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index f74da33f4026..f217a7a0caed 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -3,35 +3,17 @@ , fetchpatch }: stdenv.mkDerivation rec { - version = "8.3"; + version = "8.4"; name = "sage-src-${version}"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - sha256 = "0mbm99m5xry21xpi4q3q96gx392liwbifywf5awvl0j85a7rkfyx"; + sha256 = "0gips1hagiz9m7s21bg5as8hrrm2x5k47h1bsq0pc46iplfwmv2d"; }; nixPatches = [ - # https://trac.sagemath.org/ticket/25809 - ./patches/spkg-scripts.patch - - # https://trac.sagemath.org/ticket/25309 - (fetchpatch { - name = "spkg-paths.patch"; - url = "https://git.sagemath.org/sage.git/patch/?h=97f06fddee920399d4fcda65aa9b0925774aec69&id=a86151429ccce1ddd085e8090ada8ebdf02f3310"; - sha256 = "1xb9108rzzkdhn71vw44525620d3ww9jv1fph5a77v9y7nf9wgr7"; - }) - (fetchpatch { - name = "maxima-fas.patch"; - url = "https://git.sagemath.org/sage.git/patch/?h=97f06fddee920399d4fcda65aa9b0925774aec69"; - sha256 = "14s50yg3hpw9cp3v581dx7zfmpm2j972im7x30iwki8k45mjvk3i"; - }) - - # https://trac.sagemath.org/ticket/25722 - ./patches/test-in-tmpdir.patch - # https://trac.sagemath.org/ticket/25358 (fetchpatch { name = "safe-directory-test-without-patch.patch"; @@ -45,46 +27,9 @@ stdenv.mkDerivation rec { # https://trac.sagemath.org/ticket/25316 # https://github.com/python/cpython/pull/7476 ./patches/python-5755-hotpatch.patch - - # https://trac.sagemath.org/ticket/25315 - (fetchpatch { - name = "find-libraries-in-dyld-library-path.patch"; - url = "https://git.sagemath.org/sage.git/patch/?h=20d4593876ce9c6004eac2ab6fd61786d0d96a06"; - sha256 = "1k3afq3qlzmgqwx6rzs5wv153vv9dsf5rk8pi61g57l3r3npbjmc"; - }) - - # https://trac.sagemath.org/ticket/25345 - # (upstream patch doesn't apply on 8.2 source) - ./patches/dochtml-optional.patch - - # work with pari with threads enabled at compile time (disable them at runtime) - # https://trac.sagemath.org/ticket/26002 - ./patches/pari-no-threads.patch ]; packageUpgradePatches = [ - (fetchpatch { - name = "cypari2-1.2.1.patch"; - url = "https://git.sagemath.org/sage.git/patch/?h=62fe6eb15111327d930336d4252d5b23cbb22ab9"; - sha256 = "1xax7vvs8h4xip16xcsp47xdb6lig6f2r3pl8cksvlz8lhgbyxh2"; - }) - - # matplotlib 2.2.2 deprecated `normed` (replaced by `density`). - # This patch only ignores the warning. It would be equally easy to fix it - # (by replacing all mentions of `normed` by `density`), but its better to - # stay close to sage upstream. I didn't open an upstream ticket about it - # because the matplotlib update also requires a new dependency (kiwisolver) - # and I don't want to invest the time to learn how to add it. - ./patches/matplotlib-normed-deprecated.patch - - # Update to 20171219 broke the doctests because of insignificant precision - # changes, make the doctests less fragile. - # I didn't open an upstream ticket because its not entirely clear if - # 20171219 is really "released" yet. It is listed on the github releases - # page, but not marked as "latest release" and the homepage still links to - # the last version. - ./patches/eclib-regulator-precision.patch - # New glpk version has new warnings, filter those out until upstream sage has found a solution # https://trac.sagemath.org/ticket/24824 ./patches/pari-stackwarn.patch # not actually necessary since tha pari upgrade, but necessary for the glpk patch to apply @@ -94,66 +39,15 @@ stdenv.mkDerivation rec { stripLen = 1; }) - (fetchpatch { - name = "matplotlib-2.2.2"; - url = "https://git.sagemath.org/sage.git/patch?id=0d6244ed53b71aba861ce3d683d33e542c0bf0b0"; - sha256 = "15x4cadxxlsdfh2sblgagqjj6ir13fgdzixxnwnvzln60saahb34"; - }) - - (fetchpatch { - name = "scipy-1.1.0"; - url = "https://git.sagemath.org/sage.git/patch?id=e0db968a51678b34ebd8d34906c7042900272378"; - sha256 = "0kq5zxqphhrmavrmg830wdr7hwp1bkzdqlf3jfqfr8r8xq12qwf7"; - }) - # https://trac.sagemath.org/ticket/25260 ./patches/numpy-1.15.1.patch - # https://trac.sagemath.org/ticket/25862 - ./patches/eclib-20180710.patch - - # https://trac.sagemath.org/ticket/24735 - ./patches/singular-4.1.1p2.patch - - # https://trac.sagemath.org/ticket/25567 and dependency #25635 - (fetchpatch { - name = "pari-upgrade-dependency.patch"; - url = "https://git.sagemath.org/sage.git/patch/?id=6995e7cae1b3476ad0145f8dfc897cf91f0c3c4d"; - sha256 = "1dvhabl1c9pwd9xkjvbjjg15mvb14b24p1f3cby1mlqk34d4lrs6"; - }) - (fetchpatch { - name = "pari-2.11.0.patch"; - url = "https://git.sagemath.org/sage.git/patch/?id=7af4748cab37d651eaa88be501db88f4a5ffc584"; - sha256 = "13f740ly3c19gcmhjngiycvmc3mcfj61y00i6jv0wmfgpm2z3ank"; - }) - # ntl upgrade (fetchpatch { name = "lcalc-c++11.patch"; url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/sagemath-lcalc-c++11.patch?h=packages/sagemath&id=0e31ae526ab7c6b5c0bfacb3f8b1c4fd490035aa"; sha256 = "0p5wnvbx65i7cp0bjyaqgp4rly8xgnk12pqwaq3dqby0j2bk6ijb"; }) - - # cddlib 0.94i -> 0.94j - (fetchpatch { - name = "cddlib-0.94j.patch"; - url = "https://git.sagemath.org/sage.git/patch/?id=2ab1546b3e21d1d0ab3b4fcd58576848b3a2d888"; - sha256 = "1c5gnasq7y9xxj762bn79bis0zi8d9bgg7jzlf64ifixsrc5cymb"; - }) - - # arb 2.13.0 -> 2.14.0 - (fetchpatch { - name = "arb-2.14.0.patch"; - url = "https://git.sagemath.org/sage.git/patch?id2=8.4.beta0&id=8bef4fd2876a61969b516fe4eb3b8ad7cc076c5e"; - sha256 = "00p3hfsfn3w2vxgd9fjd23mz7xfxjfravf8ysjxkyd657jbkpjmk"; - }) - - # https://trac.sagemath.org/ticket/26117 - (fetchpatch { - name = "sympy-1.2.patch"; - url = "https://git.sagemath.org/sage.git/patch?id2=8.4.beta2&id=d94a0a3a3fb4aec05a6f4d95166d90c284f05c36"; - sha256 = "0an2xl1pp3jg36kgg2m1vb7sns7rprk1h3d0qy1gxwdab6i7qnvi"; - }) ]; patches = nixPatches ++ packageUpgradePatches ++ [ diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix index abcefba5e260..d26f5dad724e 100644 --- a/pkgs/applications/science/math/sage/sagelib.nix +++ b/pkgs/applications/science/math/sage/sagelib.nix @@ -47,6 +47,8 @@ , singular , pip , jupyter_core +, libhomfly +, libbraiding }: buildPythonPackage rec { @@ -109,6 +111,8 @@ buildPythonPackage rec { pip cython cysignals + libhomfly + libbraiding ]; buildPhase = '' diff --git a/pkgs/desktops/plasma-5/breeze-qt5.nix b/pkgs/desktops/plasma-5/breeze-qt5.nix index 1448bb40d78c..3f3222e05cdb 100644 --- a/pkgs/desktops/plasma-5/breeze-qt5.nix +++ b/pkgs/desktops/plasma-5/breeze-qt5.nix @@ -3,7 +3,7 @@ extra-cmake-modules, frameworkintegration, kcmutils, kconfigwidgets, kcoreaddons, kdecoration, kguiaddons, ki18n, kwayland, kwindowsystem, plasma-framework, qtdeclarative, - qtx11extras + qtx11extras, fftw }: mkDerivation { @@ -13,7 +13,7 @@ mkDerivation { propagatedBuildInputs = [ frameworkintegration kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons ki18n kwayland kwindowsystem plasma-framework qtdeclarative - qtx11extras + qtx11extras fftw ]; outputs = [ "bin" "dev" "out" ]; cmakeFlags = [ "-DUSE_Qt4=OFF" ]; diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index fc1850b3c2a4..64907e6271d8 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.13.5/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.14.0/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch b/pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch index b4bc89d59e9e..69f7bc4e56a0 100644 --- a/pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch +++ b/pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch @@ -1,11 +1,11 @@ -Index: kde-gtk-config-5.12.4/src/gtkconfigkcmodule.cpp -=================================================================== ---- kde-gtk-config-5.12.4.orig/src/gtkconfigkcmodule.cpp -+++ kde-gtk-config-5.12.4/src/gtkconfigkcmodule.cpp -@@ -78,6 +78,16 @@ GTKConfigKCModule::GTKConfigKCModule(QWi - m_iconsModel = new IconThemesModel(false, this); - ui->cb_icon->setModel(m_iconsModel); - ui->cb_icon_fallback->setModel(m_iconsModel); +diff --git a/src/gtkconfigkcmodule.cpp b/src/gtkconfigkcmodule.cpp +index 7b82d50..96831d8 100644 +--- a/src/gtkconfigkcmodule.cpp ++++ b/src/gtkconfigkcmodule.cpp +@@ -91,6 +91,16 @@ GTKConfigKCModule::GTKConfigKCModule(QWidget* parent, const QVariantList& args ) + iconsProxyModel->sort(0); + ui->cb_icon->setModel(iconsProxyModel); + ui->cb_icon_fallback->setModel(iconsProxyModel); + + // Add GSETTINGS_SCHEMAS_PATH to the front of XDG_DATA_DIRS. + // Normally this would be done by wrapGAppsHook, but this plugin diff --git a/pkgs/desktops/plasma-5/plasma-integration/D9070.patch b/pkgs/desktops/plasma-5/plasma-integration/D9070.patch deleted file mode 100644 index 66fef4712a7b..000000000000 --- a/pkgs/desktops/plasma-5/plasma-integration/D9070.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: src/platformtheme/kfontsettingsdata.cpp -=================================================================== ---- src/platformtheme/kfontsettingsdata.cpp -+++ src/platformtheme/kfontsettingsdata.cpp -@@ -70,15 +70,18 @@ - const KFontData &fontData = DefaultFontData[fontType]; - cachedFont = new QFont(QLatin1String(fontData.FontName), fontData.Size, fontData.Weight); - cachedFont->setStyleHint(fontData.StyleHint); -- cachedFont->setStyleName(QLatin1String(fontData.StyleName)); - - const KConfigGroup configGroup(mKdeGlobals, fontData.ConfigGroupKey); - QString fontInfo = configGroup.readEntry(fontData.ConfigKey, QString()); - - //If we have serialized information for this font, restore it - //NOTE: We are not using KConfig directly because we can't call QFont::QFont from here - if (!fontInfo.isEmpty()) { - cachedFont->fromString(fontInfo); -+ } else { -+ // set the canonical stylename here, where it cannot override -+ // user-specific font attributes if those do not include a stylename. -+ cachedFont->setStyleName(QLatin1String(fontData.StyleName)); - } - - mFonts[fontType] = cachedFont; diff --git a/pkgs/desktops/plasma-5/plasma-integration/default.nix b/pkgs/desktops/plasma-5/plasma-integration/default.nix index d33ecf050242..f69644287624 100644 --- a/pkgs/desktops/plasma-5/plasma-integration/default.nix +++ b/pkgs/desktops/plasma-5/plasma-integration/default.nix @@ -14,11 +14,4 @@ mkDerivation { breeze-qt5 kconfig kconfigwidgets kiconthemes kio knotifications kwayland libXcursor qtquickcontrols2 ]; - patches = [ - # See also: https://phabricator.kde.org/D9070 - # ttuegel: The patch is checked into Nixpkgs because I could not get - # Phabricator to give me a stable link to it. - ./D9070.patch - ]; - patchFlags = "-p0"; } diff --git a/pkgs/desktops/plasma-5/plasma-vault/cryfs-path.patch b/pkgs/desktops/plasma-5/plasma-vault/cryfs-path.patch index b3f19c4e0025..6bab35fe4a97 100644 --- a/pkgs/desktops/plasma-5/plasma-vault/cryfs-path.patch +++ b/pkgs/desktops/plasma-5/plasma-vault/cryfs-path.patch @@ -1,17 +1,13 @@ diff --git a/kded/engine/backends/cryfs/cryfsbackend.cpp b/kded/engine/backends/cryfs/cryfsbackend.cpp -index f6ef54f..160034a 100644 +index 58a6929..7212980 100644 --- a/kded/engine/backends/cryfs/cryfsbackend.cpp +++ b/kded/engine/backends/cryfs/cryfsbackend.cpp -@@ -136,11 +136,10 @@ bool CryFsBackend::isInitialized(const Device &device) const +@@ -241,7 +241,7 @@ QProcess *CryFsBackend::cryfs(const QStringList &arguments) const + auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE); + KConfigGroup backendConfig(config, "CryfsBackend"); - QProcess *CryFsBackend::cryfs(const QStringList &arguments) const - { - return process("cryfs", + return process(NIXPKGS_CRYFS, - arguments, + arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), { { "CRYFS_FRONTEND", "noninteractive" } }); } - - - } // namespace PlasmaVault -- diff --git a/pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch b/pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch index b494df55c5d0..e1c325e16934 100644 --- a/pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch +++ b/pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch @@ -1,16 +1,17 @@ diff --git a/kded/engine/backends/encfs/encfsbackend.cpp b/kded/engine/backends/encfs/encfsbackend.cpp -index 47bb237..4ff064d 100644 +index 628af7b..6edd38e 100644 --- a/kded/engine/backends/encfs/encfsbackend.cpp +++ b/kded/engine/backends/encfs/encfsbackend.cpp -@@ -132,17 +132,16 @@ bool EncFsBackend::isInitialized(const Device &device) const +@@ -137,7 +137,7 @@ QProcess *EncFsBackend::encfs(const QStringList &arguments) const + auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE); + KConfigGroup backendConfig(config, "EncfsBackend"); - QProcess *EncFsBackend::encfs(const QStringList &arguments) const - { -- return process("encfs", arguments, {}); -+ return process(NIXPKGS_ENCFS, arguments, {}); +- return process("encfs", ++ return process(NIXPKGS_ENCFS, + arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), + {}); } - - +@@ -146,7 +146,7 @@ QProcess *EncFsBackend::encfs(const QStringList &arguments) const QProcess *EncFsBackend::encfsctl(const QStringList &arguments) const { @@ -19,6 +20,3 @@ index 47bb237..4ff064d 100644 } - - } // namespace PlasmaVault -- diff --git a/pkgs/desktops/plasma-5/plasma-vault/fusermount-path.patch b/pkgs/desktops/plasma-5/plasma-vault/fusermount-path.patch index cd1b736a103f..b2a7866531bf 100644 --- a/pkgs/desktops/plasma-5/plasma-vault/fusermount-path.patch +++ b/pkgs/desktops/plasma-5/plasma-vault/fusermount-path.patch @@ -1,8 +1,8 @@ diff --git a/kded/engine/fusebackend_p.cpp b/kded/engine/fusebackend_p.cpp -index 81ce494..d3c5c9f 100644 +index d07e313..ea7d81c 100644 --- a/kded/engine/fusebackend_p.cpp +++ b/kded/engine/fusebackend_p.cpp -@@ -103,7 +103,7 @@ QProcess *FuseBackend::process(const QString &executable, +@@ -106,7 +106,7 @@ QProcess *FuseBackend::process(const QString &executable, QProcess *FuseBackend::fusermount(const QStringList &arguments) const { @@ -11,7 +11,7 @@ index 81ce494..d3c5c9f 100644 } -@@ -245,4 +245,3 @@ bool FuseBackend::isOpened(const MountPoint &mountPoint) const +@@ -279,4 +279,3 @@ bool FuseBackend::isOpened(const MountPoint &mountPoint) const } } // namespace PlasmaVault diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index ab011576b2b7..2866cddbea18 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -68,10 +68,6 @@ mkDerivation { # ./plasma-workspace.patch. patches = [ ./plasma-workspace.patch - (fetchpatch { - url = "https://github.com/KDE/plasma-workspace/commit/11e570d861858f3b3e2694e5f9ec242d7f9f12b9.patch"; - sha256 = "1vk9yacb59k0v5mgbpgmciflca9r0ll4wh1d83ffx2y2v8sqwiv2"; - }) ]; preConfigure = '' diff --git a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch index 9027f6ad8a4a..dd5f7321f0e2 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch @@ -36,7 +36,7 @@ index 493218ea..d507aa55 100644 + return system( NIXPKGS_KDOSTARTUPCONFIG5 ); } diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake -index f9e2e429..0a4267a9 100644 +index 714a9bf1..9733c612 100644 --- a/startkde/startkde.cmake +++ b/startkde/startkde.cmake @@ -1,22 +1,31 @@ @@ -454,7 +454,7 @@ index f9e2e429..0a4267a9 100644 # finally, give the session control to the session manager # see kdebase/ksmserver for the description of the rest of the startup sequence -@@ -306,34 +352,37 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & +@@ -306,12 +352,16 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & # We only check for 255 which means that the ksmserver process could not be # started, any problems thereafter, e.g. ksmserver failing to initialize, # will remain undetected. @@ -474,11 +474,9 @@ index f9e2e429..0a4267a9 100644 if test $? -eq 255; then # Startup error echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null -- xmessage -geometry 500x100 "Could not start ksmserver. Check your installation." - fi - - #Anything after here is logout/shutdown +@@ -322,36 +372,36 @@ fi + #Anything after here is logout + #It is not called after shutdown/restart -wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true` +wait_drkonqi=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true) @@ -498,12 +496,13 @@ index f9e2e429..0a4267a9 100644 # ask remaining drkonqis to die in a graceful way - qdbus | grep 'org.kde.drkonqi-' | while read address ; do - qdbus "$address" "/MainApplication" "quit" +- done +- break + @NIXPKGS_QDBUS@ | @NIXPKGS_GREP@ 'org.kde.drkonqi-' | while read address ; do + @NIXPKGS_QDBUS@ "$address" "/MainApplication" "quit" - done - break fi -@@ -342,15 +391,17 @@ fi + done + fi echo 'startkde: Shutting down...' 1>&2 # just in case @@ -526,7 +525,7 @@ index f9e2e429..0a4267a9 100644 echo 'startkde: Done.' 1>&2 diff --git a/startkde/startplasma.cmake b/startkde/startplasma.cmake -index f7330ab3..5eedbb11 100644 +index de98541c..39c0b521 100644 --- a/startkde/startplasma.cmake +++ b/startkde/startplasma.cmake @@ -1,6 +1,6 @@ @@ -668,14 +667,15 @@ index f7330ab3..5eedbb11 100644 # finally, give the session control to the session manager # see kdebase/ksmserver for the description of the rest of the startup sequence -@@ -163,19 +109,19 @@ if test $? -eq 255; then - xmessage -geometry 500x100 "Could not start ksmserver. Check your installation." - fi +@@ -166,19 +112,19 @@ fi + #Anything after here is logout + #It is not called after shutdown/restart -wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true` -+wait_drkonqi=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true) - +- -if test x"$wait_drkonqi"x = x"true"x ; then ++wait_drkonqi=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true) ++ +if [ x"$wait_drkonqi"x = x"true"x ]; then # wait for remaining drkonqi instances with timeout (in seconds) - wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900` @@ -695,7 +695,7 @@ index f7330ab3..5eedbb11 100644 done break fi -@@ -184,15 +130,17 @@ fi +@@ -187,15 +133,17 @@ fi echo 'startplasma: Shutting down...' 1>&2 # just in case diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index a6c3cb66f6a2..690f5fafef27 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,363 +3,363 @@ { bluedevil = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/bluedevil-5.13.5.tar.xz"; - sha256 = "0am708cb6jfccx1jfbriwc2jgwd4ajqllirc9i0bg4jz5ydxbjxg"; - name = "bluedevil-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/bluedevil-5.14.0.tar.xz"; + sha256 = "0d1bw6cp2vwhs17j0bgc3gysy3g2syb1z0zwg28sa889l8a3qyv9"; + name = "bluedevil-5.14.0.tar.xz"; }; }; breeze = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/breeze-5.13.5.tar.xz"; - sha256 = "09jkkfdmngvbp8i2y6irlv6yvrzpc86mw6apmqvphiaqsilyxaw0"; - name = "breeze-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/breeze-5.14.0.tar.xz"; + sha256 = "0gd95a7km0pqc0qinn2p0kv72j0ihdl96vs14f5jr5n78a2r7r9a"; + name = "breeze-5.14.0.tar.xz"; }; }; breeze-grub = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/breeze-grub-5.13.5.tar.xz"; - sha256 = "03hsq77gi75chgyq9pzh3ry6k6bi78pfm33zn8gx784k9fx7gvqr"; - name = "breeze-grub-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/breeze-grub-5.14.0.tar.xz"; + sha256 = "17kghx9qv7flm2019alqg1a6pnacgczj1hc9sc0bvj8znh9hhxvh"; + name = "breeze-grub-5.14.0.tar.xz"; }; }; breeze-gtk = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/breeze-gtk-5.13.5.tar.xz"; - sha256 = "1knh0b27b81rnd87s31s2mawqcl1yzwjcakk5npzfm3nj23xakv3"; - name = "breeze-gtk-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/breeze-gtk-5.14.0.tar.xz"; + sha256 = "1zlhyv26k3zqm2bbd9mk7123q5xy5g2cp6ayavhglgxxb8n0zyx9"; + name = "breeze-gtk-5.14.0.tar.xz"; }; }; breeze-plymouth = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/breeze-plymouth-5.13.5.tar.xz"; - sha256 = "0xsjl602wsb5ak1xg19w8y0fv9404cwbj1rcrm0hgjv735m32c57"; - name = "breeze-plymouth-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/breeze-plymouth-5.14.0.tar.xz"; + sha256 = "1ilf3cp7cg3lpkxvd8n7h33wvsbbikrvd514gan2ns16j9d4ziz1"; + name = "breeze-plymouth-5.14.0.tar.xz"; }; }; discover = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/discover-5.13.5.tar.xz"; - sha256 = "1q3nc5lih95vs5masd8z897hvfvpwidiisj8bg62iq0cblsgwz6d"; - name = "discover-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/discover-5.14.0.tar.xz"; + sha256 = "1chkf5hjpnb4laq5sn7rr8f4fv90mg4brdsx71cz1b5xbvgyy1sf"; + name = "discover-5.14.0.tar.xz"; }; }; drkonqi = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/drkonqi-5.13.5.tar.xz"; - sha256 = "02kbmymzzhsf9slaf64xlp8sfv59gl7qf1g2ahcq58sqry5bqjnk"; - name = "drkonqi-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/drkonqi-5.14.0.tar.xz"; + sha256 = "0i5zgafkdxw6wqqfw81ygdmg5fffy2gkf6sciq7f8nfxxglw6pkp"; + name = "drkonqi-5.14.0.tar.xz"; }; }; kactivitymanagerd = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/kactivitymanagerd-5.13.5.tar.xz"; - sha256 = "0zfvypxh748vsl270l8wn6inmp8shi2m051yy699qdqbyb039wjq"; - name = "kactivitymanagerd-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/kactivitymanagerd-5.14.0.tar.xz"; + sha256 = "03jxvf4mgh0wmphykskc8ra49ghrjv5in4mgzpafswn7w8q8gyii"; + name = "kactivitymanagerd-5.14.0.tar.xz"; }; }; kde-cli-tools = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/kde-cli-tools-5.13.5.tar.xz"; - sha256 = "0p1az420p4ldinmxnkdwl69542ddm0r4f3wmdysfird7d68yw2hp"; - name = "kde-cli-tools-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/kde-cli-tools-5.14.0.tar.xz"; + sha256 = "1n51vaiy073jzs051wlpll7652bb7vwg5qmravndhl8ibqrv7qaz"; + name = "kde-cli-tools-5.14.0.tar.xz"; }; }; kdecoration = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/kdecoration-5.13.5.tar.xz"; - sha256 = "04p77fs5c9b4mbpcl4a2c1wc0i09g51b7c1v7n9fd4nfkm7z8sqs"; - name = "kdecoration-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/kdecoration-5.14.0.tar.xz"; + sha256 = "01gkl0yqplm1l2qa4gfw7rzi5zfdxq7d3a25qicdwhas69hc8nzm"; + name = "kdecoration-5.14.0.tar.xz"; }; }; kde-gtk-config = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/kde-gtk-config-5.13.5.tar.xz"; - sha256 = "06j64y7p5kxnrc3407hma0drh3sb8jvjp3mx6na6b86z4xxf1kj6"; - name = "kde-gtk-config-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/kde-gtk-config-5.14.0.tar.xz"; + sha256 = "0mb1am14hd3x5gkmy3vcg3wb9g29c8y38ywhr0f93riphws0nhvh"; + name = "kde-gtk-config-5.14.0.tar.xz"; }; }; kdeplasma-addons = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/kdeplasma-addons-5.13.5.tar.xz"; - sha256 = "1a4f61bbwhc2y0lnrglbq3sas16bxff0ga3im9d15nq5a5q637i1"; - name = "kdeplasma-addons-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/kdeplasma-addons-5.14.0.tar.xz"; + sha256 = "0k98ms851z2naw4rjmxldy6pl9a51mmwvq6c4znm2pnrw04jz15d"; + name = "kdeplasma-addons-5.14.0.tar.xz"; }; }; kgamma5 = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/kgamma5-5.13.5.tar.xz"; - sha256 = "08brmdi5y69iwhj7506q2l0bfm92c9l9ds9w4d1ipcgnbydrhfyn"; - name = "kgamma5-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/kgamma5-5.14.0.tar.xz"; + sha256 = "17vb1bb4glw6ccd1s1chjm07lvpkklcvny7rdjgmz2r00vk6mjqy"; + name = "kgamma5-5.14.0.tar.xz"; }; }; khotkeys = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/khotkeys-5.13.5.tar.xz"; - sha256 = "16kp5ck6zfpnmnvspdnqklix54np3sxvj5ixs9saqf3gd5rk49mp"; - name = "khotkeys-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/khotkeys-5.14.0.tar.xz"; + sha256 = "0b2q4s0j6wji8112l89347fc8ph9vrf2p8ngig0c4dn4ayk7hqd1"; + name = "khotkeys-5.14.0.tar.xz"; }; }; kinfocenter = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/kinfocenter-5.13.5.tar.xz"; - sha256 = "15r9j33z3l31gip9q3fw015s4mxakgy5wqfs04w5p0aq8x9xkpzl"; - name = "kinfocenter-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/kinfocenter-5.14.0.tar.xz"; + sha256 = "0pc1jc7d26w2asa2yj8rr04rgjvmavlyhw3wd0dqv08rhr0rl7pj"; + name = "kinfocenter-5.14.0.tar.xz"; }; }; kmenuedit = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/kmenuedit-5.13.5.tar.xz"; - sha256 = "0zha39cd3p5nmrbkhkbcavxns2n2wnb6chc5kcsk5km9wn4laxz0"; - name = "kmenuedit-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/kmenuedit-5.14.0.tar.xz"; + sha256 = "0ld9q5jq7zc6kz72pg9qqg10rbargkwyks657cnv8id1pna17bsr"; + name = "kmenuedit-5.14.0.tar.xz"; }; }; kscreen = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/kscreen-5.13.5.tar.xz"; - sha256 = "0kf1cf88n46b4js7x9r504605v68wp5hwpwid6phvfqdyqrvbb77"; - name = "kscreen-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/kscreen-5.14.0.tar.xz"; + sha256 = "1y28a96kal2gziga2vr6vg5swv2ynfiv3804n06v9847rd7s3ixk"; + name = "kscreen-5.14.0.tar.xz"; }; }; kscreenlocker = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/kscreenlocker-5.13.5.tar.xz"; - sha256 = "171zjk9r333kbkb9pashw0rdmiwq11nzfin4wnmqzwp7rrclxs18"; - name = "kscreenlocker-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/kscreenlocker-5.14.0.tar.xz"; + sha256 = "1nyd8jy4ngpg51nq46cx038i4w1qak9zi4d4v69blkhzd65gckj1"; + name = "kscreenlocker-5.14.0.tar.xz"; }; }; ksshaskpass = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/ksshaskpass-5.13.5.tar.xz"; - sha256 = "1znhj8x8kag1jrw0j1kfvqgprdayrcfbmawz2jap1ik2bjq7dp81"; - name = "ksshaskpass-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/ksshaskpass-5.14.0.tar.xz"; + sha256 = "0nqvr3z7058hfymw8gglnfmcxx976km6sf0msyd3ykfpymxsmz74"; + name = "ksshaskpass-5.14.0.tar.xz"; }; }; ksysguard = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/ksysguard-5.13.5.tar.xz"; - sha256 = "1qjqhqc23rbimz3qj8gr3dhp0griwgbiajhvjngh1jl55fb3q29j"; - name = "ksysguard-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/ksysguard-5.14.0.tar.xz"; + sha256 = "0hbcx20r57lfh566q2974rs2kzlq5ghxadnd1ghiwz5141xh02bm"; + name = "ksysguard-5.14.0.tar.xz"; }; }; kwallet-pam = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/kwallet-pam-5.13.5.tar.xz"; - sha256 = "145daahh8qjpbfcvjk2zyd6k3sr22npgnv3n23j9aim75qiwz1ac"; - name = "kwallet-pam-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/kwallet-pam-5.14.0.tar.xz"; + sha256 = "0cw173wbf105p7028xik33lm38z82b1rlc7090l4khwsgmwgff97"; + name = "kwallet-pam-5.14.0.tar.xz"; }; }; kwayland-integration = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/kwayland-integration-5.13.5.tar.xz"; - sha256 = "1qhkrs8md36z5gndkm88pyv6mspqsdsdavjz8klfwfv1hii6qyds"; - name = "kwayland-integration-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/kwayland-integration-5.14.0.tar.xz"; + sha256 = "19xbqb7m6hxyg8s8jdbg1x9qcfia2ypm0z4k6zgva6mwqwhqcbw1"; + name = "kwayland-integration-5.14.0.tar.xz"; }; }; kwin = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/kwin-5.13.5.tar.xz"; - sha256 = "0ld1pclni1axrh7jww3gxlfwkbjsfbqb9z7gygj2ff3nmc6khgfm"; - name = "kwin-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/kwin-5.14.0.tar.xz"; + sha256 = "0rd6hkyg6n0w2jnj648sp7gs7n624igraz8ajyrglfzvxkxvqi8i"; + name = "kwin-5.14.0.tar.xz"; }; }; kwrited = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/kwrited-5.13.5.tar.xz"; - sha256 = "150nhjk4vcigs2r2bxqk309g81lxpnkkv8l44hiyivcbmwvc3aya"; - name = "kwrited-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/kwrited-5.14.0.tar.xz"; + sha256 = "0s9lgi5a945xzpl1j5gdn65n8bywqlwfnrig56x90550achbvmlq"; + name = "kwrited-5.14.0.tar.xz"; }; }; libkscreen = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/libkscreen-5.13.5.tar.xz"; - sha256 = "04719va15i66qn1xqx318v6risxhp8bfcnhxh9mqm5h9qx5c6c4k"; - name = "libkscreen-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/libkscreen-5.14.0.tar.xz"; + sha256 = "1fsi9cb724kwr0cll60dl9qh67290r3gp8lcsmlyw30zk9mqwgdi"; + name = "libkscreen-5.14.0.tar.xz"; }; }; libksysguard = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/libksysguard-5.13.5.tar.xz"; - sha256 = "0pccjjjzk8dxgmkj5vrq20nwb3qpf9isjd1zmg5nc127jld924x6"; - name = "libksysguard-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/libksysguard-5.14.0.tar.xz"; + sha256 = "00s1dkiqykw2drlmvzs3hkdrkbk8n86s751kl4xlvcbslbijzcv0"; + name = "libksysguard-5.14.0.tar.xz"; }; }; milou = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/milou-5.13.5.tar.xz"; - sha256 = "0rhgj10l2iik1mgnv2bixxqjyc3pl731bs1bqz9gsa3wiazspwrv"; - name = "milou-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/milou-5.14.0.tar.xz"; + sha256 = "1k413zs70ggsamwxxidlfjdf8aqrcnzznar86z30q3ki1y14xf1l"; + name = "milou-5.14.0.tar.xz"; }; }; oxygen = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/oxygen-5.13.5.tar.xz"; - sha256 = "0wm2mngh0gb0lqvx8g82ml2sdv0kbkx14mpb8c6aw3hslcwma7yd"; - name = "oxygen-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/oxygen-5.14.0.tar.xz"; + sha256 = "0kbafhzjkm61dpznx1w713jwyicj7qq76vk7zf6vz2g90b8c47na"; + name = "oxygen-5.14.0.tar.xz"; }; }; plasma-browser-integration = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/plasma-browser-integration-5.13.5.tar.xz"; - sha256 = "0bhpbq4n29x8m0nmxlli5ljmgpw9da7sfbmf3j5c3wnxqja16sgy"; - name = "plasma-browser-integration-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/plasma-browser-integration-5.14.0.tar.xz"; + sha256 = "1s8cxlfyp8crq2j4appffnhc3cgx9igmqhxyyk9pr4jbb4cwv42b"; + name = "plasma-browser-integration-5.14.0.tar.xz"; }; }; plasma-desktop = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/plasma-desktop-5.13.5.tar.xz"; - sha256 = "14isrq3n9lm1nzmyv8zdgq6pwnv2zmg4dwxyp7fvqjxfls8851vp"; - name = "plasma-desktop-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/plasma-desktop-5.14.0.tar.xz"; + sha256 = "0qrqd78bp9n73rr142wxiynxij2i8cw41ckgd46iw8an550v8s80"; + name = "plasma-desktop-5.14.0.tar.xz"; }; }; plasma-integration = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/plasma-integration-5.13.5.tar.xz"; - sha256 = "0j57ra79p5lkj81d05hhb87mrxgyj6qikkpzcb0p2dr2x8cmkng2"; - name = "plasma-integration-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/plasma-integration-5.14.0.tar.xz"; + sha256 = "1dv43iwh6rp5ldn16jd6krkab6nmplav47j5qvngcp88src31k47"; + name = "plasma-integration-5.14.0.tar.xz"; }; }; plasma-nm = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/plasma-nm-5.13.5.tar.xz"; - sha256 = "1z8f5iybgra72vhpiayiwpysvv2z8x2r5xal8rhgf7y24xcjwxmi"; - name = "plasma-nm-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/plasma-nm-5.14.0.tar.xz"; + sha256 = "1pr4dg90vw22jzsrbhzx3rycyj9by8r4239ypprw0i5d9795mian"; + name = "plasma-nm-5.14.0.tar.xz"; }; }; plasma-pa = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/plasma-pa-5.13.5.tar.xz"; - sha256 = "0p54x4zr3w009nn7g00qmxh7xil35x7b48d0l0flz5d7hvkk6nd8"; - name = "plasma-pa-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/plasma-pa-5.14.0.tar.xz"; + sha256 = "1b95vyirgxfpjrccnl81bynlk3zdxz0bf7czsap0bnwhal0mcp2w"; + name = "plasma-pa-5.14.0.tar.xz"; }; }; plasma-sdk = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/plasma-sdk-5.13.5.tar.xz"; - sha256 = "1x8hq343xzwlcsdvf0jy0qgn64xw8l11lawhknbjrf90qq58axga"; - name = "plasma-sdk-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/plasma-sdk-5.14.0.tar.xz"; + sha256 = "0b5h7qvan0f5afdf4d19dmpalgbd9gyxgkq3r5h7axqdfdanz38f"; + name = "plasma-sdk-5.14.0.tar.xz"; }; }; plasma-tests = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/plasma-tests-5.13.5.tar.xz"; - sha256 = "00nm0d0c4zccbwnhy8sc1qb4sf7bs5vfky3n7lihwyng3syqwz3d"; - name = "plasma-tests-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/plasma-tests-5.14.0.tar.xz"; + sha256 = "01li04p44f1yajnjhvhhqd8mjwv8si5d02749p5dn0x80fkxgh9d"; + name = "plasma-tests-5.14.0.tar.xz"; }; }; plasma-vault = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/plasma-vault-5.13.5.tar.xz"; - sha256 = "1045zb58pmcyn0cznb81bmcpd4hkhxm6509rznrjykkhcfcrbf8z"; - name = "plasma-vault-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/plasma-vault-5.14.0.tar.xz"; + sha256 = "1kclryjld7lanimr6n7r1b9y8wqgyjvcsky9cfq3ql1ssfc0ncm3"; + name = "plasma-vault-5.14.0.tar.xz"; }; }; plasma-workspace = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/plasma-workspace-5.13.5.tar.xz"; - sha256 = "1qcmw60lyp966rhvw9raaqrvxdv09pr8zc7x3fx1vpm9kphh3lv3"; - name = "plasma-workspace-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/plasma-workspace-5.14.0.tar.xz"; + sha256 = "1fgz06dnszrrq5kqa3zn22cj93adz8vwg9n9vdihgi6c77rqlxyf"; + name = "plasma-workspace-5.14.0.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/plasma-workspace-wallpapers-5.13.5.tar.xz"; - sha256 = "1wbnm6bzvgx2ssig4dk3plhrsjiw3lq1yhr2dfga6vvlyi6wg9mg"; - name = "plasma-workspace-wallpapers-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/plasma-workspace-wallpapers-5.14.0.tar.xz"; + sha256 = "10j006wc1l2hjw9s9w7sxwimpahrnlpidnrrdgwjp0fswmnyqj5c"; + name = "plasma-workspace-wallpapers-5.14.0.tar.xz"; }; }; plymouth-kcm = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/plymouth-kcm-5.13.5.tar.xz"; - sha256 = "0flgr68rms40acgl2f4539mvp53m36ifignxix27raqmibaf38s1"; - name = "plymouth-kcm-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/plymouth-kcm-5.14.0.tar.xz"; + sha256 = "0smjnh3adhsbp2ds8gvi5k3jq21i85zvaf9pvr0ih4nqpn4plalk"; + name = "plymouth-kcm-5.14.0.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.13.5"; + version = "1-5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/polkit-kde-agent-1-5.13.5.tar.xz"; - sha256 = "00f05ii3www8knn2ycgkc6izc8ydb3vjy4f657k38hkzl2sjnhl6"; - name = "polkit-kde-agent-1-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/polkit-kde-agent-1-5.14.0.tar.xz"; + sha256 = "0bzz2qmxslmms7mrs4l8myg9byx0w7dz6xrmvi8v11wyk2lngsb0"; + name = "polkit-kde-agent-1-5.14.0.tar.xz"; }; }; powerdevil = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/powerdevil-5.13.5.tar.xz"; - sha256 = "1k7ilcvm5nvx6sd43j0djar9ay6ag84g4m8f420yf7q4yryp76yn"; - name = "powerdevil-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/powerdevil-5.14.0.tar.xz"; + sha256 = "057hj7c3pq5a064ydx2r6kkf0q8lj7rl0jfrzcpr72s0yri3wcjr"; + name = "powerdevil-5.14.0.tar.xz"; }; }; sddm-kcm = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/sddm-kcm-5.13.5.tar.xz"; - sha256 = "122g83ajh0xqylvmicrhgw0fm8bmzpw26v7fjckfk9if5zqzk8ch"; - name = "sddm-kcm-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/sddm-kcm-5.14.0.tar.xz"; + sha256 = "0dz6iz0qf4ycfic1ad99cqxj05pa4m92m5l74as8pkqviv8mm33d"; + name = "sddm-kcm-5.14.0.tar.xz"; }; }; systemsettings = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/systemsettings-5.13.5.tar.xz"; - sha256 = "14029a3mf2d6cw87lyffnwy88yvj0n3jmi0glr69zwi8lmz0cbsv"; - name = "systemsettings-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/systemsettings-5.14.0.tar.xz"; + sha256 = "0gywcc1zcqp7613gd7m9811plmmk8hr9frd2v0ari69ppm1ndmpj"; + name = "systemsettings-5.14.0.tar.xz"; }; }; user-manager = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/user-manager-5.13.5.tar.xz"; - sha256 = "12550xvl084rab0y331r8dm3qwpcvm83k3j02gxrwrigv1vckas8"; - name = "user-manager-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/user-manager-5.14.0.tar.xz"; + sha256 = "17qdpdq1j53h49i71ri8f91fby9m47ngpd7gn6qp7gzsfcyqky3j"; + name = "user-manager-5.14.0.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/xdg-desktop-portal-kde-5.13.5.tar.xz"; - sha256 = "0i9pcbdxfh2cbv9ybk9i11l7vcm2ifx0zm3gkj3ry3bjxxbphn4f"; - name = "xdg-desktop-portal-kde-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/xdg-desktop-portal-kde-5.14.0.tar.xz"; + sha256 = "0xziyrrccv0jjjf8h8p5w2wx0qz745ilib1i2l50amy6dwy0k0s9"; + name = "xdg-desktop-portal-kde-5.14.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 8e7d10782157..44086538cd04 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan -, file, which +, file, which, ncurses , autoreconfHook , git , texinfo , qtbase ? null -, withPython ? false, swig2 ? null, python ? null +, pythonSupport ? false, swig2 ? null, python ? null }: let @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ++ lib.optional (qtbase != null) qtbase; nativeBuildInputs = [ file pkgconfig gnupg autoreconfHook git texinfo ] - ++ lib.optionals withPython [ python swig2 which ]; + ++ lib.optionals pythonSupport [ python swig2 which ncurses ]; postPatch ='' substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-fixed-path=${gnupg}/bin" "--with-libgpg-error-prefix=${libgpgerror.dev}" - ] ++ lib.optional withPython "--enable-languages=python"; + ] ++ lib.optional pythonSupport "--enable-languages=python"; NIX_CFLAGS_COMPILE = # qgpgme uses Q_ASSERT which retains build inputs at runtime unless diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix index 60572e7676b2..32b0c9758f73 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchbzr, cmake, qtbase }: +{ stdenv, fetchgit, cmake, qtbase }: -stdenv.mkDerivation { - name = "libdbusmenu-qt-0.9.3+14"; +stdenv.mkDerivation rec { + name = "libdbusmenu-qt-${version}"; + version = "0.9.3+16"; - src = fetchbzr { - url = "https://bazaar.launchpad.net/~dbusmenu-team/libdbusmenu-qt/trunk"; - rev = "ps-jenkins@lists.canonical.com-20140619090718-mppiiax5atpnb8i2"; - sha256 = "1dbhaljyivbv3wc184zpjfjmn24zb6aj72wgg1gg1xl5f783issd"; + src = fetchgit { + url = https://git.launchpad.net/ubuntu/+source/libdbusmenu-qt; + rev = "import/${version}.04.20160218-1"; + sha256 = "039yvklhbmfbcynrbqq9n5ywmj8bjfslnkzcnwpzyhnxdzb6yxlx"; }; buildInputs = [ qtbase ]; diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index c3040ec567c7..fe80d0d9dd19 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "rust-cbindgen-${version}"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "eqrion"; repo = "cbindgen"; rev = "v${version}"; - sha256 = "0hifmn9578cf1r5m4ajazg3rhld2ybd2v48xz04vfhappkarv4w2"; + sha256 = "18lvvzksc7gfx8fffpil41phjzwdc67xfh0mijkkv4zchwlqkpq2"; }; - cargoSha256 = "0c3xpzff8jldqbn5a25yy6c2hlz5xy636ml6sj5d24wzcgwg5a2i"; + cargoSha256 = "1m1chwmfgj74xrmn4gb9yz5kx8c408a1hlqmpcq780kqj0k927i9"; meta = with stdenv.lib; { description = "A project for generating C bindings from Rust code"; diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix index e507e3898c38..ac1f36c893d0 100644 --- a/pkgs/development/tools/unity3d/default.nix +++ b/pkgs/development/tools/unity3d/default.nix @@ -1,31 +1,23 @@ -{ stdenv, lib, fetchurl, makeWrapper, fakeroot, file, getopt -, gtk2, gdk_pixbuf, glib, libGLU, postgresql, nss, nspr, udev +{ stdenv, lib, fetchurl, makeWrapper, file, getopt +, gtk2, gdk_pixbuf, glib, libGLU, nss, nspr, udev, tbb , alsaLib, GConf, cups, libcap, fontconfig, freetype, pango , cairo, dbus, expat, zlib, libpng12, nodejs, gnutar, gcc, gcc_32bit , libX11, libXcursor, libXdamage, libXfixes, libXrender, libXi -, libXcomposite, libXext, libXrandr, libXtst, libSM, libICE, libxcb -, mono, libgnomeui, gnome_vfs, gnome-sharp, gtk-sharp-2_0, chromium +, libXcomposite, libXext, libXrandr, libXtst, libSM, libICE, libxcb, chromium }: let libPath64 = lib.makeLibraryPath [ - gcc.cc gtk2 gdk_pixbuf glib libGLU postgresql nss nspr + gcc.cc gtk2 gdk_pixbuf glib libGLU nss nspr alsaLib GConf cups libcap fontconfig freetype pango - cairo dbus expat zlib libpng12 udev + cairo dbus expat zlib libpng12 udev tbb libX11 libXcursor libXdamage libXfixes libXrender libXi libXcomposite libXext libXrandr libXtst libSM libICE libxcb ]; libPath32 = lib.makeLibraryPath [ gcc_32bit.cc ]; binPath = lib.makeBinPath [ nodejs gnutar ]; - developBinPath = lib.makeBinPath [ mono ]; - developLibPath = lib.makeLibraryPath [ - glib libgnomeui gnome_vfs gnome-sharp gtk-sharp-2_0 gtk-sharp-2_0.gtk - ]; - developDotnetPath = lib.concatStringsSep ":" [ - gnome-sharp gtk-sharp-2_0 - ]; - ver = "5.6.1"; + ver = "2017.4.10"; build = "f1"; in stdenv.mkDerivation rec { @@ -33,24 +25,19 @@ in stdenv.mkDerivation rec { version = "${ver}x${build}"; src = fetchurl { - url = "http://beta.unity3d.com/download/6a86e542cf5c/unity-editor-installer-${version}Linux.sh"; - sha256 = "10z4h94c9h967gx4b3gwb268zn7bnrb7ylnqnmnqhx6byac7cf4m"; + url = "https://beta.unity3d.com/download/14396d76537e/LinuxEditorInstaller/Unity.tar.xz"; + sha256 = "e1b4fe41c0ff793f7a9146c49a8eca8c71d30abdfa3e81922bd69699810b3f67"; }; nosuidLib = ./unity-nosuid.c; - nativeBuildInputs = [ makeWrapper fakeroot file getopt ]; + nativeBuildInputs = [ makeWrapper file getopt ]; - outputs = [ "out" "monodevelop" ]; + outputs = [ "out" ]; - sourceRoot = "unity-editor-${version}Linux"; - - unpackPhase = '' - echo -e 'q\ny' | fakeroot sh $src - ''; + sourceRoot = "."; buildPhase = '' - cd Editor $CC -fPIC -shared -o libunity-nosuid.so $nosuidLib -ldl @@ -65,32 +52,10 @@ in stdenv.mkDerivation rec { mv Editor/* $unitydir ln -sf /run/wrappers/bin/${chromium.sandboxExecutableName} $unitydir/chrome-sandbox - mkdir -p $out/share/applications - sed "/^Exec=/c\Exec=$out/bin/unity-editor" \ - < unity-editor.desktop \ - > $out/share/applications/unity-editor.desktop - - install -D unity-editor-icon.png $out/share/icons/hicolor/256x256/apps/unity-editor-icon.png - mkdir -p $out/bin makeWrapper $unitydir/Unity $out/bin/unity-editor \ --prefix LD_PRELOAD : "$unitydir/libunity-nosuid.so" \ --prefix PATH : "${binPath}" - - developdir="$monodevelop/opt/Unity/MonoDevelop" - mkdir -p $developdir - mv MonoDevelop/* $developdir - - mkdir -p $monodevelop/share/applications - sed "/^Exec=/c\Exec=$monodevelop/bin/unity-monodevelop" \ - < unity-monodevelop.desktop \ - > $monodevelop/share/applications/unity-monodevelop.desktop - - mkdir -p $monodevelop/bin - makeWrapper $developdir/bin/monodevelop $monodevelop/bin/unity-monodevelop \ - --prefix PATH : "${developBinPath}" \ - --prefix LD_LIBRARY_PATH : "${developLibPath}" \ - --prefix MONO_GAC_PREFIX : "${developDotnetPath}" ''; preFixup = '' @@ -105,26 +70,54 @@ in stdenv.mkDerivation rec { intp="$(cat $NIX_CC/nix-support/dynamic-linker)" fi - oldRpath="$(patchelf --print-rpath "$1")" - # Always search at least for libraries in origin directory. - rpath="''${oldRpath:-\$ORIGIN}:$rpath" - if [[ "$ftype" =~ LSB\ shared ]]; then - patchelf \ - --set-rpath "$rpath" \ - "$1" - elif [[ "$ftype" =~ LSB\ executable ]]; then - patchelf \ - --set-rpath "$rpath" \ - --interpreter "$intp" \ - "$1" - fi + # Save origin-relative parts of rpath. + originRpath="$(patchelf --print-rpath "$1" | sed "s/:/\n/g" | grep "^\$ORIGIN" | paste -sd ":" - || echo "")" + rpath="$originRpath:$rpath" + + patchelf --set-rpath "$rpath" "$1" + patchelf --set-interpreter "$intp" "$1" 2> /dev/null || true fi } + upm_linux=$unitydir/Data/Resources/Upm/upm-linux + + orig_size=$(stat --printf=%s $upm_linux) + # Exclude PlaybackEngines to build something that can be run on FHS-compliant Linuxes find $unitydir -name PlaybackEngines -prune -o -type f -print | while read path; do patchFile "$path" done + + new_size=$(stat --printf=%s $upm_linux) + + ###### zeit-pkg fixing starts here. + # we're replacing plaintext js code that looks like + # PAYLOAD_POSITION = '1234 ' | 0 + # [...] + # PRELUDE_POSITION = '1234 ' | 0 + # ^-----20-chars-----^^------22-chars------^ + # ^-- grep points here + # + # var_* are as described above + # shift_by seems to be safe so long as all patchelf adjustments occur + # before any locations pointed to by hardcoded offsets + + var_skip=20 + var_select=22 + shift_by=$(expr $new_size - $orig_size) + + function fix_offset { + # $1 = name of variable to adjust + location=$(grep -obUam1 "$1" $upm_linux | cut -d: -f1) + location=$(expr $location + $var_skip) + value=$(dd if=$upm_linux iflag=count_bytes,skip_bytes skip=$location \ + bs=1 count=$var_select status=none) + value=$(expr $shift_by + $value) + echo -n $value | dd of=$upm_linux bs=1 seek=$location conv=notrunc + } + + fix_offset PAYLOAD_POSITION + fix_offset PRELUDE_POSITION ''; dontStrip = true; diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index e9f239b4df32..8ac70fcd6f3e 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -16,6 +16,7 @@ , pytest , glibcLocales , nose +, send2trash # This little flag adds a huge number of dependencies, but we assume that # everyone wants Anki to draw plots with statistics by default. , plotsSupport ? true @@ -40,7 +41,7 @@ in buildPythonApplication rec { sha256 = "0yjyxgpk79rplz9z2r93kmlk09ari6xxfrz1cfm2yl9v8zfw1n6l"; }; - propagatedBuildInputs = [ pyqt4 sqlalchemy pyaudio beautifulsoup httplib2 ] + propagatedBuildInputs = [ pyqt4 sqlalchemy pyaudio beautifulsoup httplib2 send2trash ] ++ lib.optional plotsSupport matplotlib; checkInputs = [ pytest glibcLocales nose ]; @@ -108,16 +109,14 @@ in buildPythonApplication rec { cp -v anki.xml $out/share/mime/packages/ cp -v anki.{png,xpm} $out/share/pixmaps/ cp -rv locale $out/share/ - cp -rv anki aqt thirdparty/send2trash $pp/ + cp -rv anki aqt $pp/ wrapPythonPrograms ''; meta = with stdenv.lib; { - homepage = http://ankisrs.net/; + homepage = "https://apps.ankiweb.net/"; description = "Spaced repetition flashcard program"; - license = licenses.gpl3; - longDescription = '' Anki is a program which makes remembering things easy. Because it is a lot more efficient than traditional study methods, you can either greatly @@ -130,8 +129,9 @@ in buildPythonApplication rec { people's names and faces, brushing up on geography, mastering long poems, or even practicing guitar chords! ''; - - maintainers = with maintainers; [ the-kenny ]; + license = licenses.agpl3Plus; + broken = stdenv.hostPlatform.isAarch64; platforms = platforms.mesaPlatforms; + maintainers = with maintainers; [ the-kenny ]; }; } diff --git a/pkgs/games/warmux/default.nix b/pkgs/games/warmux/default.nix index a56afbbf44b5..c99183bfbea3 100644 --- a/pkgs/games/warmux/default.nix +++ b/pkgs/games/warmux/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, fetchFromGitHub, autoconf, automake , zlib, curl, gnutls, fribidi, libpng, SDL, SDL_gfx, SDL_image, SDL_mixer , SDL_net, SDL_ttf, libunwind, libX11, xproto, libxml2, pkgconfig , gettext, intltool, libtool, perl @@ -6,31 +6,32 @@ stdenv.mkDerivation rec { name = "warmux-${version}"; - version = "11.04.1"; + version = "unstable-2017-10-20"; - src = fetchurl { - url = "http://download.gna.org/warmux/${name}.tar.bz2"; - sha256 = "1vp44wdpnb1g6cddmn3nphc543pxsdhjis52mfif0p2c7qslz73q"; + src = fetchFromGitHub { + owner = "fluxer"; + repo = "warmux"; + rev = "8f81d4fc309a548ae89a068c2dde27b7e7ef8851"; + sha256 = "1hvzglsmp75xiqqb0k75qjz4jwi8kl3fhn8zfsz53hhhqmbw6wkr"; }; - buildInputs = - [ zlib curl gnutls fribidi libpng SDL SDL_gfx SDL_image SDL_mixer - SDL_net SDL_ttf libunwind libX11 xproto libxml2 pkgconfig - gettext intltool libtool perl - ]; - + preConfigure = "patchShebangs autogen.sh && ./autogen.sh"; configureFlagsArray = ("CFLAGS=-include ${zlib.dev}/include/zlib.h"); - patches = [ ./gcc-fix.patch ]; + nativeBuildInputs = [ + autoconf automake gettext intltool libtool pkgconfig + ]; + buildInputs = [ + zlib curl gnutls fribidi libpng SDL SDL_gfx SDL_image SDL_mixer + SDL_net SDL_ttf libunwind libX11 xproto libxml2 perl + ]; + enableParallelBuilding = true; meta = with stdenv.lib; { - description = "Ballistics turn-based battle game between teams"; - maintainers = with maintainers; - [ - raskin - ]; + description = "Ballistics turn-based battle game between teams - unofficial copy"; + maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; - license = licenses.gpl2; - downloadPage = "http://download.gna.org/warmux/"; + license = with licenses; [ gpl2 ufl ]; + homepage = https://github.com/fluxer/warmux; }; } diff --git a/pkgs/games/warmux/gcc-fix.patch b/pkgs/games/warmux/gcc-fix.patch deleted file mode 100644 index 913b912af7d4..000000000000 --- a/pkgs/games/warmux/gcc-fix.patch +++ /dev/null @@ -1,51 +0,0 @@ -## i-love-you-lordheavy.patch [diff] -diff -ru warmux-11.04/lib/warmux/action/action.cpp warmux-11.04-new/lib/warmux/action/action.cpp ---- warmux-11.04/lib/warmux/action/action.cpp 2011-04-28 21:03:14.000000000 +0200 -+++ warmux-11.04-new/lib/warmux/action/action.cpp 2012-01-29 09:51:16.680251815 +0100 -@@ -81,7 +81,7 @@ - } - - // Build an action from a network packet --Action::Action(const char *buffer, DistantComputer* _creator) -+Action::Action(char *buffer, DistantComputer* _creator) - { - m_creator = _creator; - -diff -ru warmux-11.04/lib/warmux/include/WARMUX_action.h warmux-11.04-new/lib/warmux/include/WARMUX_action.h ---- warmux-11.04/lib/warmux/include/WARMUX_action.h 2011-04-28 21:03:13.000000000 +0200 -+++ warmux-11.04-new/lib/warmux/include/WARMUX_action.h 2012-01-29 09:52:14.246921833 +0100 -@@ -168,7 +168,7 @@ - Action(Action_t type, Double value1, Double value2); - - // Build an action from a network packet -- Action(const char* buffer, DistantComputer* _creator); -+ Action(char* buffer, DistantComputer* _creator); - - ~Action(); - -Description: Fix FTBFS with gcc 4.7. -Author: Felix Geyer <debfx-pkg@fobos.de> - ---- warmux-11.04.1+repack.orig/tools/list_games/main.cpp -+++ warmux-11.04.1+repack/tools/list_games/main.cpp -@@ -1,4 +1,5 @@ - #include <stdio.h> -+#include <unistd.h> - #include <WARMUX_types.h> - #include <WARMUX_network.h> - #include <WARMUX_index_server.h> - -Description: Fix conversion error in gcc 6. -Author: Robin Gloster <mail@glob.in> - ---- warmux-11.04.1.orig/src/interface/weapon_menu.cpp 2017-01-19 23:06:32.401035923 +0100 -+++ warmux-11.04.1/src/interface/weapon_menu.cpp 2017-01-19 23:07:14.245866593 +0100 -@@ -391,7 +391,7 @@ - Weapon * WeaponsMenu::UpdateCurrentOverflyItem(const Polygon * poly) - { - if (!show) -- return false; -+ return nullptr; - const std::vector<PolygonItem *>& items = poly->GetItem(); - WeaponMenuItem * tmp; - Interface::GetInstance()->SetCurrentOverflyWeapon(NULL); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68fe5b5d99c3..010532e7b5b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22356,7 +22356,7 @@ with pkgs; unity3d = callPackage ../development/tools/unity3d { stdenv = stdenv_32bit; gcc_32bit = pkgsi686Linux.gcc; - inherit (gnome2) GConf libgnomeui gnome_vfs; + inherit (gnome2) GConf; }; urbit = callPackage ../misc/urbit { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 83f6aeda7f85..04b75871559b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5656,7 +5656,7 @@ in { google_cloud_speech = callPackage ../development/python-modules/google_cloud_speech { }; - gpgme = toPythonModule (pkgs.gpgme.override { withPython=true; }); + gpgme = toPythonModule (pkgs.gpgme.override { pythonSupport=true; inherit python; }); gphoto2 = callPackage ../development/python-modules/gphoto2 { inherit (pkgs) pkgconfig; |