nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-28 02:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge release-23.05 into staging-next-23.05

Browse Source
This commit is contained in:
github-actions[bot]
2023-06-23 00:18:00 +00:00
committed by GitHub
parent cfabb0f661 ecb441f220
commit cd79a076b1
64 changed files with 591 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
lib/tests/filesystem.sh
View File

@@ -35,58 +35,50 @@ touch regular
ln -s target symlink
mkfifo fifo
checkPathType() {
local path=$1
local expectedPathType=$2
local actualPathType=$(nix-instantiate --eval --strict --json 2>&1 \
-E '{ path }: let lib = import <nixpkgs/lib>; in lib.filesystem.pathType path' \
--argstr path "$path")
if [[ "$actualPathType" != "$expectedPathType" ]]; then
die "lib.filesystem.pathType \"$path\" == $actualPathType, but $expectedPathType was expected"
expectSuccess() {
local expr=$1
local expectedResultRegex=$2
if ! result=$(nix-instantiate --eval --strict --json \
--expr "with (import <nixpkgs/lib>).filesystem; $expr"); then
die "$expr failed to evaluate, but it was expected to succeed"
fi
if [[ ! "$result" =~ $expectedResultRegex ]]; then
die "$expr == $result, but $expectedResultRegex was expected"
fi
}
checkPathType "/" '"directory"'
checkPathType "$PWD/directory" '"directory"'
checkPathType "$PWD/regular" '"regular"'
checkPathType "$PWD/symlink" '"symlink"'
checkPathType "$PWD/fifo" '"unknown"'
checkPathType "$PWD/non-existent" "error: evaluation aborted with the following error message: 'lib.filesystem.pathType: Path $PWD/non-existent does not exist.'"
checkPathIsDirectory() {
local path=$1
local expectedIsDirectory=$2
local actualIsDirectory=$(nix-instantiate --eval --strict --json 2>&1 \
-E '{ path }: let lib = import <nixpkgs/lib>; in lib.filesystem.pathIsDirectory path' \
--argstr path "$path")
if [[ "$actualIsDirectory" != "$expectedIsDirectory" ]]; then
die "lib.filesystem.pathIsDirectory \"$path\" == $actualIsDirectory, but $expectedIsDirectory was expected"
expectFailure() {
local expr=$1
local expectedErrorRegex=$2
if result=$(nix-instantiate --eval --strict --json 2>"$work/stderr" \
--expr "with (import <nixpkgs/lib>).filesystem; $expr"); then
die "$expr evaluated successfully to $result, but it was expected to fail"
fi
if [[ ! "$(<"$work/stderr")" =~ $expectedErrorRegex ]]; then
die "Error was $(<"$work/stderr"), but $expectedErrorRegex was expected"
fi
}
checkPathIsDirectory "/" "true"
checkPathIsDirectory "$PWD/directory" "true"
checkPathIsDirectory "$PWD/regular" "false"
checkPathIsDirectory "$PWD/symlink" "false"
checkPathIsDirectory "$PWD/fifo" "false"
checkPathIsDirectory "$PWD/non-existent" "false"
expectSuccess "pathType /." '"directory"'
expectSuccess "pathType $PWD/directory" '"directory"'
expectSuccess "pathType $PWD/regular" '"regular"'
expectSuccess "pathType $PWD/symlink" '"symlink"'
expectSuccess "pathType $PWD/fifo" '"unknown"'
# Different errors depending on whether the builtins.readFilePath primop is available or not
expectFailure "pathType $PWD/non-existent" "error: (evaluation aborted with the following error message: 'lib.filesystem.pathType: Path $PWD/non-existent does not exist.'|getting status of '$PWD/non-existent': No such file or directory)"
checkPathIsRegularFile() {
local path=$1
local expectedIsRegularFile=$2
local actualIsRegularFile=$(nix-instantiate --eval --strict --json 2>&1 \
-E '{ path }: let lib = import <nixpkgs/lib>; in lib.filesystem.pathIsRegularFile path' \
--argstr path "$path")
if [[ "$actualIsRegularFile" != "$expectedIsRegularFile" ]]; then
die "lib.filesystem.pathIsRegularFile \"$path\" == $actualIsRegularFile, but $expectedIsRegularFile was expected"
fi
}
expectSuccess "pathIsDirectory /." "true"
expectSuccess "pathIsDirectory $PWD/directory" "true"
expectSuccess "pathIsDirectory $PWD/regular" "false"
expectSuccess "pathIsDirectory $PWD/symlink" "false"
expectSuccess "pathIsDirectory $PWD/fifo" "false"
expectSuccess "pathIsDirectory $PWD/non-existent" "false"
checkPathIsRegularFile "/" "false"
checkPathIsRegularFile "$PWD/directory" "false"
checkPathIsRegularFile "$PWD/regular" "true"
checkPathIsRegularFile "$PWD/symlink" "false"
checkPathIsRegularFile "$PWD/fifo" "false"
checkPathIsRegularFile "$PWD/non-existent" "false"
expectSuccess "pathIsRegularFile /." "false"
expectSuccess "pathIsRegularFile $PWD/directory" "false"
expectSuccess "pathIsRegularFile $PWD/regular" "true"
expectSuccess "pathIsRegularFile $PWD/symlink" "false"
expectSuccess "pathIsRegularFile $PWD/fifo" "false"
expectSuccess "pathIsRegularFile $PWD/non-existent" "false"
echo >&2 tests ok

2
lib/tests/modules.sh
View File

@@ -378,7 +378,7 @@ checkConfigOutput '^{ }$' config.sub.nixosOk ./class-check.nix
checkConfigError 'The module .*/module-class-is-darwin.nix was imported into nixos instead of darwin.' config.sub.nixosFail.config ./class-check.nix
# submoduleWith type merge with different class
checkConfigError 'error: A submoduleWith option is declared multiple times with conflicting class values "darwin" and "nixos".' config.sub.mergeFail.config ./class-check.nix
checkConfigError 'A submoduleWith option is declared multiple times with conflicting class values "darwin" and "nixos".' config.sub.mergeFail.config ./class-check.nix
# _type check
checkConfigError 'Could not load a value as a module, because it is of type "flake", in file .*/module-imports-_type-check.nix' config.ok.config ./module-imports-_type-check.nix

94
lib/tests/release.nix
View File

@@ -2,53 +2,63 @@
# Don't test properties of pkgs.lib, but rather the lib in the parent directory
pkgs ? import ../.. {} // { lib = throw "pkgs.lib accessed, but the lib tests should use nixpkgs' lib path directly!"; },
nix ? pkgs.nix,
nixVersions ? [ pkgs.nixVersions.minimum nix pkgs.nixVersions.unstable ],
}:
pkgs.runCommand "nixpkgs-lib-tests" {
buildInputs = [
(import ./check-eval.nix)
(import ./maintainers.nix {
inherit pkgs;
lib = import ../.;
})
(import ./teams.nix {
inherit pkgs;
lib = import ../.;
})
(import ../path/tests {
inherit pkgs;
})
];
nativeBuildInputs = [
nix
];
strictDeps = true;
} ''
datadir="${nix}/share"
export TEST_ROOT=$(pwd)/test-tmp
export NIX_BUILD_HOOK=
export NIX_CONF_DIR=$TEST_ROOT/etc
export NIX_LOCALSTATE_DIR=$TEST_ROOT/var
export NIX_LOG_DIR=$TEST_ROOT/var/log/nix
export NIX_STATE_DIR=$TEST_ROOT/var/nix
export NIX_STORE_DIR=$TEST_ROOT/store
export PAGER=cat
cacheDir=$TEST_ROOT/binary-cache
let
testWithNix = nix:
pkgs.runCommand "nixpkgs-lib-tests-nix-${nix.version}" {
buildInputs = [
(import ./check-eval.nix)
(import ./maintainers.nix {
inherit pkgs;
lib = import ../.;
})
(import ./teams.nix {
inherit pkgs;
lib = import ../.;
})
(import ../path/tests {
inherit pkgs;
})
];
nativeBuildInputs = [
nix
];
strictDeps = true;
} ''
datadir="${nix}/share"
export TEST_ROOT=$(pwd)/test-tmp
export NIX_BUILD_HOOK=
export NIX_CONF_DIR=$TEST_ROOT/etc
export NIX_LOCALSTATE_DIR=$TEST_ROOT/var
export NIX_LOG_DIR=$TEST_ROOT/var/log/nix
export NIX_STATE_DIR=$TEST_ROOT/var/nix
export NIX_STORE_DIR=$TEST_ROOT/store
export PAGER=cat
cacheDir=$TEST_ROOT/binary-cache
mkdir -p $NIX_CONF_DIR
echo "experimental-features = nix-command" >> $NIX_CONF_DIR/nix.conf
mkdir -p $NIX_CONF_DIR
echo "experimental-features = nix-command" >> $NIX_CONF_DIR/nix.conf
nix-store --init
nix-store --init
cp -r ${../.} lib
echo "Running lib/tests/modules.sh"
bash lib/tests/modules.sh
cp -r ${../.} lib
echo "Running lib/tests/modules.sh"
bash lib/tests/modules.sh
echo "Running lib/tests/filesystem.sh"
TEST_LIB=$PWD/lib bash lib/tests/filesystem.sh
echo "Running lib/tests/filesystem.sh"
TEST_LIB=$PWD/lib bash lib/tests/filesystem.sh
echo "Running lib/tests/sources.sh"
TEST_LIB=$PWD/lib bash lib/tests/sources.sh
echo "Running lib/tests/sources.sh"
TEST_LIB=$PWD/lib bash lib/tests/sources.sh
touch $out
''
mkdir $out
echo success > $out/${nix.version}
'';
in
pkgs.symlinkJoin {
name = "nixpkgs-lib-tests";
paths = map testWithNix nixVersions;
}

23
lib/tests/sources.sh
View File

@@ -23,14 +23,19 @@ clean_up() {
trap clean_up EXIT
cd "$work"
# Crudely unquotes a JSON string by just taking everything between the first and the second quote.
# We're only using this for resulting /nix/store paths, which can't contain " anyways,
# nor can they contain any other characters that would need to be escaped specially in JSON
# This way we don't need to add a dependency on e.g. jq
crudeUnquoteJSON() {
cut -d \" -f2
}
touch {README.md,module.o,foo.bar}
# nix-instantiate doesn't write out the source, only computing the hash, so
# this uses the experimental nix command instead.
dir="$(nix eval --impure --raw --expr '(with import <nixpkgs/lib>; "${
dir="$(nix-instantiate --eval --strict --read-write-mode --json --expr '(with import <nixpkgs/lib>; "${
cleanSource ./.
}")')"
}")' | crudeUnquoteJSON)"
(cd "$dir"; find) | sort -f | diff -U10 - <(cat <<EOF
.
./foo.bar
@@ -39,9 +44,9 @@ EOF
) || die "cleanSource 1"
dir="$(nix eval --impure --raw --expr '(with import <nixpkgs/lib>; "${
dir="$(nix-instantiate --eval --strict --read-write-mode --json --expr '(with import <nixpkgs/lib>; "${
cleanSourceWith { src = '"$work"'; filter = path: type: ! hasSuffix ".bar" path; }
}")')"
}")' | crudeUnquoteJSON)"
(cd "$dir"; find) | sort -f | diff -U10 - <(cat <<EOF
.
./module.o
@@ -49,9 +54,9 @@ dir="$(nix eval --impure --raw --expr '(with import <nixpkgs/lib>; "${
EOF
) || die "cleanSourceWith 1"
dir="$(nix eval --impure --raw --expr '(with import <nixpkgs/lib>; "${
dir="$(nix-instantiate --eval --strict --read-write-mode --json --expr '(with import <nixpkgs/lib>; "${
cleanSourceWith { src = cleanSource '"$work"'; filter = path: type: ! hasSuffix ".bar" path; }
}")')"
}")' | crudeUnquoteJSON)"
(cd "$dir"; find) | sort -f | diff -U10 - <(cat <<EOF
.
./README.md

6
maintainers/maintainer-list.nix
View File

@@ -14786,6 +14786,12 @@
githubId = 1437166;
name = "Xia Bin";
};
sochotnicky = {
email = "stanislav+github@ochotnicky.com";
github = "sochotnicky";
githubId = 55726;
name = "Stanislav Ochotnický";
};
softinio = {
email = "code@softinio.com";
github = "softinio";

3
maintainers/team-list.nix
View File

@@ -273,7 +273,7 @@ with lib.maintainers; {
};
freedesktop = {
members = [ jtojnar ];
members = [ ];
scope = "Maintain Freedesktop.org packages for graphical desktop.";
shortName = "freedesktop.org packaging";
};
@@ -316,7 +316,6 @@ with lib.maintainers; {
members = [
bobby285271
hedning
jtojnar
dasj19
maxeaubrey
];

2
nixos/modules/hardware/video/nvidia.nix
View File

@@ -265,7 +265,7 @@ in
{
assertion = primeEnabled -> pCfg.nvidiaBusId != "" && (pCfg.intelBusId != "" || pCfg.amdgpuBusId != "");
message = ''
When NVIDIA PRIME is enabled, the GPU bus IDs must configured.
When NVIDIA PRIME is enabled, the GPU bus IDs must be configured.
'';
}

1
nixos/tests/fontconfig-default-fonts.nix
View File

@@ -3,7 +3,6 @@ import ./make-test-python.nix ({ lib, ... }:
name = "fontconfig-default-fonts";
meta.maintainers = with lib.maintainers; [
jtojnar
];
nodes.machine = { config, pkgs, ... }: {

2
pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix
View File

@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
description = "Plug-in that adds GTK 3 header bar to the DeaDBeeF music player";
homepage = "https://github.com/saivert/ddb_misc_headerbar_GTK3";
license = licenses.gpl2Plus;
maintainers = [ maintainers.jtojnar ];
maintainers = [ ];
platforms = platforms.linux;
};
}

2
pkgs/applications/audio/deadbeef/plugins/lyricbar.nix
View File

@@ -20,7 +20,7 @@ stdenv.mkDerivation {
description = "Plugin for DeaDBeeF audio player that fetches and shows the song’s lyrics";
homepage = "https://github.com/C0rn3j/deadbeef-lyricbar";
license = licenses.mit;
maintainers = [ maintainers.jtojnar ];
maintainers = [ ];
platforms = platforms.linux;
};
}

2
pkgs/applications/backup/deja-dup/default.nix
View File

@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://wiki.gnome.org/Apps/DejaDup";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ jtojnar ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}

2
pkgs/applications/editors/sublime/4/common.nix
View File

@@ -166,7 +166,7 @@ in stdenv.mkDerivation (rec {
meta = with lib; {
description = "Sophisticated text editor for code, markup and prose";
homepage = "https://www.sublimetext.com/";
maintainers = with maintainers; [ jtojnar wmertens demin-dmitriy zimbatm ];
maintainers = with maintainers; [ wmertens demin-dmitriy zimbatm ];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
platforms = [ "aarch64-linux" "x86_64-linux" ];

2
pkgs/applications/graphics/gimp/default.nix
View File

@@ -192,7 +192,7 @@ in stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "The GNU Image Manipulation Program";
homepage = "https://www.gimp.org/";
maintainers = with maintainers; [ jtojnar ];
maintainers = with maintainers; [ ];
license = licenses.gpl3Plus;
platforms = platforms.unix;
mainProgram = "gimp";

2
pkgs/applications/graphics/inkscape/default.nix
View File

@@ -155,7 +155,7 @@ stdenv.mkDerivation rec {
description = "Vector graphics editor";
homepage = "https://www.inkscape.org";
license = licenses.gpl3Plus;
maintainers = [ maintainers.jtojnar ];
maintainers = [ ];
platforms = platforms.all;
longDescription = ''
Inkscape is a feature-rich vector graphics editor that edits

2
pkgs/applications/graphics/inkscape/extensions/applytransforms/default.nix
View File

@@ -36,7 +36,7 @@ stdenv.mkDerivation {
description = "Inkscape extension which removes all matrix transforms by applying them recursively to shapes";
homepage = "https://github.com/Klowner/inkscape-applytransforms";
license = licenses.gpl2Only;
maintainers = with maintainers; [ jtojnar ];
maintainers = with maintainers; [ ];
platforms = platforms.all;
};
}

2
pkgs/applications/graphics/mypaint/default.nix
View File

@@ -107,6 +107,6 @@ in buildPythonApplication rec {
homepage = "http://mypaint.org/";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ goibhniu jtojnar ];
maintainers = with maintainers; [ goibhniu ];
};
}

4
pkgs/applications/networking/instant-messengers/discord/default.nix
View File

@@ -3,7 +3,7 @@ let
versions = if stdenv.isLinux then {
stable = "0.0.27";
ptb = "0.0.42";
canary = "0.0.154";
canary = "0.0.160";
development = "0.0.216";
} else {
stable = "0.0.273";
@@ -24,7 +24,7 @@ let
};
canary = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
sha256 = "sha256-rtqPQZBrmxnHuXgzmC7VNiucXBBmtrn8AiKNDtxaR7c=";
sha256 = "sha256-fsltWhCQ/jSxdELngRlpOsdH7gXl1WW5euZsrEQgkm0=";
};
development = fetchurl {
url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";

52
pkgs/applications/networking/p2p/tremotesf/default.nix Normal file
View File

@@ -0,0 +1,52 @@
{stdenv
,lib
, cmake
, pkg-config
, fetchFromGitHub
, qtbase
, qttools
, kwidgetsaddons
, kwindowsystem
, fmt
, libpsl
, cxxopts
, wrapQtAppsHook
}:
stdenv.mkDerivation (finalAttrs: {
pname = "tremotesf";
version = "2.4.0";
src = fetchFromGitHub {
owner = "equeim";
repo = "tremotesf2";
rev = finalAttrs.version;
hash = "sha256-TKtBgMpCWIUl1bohAKCbTcZX2uaPmzeWut/OeNs/rME=";
# We need this for src/libtremotesf
fetchSubmodules = true;
};
buildInputs = [
qtbase
qttools
fmt
libpsl
kwidgetsaddons
kwindowsystem
cxxopts
];
nativeBuildInputs = [
cmake
pkg-config
];
propagatedBuildInputs = [ wrapQtAppsHook ];
meta = with lib; {
description = "Remote GUI for transmission-daemon";
license = licenses.gpl3Plus;
homepage = "https://github.com/equeim/tremotesf2";
maintainers = with maintainers; [ sochotnicky ];
};
})

2
pkgs/applications/version-management/meld/default.nix
View File

@@ -68,6 +68,6 @@ python3.pkgs.buildPythonApplication rec {
homepage = "https://meld.app/";
license = licenses.gpl2Plus;
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ jtojnar mimame ];
maintainers = with maintainers; [ mimame ];
};
}

1
pkgs/data/fonts/input-fonts/default.nix
View File

@@ -90,7 +90,6 @@ stdenv.mkDerivation rec {
homepage = "https://input.djr.com/";
license = licenses.unfree;
maintainers = with maintainers; [
jtojnar
romildo
];
platforms = platforms.all;

2
pkgs/data/fonts/joypixels/default.nix
View File

@@ -98,6 +98,6 @@ stdenv.mkDerivation rec {
appendixUrl = appendix.url;
free = false;
};
maintainers = with maintainers; [ toonn jtojnar ];
maintainers = with maintainers; [ toonn ];
};
}

2
pkgs/desktops/gnome/extensions/dash-to-dock/default.nix
View File

@@ -42,6 +42,6 @@ stdenv.mkDerivation rec {
description = "A dock for the Gnome Shell";
homepage = "https://micheleg.github.io/dash-to-dock/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ eperuffo jtojnar rhoriguchi ];
maintainers = with maintainers; [ eperuffo rhoriguchi ];
};
}

2
pkgs/development/compilers/vala/default.nix
View File

@@ -87,7 +87,7 @@ let
homepage = "https://wiki.gnome.org/Projects/Vala";
license = licenses.lgpl21Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ antono jtojnar maxeaubrey ] ++ teams.pantheon.members;
maintainers = with maintainers; [ antono maxeaubrey ] ++ teams.pantheon.members;
};
});

