Skip to content

Commit 92cc194

Browse files
FRidhFRidh
committed
Merge staging into staging-next
2 parents d2f5d37 + d4a33d7 commit 92cc194

184 files changed

Lines changed: 1345 additions & 1164 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎maintainers/scripts/fetch-kde-qt.sh‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@ fi
1414

1515
tmp=$(mktemp -d)
1616
pushd $tmp >/dev/null
17-
wget -nH -r -c --no-parent "${WGET_ARGS[@]}" -A '*.tar.xz.sha256' -A '*.mirrorlist' >/dev/null
18-
find -type f -name '*.mirrorlist' -delete
17+
wget -nH -r -c --no-parent "${WGET_ARGS[@]}" >/dev/null
1918

2019
csv=$(mktemp)
2120
find . -type f | while read src; do
2221
# Sanitize file name
23-
filename=$(gawk '{ print $2 }' "$src" | tr '@' '_')
22+
filename=$(basename "$src" | tr '@' '_')
2423
nameVersion="${filename%.tar.*}"
2524
name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,' | sed -e 's,-everywhere-src$,,')
2625
version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,')
@@ -40,8 +39,8 @@ gawk -F , "{ print \$1 }" $csv | sort | uniq | while read name; do
4039
latestVersion=$(echo "$versions" | sort -rV | head -n 1)
4140
src=$(gawk -F , "/^$name,$latestVersion,/ { print \$3 }" $csv)
4241
filename=$(gawk -F , "/^$name,$latestVersion,/ { print \$4 }" $csv)
43-
url="$(dirname "${src:2}")/$filename"
44-
sha256=$(gawk '{ print $1 }' "$src")
42+
url="${src:2}"
43+
sha256=$(nix-hash --type sha256 --base32 --flat "$src")
4544
cat >>"$SRCS" <<EOF
4645
$name = {
4746
version = "$latestVersion";

‎nixos/doc/manual/release-notes/rl-2103.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,12 @@
287287
This avoids that the password gets exposed in the nix store.
288288
</para>
289289
</listitem>
290+
<listitem>
291+
<para>
292+
The <literal>wafHook</literal> hook does not wrap Python anymore.
293+
Packages depending on <literal>wafHook</literal> need to include any Python into their <literal>nativeBuildInputs</literal>.
294+
</para>
295+
</listitem>
290296
<listitem>
291297
<para>
292298
Starting with version 1.7.0, the project formerly named <literal>CodiMD</literal>

‎pkgs/applications/audio/ams-lv2/default.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{ stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig
2-
, wafHook }:
2+
, wafHook, python3 }:
33

44
stdenv.mkDerivation rec {
55
pname = "ams-lv2";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212
sha256 = "1lz2mvk4gqsyf92yxd3aaldx0d0qi28h4rnnvsaz4ls0ccqm80nk";
1313
};
1414

15-
nativeBuildInputs = [ pkgconfig wafHook ];
15+
nativeBuildInputs = [ pkgconfig wafHook python3 ];
1616
buildInputs = [ cairo fftw gtkmm2 lv2 lvtk ];
1717

1818
meta = with stdenv.lib; {

‎pkgs/applications/audio/mda-lv2/default.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ stdenv, fetchurl, fftwSinglePrec, lv2, pkgconfig, wafHook }:
1+
{ stdenv, fetchurl, fftwSinglePrec, lv2, pkgconfig, wafHook, python3 }:
22

33
stdenv.mkDerivation rec {
44
pname = "mda-lv2";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99
sha256 = "1a3cv6w5xby9yn11j695rbh3c4ih7rxfxmkca9s1324ljphh06m8";
1010
};
1111

12-
nativeBuildInputs = [ pkgconfig wafHook ];
12+
nativeBuildInputs = [ pkgconfig wafHook python3 ];
1313
buildInputs = [ fftwSinglePrec lv2 ];
1414

1515
meta = with stdenv.lib; {

‎pkgs/applications/audio/mopidy/mopidy.nix‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ pythonPackages.buildPythonApplication rec {
3838
# There are no tests
3939
doCheck = false;
4040

41-
preFixup = ''
42-
gappsWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH")
43-
'';
44-
4541
meta = with stdenv.lib; {
4642
homepage = "https://www.mopidy.com/";
4743
description = ''

‎pkgs/applications/kde/akonadi-calendar.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
}:
77

88
mkDerivation {
9-
name = "akonadi-calendar";
9+
pname = "akonadi-calendar";
1010
meta = {
1111
license = with lib.licenses; [ gpl2 lgpl21 ];
1212
maintainers = kdepimTeam;

‎pkgs/applications/kde/akonadi-contacts.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
}:
99

1010
mkDerivation {
11-
name = "akonadi-contacts";
11+
pname = "akonadi-contacts";
1212
meta = {
1313
license = with lib.licenses; [ gpl2 lgpl21 ];
1414
maintainers = kdepimTeam;

‎pkgs/applications/kde/akonadi-import-wizard.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
}:
77

88
mkDerivation {
9-
name = "akonadi-import-wizard";
9+
pname = "akonadi-import-wizard";
1010
meta = {
1111
license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12 ];
1212
maintainers = kdepimTeam;

‎pkgs/applications/kde/akonadi-mime.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
}:
66

77
mkDerivation {
8-
name = "akonadi-mime";
8+
pname = "akonadi-mime";
99
meta = {
1010
license = with lib.licenses; [ gpl2 lgpl21 ];
1111
maintainers = kdepimTeam;

‎pkgs/applications/kde/akonadi-notes.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
}:
66

77
mkDerivation {
8-
name = "akonadi-notes";
8+
pname = "akonadi-notes";
99
meta = {
1010
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
1111
maintainers = kdepimTeam;

0 commit comments

Comments
 (0)