Merge master into staging-next
This commit is contained in:
commit
fda05db0c1
|
@ -1456,6 +1456,46 @@
|
||||||
desktop environments as needed.
|
desktop environments as needed.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
The <literal>hadoop</literal> package has added support for
|
||||||
|
<literal>aarch64-linux</literal> and
|
||||||
|
<literal>aarch64-darwin</literal> as of 3.3.1
|
||||||
|
(<link xlink:href="https://github.com/NixOS/nixpkgs/pull/158613">#158613</link>).
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
The <literal>R</literal> package now builds again on
|
||||||
|
<literal>aarch64-darwin</literal>
|
||||||
|
(<link xlink:href="https://github.com/NixOS/nixpkgs/pull/158992">#158992</link>).
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
The <literal>spark3</literal> package has been updated from
|
||||||
|
3.1.2 to 3.2.1
|
||||||
|
(<link xlink:href="https://github.com/NixOS/nixpkgs/pull/160075">#160075</link>):
|
||||||
|
</para>
|
||||||
|
<itemizedlist spacing="compact">
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
Testing has been enabled for
|
||||||
|
<literal>aarch64-linux</literal> in addition to
|
||||||
|
<literal>x86_64-linux</literal>.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
The <literal>spark3</literal> package is now usable on
|
||||||
|
<literal>aarch64-darwin</literal> as a result of
|
||||||
|
<link xlink:href="https://github.com/NixOS/nixpkgs/pull/158613">#158613</link>
|
||||||
|
and
|
||||||
|
<link xlink:href="https://github.com/NixOS/nixpkgs/pull/158992">#158992</link>.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
|
</itemizedlist>
|
||||||
|
</listitem>
|
||||||
</itemizedlist>
|
</itemizedlist>
|
||||||
</section>
|
</section>
|
||||||
</section>
|
</section>
|
||||||
|
|
|
@ -537,4 +537,13 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||||
|
|
||||||
- The polkit service, available at `security.polkit.enable`, is now disabled by default. It will automatically be enabled through services and desktop environments as needed.
|
- The polkit service, available at `security.polkit.enable`, is now disabled by default. It will automatically be enabled through services and desktop environments as needed.
|
||||||
|
|
||||||
|
- The `hadoop` package has added support for `aarch64-linux` and `aarch64-darwin` as of 3.3.1 ([#158613](https://github.com/NixOS/nixpkgs/pull/158613)).
|
||||||
|
|
||||||
|
- The `R` package now builds again on `aarch64-darwin` ([#158992](https://github.com/NixOS/nixpkgs/pull/158992)).
|
||||||
|
|
||||||
|
- The `spark3` package has been updated from 3.1.2 to 3.2.1 ([#160075](https://github.com/NixOS/nixpkgs/pull/160075)):
|
||||||
|
|
||||||
|
- Testing has been enabled for `aarch64-linux` in addition to `x86_64-linux`.
|
||||||
|
- The `spark3` package is now usable on `aarch64-darwin` as a result of [#158613](https://github.com/NixOS/nixpkgs/pull/158613) and [#158992](https://github.com/NixOS/nixpkgs/pull/158992).
|
||||||
|
|
||||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||||
|
|
|
@ -8,8 +8,12 @@ let
|
||||||
concatStringsSep mapAttrsToList toLower
|
concatStringsSep mapAttrsToList toLower
|
||||||
literalExpression mkRenamedOptionModule mkDefault mkOption trivial types;
|
literalExpression mkRenamedOptionModule mkDefault mkOption trivial types;
|
||||||
|
|
||||||
|
needsEscaping = s: null != builtins.match "[a-zA-Z0-9]+" s;
|
||||||
|
escapeIfNeccessary = s: if needsEscaping s then s else ''"${lib.escape [ "\$" "\"" "\\" "\`" ] s}"'';
|
||||||
attrsToText = attrs:
|
attrsToText = attrs:
|
||||||
concatStringsSep "\n" (mapAttrsToList (n: v: ''${n}="${toString v}"'') attrs);
|
concatStringsSep "\n" (
|
||||||
|
mapAttrsToList (n: v: ''${n}=${escapeIfNeccessary (toString v)}'') attrs
|
||||||
|
);
|
||||||
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
|
@ -485,7 +485,7 @@ in
|
||||||
sonarr = handleTest ./sonarr.nix {};
|
sonarr = handleTest ./sonarr.nix {};
|
||||||
sourcehut = handleTest ./sourcehut.nix {};
|
sourcehut = handleTest ./sourcehut.nix {};
|
||||||
spacecookie = handleTest ./spacecookie.nix {};
|
spacecookie = handleTest ./spacecookie.nix {};
|
||||||
spark = handleTestOn ["x86_64-linux"] ./spark {};
|
spark = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./spark {};
|
||||||
sslh = handleTest ./sslh.nix {};
|
sslh = handleTest ./sslh.nix {};
|
||||||
sssd = handleTestOn ["x86_64-linux"] ./sssd.nix {};
|
sssd = handleTestOn ["x86_64-linux"] ./sssd.nix {};
|
||||||
sssd-ldap = handleTestOn ["x86_64-linux"] ./sssd-ldap.nix {};
|
sssd-ldap = handleTestOn ["x86_64-linux"] ./sssd-ldap.nix {};
|
||||||
|
|
|
@ -9,16 +9,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "stork";
|
pname = "stork";
|
||||||
version = "1.4.0";
|
version = "1.4.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jameslittle230";
|
owner = "jameslittle230";
|
||||||
repo = "stork";
|
repo = "stork";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-9fylJcUuModemkBRnXeFfB1b+CD9IvTxW+CnlqaUb60=";
|
sha256 = "sha256-aBsxRLUufVUauySCxZKk/ZfcU/5KR7jOHmnx6mHmsFs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "sha256-j7OXl66xuTuP6hWJs+xHrwtaBGAYt02OESCN6FH3KX0=";
|
cargoSha256 = "sha256-oNoWGdXYfp47IpqU1twbORPOYrHjArNf43Zyeyat4Xs=";
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "qbec";
|
pname = "qbec";
|
||||||
version = "0.15.1";
|
version = "0.15.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "splunk";
|
owner = "splunk";
|
||||||
repo = "qbec";
|
repo = "qbec";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-cXU+LnOCsGg+iwH5c7cKVi2Htw45AGxyjJFKXKbTkUo=";
|
sha256 = "sha256-js/UjnNYRW7s3b4TeprhmBe4cDLDYDrMeLtpASI9aN4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-CiVAzFN/ygIiyhZKYtJ197TZO3ppL/emWSj4hAlIanc=";
|
vendorSha256 = "sha256-oEbKk9cMbI0ZWXrfM8Y19OF/A75mwHl0C/PJx0oTOBo=";
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
|
|
@ -1,13 +1,26 @@
|
||||||
{ lib, stdenv, fetchzip, makeWrapper, jdk8, python3Packages, extraPythonPackages ? [], coreutils, hadoop
|
{ lib
|
||||||
, RSupport? true, R
|
, stdenv
|
||||||
|
, fetchzip
|
||||||
|
, makeWrapper
|
||||||
|
, jdk8
|
||||||
|
, python3Packages
|
||||||
|
, extraPythonPackages ? [ ]
|
||||||
|
, coreutils
|
||||||
|
, hadoop
|
||||||
|
, RSupport ? true
|
||||||
|
, R
|
||||||
}:
|
}:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
let
|
let
|
||||||
spark = { pname, version, src }:
|
spark = { pname, version, sha256 }:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
inherit pname version src;
|
inherit pname version;
|
||||||
|
src = fetchzip {
|
||||||
|
url = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz";
|
||||||
|
sha256 = sha256;
|
||||||
|
};
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
buildInputs = [ jdk8 python3Packages.python ]
|
buildInputs = [ jdk8 python3Packages.python ]
|
||||||
++ extraPythonPackages
|
++ extraPythonPackages
|
||||||
|
@ -53,23 +66,21 @@ let
|
||||||
repositories.git = "git://git.apache.org/spark.git";
|
repositories.git = "git://git.apache.org/spark.git";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in {
|
in
|
||||||
spark3 = spark rec {
|
{
|
||||||
|
spark_3_2 = spark rec {
|
||||||
|
pname = "spark";
|
||||||
|
version = "3.2.1";
|
||||||
|
sha256 = "0kxdqczwmj6pray0h8h1qhygni9m82jzznw5fbv9hrxrkq1v182d";
|
||||||
|
};
|
||||||
|
spark_3_1 = spark rec {
|
||||||
pname = "spark";
|
pname = "spark";
|
||||||
version = "3.1.2";
|
version = "3.1.2";
|
||||||
|
|
||||||
src = fetchzip {
|
|
||||||
url = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz";
|
|
||||||
sha256 = "1bgh2y6jm7wqy6yc40rx68xkki31i3jiri2yixb1bm0i9pvsj9yf";
|
sha256 = "1bgh2y6jm7wqy6yc40rx68xkki31i3jiri2yixb1bm0i9pvsj9yf";
|
||||||
};
|
};
|
||||||
};
|
spark_2_4 = spark rec {
|
||||||
spark2 = spark rec {
|
|
||||||
pname = "spark";
|
pname = "spark";
|
||||||
version = "2.4.8";
|
version = "2.4.8";
|
||||||
|
|
||||||
src = fetchzip {
|
|
||||||
url = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz";
|
|
||||||
sha256 = "1mkyq0gz9fiav25vr0dba5ivp0wh0mh7kswwnx8pvsmb6wbwyfxv";
|
sha256 = "1mkyq0gz9fiav25vr0dba5ivp0wh0mh7kswwnx8pvsmb6wbwyfxv";
|
||||||
};
|
};
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,13 +8,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "smplayer";
|
pname = "smplayer";
|
||||||
version = "21.10.0";
|
version = "22.2.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "smplayer-dev";
|
owner = "smplayer-dev";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-p6036c8KX3GCINmkjHZlDLgHhLKri+t2WNWzP4KsSI8=";
|
hash = "sha256-7DMvIqW3vzjVzJPyjbXuHHcf1T6EFcf/a/mVYqa3XS8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -22,7 +22,9 @@ stdenv.mkDerivation rec {
|
||||||
wrapQtAppsHook
|
wrapQtAppsHook
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [ qtscript ];
|
buildInputs = [
|
||||||
|
qtscript
|
||||||
|
];
|
||||||
|
|
||||||
dontUseQmakeConfigure = true;
|
dontUseQmakeConfigure = true;
|
||||||
|
|
||||||
|
|
|
@ -1,44 +0,0 @@
|
||||||
{ lib, stdenv, fetchurl, fetchpatch, python2 }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
pname = "clearsilver";
|
|
||||||
version = "0.10.5";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "http://www.clearsilver.net/downloads/clearsilver-${version}.tar.gz";
|
|
||||||
sha256 = "1046m1dpq3nkgxbis2dr2x7hynmy51n64465q78d7pdgvqwa178y";
|
|
||||||
};
|
|
||||||
|
|
||||||
PYTHON_SITE = "${placeholder "out"}/${python2.sitePackages}";
|
|
||||||
|
|
||||||
configureFlags = [
|
|
||||||
"--with-python=${python2.interpreter}"
|
|
||||||
"--disable-apache"
|
|
||||||
"--disable-perl"
|
|
||||||
"--disable-ruby"
|
|
||||||
"--disable-java"
|
|
||||||
"--disable-csharp"
|
|
||||||
];
|
|
||||||
|
|
||||||
preInstall = ''
|
|
||||||
mkdir -p $out
|
|
||||||
mkdir -p $out/${python2.sitePackages}
|
|
||||||
'';
|
|
||||||
|
|
||||||
patches = [
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://sources.debian.net/data/main/c/clearsilver/0.10.5-1.6/debian/patches/clang-gcc5.patch";
|
|
||||||
sha256 = "0d44v9jx0b6k8nvrhknd958i9rs59kdh73z0lb4f1mzi8if16c38";
|
|
||||||
})
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://sources.debian.net/data/main/c/clearsilver/0.10.5-1.6/debian/patches/CVE-2011-4357.diff";
|
|
||||||
sha256 = "1lfncavxdqckrz03gv97lcliygbpi9lnih944vmdbn9zw6fwcipi";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Fast, powerful, and language-neutral HTML template system";
|
|
||||||
homepage = "http://www.clearsilver.net/";
|
|
||||||
license = licenses.free;
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "protolock";
|
pname = "protolock";
|
||||||
version = "0.15.2";
|
version = "0.16.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "nilslice";
|
owner = "nilslice";
|
||||||
repo = "protolock";
|
repo = "protolock";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-cKrG8f8cabuGDN1gmBYleXcBqeJksdREiEy63UK/6J0=";
|
sha256 = "sha256-vWwRZVArmlTIGwD4zV3dEHN2kkoeCZuNIvjCBVAviPo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-2XbBiiiPvZCnlKUzGDLFnxA34N/LmHoPbvRKZckmhx4=";
|
vendorSha256 = "sha256-kgSJUSjY8kgrGCNDPgw1WA8KwAqI5koJQ0IcE+tC5nk=";
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
|
|
@ -5,16 +5,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "bazel-remote";
|
pname = "bazel-remote";
|
||||||
version = "2.3.4";
|
version = "2.3.5";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "buchgr";
|
owner = "buchgr";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-ijR3RjGzm0HtVp5lSKGJemCGkRzhgQqaDOgg+MjDB1c=";
|
sha256 = "sha256-8tT00ppqBGLw2h+RxaiD7r3XYzyvXOHj1U8V5H/ftyQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-NmTdS5xgv0o7AT4lBJk472Lq1e73EcrcfnI8RIxKEoc=";
|
vendorSha256 = "sha256-wXgW7HigMIeUZAcZpm5TH9thfCHmpz+M42toWHgwIYo=";
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
|
|
@ -13,16 +13,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "cargo-crev";
|
pname = "cargo-crev";
|
||||||
version = "0.23.0";
|
version = "0.23.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "crev-dev";
|
owner = "crev-dev";
|
||||||
repo = "cargo-crev";
|
repo = "cargo-crev";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-iqFE3sz7cIFcd9zCFjU1PjMWVmxCRcdiiGAbirWUWMA=";
|
sha256 = "sha256-XzjZEVyPVn+7VrjG4QsqVBFmuGC1TWTWLEoqFcwQhaI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "sha256-qlqW5phw7QI5KT2uUamQFEYHZd4uzYaUuvZTG3KhrOU=";
|
cargoSha256 = "sha256-p87ZnOxaF9ytSUxp0P3QE3K1/jo7hz/N7BH1f2Lc0I0=";
|
||||||
|
|
||||||
preCheck = ''
|
preCheck = ''
|
||||||
export HOME=$(mktemp -d)
|
export HOME=$(mktemp -d)
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
addNodePath () {
|
addNodePath () {
|
||||||
addToSearchPath NODE_PATH $1/lib/node_modules
|
addToSearchPath NODE_PATH "$1/lib/node_modules"
|
||||||
}
|
}
|
||||||
|
|
||||||
addEnvHooks "$hostOffset" addNodePath
|
addEnvHooks "$hostOffset" addNodePath
|
||||||
|
|
|
@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
|
||||||
cargoSha256 = "sha256-H5xqk7Yd3M8sFGHlmhAS0fhh3eM4dkvkNQGVxRSXUJs=";
|
cargoSha256 = "sha256-H5xqk7Yd3M8sFGHlmhAS0fhh3eM4dkvkNQGVxRSXUJs=";
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Graphical console greter for greetd";
|
description = "Graphical console greeter for greetd";
|
||||||
homepage = "https://github.com/apognu/tuigreet";
|
homepage = "https://github.com/apognu/tuigreet";
|
||||||
license = licenses.gpl3Plus;
|
license = licenses.gpl3Plus;
|
||||||
maintainers = with maintainers; [ luc65r ivar ];
|
maintainers = with maintainers; [ luc65r ivar ];
|
||||||
|
|
|
@ -25,9 +25,11 @@ stdenv.mkDerivation rec {
|
||||||
blkid = "${util-linux}/bin/blkid";
|
blkid = "${util-linux}/bin/blkid";
|
||||||
false = "${coreutils}/bin/false";
|
false = "${coreutils}/bin/false";
|
||||||
mdadm = "${mdadm}/bin/mdadm";
|
mdadm = "${mdadm}/bin/mdadm";
|
||||||
|
mkswap = "${util-linux}/bin/mkswap";
|
||||||
sed = "${gnused}/bin/sed";
|
sed = "${gnused}/bin/sed";
|
||||||
sh = "${bash}/bin/sh";
|
sh = "${bash}/bin/sh";
|
||||||
sleep = "${coreutils}/bin/sleep";
|
sleep = "${coreutils}/bin/sleep";
|
||||||
|
swapon = "${util-linux}/bin/swapon";
|
||||||
true = "${coreutils}/bin/true";
|
true = "${coreutils}/bin/true";
|
||||||
})
|
})
|
||||||
(substituteAll {
|
(substituteAll {
|
||||||
|
@ -77,7 +79,7 @@ stdenv.mkDerivation rec {
|
||||||
description = "A daemon, tools and libraries to access and manipulate disks, storage devices and technologies";
|
description = "A daemon, tools and libraries to access and manipulate disks, storage devices and technologies";
|
||||||
homepage = "https://www.freedesktop.org/wiki/Software/udisks/";
|
homepage = "https://www.freedesktop.org/wiki/Software/udisks/";
|
||||||
license = with licenses; [ lgpl2Plus gpl2Plus ]; # lgpl2Plus for the library, gpl2Plus for the tools & daemon
|
license = with licenses; [ lgpl2Plus gpl2Plus ]; # lgpl2Plus for the library, gpl2Plus for the tools & daemon
|
||||||
maintainers = with maintainers; [ johnazoidberg ];
|
maintainers = teams.freedesktop.members ++ (with maintainers; [ johnazoidberg ]);
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,17 +1,5 @@
|
||||||
diff --git a/Makefile.am b/Makefile.am
|
|
||||||
index 56922b79..697f8c6e 100644
|
|
||||||
--- a/Makefile.am
|
|
||||||
+++ b/Makefile.am
|
|
||||||
@@ -1,6 +1,6 @@
|
|
||||||
## Process this file with automake to produce Makefile.in
|
|
||||||
|
|
||||||
-SHELL = @BASH@
|
|
||||||
+SHELL = @bash@
|
|
||||||
.SHELLFLAGS = -o pipefail -c
|
|
||||||
|
|
||||||
PYTHON ?= python3
|
|
||||||
diff --git a/data/80-udisks2.rules b/data/80-udisks2.rules
|
diff --git a/data/80-udisks2.rules b/data/80-udisks2.rules
|
||||||
index 39bfa28b..ee1ca90a 100644
|
index ca802cce..bfd1c29e 100644
|
||||||
--- a/data/80-udisks2.rules
|
--- a/data/80-udisks2.rules
|
||||||
+++ b/data/80-udisks2.rules
|
+++ b/data/80-udisks2.rules
|
||||||
@@ -17,9 +17,9 @@ ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="?*", GOTO="udisks_probe_end"
|
@@ -17,9 +17,9 @@ ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="?*", GOTO="udisks_probe_end"
|
||||||
|
@ -66,9 +54,27 @@ index e7df4ed2..ab4356d9 100644
|
||||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
#
|
#
|
||||||
diff --git a/src/tests/integration-test b/src/tests/integration-test
|
diff --git a/src/tests/integration-test b/src/tests/integration-test
|
||||||
index 4499a6a9..8b711f95 100755
|
index 07e4e029..3bd8ec51 100755
|
||||||
--- a/src/tests/integration-test
|
--- a/src/tests/integration-test
|
||||||
+++ b/src/tests/integration-test
|
+++ b/src/tests/integration-test
|
||||||
|
@@ -299,7 +299,7 @@ class UDisksTestCase(unittest.TestCase):
|
||||||
|
if not device:
|
||||||
|
device = cls.devname(partition)
|
||||||
|
result = {}
|
||||||
|
- cmd = subprocess.Popen(['blkid', '-p', '-o', 'udev', device], stdout=subprocess.PIPE)
|
||||||
|
+ cmd = subprocess.Popen(['@blkid@', '-p', '-o', 'udev', device], stdout=subprocess.PIPE)
|
||||||
|
for l in cmd.stdout:
|
||||||
|
(key, value) = l.decode('UTF-8').split('=', 1)
|
||||||
|
result[key] = value.strip()
|
||||||
|
@@ -437,7 +437,7 @@ class UDisksTestCase(unittest.TestCase):
|
||||||
|
f.write('KERNEL=="sr*", ENV{DISK_EJECT_REQUEST}!="?*", '
|
||||||
|
'ATTRS{model}=="scsi_debug*", '
|
||||||
|
'ENV{ID_CDROM_MEDIA}=="?*", '
|
||||||
|
- 'IMPORT{program}="/sbin/blkid -o udev -p -u noraid $tempnode"\n')
|
||||||
|
+ 'IMPORT{program}="@blkid@ -o udev -p -u noraid $tempnode"\n')
|
||||||
|
# reload udev
|
||||||
|
subprocess.call('sync; pkill --signal HUP udevd || '
|
||||||
|
'pkill --signal HUP systemd-udevd',
|
||||||
@@ -1142,7 +1142,7 @@ class FS(UDisksTestCase):
|
@@ -1142,7 +1142,7 @@ class FS(UDisksTestCase):
|
||||||
self.assertFalse(os.access(f, os.X_OK))
|
self.assertFalse(os.access(f, os.X_OK))
|
||||||
|
|
||||||
|
@ -150,6 +156,3 @@ index 3ddbdf2c..a87f960a 100644
|
||||||
udisks_spawned_job_start (job);
|
udisks_spawned_job_start (job);
|
||||||
g_object_unref (job);
|
g_object_unref (job);
|
||||||
}
|
}
|
||||||
--
|
|
||||||
2.33.1
|
|
||||||
|
|
||||||
|
|
|
@ -134,7 +134,7 @@ let
|
||||||
|
|
||||||
fish = stdenv.mkDerivation rec {
|
fish = stdenv.mkDerivation rec {
|
||||||
pname = "fish";
|
pname = "fish";
|
||||||
version = "3.3.1";
|
version = "3.4.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
# There are differences between the release tarball and the tarball GitHub
|
# There are differences between the release tarball and the tarball GitHub
|
||||||
|
@ -144,11 +144,9 @@ let
|
||||||
# --version`), as well as the local documentation for all builtins (and
|
# --version`), as well as the local documentation for all builtins (and
|
||||||
# maybe other things).
|
# maybe other things).
|
||||||
url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz";
|
url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "sha256-tbTuGlJpdiy76ZOkvWUH5nXkEAzpu+hCFKXusrGfrok=";
|
sha256 = "sha256-tbSKuEhrGe9xajL39GuIuepTVhVfDpZ+6Z9Ak2RUE8U=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./tests-pcre2-update.patch ]; # should be included in >= 3.4
|
|
||||||
|
|
||||||
# Fix FHS paths in tests
|
# Fix FHS paths in tests
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
# src/fish_tests.cpp
|
# src/fish_tests.cpp
|
||||||
|
@ -182,6 +180,10 @@ let
|
||||||
rm tests/pexpects/exit.py
|
rm tests/pexpects/exit.py
|
||||||
rm tests/pexpects/job_summary.py
|
rm tests/pexpects/job_summary.py
|
||||||
rm tests/pexpects/signals.py
|
rm tests/pexpects/signals.py
|
||||||
|
'' + lib.optionalString (stdenv.isLinux && stdenv.isAarch64) ''
|
||||||
|
# pexpect tests are flaky on aarch64-linux
|
||||||
|
# See https://github.com/fish-shell/fish-shell/issues/8789
|
||||||
|
rm tests/pexpects/exit_handlers.py
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -1,7 +0,0 @@
|
||||||
Adapted formating to 3.3.1 from
|
|
||||||
https://github.com/fish-shell/fish-shell/commit/ec8844d834cc9fe626e9fc326c6f5410341d532a
|
|
||||||
--- a/src/fish_tests.cpp
|
|
||||||
+++ b/src/fish_tests.cpp
|
|
||||||
@@ -5726,2 +5725,0 @@
|
|
||||||
- {{L"string", L"match", L"-r", L"(?=ab\\K)", L"ab", 0}, STATUS_CMD_OK, L"\n"},
|
|
||||||
- {{L"string", L"match", L"-r", L"(?=ab\\K)..(?=cd\\K)", L"abcd", 0}, STATUS_CMD_OK, L"\n"},
|
|
|
@ -168,6 +168,7 @@ mapAliases ({
|
||||||
claws-mail-gtk2 = throw "claws-mail-gtk2 was removed to get rid of Python 2, please use claws-mail"; # Added 2021-12-05
|
claws-mail-gtk2 = throw "claws-mail-gtk2 was removed to get rid of Python 2, please use claws-mail"; # Added 2021-12-05
|
||||||
claws-mail-gtk3 = claws-mail; # Added 2021-07-10
|
claws-mail-gtk3 = claws-mail; # Added 2021-07-10
|
||||||
clawsMail = throw "'clawsMail' has been renamed to/replaced by 'claws-mail'"; # Converted to throw 2022-02-22
|
clawsMail = throw "'clawsMail' has been renamed to/replaced by 'claws-mail'"; # Converted to throw 2022-02-22
|
||||||
|
clearsilver = throw "clearsilver has been removed: abandoned by upstream"; # Added 2022-03-15
|
||||||
clutter_gtk = throw "'clutter_gtk' has been renamed to/replaced by 'clutter-gtk'"; # Converted to throw 2022-02-22
|
clutter_gtk = throw "'clutter_gtk' has been renamed to/replaced by 'clutter-gtk'"; # Converted to throw 2022-02-22
|
||||||
cmakeWithQt4Gui = throw "cmakeWithQt4Gui has been removed in favor of cmakeWithGui (Qt 5)"; # Added 2021-05
|
cmakeWithQt4Gui = throw "cmakeWithQt4Gui has been removed in favor of cmakeWithGui (Qt 5)"; # Added 2021-05
|
||||||
codimd = hedgedoc; # Added 2020-11-29
|
codimd = hedgedoc; # Added 2020-11-29
|
||||||
|
|
|
@ -14163,8 +14163,11 @@ with pkgs;
|
||||||
self = pkgsi686Linux.callPackage ../development/interpreters/self { };
|
self = pkgsi686Linux.callPackage ../development/interpreters/self { };
|
||||||
|
|
||||||
inherit (callPackages ../applications/networking/cluster/spark { })
|
inherit (callPackages ../applications/networking/cluster/spark { })
|
||||||
spark3
|
spark_3_2
|
||||||
spark2;
|
spark_3_1
|
||||||
|
spark_2_4;
|
||||||
|
spark3 = spark_3_2;
|
||||||
|
spark2 = spark_2_4;
|
||||||
spark = spark3;
|
spark = spark3;
|
||||||
|
|
||||||
sparkleshare = callPackage ../applications/version-management/sparkleshare { };
|
sparkleshare = callPackage ../applications/version-management/sparkleshare { };
|
||||||
|
@ -16371,8 +16374,6 @@ with pkgs;
|
||||||
|
|
||||||
classads = callPackage ../development/libraries/classads { };
|
classads = callPackage ../development/libraries/classads { };
|
||||||
|
|
||||||
clearsilver = callPackage ../development/libraries/clearsilver { };
|
|
||||||
|
|
||||||
clfft = callPackage ../development/libraries/clfft { };
|
clfft = callPackage ../development/libraries/clfft { };
|
||||||
|
|
||||||
clipp = callPackage ../development/libraries/clipp { };
|
clipp = callPackage ../development/libraries/clipp { };
|
||||||
|
|
Loading…
Reference in a new issue