2
pkgs/development/libraries/babl/default.nix
View File

@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
homepage = "https://gegl.org/babl/";
changelog = "https://gitlab.gnome.org/GNOME/babl/-/blob/BABL_${lib.replaceStrings [ "." ] [ "_" ] version}/NEWS";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ jtojnar ];
maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}

2
pkgs/development/libraries/dleyna-connector-dbus/default.nix
View File

@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A D-Bus API for the dLeyna services";
homepage = "https://github.com/phako/dleyna-connector-dbus";
maintainers = with maintainers; [ jtojnar ];
maintainers = with maintainers; [ ];
platforms = platforms.unix;
license = licenses.lgpl21Only;
};

2
pkgs/development/libraries/dleyna-core/default.nix
View File

@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Library of utility functions that are used by the higher level dLeyna";
homepage = "https://github.com/phako/dleyna-core";
maintainers = with maintainers; [ jtojnar ];
maintainers = with maintainers; [ ];
platforms = platforms.unix;
license = licenses.lgpl21Only;
};

2
pkgs/development/libraries/dleyna-renderer/default.nix
View File

@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Library to discover and manipulate Digital Media Renderers";
homepage = "https://github.com/phako/dleyna-renderer";
maintainers = with maintainers; [ jtojnar ];
maintainers = with maintainers; [ ];
platforms = platforms.unix;
license = licenses.lgpl21Only;
};

2
pkgs/development/libraries/dleyna-server/default.nix
View File

@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Library to discover, browse and manipulate Digital Media Servers";
homepage = "https://github.com/phako/dleyna-server";
maintainers = with maintainers; [ jtojnar ];
maintainers = with maintainers; [ ];
platforms = platforms.unix;
license = licenses.lgpl21Only;
};

2
pkgs/development/libraries/enchant/2.x.nix
View File

@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
description = "Generic spell checking library";
homepage = "https://abiword.github.io/enchant/";
license = licenses.lgpl21Plus; # with extra provision for non-free checkers
maintainers = with maintainers; [ jtojnar ];
maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}

2
pkgs/development/libraries/gegl/default.nix
View File

@@ -120,7 +120,7 @@ stdenv.mkDerivation rec {
description = "Graph-based image processing framework";
homepage = "https://www.gegl.org";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ jtojnar ];
maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}

2
pkgs/development/libraries/glib-testing/default.nix
View File

@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
description = "Test library providing test harnesses and mock classes complementing the classes provided by GLib";
homepage = "https://gitlab.gnome.org/pwithnall/libglib-testing";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ jtojnar ];
maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}

776
pkgs/development/libraries/gstreamer/rs/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

8
pkgs/development/libraries/gstreamer/rs/default.nix
View File

@@ -118,7 +118,7 @@ in
stdenv.mkDerivation rec {
pname = "gst-plugins-rs";
version = "0.10.7";
version = "0.10.8";
outputs = [ "out" "dev" ];
@@ -127,7 +127,7 @@ stdenv.mkDerivation rec {
owner = "gstreamer";
repo = "gst-plugins-rs";
rev = version;
hash = "sha256-b+j7nAMK66+msRnIaj1S1DSvES5Gid3QazXgqO1II/Q=";
hash = "sha256-UxmfyqbQwkQjwHiARRpFJiGsrsNjv6V129lIHPk7gRk=";
# TODO: temporary workaround for case-insensitivity problems with color-name crate - https://github.com/annymosse/color-name/pull/2
nativeBuildInputs = [ yq moreutils ];
postFetch = ''
@@ -141,12 +141,12 @@ stdenv.mkDerivation rec {
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
"cairo-rs-0.17.9" = "sha256-LiIb6y/Ks/o+rZhU8RpXN7jSo7JzBGmcNumxyx/lZs0=";
"cairo-rs-0.17.10" = "sha256-5lWlDHlMco380tRaxyApdNv5DDKJL9QrKI2DvHM3868=";
"color-name-1.1.0" = "sha256-RfMStbe2wX5qjPARHIFHlSDKjzx8DwJ+RjzyltM5K7A=";
"ffv1-0.0.0" = "sha256-af2VD00tMf/hkfvrtGrHTjVJqbl+VVpLaR0Ry+2niJE=";
"flavors-0.2.0" = "sha256-zBa0X75lXnASDBam9Kk6w7K7xuH9fP6rmjWZBUB5hxk=";
"gdk4-0.6.6" = "sha256-TI4F9MjIpxFEZItoewP/Zem1vM4MsKNJTzfgah1vjmI=";
"gstreamer-0.20.5" = "sha256-IQ56Upe73egId1IJRfzvqrJIzTc1x5FgAEbva9kuqPE=";
"gstreamer-0.20.6" = "sha256-IyzqCQ5oQt5QgFp6liGyDaFhteCceR1KPzJCE4R6zus=";
};
};

2
pkgs/development/libraries/lib2geom/default.nix
View File

@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
description = "Easy to use 2D geometry library in C++";
homepage = "https://gitlab.com/inkscape/lib2geom";
license = [ licenses.lgpl21Only licenses.mpl11 ];
maintainers = with maintainers; [ jtojnar ];
maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}

2
pkgs/development/libraries/libcloudproviders/default.nix
View File

@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
description = "DBus API that allows cloud storage sync clients to expose their services";
homepage = "https://gitlab.gnome.org/World/libcloudproviders";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ jtojnar ];
maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}

2
pkgs/development/libraries/liblouis/default.nix
View File

@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
lgpl21Plus # library
gpl3Plus # tools
];
maintainers = with maintainers; [ jtojnar ];
maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
})

2
pkgs/development/libraries/libmypaint/default.nix
View File

@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
homepage = "http://mypaint.org/";
description = "Library for making brushstrokes which is used by MyPaint and other projects";
license = licenses.isc;
maintainers = with maintainers; [ goibhniu jtojnar ];
maintainers = with maintainers; [ goibhniu ];
platforms = platforms.unix;
};
}

2
pkgs/development/libraries/libportal/default.nix
View File

@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
description = "Flatpak portal library";
homepage = "https://github.com/flatpak/libportal";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ jtojnar ];
maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}

2
pkgs/development/libraries/libsegfault/default.nix
View File

@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
description = "Implementation of libSegFault.so with Boost.stracktrace";
homepage = "https://github.com/jonathanpoelen/libsegfault";
license = licenses.asl20;
maintainers = with maintainers; [ jtojnar ];
maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}

2
pkgs/development/libraries/libxml2/default.nix
View File

@@ -145,7 +145,7 @@ libxml = stdenv.mkDerivation rec {
description = "XML parsing library for C";
license = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [ eelco jtojnar ];
maintainers = with maintainers; [ eelco ];
};
};
in

2
pkgs/development/libraries/libxslt/default.nix
View File

@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
description = "A C library and tools to do XSL transformations";
license = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [ eelco jtojnar ];
maintainers = with maintainers; [ eelco ];
broken = pythonSupport && !libxml2.pythonSupport; # see #73102 for why this is not an assert
};
}

2
pkgs/development/libraries/malcontent/default.nix
View File

@@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
description = "Parental controls library";
homepage = "https://gitlab.freedesktop.org/pwithnall/malcontent";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ jtojnar ];
maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}

2
pkgs/development/libraries/malcontent/ui.nix
View File

@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
description = "UI components for parental controls library";
homepage = "https://gitlab.freedesktop.org/pwithnall/malcontent";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ jtojnar ];
maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}

2
pkgs/development/libraries/mutest/default.nix
View File

@@ -28,7 +28,7 @@ stdenv.mkDerivation {
homepage = "https://ebassi.github.io/mutest/mutest.md.html";
description = "A BDD testing framework for C, inspired by Mocha";
license = licenses.mit;
maintainers = with maintainers; [ jtojnar ];
maintainers = with maintainers; [ ];
platforms = platforms.all;
};
}

2
pkgs/development/libraries/mypaint-brushes/1.0.nix
View File

@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
homepage = "http://mypaint.org/";
description = "Brushes used by MyPaint and other software using libmypaint";
license = licenses.cc0;
maintainers = with maintainers; [ jtojnar ];
maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}

2
pkgs/development/libraries/mypaint-brushes/default.nix
View File

@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
homepage = "http://mypaint.org/";
description = "Brushes used by MyPaint and other software using libmypaint";
license = licenses.cc0;
maintainers = with maintainers; [ jtojnar ];
maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}

2
pkgs/development/libraries/poly2tri-c/default.nix
View File

@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
description = "Library for generating, refining and rendering 2-Dimensional Constrained Delaunay Triangulations";
homepage = "https://code.google.com/archive/p/poly2tri-c/";
license = licenses.bsd3;
maintainers = with lib.maintainers; [ jtojnar ];
maintainers = with lib.maintainers; [ ];
platforms = platforms.unix;
};
}

1
pkgs/development/libraries/speechd/default.nix
View File

@@ -113,7 +113,6 @@ in stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
maintainers = with maintainers; [
berce
jtojnar
];
platforms = platforms.linux;
};

2
pkgs/development/libraries/xdg-dbus-proxy/default.nix
View File

@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
description = "DBus proxy for Flatpak and others";
homepage = "https://github.com/flatpak/xdg-dbus-proxy";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ jtojnar ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}

2
pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
View File

@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Desktop integration portals for sandboxed apps";
maintainers = with maintainers; [ jtojnar ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
license = licenses.lgpl2Plus;
};

2
pkgs/development/libraries/xdg-desktop-portal/default.nix
View File

@@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "Desktop integration portals for sandboxed apps";
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ jtojnar ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
})

2
pkgs/development/python-modules/pyatspi/default.nix
View File

@@ -41,7 +41,7 @@ buildPythonPackage rec {
description = "Python client bindings for D-Bus AT-SPI";
homepage = "https://wiki.linuxfoundation.org/accessibility/d-bus";
license = licenses.gpl2;
maintainers = with maintainers; [ jtojnar ];
maintainers = with maintainers; [ ];
platforms = with platforms; unix;
};
}

2
pkgs/development/python-modules/pygobject/3.nix
View File

@@ -72,7 +72,7 @@ buildPythonPackage rec {
homepage = "https://pygobject.readthedocs.io/";
description = "Python bindings for Glib";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ jtojnar ];
maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}

2
pkgs/development/tools/analysis/tartan/default.nix
View File

@@ -48,6 +48,6 @@ stdenv.mkDerivation rec {
homepage = "https://freedesktop.org/wiki/Software/tartan";
license = licenses.gpl3Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ jtojnar ];
maintainers = with maintainers; [ ];
};
}

2
pkgs/development/tools/ashpd-demo/default.nix
View File

@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Tool for playing with XDG desktop portals";
homepage = "https://github.com/bilelmoussaoui/ashpd/tree/master/ashpd-demo";
license = licenses.mit;
maintainers = with maintainers; [ jtojnar ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
})

2
pkgs/development/tools/gnome-desktop-testing/default.nix
View File

@@ -41,6 +41,6 @@ stdenv.mkDerivation rec {
homepage = "https://wiki.gnome.org/Initiatives/GnomeGoals/InstalledTests";
license = licenses.lgpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.jtojnar ];
maintainers = [ ];
};
}

1
pkgs/servers/adminer/default.nix
View File

@@ -41,7 +41,6 @@ stdenv.mkDerivation rec {
homepage = "https://www.adminer.org";
license = with licenses; [ asl20 gpl2Only ];
maintainers = with maintainers; [
jtojnar
sstef
];
platforms = platforms.all;

2
pkgs/servers/web-apps/selfoss/default.nix
View File

@@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation rec {
description = "Web-based news feed (RSS/Atom) aggregator";
homepage = "https://selfoss.aditu.de";
license = licenses.gpl3Only;
maintainers = with maintainers; [ jtojnar regnat ];
maintainers = with maintainers; [ regnat ];
platforms = platforms.all;
};
}

2
pkgs/tools/misc/pandoc-lua-filters/default.nix
View File

@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
description = "A collection of lua filters for pandoc";
homepage = "https://github.com/pandoc/lua-filters";
license = licenses.mit;
maintainers = with maintainers; [ jtojnar ];
maintainers = with maintainers; [ ];
platforms = platforms.all;
};
}

4
pkgs/tools/misc/yt-dlp/default.nix
View File

@@ -22,11 +22,11 @@ buildPythonPackage rec {
# The websites yt-dlp deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
version = "2023.6.21";
version = "2023.6.22";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-VsNdGtPs+4KMO4n/4HsjWzVO3dguGjHdw9FuuMPnHo4=";
sha256 = "sha256-7WqLjgrQikVA1K+g/Qin+YACLHm5CBvZ5j3cAK7u5ag=";
};
propagatedBuildInputs = [

4
pkgs/tools/networking/minidlna/default.nix
View File

@@ -2,7 +2,7 @@
let
pname = "minidlna";
version = "1.3.2";
version = "1.3.3";
in
stdenv.mkDerivation {
inherit pname version;
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
src = fetchgit {
url = "https://git.code.sf.net/p/${pname}/git";
rev = "v${builtins.replaceStrings [ "." ] [ "_" ] version}";
hash = "sha256-v+puglrbuLqHIAbrO7bhOA0npc/GYp0Bdi3DnD9qyII=";
hash = "sha256-InsSguoGi1Gp8R/bd4/c16xqRuk0bRsgw7wvcbokgKo=";
};
preConfigure = ''

6
pkgs/tools/networking/netbird/default.nix
View File

@@ -30,16 +30,16 @@ let
in
buildGoModule rec {
pname = "netbird";
version = "0.21.3";
version = "0.21.5";
src = fetchFromGitHub {
owner = "netbirdio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-OPLt2IDC/utRdmpYo8V1VVThpv4Fy2X7lhF5BckKkMM=";
sha256 = "sha256-zsbxc6Arbqrx2LxmNJJXlsyQc7X6L84ej+2piy2Hy/k=";
};
vendorHash = "sha256-D2jPpaPkbou/upkiOUhA8QJONyKTlTqx9Ylgkq+nBfo=";
vendorHash = "sha256-R5LhqW6uh7R8/vr60Sy0kVpAaTL3rwh5c4Ix08Rx6Zk=";
nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;

2
pkgs/tools/text/link-grammar/default.nix
View File

@@ -58,7 +58,7 @@ link-grammar = stdenv.mkDerivation rec {
homepage = "https://www.abisource.com/projects/link-grammar/";
changelog = "https://github.com/opencog/link-grammar/blob/link-grammar-${version}/ChangeLog";
license = licenses.lgpl21Only;
maintainers = with maintainers; [ jtojnar ];
maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
};

2
pkgs/top-level/all-packages.nix
View File

@@ -40571,5 +40571,7 @@ with pkgs;
isolate = callPackage ../tools/security/isolate { };
tremotesf = libsForQt5.callPackage ../applications/networking/p2p/tremotesf { };
reindeer = callPackage ../development/tools/reindeer { };
}