Merge staging-next into staging
This commit is contained in:
commit
09eedfc76b
|
@ -35,6 +35,70 @@ passthru.tests.version = testers.testVersion {
|
|||
};
|
||||
```
|
||||
|
||||
## `testBuildFailure` {#tester-testBuildFailure}
|
||||
|
||||
Make sure that a build does not succeed. This is useful for testing testers.
|
||||
|
||||
This returns a derivation with an override on the builder, with the following effects:
|
||||
|
||||
- Fail the build when the original builder succeeds
|
||||
- Move `$out` to `$out/result`, if it exists (assuming `out` is the default output)
|
||||
- Save the build log to `$out/testBuildFailure.log` (same)
|
||||
|
||||
Example:
|
||||
|
||||
```nix
|
||||
runCommand "example" {
|
||||
failed = testers.testBuildFailure (runCommand "fail" {} ''
|
||||
echo ok-ish >$out
|
||||
echo failing though
|
||||
exit 3
|
||||
'');
|
||||
} ''
|
||||
grep -F 'ok-ish' $failed/result
|
||||
grep -F 'failing though' $failed/testBuildFailure.log
|
||||
[[ 3 = $(cat $failed/testBuildFailure.exit) ]]
|
||||
touch $out
|
||||
'';
|
||||
```
|
||||
|
||||
While `testBuildFailure` is designed to keep changes to the original builder's
|
||||
environment to a minimum, some small changes are inevitable.
|
||||
|
||||
- The file `$TMPDIR/testBuildFailure.log` is present. It should not be deleted.
|
||||
- `stdout` and `stderr` are a pipe instead of a tty. This could be improved.
|
||||
- One or two extra processes are present in the sandbox during the original
|
||||
builder's execution.
|
||||
- The derivation and output hashes are different, but not unusual.
|
||||
- The derivation includes a dependency on `buildPackages.bash` and
|
||||
`expect-failure.sh`, which is built to include a transitive dependency on
|
||||
`buildPackages.coreutils` and possibly more. These are not added to `PATH`
|
||||
or any other environment variable, so they should be hard to observe.
|
||||
|
||||
## `testEqualContents` {#tester-equalContents}
|
||||
|
||||
Check that two paths have the same contents.
|
||||
|
||||
Example:
|
||||
|
||||
```nix
|
||||
testers.testEqualContents {
|
||||
assertion = "sed -e performs replacement";
|
||||
expected = writeText "expected" ''
|
||||
foo baz baz
|
||||
'';
|
||||
actual = runCommand "actual" {
|
||||
# not really necessary for a package that's in stdenv
|
||||
nativeBuildInputs = [ gnused ];
|
||||
base = writeText "base" ''
|
||||
foo bar baz
|
||||
'';
|
||||
} ''
|
||||
sed -e 's/bar/baz/g' $base >$out
|
||||
'';
|
||||
}
|
||||
```
|
||||
|
||||
## `testEqualDerivation` {#tester-testEqualDerivation}
|
||||
|
||||
Checks that two packages produce the exact same build instructions.
|
||||
|
|
|
@ -4949,6 +4949,13 @@
|
|||
githubId = 37017396;
|
||||
name = "gbtb";
|
||||
};
|
||||
gdamjan = {
|
||||
email = "gdamjan@gmail.com";
|
||||
matrix = "@gdamjan:spodeli.org";
|
||||
github = "gdamjan";
|
||||
githubId = 81654;
|
||||
name = "Damjan Georgievski";
|
||||
};
|
||||
gdinh = {
|
||||
email = "nix@contact.dinh.ai";
|
||||
github = "gdinh";
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
# D-Bus configuration and system bus daemon.
|
||||
|
||||
{ config, lib, options, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
|
||||
|
@ -16,11 +14,11 @@ let
|
|||
serviceDirectories = cfg.packages;
|
||||
};
|
||||
|
||||
inherit (lib) mkOption types;
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
|
||||
services.dbus = {
|
||||
|
@ -65,31 +63,13 @@ in
|
|||
'';
|
||||
default = "disabled";
|
||||
};
|
||||
|
||||
socketActivated = mkOption {
|
||||
type = types.nullOr types.bool;
|
||||
default = null;
|
||||
visible = false;
|
||||
description = lib.mdDoc ''
|
||||
Removed option, do not use.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
warnings = optional (cfg.socketActivated != null) (
|
||||
let
|
||||
files = showFiles options.services.dbus.socketActivated.files;
|
||||
in
|
||||
"The option 'services.dbus.socketActivated' in ${files} no longer has"
|
||||
+ " any effect and can be safely removed: the user D-Bus session is"
|
||||
+ " now always socket activated."
|
||||
);
|
||||
|
||||
environment.systemPackages = [ pkgs.dbus.daemon pkgs.dbus ];
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment.systemPackages = [
|
||||
pkgs.dbus
|
||||
];
|
||||
|
||||
environment.etc."dbus-1".source = configDir;
|
||||
|
||||
|
@ -102,10 +82,12 @@ in
|
|||
|
||||
users.groups.messagebus.gid = config.ids.gids.messagebus;
|
||||
|
||||
systemd.packages = [ pkgs.dbus.daemon ];
|
||||
systemd.packages = [
|
||||
pkgs.dbus
|
||||
];
|
||||
|
||||
security.wrappers.dbus-daemon-launch-helper = {
|
||||
source = "${pkgs.dbus.daemon}/libexec/dbus-daemon-launch-helper";
|
||||
source = "${pkgs.dbus}/libexec/dbus-daemon-launch-helper";
|
||||
owner = "root";
|
||||
group = "messagebus";
|
||||
setuid = true;
|
||||
|
@ -114,26 +96,36 @@ in
|
|||
};
|
||||
|
||||
services.dbus.packages = [
|
||||
pkgs.dbus.out
|
||||
pkgs.dbus
|
||||
config.system.path
|
||||
];
|
||||
|
||||
systemd.services.dbus = {
|
||||
# Don't restart dbus-daemon. Bad things tend to happen if we do.
|
||||
reloadIfChanged = true;
|
||||
restartTriggers = [ configDir ];
|
||||
environment = { LD_LIBRARY_PATH = config.system.nssModules.path; };
|
||||
};
|
||||
|
||||
systemd.user = {
|
||||
services.dbus = {
|
||||
# Don't restart dbus-daemon. Bad things tend to happen if we do.
|
||||
reloadIfChanged = true;
|
||||
restartTriggers = [ configDir ];
|
||||
restartTriggers = [
|
||||
configDir
|
||||
];
|
||||
environment = {
|
||||
LD_LIBRARY_PATH = config.system.nssModules.path;
|
||||
};
|
||||
sockets.dbus.wantedBy = [ "sockets.target" ];
|
||||
};
|
||||
|
||||
environment.pathsToLink = [ "/etc/dbus-1" "/share/dbus-1" ];
|
||||
systemd.user.services.dbus = {
|
||||
# Don't restart dbus-daemon. Bad things tend to happen if we do.
|
||||
reloadIfChanged = true;
|
||||
restartTriggers = [
|
||||
configDir
|
||||
];
|
||||
};
|
||||
|
||||
systemd.user.sockets.dbus.wantedBy = [
|
||||
"sockets.target"
|
||||
];
|
||||
|
||||
environment.pathsToLink = [
|
||||
"/etc/dbus-1"
|
||||
"/share/dbus-1"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,22 +1,40 @@
|
|||
{ mkDerivation, lib, fetchFromGitHub, pkg-config, which, qtbase, qtsvg, qttools, qtwebkit }:
|
||||
{ mkDerivation
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, which
|
||||
, libuchardet
|
||||
, qtbase
|
||||
, qtsvg
|
||||
, qttools
|
||||
, qtwebengine
|
||||
, qtwebsockets
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "notepadqq";
|
||||
version = "1.4.8";
|
||||
# shipping a beta build as there's no proper release which supports qtwebengine
|
||||
version = "2.0.0-beta";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "notepadqq";
|
||||
repo = "notepadqq";
|
||||
rev = "v${version}";
|
||||
sha256 = "0lbv4s7ng31dkznzbkmp2cvkqglmfj6lv4mbg3r410fif2nrva7k";
|
||||
sha256 = "sha256-XA9Ay9kJApY+bDeOf0iPv+BWYFuTmIuqsLEPgRTCZCE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config which qttools
|
||||
pkg-config
|
||||
which
|
||||
qttools
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase qtsvg qtwebkit
|
||||
libuchardet
|
||||
qtbase
|
||||
qtsvg
|
||||
qtwebengine
|
||||
qtwebsockets
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lscolors";
|
||||
version = "0.12.0";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version pname;
|
||||
sha256 = "sha256-1tLI+M2hpXWsiO/x27ncs8zn8dBDx18AgsSbN/YE2Ic=";
|
||||
sha256 = "sha256-rs/qv6zmSHy2FFiPSgGzxAV/r0SqK9vnfwnLj45WY4I=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-4bFzFztaD9jV3GXpZwCowAhvszedM5ion5/h3D26EY8=";
|
||||
cargoSha256 = "sha256-WDvflAb56l+UkrxeQQZrloxlaK/mZavT9sA+VOWDW5Q=";
|
||||
|
||||
# setid is not allowed in the sandbox
|
||||
checkFlags = [ "--skip=tests::style_for_setid" ];
|
||||
|
|
|
@ -1,17 +1,12 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, setuptools
|
||||
, pyside2
|
||||
, johnnycanencrypt
|
||||
, pythonOlder
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "tumpa";
|
||||
version = "0.1.2";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kushaldas";
|
||||
|
@ -20,7 +15,7 @@ buildPythonPackage rec {
|
|||
sha256 = "17nhdildapgic5l05f3q1wf5jvz3qqdjv543c8gij1x9rdm8hgxi";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
setuptools
|
||||
johnnycanencrypt
|
||||
pyside2
|
||||
|
@ -42,5 +37,6 @@ buildPythonPackage rec {
|
|||
homepage = "https://github.com/kushaldas/tumpa";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ _0x4A6F ];
|
||||
broken = true;
|
||||
};
|
||||
}
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "werf";
|
||||
version = "1.2.188";
|
||||
version = "1.2.190";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "werf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-C8y86q+uf+8EZ9kBAZehld7PpGByJLjhYQOrc3YKH1A=";
|
||||
hash = "sha256-xjZVBLdDLLlfnXX87lwgIeQ6ySI9cNoE5nrRJVBS/l0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-GjcmpHyjhjCWE5gQR/oTHfhHYg5WRu8uhgAuWhdxlYk=";
|
||||
|
|
57
pkgs/applications/video/go2tv/default.nix
Normal file
57
pkgs/applications/video/go2tv/default.nix
Normal file
|
@ -0,0 +1,57 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, Carbon
|
||||
, Cocoa
|
||||
, Kernel
|
||||
, UserNotifications
|
||||
, xorg
|
||||
, libglvnd
|
||||
, pkg-config
|
||||
, withGui ? true
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go2tv" + lib.optionalString (!withGui) "-lite";
|
||||
version = "1.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexballas";
|
||||
repo = "go2tv";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZHKfBKOX3/kVR6Nc+jSmLgfmpihc6QMb6NvTFlsBr5E=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-msXfXFWXyZeT6zrRPZkBV7PEyPqYkx+JlpTWUwgFavI=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
xorg.libX11
|
||||
xorg.libXcursor
|
||||
xorg.libXrandr
|
||||
xorg.libXinerama
|
||||
xorg.libXi
|
||||
xorg.libXext
|
||||
xorg.libXxf86vm
|
||||
libglvnd
|
||||
] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa Kernel UserNotifications ];
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
"-linkmode=external"
|
||||
];
|
||||
|
||||
# conditionally build with GUI or not (go2tv or go2tv-lite sub-packages)
|
||||
subPackages = [ "cmd/${pname}" ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cast media files to UPnP/DLNA Media Renderers and Smart TVs";
|
||||
homepage = "https://github.com/alexballas/go2tv";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ gdamjan ];
|
||||
};
|
||||
}
|
|
@ -1,8 +1,60 @@
|
|||
{ pkgs, lib, callPackage, runCommand, stdenv }:
|
||||
{ pkgs, buildPackages, lib, callPackage, runCommand, stdenv, substituteAll, }:
|
||||
# Documentation is in doc/builders/testers.chapter.md
|
||||
{
|
||||
# See https://nixos.org/manual/nixpkgs/unstable/#tester-testBuildFailure
|
||||
# or doc/builders/testers.chapter.md
|
||||
testBuildFailure = drv: drv.overrideAttrs (orig: {
|
||||
builder = buildPackages.bash;
|
||||
args = [
|
||||
(substituteAll { coreutils = buildPackages.coreutils; src = ./expect-failure.sh; })
|
||||
orig.realBuilder or stdenv.shell
|
||||
] ++ orig.args or ["-e" (orig.builder or ../../stdenv/generic/default-builder.sh)];
|
||||
});
|
||||
|
||||
# See https://nixos.org/manual/nixpkgs/unstable/#tester-testEqualDerivation
|
||||
# or doc/builders/testers.chapter.md
|
||||
testEqualDerivation = callPackage ./test-equal-derivation.nix { };
|
||||
|
||||
# See https://nixos.org/manual/nixpkgs/unstable/#tester-testEqualContents
|
||||
# or doc/builders/testers.chapter.md
|
||||
testEqualContents = {
|
||||
assertion,
|
||||
actual,
|
||||
expected,
|
||||
}: runCommand "equal-contents-${lib.strings.toLower assertion}" {
|
||||
inherit assertion actual expected;
|
||||
} ''
|
||||
echo "Checking:"
|
||||
echo "$assertion"
|
||||
if ! diff -U5 -r "$actual" "$expected" --color=always
|
||||
then
|
||||
echo
|
||||
echo 'Contents must be equal, but were not!'
|
||||
echo
|
||||
echo "+: expected, at $expected"
|
||||
echo "-: unexpected, at $actual"
|
||||
exit 1
|
||||
else
|
||||
find "$expected" -type f -executable > expected-executables | sort
|
||||
find "$actual" -type f -executable > actual-executables | sort
|
||||
if ! diff -U0 actual-executables expected-executables --color=always
|
||||
then
|
||||
echo
|
||||
echo "Contents must be equal, but some files' executable bits don't match"
|
||||
echo
|
||||
echo "+: make this file executable in the actual contents"
|
||||
echo "-: make this file non-executable in the actual contents"
|
||||
exit 1
|
||||
else
|
||||
echo "expected $expected and actual $actual match."
|
||||
echo 'OK'
|
||||
touch $out
|
||||
fi
|
||||
fi
|
||||
'';
|
||||
|
||||
# See https://nixos.org/manual/nixpkgs/unstable/#tester-testVersion
|
||||
# or doc/builders/testers.chapter.md
|
||||
testVersion =
|
||||
{ package,
|
||||
command ? "${package.meta.mainProgram or package.pname or package.name} --version",
|
||||
|
|
62
pkgs/build-support/testers/expect-failure.sh
Normal file
62
pkgs/build-support/testers/expect-failure.sh
Normal file
|
@ -0,0 +1,62 @@
|
|||
# Run a builder, flip exit code, save log and fix outputs
|
||||
#
|
||||
# Sub-goals:
|
||||
# - Delegate to another original builder passed via args
|
||||
# - Save the build log to output for further checks
|
||||
# - Make the derivation succeed if the original builder fails
|
||||
# - Make the derivation fail if the original builder returns exit code 0
|
||||
#
|
||||
# Requirements:
|
||||
# This runs before, without and after stdenv. Do not modify the environment;
|
||||
# especially not before invoking the original builder. For example, use
|
||||
# "@" substitutions instead of PATH.
|
||||
# Do not export any variables.
|
||||
|
||||
# Stricter bash
|
||||
set -eu
|
||||
|
||||
# ------------------------
|
||||
# Run the original builder
|
||||
|
||||
echo "testBuildFailure: Expecting non-zero exit from builder and args: ${*@Q}"
|
||||
|
||||
("$@" 2>&1) | @coreutils@/bin/tee $TMPDIR/testBuildFailure.log \
|
||||
| while read ln; do
|
||||
echo "original builder: $ln"
|
||||
done
|
||||
|
||||
r=${PIPESTATUS[0]}
|
||||
if [[ $r = 0 ]]; then
|
||||
echo "testBuildFailure: The builder did not fail, but a failure was expected!"
|
||||
exit 1
|
||||
fi
|
||||
echo "testBuildFailure: Original builder produced exit code: $r"
|
||||
|
||||
# -----------------------------------------
|
||||
# Write the build log to the default output
|
||||
|
||||
outs=( $outputs )
|
||||
defOut=${outs[0]}
|
||||
defOutPath=${!defOut}
|
||||
|
||||
if [[ ! -d $defOutPath ]]; then
|
||||
if [[ -e $defOutPath ]]; then
|
||||
@coreutils@/bin/mv $defOutPath $TMPDIR/out-node
|
||||
@coreutils@/bin/mkdir $defOutPath
|
||||
@coreutils@/bin/mv $TMPDIR/out-node $defOutPath/result
|
||||
fi
|
||||
fi
|
||||
|
||||
@coreutils@/bin/mkdir -p $defOutPath
|
||||
@coreutils@/bin/mv $TMPDIR/testBuildFailure.log $defOutPath/testBuildFailure.log
|
||||
echo $r >$defOutPath/testBuildFailure.exit
|
||||
|
||||
# ------------------------------------------------------
|
||||
# Put empty directories in place for any missing outputs
|
||||
|
||||
for outputName in ${outputs:-out}; do
|
||||
outputPath="${!outputName}"
|
||||
if [[ ! -e "${outputPath}" ]]; then
|
||||
@coreutils@/bin/mkdir "${outputPath}";
|
||||
fi
|
||||
done
|
|
@ -1,4 +1,4 @@
|
|||
{ testers, lib, pkgs, ... }:
|
||||
{ testers, lib, pkgs, hello, runCommand, ... }:
|
||||
let
|
||||
pkgs-with-overlay = pkgs.extend(final: prev: {
|
||||
proof-of-overlay-hello = prev.hello;
|
||||
|
@ -24,4 +24,167 @@ lib.recurseIntoAttrs {
|
|||
machine.succeed("hello | figlet >/dev/console")
|
||||
'';
|
||||
});
|
||||
|
||||
testBuildFailure = lib.recurseIntoAttrs {
|
||||
happy = runCommand "testBuildFailure-happy" {
|
||||
failed = testers.testBuildFailure (runCommand "fail" {} ''
|
||||
echo ok-ish >$out
|
||||
echo failing though
|
||||
echo also stderr 1>&2
|
||||
exit 3
|
||||
'');
|
||||
} ''
|
||||
grep -F 'failing though' $failed/testBuildFailure.log
|
||||
grep -F 'also stderr' $failed/testBuildFailure.log
|
||||
grep -F 'ok-ish' $failed/result
|
||||
[[ 3 = $(cat $failed/testBuildFailure.exit) ]]
|
||||
touch $out
|
||||
'';
|
||||
|
||||
helloDoesNotFail = runCommand "testBuildFailure-helloDoesNotFail" {
|
||||
failed = testers.testBuildFailure (testers.testBuildFailure hello);
|
||||
|
||||
# Add hello itself as a prerequisite, so we don't try to run this test if
|
||||
# there's an actual failure in hello.
|
||||
inherit hello;
|
||||
} ''
|
||||
echo "Checking $failed/testBuildFailure.log"
|
||||
grep -F 'testBuildFailure: The builder did not fail, but a failure was expected' $failed/testBuildFailure.log
|
||||
[[ 1 = $(cat $failed/testBuildFailure.exit) ]]
|
||||
touch $out
|
||||
'';
|
||||
|
||||
multiOutput = runCommand "testBuildFailure-multiOutput" {
|
||||
failed = testers.testBuildFailure (runCommand "fail" {
|
||||
# dev will be the default output
|
||||
outputs = ["dev" "doc" "out"];
|
||||
} ''
|
||||
echo i am failing
|
||||
exit 1
|
||||
'');
|
||||
} ''
|
||||
grep -F 'i am failing' $failed/testBuildFailure.log >/dev/null
|
||||
[[ 1 = $(cat $failed/testBuildFailure.exit) ]]
|
||||
|
||||
# Checking our note that dev is the default output
|
||||
echo $failed/_ | grep -- '-dev/_' >/dev/null
|
||||
echo 'All good.'
|
||||
touch $out
|
||||
'';
|
||||
};
|
||||
|
||||
testEqualContents = lib.recurseIntoAttrs {
|
||||
happy = testers.testEqualContents {
|
||||
assertion = "The same directory contents at different paths are recognized as equal";
|
||||
expected = runCommand "expected" {} ''
|
||||
mkdir -p $out/c
|
||||
echo a >$out/a
|
||||
echo b >$out/b
|
||||
echo d >$out/c/d
|
||||
'';
|
||||
actual = runCommand "actual" {} ''
|
||||
mkdir -p $out/c
|
||||
echo a >$out/a
|
||||
echo b >$out/b
|
||||
echo d >$out/c/d
|
||||
'';
|
||||
};
|
||||
|
||||
unequalExe =
|
||||
runCommand "testEqualContents-unequalExe" {
|
||||
log = testers.testBuildFailure (testers.testEqualContents {
|
||||
assertion = "The same directory contents at different paths are recognized as equal";
|
||||
expected = runCommand "expected" {} ''
|
||||
mkdir -p $out/c
|
||||
echo a >$out/a
|
||||
chmod a+x $out/a
|
||||
echo b >$out/b
|
||||
echo d >$out/c/d
|
||||
'';
|
||||
actual = runCommand "actual" {} ''
|
||||
mkdir -p $out/c
|
||||
echo a >$out/a
|
||||
echo b >$out/b
|
||||
chmod a+x $out/b
|
||||
echo d >$out/c/d
|
||||
'';
|
||||
});
|
||||
} ''
|
||||
(
|
||||
set -x
|
||||
grep -F -- "executable bits don't match" $log/testBuildFailure.log
|
||||
grep -E -- '+.*-actual/a' $log/testBuildFailure.log
|
||||
grep -E -- '-.*-actual/b' $log/testBuildFailure.log
|
||||
grep -F -- "--- actual-executables" $log/testBuildFailure.log
|
||||
grep -F -- "+++ expected-executables" $log/testBuildFailure.log
|
||||
) || {
|
||||
echo "Test failed: could not find pattern in build log $log"
|
||||
exit 1
|
||||
}
|
||||
echo 'All good.'
|
||||
touch $out
|
||||
'';
|
||||
|
||||
fileDiff =
|
||||
runCommand "testEqualContents-fileDiff" {
|
||||
log = testers.testBuildFailure (testers.testEqualContents {
|
||||
assertion = "The same directory contents at different paths are recognized as equal";
|
||||
expected = runCommand "expected" {} ''
|
||||
mkdir -p $out/c
|
||||
echo a >$out/a
|
||||
echo b >$out/b
|
||||
echo d >$out/c/d
|
||||
'';
|
||||
actual = runCommand "actual" {} ''
|
||||
mkdir -p $out/c
|
||||
echo a >$out/a
|
||||
echo B >$out/b
|
||||
echo d >$out/c/d
|
||||
'';
|
||||
});
|
||||
} ''
|
||||
(
|
||||
set -x
|
||||
grep -F -- "Contents must be equal but were not" $log/testBuildFailure.log
|
||||
grep -E -- '+++ .*-actual/b' $log/testBuildFailure.log
|
||||
grep -E -- '--- .*-actual/b' $log/testBuildFailure.log
|
||||
grep -F -- "-B" $log/testBuildFailure.log
|
||||
grep -F -- "+b" $log/testBuildFailure.log
|
||||
) || {
|
||||
echo "Test failed: could not find pattern in build log $log"
|
||||
exit 1
|
||||
}
|
||||
echo 'All good.'
|
||||
touch $out
|
||||
'';
|
||||
|
||||
fileMissing =
|
||||
runCommand "testEqualContents-fileMissing" {
|
||||
log = testers.testBuildFailure (testers.testEqualContents {
|
||||
assertion = "The same directory contents at different paths are recognized as equal";
|
||||
expected = runCommand "expected" {} ''
|
||||
mkdir -p $out/c
|
||||
echo a >$out/a
|
||||
echo b >$out/b
|
||||
echo d >$out/c/d
|
||||
'';
|
||||
actual = runCommand "actual" {} ''
|
||||
mkdir -p $out/c
|
||||
echo a >$out/a
|
||||
echo d >$out/c/d
|
||||
'';
|
||||
});
|
||||
} ''
|
||||
(
|
||||
set -x
|
||||
grep -F -- "Contents must be equal but were not" $log/testBuildFailure.log
|
||||
grep -E -- 'Only in .*-expected: b' $log/testBuildFailure.log
|
||||
) || {
|
||||
echo "Test failed: could not find pattern in build log $log"
|
||||
exit 1
|
||||
}
|
||||
echo 'All good.'
|
||||
touch $out
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,22 +1,27 @@
|
|||
{ lib, fetchFromGitHub }:
|
||||
|
||||
let
|
||||
version = "1.008";
|
||||
fetchFromGitHub rec {
|
||||
pname = "b612";
|
||||
in fetchFromGitHub {
|
||||
name = "${pname}-font-${version}";
|
||||
version = "1.008";
|
||||
|
||||
owner = "polarsys";
|
||||
repo = "b612";
|
||||
rev = version;
|
||||
|
||||
postFetch = ''
|
||||
tar xf $downloadedFile --strip=1
|
||||
mkdir -p $out/share/fonts/truetype/${pname}
|
||||
cp fonts/ttf/*.ttf $out/share/fonts/truetype/${pname}
|
||||
mkdir -p $out/share/fonts/truetype
|
||||
|
||||
mv $out/fonts/ttf/*.ttf $out/share/fonts/truetype
|
||||
|
||||
shopt -s extglob dotglob
|
||||
rm -rf $out/!(share)
|
||||
shopt -u extglob dotglob
|
||||
'';
|
||||
sha256 = "0r3lana1q9w3siv8czb3p9rrb5d9svp628yfbvvmnj7qvjrmfsiq";
|
||||
|
||||
hash = "sha256-aJ3XzWQauPsWwEDAHT2rD9a8RvLv1kqU3krFXprmypk=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://b612-font.com/";
|
||||
homepage = "https://b612-font.com/";
|
||||
description = "Highly legible font family for use on aircraft cockpit screens";
|
||||
longDescription = ''
|
||||
B612 is the result of a research project initiated by Airbus. The font
|
||||
|
|
|
@ -1,21 +1,25 @@
|
|||
{ lib, fetchFromGitHub }:
|
||||
|
||||
let
|
||||
fetchFromGitHub rec {
|
||||
pname = "montserrat";
|
||||
version = "7.222";
|
||||
in fetchFromGitHub {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
owner = "JulietaUla";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MeNnc1e5X5f0JyaLY6fX22rytHkvL++eM2ygsdlGMv0=";
|
||||
|
||||
postFetch = ''
|
||||
tar xf $downloadedFile --strip 1
|
||||
install -Dm 444 fonts/otf/*.otf -t $out/share/fonts/otf
|
||||
install -Dm 444 fonts/ttf/*.ttf -t $out/share/fonts/ttf
|
||||
install -Dm 444 fonts/webfonts/*.woff -t $out/share/fonts/woff
|
||||
install -Dm 444 fonts/webfonts/*.woff2 -t $out/share/fonts/woff2
|
||||
mkdir -p $out/share/fonts/{otf,ttf,woff,woff2}
|
||||
|
||||
mv $out/fonts/otf/*.otf $out/share/fonts/otf
|
||||
mv $out/fonts/ttf/*.ttf $out/share/fonts/ttf
|
||||
mv $out/fonts/webfonts/*.woff $out/share/fonts/woff
|
||||
mv $out/fonts/webfonts/*.woff2 $out/share/fonts/woff2
|
||||
|
||||
shopt -s extglob dotglob
|
||||
rm -rf $out/!(share)
|
||||
shopt -u extglob dotglob
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -6,15 +6,15 @@
|
|||
, libusb-compat-0_1
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "teensy-loader-cli";
|
||||
version = "2.1+unstable=2021-04-10";
|
||||
version = "2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PaulStoffregen";
|
||||
repo = "teensy_loader_cli";
|
||||
rev = "9dbbfa3b367b6c37e91e8a42dae3c6edfceccc4d";
|
||||
sha256 = "lQ1XtaWPr6nvE8NArD1980QVOH6NggO3FlfsntUjY7s=";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-C9Qhd6LhAES7X0sh4rofjAM+gxwuosahVQHeR76LyIo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -30,8 +30,8 @@ stdenv.mkDerivation rec {
|
|||
runHook preInstall
|
||||
|
||||
install -Dm555 teensy_loader_cli $out/bin/teensy-loader-cli
|
||||
install -Dm444 -t $out/share/doc/${pname} *.md *.txt
|
||||
go-md2man -in README.md -out ${pname}.1
|
||||
install -Dm444 -t $out/share/doc/teensy-loader-cli *.md *.txt
|
||||
go-md2man -in README.md -out teensy-loader-cli.1
|
||||
installManPage *.1
|
||||
|
||||
runHook postInstall
|
||||
|
@ -43,4 +43,4 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl3Only;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
22
pkgs/development/libraries/intel-media-driver/32bit.patch
Normal file
22
pkgs/development/libraries/intel-media-driver/32bit.patch
Normal file
|
@ -0,0 +1,22 @@
|
|||
diff --git a/media_softlet/linux/common/ddi/media_libva_util_next.cpp b/media_softlet/linux/common/ddi/media_libva_util_next.cpp
|
||||
index 66fab63de..a2cdf79d7 100644
|
||||
--- a/media_softlet/linux/common/ddi/media_libva_util_next.cpp
|
||||
+++ b/media_softlet/linux/common/ddi/media_libva_util_next.cpp
|
||||
@@ -2195,8 +2195,8 @@ void MediaLibvaUtilNext::MediaPrintFps()
|
||||
|
||||
int64_t diff = (tv2.tv_sec - m_tv1.tv_sec)*1000000 + tv2.tv_usec - m_tv1.tv_usec;
|
||||
float fps = m_frameCountFps / (diff / 1000000.0);
|
||||
- DDI_NORMALMESSAGE("FPS:%6.4f, Interval:%11lu.", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000));
|
||||
- sprintf(temp,"FPS:%6.4f, Interval:%11lu\n", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000));
|
||||
+ DDI_NORMALMESSAGE("FPS:%6.4f, Interval:%11llu.", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000));
|
||||
+ sprintf(temp,"FPS:%6.4f, Interval:%11llu\n", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000));
|
||||
|
||||
MOS_ZeroMemory(fpsFileName,LENGTH_OF_FPS_FILE_NAME);
|
||||
sprintf(fpsFileName, FPS_FILE_NAME);
|
||||
@@ -2213,4 +2213,4 @@ void MediaLibvaUtilNext::MediaPrintFps()
|
||||
pthread_mutex_unlock(&m_fpsMutex);
|
||||
return;
|
||||
}
|
||||
-#endif
|
||||
\ No newline at end of file
|
||||
+#endif
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-media-driver";
|
||||
version = "22.5.3.1";
|
||||
version = "22.6.3";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "intel";
|
||||
repo = "media-driver";
|
||||
rev = "intel-media-${version}";
|
||||
sha256 = "sha256-3l8mfw1h1se0+w4VtfMr0xuPW8G3JA6hbvkyCaEGTek=";
|
||||
sha256 = "sha256-lQg+L64DW2ZIBeJRimNkba7EL+SM4jSnX9PWIx4j2AY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -33,12 +33,10 @@ stdenv.mkDerivation rec {
|
|||
url = "https://salsa.debian.org/multimedia-team/intel-media-driver-non-free/-/raw/master/debian/patches/0002-Remove-settings-based-on-ARCH.patch";
|
||||
sha256 = "sha256-f4M0CPtAVf5l2ZwfgTaoPw7sPuAP/Uxhm5JSHEGhKT0=";
|
||||
})
|
||||
# fix compilation on i686-linux
|
||||
(fetchpatch {
|
||||
url = "https://github.com/intel/media-driver/commit/5ee502b84eb70f0d677a3b49d624c356b3f0c2b1.patch";
|
||||
revert = true;
|
||||
sha256 = "sha256-yRS10BKD5IkW8U0PxmyB7ryQiLwrqeetm0NivnoM224=";
|
||||
})
|
||||
] ++ lib.optional stdenv.is32bit [
|
||||
# fix compilation on i686-linux but also breaks x86_64
|
||||
# a similar issue got fixed in https://github.com/intel/media-driver/pull/1493 but thats to much C magic for me
|
||||
./32bit.patch
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
@ -1,20 +1,20 @@
|
|||
{ lib, stdenv, fetchFromGitHub
|
||||
, pkg-config, autoreconfHook
|
||||
, meson, ninja, pkg-config, cmake
|
||||
, libtirpc, rpcsvc-proto, avahi, libxml2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "liblxi";
|
||||
version = "1.13";
|
||||
version = "1.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxi-tools";
|
||||
repo = "liblxi";
|
||||
rev = "v${version}";
|
||||
sha256 = "129m0k2wrlgs25qkskynljddqspasla1x8iq51vmg38nhnilpqf6";
|
||||
sha256 = "sha256-2tZWIN58J6zNHG3dahNfg5eNiS8ykWFQyRSyikuzdjE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config rpcsvc-proto ];
|
||||
nativeBuildInputs = [ meson ninja cmake pkg-config rpcsvc-proto ];
|
||||
|
||||
buildInputs = [ libtirpc avahi libxml2 ];
|
||||
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
, minimal ? false, libva-minimal
|
||||
, libX11, libXext, libXfixes, wayland, libffi, libGL
|
||||
, mesa
|
||||
, intel-media-driver
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -29,6 +30,10 @@ stdenv.mkDerivation rec {
|
|||
"-Ddriverdir=${mesa.drivers.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri:/usr/lib/x86_64-linux-gnu/dri:/usr/lib/i386-linux-gnu/dri"
|
||||
];
|
||||
|
||||
passthru.tests = {
|
||||
inherit intel-media-driver;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "An implementation for VA-API (Video Acceleration API)";
|
||||
longDescription = ''
|
||||
|
|
|
@ -1 +1 @@
|
|||
WGET_ARGS=( https://download.qt.io/official_releases/qt/6.4/6.4.0/submodules/ -A '*.tar.xz' )
|
||||
WGET_ARGS=( https://download.qt.io/official_releases/qt/6.4/6.4.1/submodules/ -A '*.tar.xz' )
|
||||
|
|
|
@ -94,12 +94,6 @@ qtModule {
|
|||
# which cannot be set at the same time as -Wformat-security
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
patches = [
|
||||
# fixes consistent crashing in github on 6.4.0, can probably remove when there is a patch release
|
||||
# https://codereview.qt-project.org/c/qt/qtwebengine/+/436316
|
||||
../patches/qtwebengine-fix.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Patch Chromium build tools
|
||||
(
|
||||
|
|
|
@ -1,28 +0,0 @@
|
|||
From 81bf140583f7b7bf13cc8dd522e1ca2aba873fc4 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Negyokru <negyokru@inf.u-szeged.hu>
|
||||
Date: Mon, 03 Oct 2022 12:20:00 +0200
|
||||
Subject: [PATCH] Do not intercept websocket connection when there is no associated frame
|
||||
|
||||
This fix is based on chrome's implementation.
|
||||
|
||||
Fixes: QTBUG-107144
|
||||
Change-Id: If042e4156b8a4bdb27a210c4db94e3a6198aed7d
|
||||
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
||||
(cherry picked from commit 64b7da9dab82713fdcb2e03d8a2715421eae5685)
|
||||
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
||||
---
|
||||
|
||||
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
|
||||
index 020ae91..99a3aa3 100644
|
||||
--- a/src/core/content_browser_client_qt.cpp
|
||||
+++ b/src/core/content_browser_client_qt.cpp
|
||||
@@ -1237,8 +1237,7 @@
|
||||
|
||||
bool ContentBrowserClientQt::WillInterceptWebSocket(content::RenderFrameHost *frame)
|
||||
{
|
||||
- Q_UNUSED(frame);
|
||||
- return true; // It is probably not worth it to only intercept when interceptors are installed
|
||||
+ return frame != nullptr;
|
||||
}
|
||||
|
||||
QWebEngineUrlRequestInterceptor *getProfileInterceptorFromFrame(content::RenderFrameHost *frame)
|
|
@ -4,283 +4,283 @@
|
|||
|
||||
{
|
||||
qt3d = {
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qt3d-everywhere-src-6.4.0.tar.xz";
|
||||
sha256 = "1sxxxa6gaiy573j7x2k06dr4jsxbr9r1brcjfkn0zjgl46sbbgba";
|
||||
name = "qt3d-everywhere-src-6.4.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qt3d-everywhere-src-6.4.1.tar.xz";
|
||||
sha256 = "1654hx04k6vdifjp5kr4sj6jm8qy8m8vna7yalmb3l55pr1k5dg4";
|
||||
name = "qt3d-everywhere-src-6.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
qt5compat = {
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qt5compat-everywhere-src-6.4.0.tar.xz";
|
||||
sha256 = "1h54jiqkiipbb3i3sjznrinc67y76ld237qr17ald0pp6w45sivk";
|
||||
name = "qt5compat-everywhere-src-6.4.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qt5compat-everywhere-src-6.4.1.tar.xz";
|
||||
sha256 = "0cfh5z0kw75k2p3sca9d5gdfxvh93719prh2njg1nd6n8pp379fl";
|
||||
name = "qt5compat-everywhere-src-6.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
qtactiveqt = {
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtactiveqt-everywhere-src-6.4.0.tar.xz";
|
||||
sha256 = "1pdam1ggxanrxr0pz8rap2ya59zyd4j56b9kfqbxm5kpkps345ar";
|
||||
name = "qtactiveqt-everywhere-src-6.4.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtactiveqt-everywhere-src-6.4.1.tar.xz";
|
||||
sha256 = "118ivyzh6xk92ak2qf0294n1fzziy2mxp2xgkblh801d3nbg7kql";
|
||||
name = "qtactiveqt-everywhere-src-6.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
qtbase = {
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtbase-everywhere-src-6.4.0.tar.xz";
|
||||
sha256 = "0zdkv7m98axjfpdmbv8v2xqndvhnanh75c7vgygw8rw5pnh7ar6b";
|
||||
name = "qtbase-everywhere-src-6.4.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtbase-everywhere-src-6.4.1.tar.xz";
|
||||
sha256 = "1bjgy9x75y82702xkv3bhxh3q9i37ny4fv3njb5zgj7rq0fdfajk";
|
||||
name = "qtbase-everywhere-src-6.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
qtcharts = {
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtcharts-everywhere-src-6.4.0.tar.xz";
|
||||
sha256 = "1ls077dhvkb4v7g2wwnb6v0rgg5fh4i2fx11fvzdlnsi4k7cmhr8";
|
||||
name = "qtcharts-everywhere-src-6.4.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtcharts-everywhere-src-6.4.1.tar.xz";
|
||||
sha256 = "0rwglk5g0k1x0vjb8j5r4fqaa7m31aykh42f18svkjpz3kbbrs6y";
|
||||
name = "qtcharts-everywhere-src-6.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
qtconnectivity = {
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtconnectivity-everywhere-src-6.4.0.tar.xz";
|
||||
sha256 = "0kn52xibbp7a0021x6jznp9jxlf57fk85zba0z3lqqzanmyigp2s";
|
||||
name = "qtconnectivity-everywhere-src-6.4.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtconnectivity-everywhere-src-6.4.1.tar.xz";
|
||||
sha256 = "1qxvixv95wkb7h6ch1q39pxs7cidph6kyddz91qgxr2gznz5s3wv";
|
||||
name = "qtconnectivity-everywhere-src-6.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
qtdatavis3d = {
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtdatavis3d-everywhere-src-6.4.0.tar.xz";
|
||||
sha256 = "038591l0s9mkzxxxxm3knvyrk1vdimbp0gi5m26n79bx8lw01d0d";
|
||||
name = "qtdatavis3d-everywhere-src-6.4.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtdatavis3d-everywhere-src-6.4.1.tar.xz";
|
||||
sha256 = "00ddsv4inbsqbgc7lc163j8fqx9r156xzsrilh9papidfm7yvrm9";
|
||||
name = "qtdatavis3d-everywhere-src-6.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
qtdeclarative = {
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtdeclarative-everywhere-src-6.4.0.tar.xz";
|
||||
sha256 = "10s35iivmafprw2spca6fw3gamf10lyp54376af9437srhpyfd1l";
|
||||
name = "qtdeclarative-everywhere-src-6.4.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtdeclarative-everywhere-src-6.4.1.tar.xz";
|
||||
sha256 = "1zjdd2ndaywl7wgl9q94a1qwin5p45l2838lqhkdm3ckvdgli35g";
|
||||
name = "qtdeclarative-everywhere-src-6.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
qtdoc = {
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtdoc-everywhere-src-6.4.0.tar.xz";
|
||||
sha256 = "11j2vp2k3liz7388702ccy7fjb5ickhxnsc0iyiyirdmll187zgf";
|
||||
name = "qtdoc-everywhere-src-6.4.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtdoc-everywhere-src-6.4.1.tar.xz";
|
||||
sha256 = "198gl45c6m1gxn13aic65xgy94in1b1hy255jq6pi44m36brspbn";
|
||||
name = "qtdoc-everywhere-src-6.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
qthttpserver = {
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qthttpserver-everywhere-src-6.4.0.tar.xz";
|
||||
sha256 = "10rlmpcj36qfr4465prpb515imrcfa6b2kiz16qyr8m4c86wb51i";
|
||||
name = "qthttpserver-everywhere-src-6.4.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qthttpserver-everywhere-src-6.4.1.tar.xz";
|
||||
sha256 = "1xib6q8ji64kq2r5y6qqig0090irjwi25vzpy8528wv5a3i0yxah";
|
||||
name = "qthttpserver-everywhere-src-6.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
qtimageformats = {
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtimageformats-everywhere-src-6.4.0.tar.xz";
|
||||
sha256 = "0g2zjipayhzh0lwn6xgxw5mx6f5dpak75xszm2cg1h83bnvsf68l";
|
||||
name = "qtimageformats-everywhere-src-6.4.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtimageformats-everywhere-src-6.4.1.tar.xz";
|
||||
sha256 = "1rjd8mi8z864gqaa849kc4xppbjjr2yddcgahx16z3psn8zfg1ay";
|
||||
name = "qtimageformats-everywhere-src-6.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
qtlanguageserver = {
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtlanguageserver-everywhere-src-6.4.0.tar.xz";
|
||||
sha256 = "09bhg3cm27d8imih1s7rk00zqwf863183znbzhhr3nkl6mqscy0q";
|
||||
name = "qtlanguageserver-everywhere-src-6.4.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtlanguageserver-everywhere-src-6.4.1.tar.xz";
|
||||
sha256 = "1j2xd4r9ngdi5nq35bycxx9jc7bngjlrxa0cs8cjgl7zkj3wsmg3";
|
||||
name = "qtlanguageserver-everywhere-src-6.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
qtlottie = {
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtlottie-everywhere-src-6.4.0.tar.xz";
|
||||
sha256 = "1d66fr2my8wcbalikppiykqwisflxahcl86zgqqy2s2wkv5bzz0w";
|
||||
name = "qtlottie-everywhere-src-6.4.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtlottie-everywhere-src-6.4.1.tar.xz";
|
||||
sha256 = "0b59xd5nx4c2mhdl79fzbyz25n8bkdbh8h43l8lp3an15y08bdya";
|
||||
name = "qtlottie-everywhere-src-6.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
qtmultimedia = {
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtmultimedia-everywhere-src-6.4.0.tar.xz";
|
||||
sha256 = "0vvrgqcvvr6ch5vnmq3j3lx1xci21b8vc1fv24d9aamfgj28wbp8";
|
||||
name = "qtmultimedia-everywhere-src-6.4.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtmultimedia-everywhere-src-6.4.1.tar.xz";
|
||||
sha256 = "1bxs1n22yplds2f60h2j25aw9ibhhgprg9np3ybr0q3f08xd91n0";
|
||||
name = "qtmultimedia-everywhere-src-6.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
qtnetworkauth = {
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtnetworkauth-everywhere-src-6.4.0.tar.xz";
|
||||
sha256 = "1cqp1z73d1kgnz5l5vvgxa58mfx61kdsr9xg1wgwrwbpzpw7g6v0";
|
||||
name = "qtnetworkauth-everywhere-src-6.4.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtnetworkauth-everywhere-src-6.4.1.tar.xz";
|
||||
sha256 = "08kmkpjm34bkbiz54zm4p9mjr9fjzx2kjf0fkhay0lz3iljp0sl3";
|
||||
name = "qtnetworkauth-everywhere-src-6.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
qtpositioning = {
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtpositioning-everywhere-src-6.4.0.tar.xz";
|
||||
sha256 = "0d58zgjzdmi2fv8wbn0iz941mlpsxclcldzadwwhh0dbdmgmq6rd";
|
||||
name = "qtpositioning-everywhere-src-6.4.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtpositioning-everywhere-src-6.4.1.tar.xz";
|
||||
sha256 = "12yip3awqwcx3fqr8jl64bvp3scvi9pbzyjzk0pm2f6r3kl14qbh";
|
||||
name = "qtpositioning-everywhere-src-6.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
qtquick3d = {
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtquick3d-everywhere-src-6.4.0.tar.xz";
|
||||
sha256 = "1v0py2njivqbj0562pmwpfkqz1ylwkffsn7j943ky46lsih1c2pi";
|
||||
name = "qtquick3d-everywhere-src-6.4.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtquick3d-everywhere-src-6.4.1.tar.xz";
|
||||
sha256 = "11881pfia0nwjxsgy2789s01qcvi9x4rhfcckxfzl4819pxw1nx6";
|
||||
name = "qtquick3d-everywhere-src-6.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
qtquick3dphysics = {
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtquick3dphysics-everywhere-src-6.4.0.tar.xz";
|
||||
sha256 = "01zx50f5gmvwg2mb853hsr2hgrciyg62h365ryq5y9fi6hs48nfw";
|
||||
name = "qtquick3dphysics-everywhere-src-6.4.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtquick3dphysics-everywhere-src-6.4.1.tar.xz";
|
||||
sha256 = "1fxd3d8x0sgwqsvwv61m0kg4pd9gz99gqkgqd3schdhlcwgaim0x";
|
||||
name = "qtquick3dphysics-everywhere-src-6.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
qtquicktimeline = {
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtquicktimeline-everywhere-src-6.4.0.tar.xz";
|
||||
sha256 = "0msg0l75m0slwar9p3vpx99cyf3j3mfbajfra26jmi0haf5s5s3h";
|
||||
name = "qtquicktimeline-everywhere-src-6.4.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtquicktimeline-everywhere-src-6.4.1.tar.xz";
|
||||
sha256 = "0p6yb3qg9i7774kvwcj8i56ab9vkifi5d92y2w8v9s25g31pspzk";
|
||||
name = "qtquicktimeline-everywhere-src-6.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
qtremoteobjects = {
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtremoteobjects-everywhere-src-6.4.0.tar.xz";
|
||||
sha256 = "1kp1as4ih021dz37z53nv7s2byb4w04cxpj4qkxqdvvgxvmps6pm";
|
||||
name = "qtremoteobjects-everywhere-src-6.4.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtremoteobjects-everywhere-src-6.4.1.tar.xz";
|
||||
sha256 = "1jvsvfj8bdqxfc0vhihgmvglck0zk5nl487kbbjyhkgia1v37m98";
|
||||
name = "qtremoteobjects-everywhere-src-6.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
qtscxml = {
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtscxml-everywhere-src-6.4.0.tar.xz";
|
||||
sha256 = "0r3nv4bbdab8hsvzz0d03qq977smlfmp7k4wm6n2jj2rwsjp61yl";
|
||||
name = "qtscxml-everywhere-src-6.4.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtscxml-everywhere-src-6.4.1.tar.xz";
|
||||
sha256 = "13mvih36shrjhpp1z3kqlyzgyh35gkx3a12rzh0yff4gmp5y9w6j";
|
||||
name = "qtscxml-everywhere-src-6.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
qtsensors = {
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtsensors-everywhere-src-6.4.0.tar.xz";
|
||||
sha256 = "1njhrbhknbil8dllknc8p3q16k65rmqdx1gkhlcn6qlzbcphg37k";
|
||||
name = "qtsensors-everywhere-src-6.4.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtsensors-everywhere-src-6.4.1.tar.xz";
|
||||
sha256 = "1qpr6g424dpy2xccfyrkf5v2rszczq5p73lzk79s8g95fl33yzk6";
|
||||
name = "qtsensors-everywhere-src-6.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
qtserialbus = {
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtserialbus-everywhere-src-6.4.0.tar.xz";
|
||||
sha256 = "14ga962x9h5rkgybf63b4b4fn8i96c0z9q60ns2ml20jgikmbjpg";
|
||||
name = "qtserialbus-everywhere-src-6.4.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtserialbus-everywhere-src-6.4.1.tar.xz";
|
||||
sha256 = "12y4pd87k1y044rfppnmv0zdfmqx42ng0hixhzblr8fbvvwh494g";
|
||||
name = "qtserialbus-everywhere-src-6.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
qtserialport = {
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtserialport-everywhere-src-6.4.0.tar.xz";
|
||||
sha256 = "10s4997n3b0vp51slrjcdkkfqf8kabcn8ypz5gl2h8nfhygcqj7i";
|
||||
name = "qtserialport-everywhere-src-6.4.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtserialport-everywhere-src-6.4.1.tar.xz";
|
||||
sha256 = "1yl25cv0ajfjswg8jgkf4jwwsasr5g7sgsc3fb3zsaz6cd8cw2hx";
|
||||
name = "qtserialport-everywhere-src-6.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
qtshadertools = {
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtshadertools-everywhere-src-6.4.0.tar.xz";
|
||||
sha256 = "141vmracfa9r71l0mqilgllfb3c1ygpc913yx8pwsy411vqabmnv";
|
||||
name = "qtshadertools-everywhere-src-6.4.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtshadertools-everywhere-src-6.4.1.tar.xz";
|
||||
sha256 = "012525kfnnkprgzgncqkzmif3z9k1qa6hfpscbsqg3084s1p9hbb";
|
||||
name = "qtshadertools-everywhere-src-6.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
qtspeech = {
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtspeech-everywhere-src-6.4.0.tar.xz";
|
||||
sha256 = "1xrx323vyvrgrphxvf3nxy8s7ps26pgxaj71rlgipl58jqhc4fw7";
|
||||
name = "qtspeech-everywhere-src-6.4.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtspeech-everywhere-src-6.4.1.tar.xz";
|
||||
sha256 = "0jbv6r953r884wfnxrrcvf44xpvc7d8kzjd3lqv4y234748hsrih";
|
||||
name = "qtspeech-everywhere-src-6.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
qtsvg = {
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtsvg-everywhere-src-6.4.0.tar.xz";
|
||||
sha256 = "09av5ky5zlsz4smf3xwvk07ylkz1wz3g5hbx73xdqx6h6yaaxz83";
|
||||
name = "qtsvg-everywhere-src-6.4.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtsvg-everywhere-src-6.4.1.tar.xz";
|
||||
sha256 = "1rcwrsdq9412qq9ilfs54yjz7ih8a6r8mbwx7y4dnrqmjk2lalsy";
|
||||
name = "qtsvg-everywhere-src-6.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
qttools = {
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qttools-everywhere-src-6.4.0.tar.xz";
|
||||
sha256 = "18pv3b0y9ycbn5v98rjir8wsvsy40vy8xc5pyylfg2s5ikwdbwwp";
|
||||
name = "qttools-everywhere-src-6.4.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qttools-everywhere-src-6.4.1.tar.xz";
|
||||
sha256 = "0cq99c79p90yv3vlb3xbzamgx7qn4s9fb2gdnjyizhh4dcn5c84y";
|
||||
name = "qttools-everywhere-src-6.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
qttranslations = {
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qttranslations-everywhere-src-6.4.0.tar.xz";
|
||||
sha256 = "0pwjfsi4b4fr2hw9mx76fiix0mz0wss3ic4pmd9yngk91f9kmfbs";
|
||||
name = "qttranslations-everywhere-src-6.4.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qttranslations-everywhere-src-6.4.1.tar.xz";
|
||||
sha256 = "04kal5b3bplylf33kjc8f7kc4x801qj5qrpsjs609ljnsbqwdns4";
|
||||
name = "qttranslations-everywhere-src-6.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
qtvirtualkeyboard = {
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtvirtualkeyboard-everywhere-src-6.4.0.tar.xz";
|
||||
sha256 = "087xlc7ljkbmm85n42qx0cz8rvyhfkw1dzypxp5h3c5glamhkar5";
|
||||
name = "qtvirtualkeyboard-everywhere-src-6.4.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtvirtualkeyboard-everywhere-src-6.4.1.tar.xz";
|
||||
sha256 = "089v5nxfvrglp9ilaayxls8mhdbrq80z38m2agmw147m8d8dspy2";
|
||||
name = "qtvirtualkeyboard-everywhere-src-6.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwayland = {
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtwayland-everywhere-src-6.4.0.tar.xz";
|
||||
sha256 = "1z32bdgcril9ijqsn4d60znm610mm72rgn1a6dblvhxy9zhsi2zh";
|
||||
name = "qtwayland-everywhere-src-6.4.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtwayland-everywhere-src-6.4.1.tar.xz";
|
||||
sha256 = "1mgjd6qbz0m2kq9bcdn6mnypfjycwdfyna6z7dhj1m61s52id5lw";
|
||||
name = "qtwayland-everywhere-src-6.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebchannel = {
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtwebchannel-everywhere-src-6.4.0.tar.xz";
|
||||
sha256 = "0nk92cbdph5ri91pnh54i3bdpx1pn9pbgyysmpg59265gj1nv3sj";
|
||||
name = "qtwebchannel-everywhere-src-6.4.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtwebchannel-everywhere-src-6.4.1.tar.xz";
|
||||
sha256 = "1abw58yccjhgwjrry56mih0vnxlg69dc10vfyi8grqy543qikgid";
|
||||
name = "qtwebchannel-everywhere-src-6.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebengine = {
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtwebengine-everywhere-src-6.4.0.tar.xz";
|
||||
sha256 = "00skwxlin6za8wsh6ddhy7nmpabzjzj1lxf2w81fj04vb7nfjak6";
|
||||
name = "qtwebengine-everywhere-src-6.4.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtwebengine-everywhere-src-6.4.1.tar.xz";
|
||||
sha256 = "10m763yq39jn6k02bqax6mhgbc0bpnmfmxj4wkw5b67ks48w0n9c";
|
||||
name = "qtwebengine-everywhere-src-6.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebsockets = {
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtwebsockets-everywhere-src-6.4.0.tar.xz";
|
||||
sha256 = "1jlvxidjaj44hky1cwm0y8gj6zynrnd70hf44dhjcdv5rllncg7z";
|
||||
name = "qtwebsockets-everywhere-src-6.4.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtwebsockets-everywhere-src-6.4.1.tar.xz";
|
||||
sha256 = "093ssssws3w1cjacjzp9j80n7b9y7i87yp8ibshshgj0avm8jxsk";
|
||||
name = "qtwebsockets-everywhere-src-6.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebview = {
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtwebview-everywhere-src-6.4.0.tar.xz";
|
||||
sha256 = "19z5d1gs6jm2776si9i3dxn4j70y3s8yh3m299gvb2b8fby8xfwl";
|
||||
name = "qtwebview-everywhere-src-6.4.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtwebview-everywhere-src-6.4.1.tar.xz";
|
||||
sha256 = "15rqka6pyvi33cmizdjfhc2k5ldd1pykmc4nfx826drar6y32a27";
|
||||
name = "qtwebview-everywhere-src-6.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -46,6 +46,10 @@ let
|
|||
version = "8.06.12";
|
||||
sha256 = "sha256:17fmb13l18isgwr38hg9r5a0nayf2hhw6acj5153cy1sygsdg3b5";
|
||||
};
|
||||
"5.0" = mkNewParam {
|
||||
version = "8.06.13";
|
||||
sha256 = "sha256-Vpf13g3DEWlUI5aypiowGp2fkQPK0cOGv2XiRUY/Ip4=";
|
||||
};
|
||||
};
|
||||
param = params . ${lib.versions.majorMinor ocaml.version}
|
||||
or (throw "labltk is not available for OCaml ${ocaml.version}");
|
||||
|
|
|
@ -12,12 +12,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible-compat";
|
||||
version = "2.2.3";
|
||||
version = "2.2.5";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-H06GH6OwhDaIrdMsWHOyCEjr75bvcV0dgI0mWDViBCg=";
|
||||
sha256 = "sha256-KMfFRf1g75wwWc+y/v0n+S2wkf9rWGj4PxIc614f4bU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -22,13 +22,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible-lint";
|
||||
version = "6.8.5";
|
||||
version = "6.8.6";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-r+lWJWLp5tGxehhltUDU9xZb8Bz+8q0DA9HK1q05f4g=";
|
||||
sha256 = "sha256-Fx/o2tYgeLmBm1x01g61r6ow6py5ybqHBhSeVsVam24=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
, ansible-core
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, glibcLocales
|
||||
, mock
|
||||
, openssh
|
||||
, pbr
|
||||
|
@ -20,14 +21,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible-runner";
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-mcTfu+reRGOXvRqeC/BQhz2KBrWSbVXSQIWyld2/Ecs=";
|
||||
hash = "sha256-HS8C06Ylc/OOaKI3kBGLeYF5HCvtK18i96NqIhwoh1Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -45,6 +46,7 @@ buildPythonPackage rec {
|
|||
|
||||
checkInputs = [
|
||||
ansible-core # required to place ansible CLI onto the PATH in tests
|
||||
glibcLocales
|
||||
pytestCheckHook
|
||||
pytest-mock
|
||||
pytest-timeout
|
||||
|
|
|
@ -24,11 +24,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible-core";
|
||||
version = "2.13.5";
|
||||
version = "2.14.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-JtzZIY1VRMwVFE9gu1tjTyJ25HbIn0gbP2GcT53vFYg=";
|
||||
hash = "sha256-+ki0gctiO/ebuQPyIwl2gaDBPhtOx+eOfdfYWNNqNLI=";
|
||||
};
|
||||
|
||||
# ansible_connection is already wrapped, so don't pass it through
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
let
|
||||
pname = "ansible";
|
||||
version = "6.5.0";
|
||||
version = "6.6.0";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
|
@ -30,7 +30,7 @@ buildPythonPackage {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-fAzc0RIaXxKrLaS90uFMLBU+ASFL/GprwVa2G9dAHFs=";
|
||||
sha256 = "sha256-4blAqNT0EhI+3jwUsly5nDyKTVNf0ECqv45Pt7Dk8JI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bleak-retry-connector";
|
||||
version = "2.8.4";
|
||||
version = "2.8.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-eXHgxjSmr+BH+kI3qLbjq+z+YGRbyrvYvDgx6xwt2os=";
|
||||
hash = "sha256-Uct040yI4tJkdQNBAJhr/aOjMRcGkTOAnm4pzmeHNZM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -7,8 +7,7 @@
|
|||
, pkg-config
|
||||
, pcsclite
|
||||
, nettle
|
||||
, requests
|
||||
, vcrpy
|
||||
, httpx
|
||||
, numpy
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
|
@ -18,31 +17,31 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "johnnycanencrypt";
|
||||
version = "0.6.0";
|
||||
version = "0.11.0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kushaldas";
|
||||
repo = "johnnycanencrypt";
|
||||
rev = "v${version}";
|
||||
sha256 = "0b1yfddf38dicmjgnw9mk5g0iisa5yq6l9cj6kfskhyrznasvz3g";
|
||||
hash = "sha256-YhuYejxuKZEv1xQ1fQcXSkt9I80iJOJ6MecG622JJJo=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit patches src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-1dRFC59GY7M99LvQWy2eXPesmLX5k46rN8l4suLYkQY=";
|
||||
hash = "sha256-r2NU1e3yeZDLOBy9pndGYM3JoH6BBKQkXMLsJR6PTRs=";
|
||||
};
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
# https://github.com/kushaldas/johnnycanencrypt/issues/125
|
||||
patches = [ ./Cargo.lock.patch ];
|
||||
|
||||
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
vcrpy
|
||||
httpx
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -54,8 +53,9 @@ buildPythonPackage rec {
|
|||
]);
|
||||
|
||||
buildInputs = [
|
||||
pcsclite
|
||||
nettle
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
pcsclite
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
PCSC
|
||||
libiconv
|
||||
|
@ -70,14 +70,6 @@ buildPythonPackage rec {
|
|||
numpy
|
||||
];
|
||||
|
||||
# Remove with the next release after 0.5.0. This change is required
|
||||
# for compatibility with maturin 0.9.0.
|
||||
postPatch = ''
|
||||
sed '/project-url = /d' -i Cargo.toml
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'manylinux = "off"' 'skip-auditwheel = true'
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
export TESTDIR=$(mktemp -d)
|
||||
cp -r tests/ $TESTDIR
|
||||
|
@ -91,7 +83,6 @@ buildPythonPackage rec {
|
|||
pythonImportsCheck = [ "johnnycanencrypt" ];
|
||||
|
||||
meta = with lib; {
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
|
||||
homepage = "https://github.com/kushaldas/johnnycanencrypt";
|
||||
description = "Python module for OpenPGP written in Rust";
|
||||
license = licenses.gpl3Plus;
|
||||
|
|
|
@ -1,30 +0,0 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, six
|
||||
, requests
|
||||
, mock
|
||||
, unittest2
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "PyChef";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0zdz8lw545cd3a34cpib7mdwnad83gr2mrrxyj3v74h4zhwabhmg";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six requests mock unittest2 ];
|
||||
|
||||
# FIXME
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/coderanger/pychef";
|
||||
description = "Python implementation of a Chef API client";
|
||||
license = licenses.bsd0;
|
||||
};
|
||||
|
||||
}
|
|
@ -1,12 +1,32 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, libxml2
|
||||
, m2crypto, ply, pyyaml, six, pbr, pythonOlder, nocasedict, nocaselist, yamlloader, requests-mock
|
||||
, httpretty, lxml, mock, pytest, requests, decorator, unittest2
|
||||
, FormEncode, testfixtures, pytz
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, libxml2
|
||||
, m2crypto
|
||||
, ply
|
||||
, pyyaml
|
||||
, six
|
||||
, pbr
|
||||
, pythonOlder
|
||||
, nocasedict
|
||||
, nocaselist
|
||||
, yamlloader
|
||||
, requests-mock
|
||||
, httpretty
|
||||
, lxml
|
||||
, mock
|
||||
, pytest
|
||||
, requests
|
||||
, decorator
|
||||
, FormEncode
|
||||
, testfixtures
|
||||
, pytz
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pywbem";
|
||||
version = "1.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
|
@ -35,7 +55,6 @@ buildPythonPackage rec {
|
|||
requests
|
||||
requests-mock
|
||||
testfixtures
|
||||
unittest2
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -1,8 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, unittest2
|
||||
, python
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, isPy27
|
||||
}:
|
||||
|
||||
|
@ -11,20 +10,14 @@ buildPythonPackage rec {
|
|||
version = "1.4";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ad4cc56bf4b35def33783e6d4783882702111fe8f9a781c63228e2114067c065";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gvanrossum";
|
||||
repo = pname;
|
||||
rev = "e6588c12caee49c43faf6aa260f04d7e971f6aa8";
|
||||
hash = "sha256-8nKQgwLXPVgPxNRF4CryKJb7+llDsZHis5VctxqpIRo=";
|
||||
};
|
||||
|
||||
checkInputs = [ unittest2 ];
|
||||
|
||||
checkPhase = ''
|
||||
${python.interpreter} tests/test_basic.py
|
||||
'';
|
||||
|
||||
# tests require weird codec installation
|
||||
# which is not necessary for major use of package
|
||||
doCheck = false;
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python 3 port of pyxl for writing structured and reusable inline HTML";
|
||||
|
|
|
@ -40,6 +40,6 @@ buildPythonPackage rec {
|
|||
description = "Unittest-compatible framework for repeating a test function over many fixtures";
|
||||
homepage = "https://github.com/epsy/repeated_test";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ tjni ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "xknx";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "XKNX";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-IHZvmVloBSLcK3GZV9urFeqRxOG76O9O/3ZDNTz4wjQ=";
|
||||
hash = "sha256-5uRPMu9qZ0ofMdgk8d1IpKjHjnEP+zhWs+EDQx9wk6U=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ruff";
|
||||
version = "0.0.131";
|
||||
version = "0.0.132";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charliermarsh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-botqrFWfW0+hu0oi6UhDcz8jO5TCKWwgN+u6oaWB7pE=";
|
||||
sha256 = "sha256-0UcZBGD1l2hP8VH0tdNKY/SiXVTPLL0/eZpOwYnUgPs=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-5fDhwcdLOGDqtWcCR9C1BOonb1CIxfwlcMFZ3spvfGU=";
|
||||
cargoSha256 = "sha256-DlSSzFf2AludfAKrXSsI/V0K2ZjCy/ehZd3ULe3fjK4=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
CoreServices
|
||||
|
|
|
@ -15,14 +15,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-update";
|
||||
version = "11.0.0";
|
||||
version = "11.1.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-bqDbMQXzOlNQBVufEwBeH9XOjS3gpacowzHVTwu8XhA=";
|
||||
sha256 = "sha256-WQUWAE8PR3FxTmWxoXmi6nsiyfbmLaIzOBJhC/8QYQw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-oHp4olxnTeVXxhhWqWPBZXRfYZRtzuPfP3rENJAJQMo=";
|
||||
cargoSha256 = "sha256-GirS6Tu5gkNPVGAKzfFkyi3tTlu3RRzp/PWHhPbmKdI=";
|
||||
|
||||
nativeBuildInputs = [ cmake installShellFiles pkg-config ronn ];
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2022.11.3";
|
||||
version = "2022.11.4";
|
||||
components = {
|
||||
"3_day_blinds" = ps: with ps; [
|
||||
];
|
||||
|
|
|
@ -258,7 +258,7 @@ let
|
|||
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2022.11.3";
|
||||
hassVersion = "2022.11.4";
|
||||
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
|
@ -276,7 +276,7 @@ in python.pkgs.buildPythonApplication rec {
|
|||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = version;
|
||||
hash = "sha256-9L2GBgM3RTqeOCnW47Kr4OxqVjcbBEvzkiPYZ5qEQAE=";
|
||||
hash = "sha256-3vNwWPFSR9Ap89rAxZjUOptigBaDlboxvLZysMyUUX0=";
|
||||
};
|
||||
|
||||
# leave this in, so users don't have to constantly update their downstream patch handling
|
||||
|
|
|
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
|
|||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/share/outline
|
||||
mv node_modules build $out/share/outline/
|
||||
mv public node_modules build $out/share/outline/
|
||||
|
||||
node_modules=$out/share/outline/node_modules
|
||||
build=$out/share/outline/build
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "mutagen-compose";
|
||||
version = "0.16.1";
|
||||
version = "0.16.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mutagen-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tH1aYMjKsSMWls53IgsqtAgMMLUvotb5zGlAmV3dlvQ=";
|
||||
sha256 = "sha256-x8tgdrb4WtjCaa28A4+fL/lUgMYaN71bEyQ1iDayNHM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-nRH26ty3JVSz2ZnrZ+owTj2fponnvYkrASQxcJXm8aE=";
|
||||
vendorSha256 = "sha256-FJEB7rii6DcWyGqrmPEKOZTy27tG+CkZ2xUY+cpKakE=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -1,22 +1,42 @@
|
|||
{ lib, stdenv, fetchFromGitHub
|
||||
, autoreconfHook, pkg-config
|
||||
, liblxi, readline, lua
|
||||
, meson, ninja, cmake, pkg-config
|
||||
, liblxi, readline, lua, bash-completion
|
||||
, wrapGAppsHook
|
||||
, glib, gtk4, gtksourceview5, libadwaita, json-glib
|
||||
, desktop-file-utils, appstream-glib
|
||||
, gsettings-desktop-schemas
|
||||
, withGui ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lxi-tools";
|
||||
version = "1.21";
|
||||
version = "2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxi-tools";
|
||||
repo = "lxi-tools";
|
||||
rev = "v${version}";
|
||||
sha256 = "0rkp6ywsw2zv7hpbr12kba79wkcwqin7xagxxhd968rbfkfdxlwc";
|
||||
sha256 = "sha256-c53Jn/9xKsxQDsRWU2LKtNWs28AuG4t5OwYOAMxpcPA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
meson ninja cmake pkg-config
|
||||
] ++ lib.optional withGui wrapGAppsHook;
|
||||
|
||||
buildInputs = [ liblxi readline lua ];
|
||||
buildInputs = [
|
||||
liblxi readline lua bash-completion
|
||||
] ++ lib.optionals withGui [
|
||||
glib gtk4 gtksourceview5 libadwaita json-glib
|
||||
desktop-file-utils appstream-glib
|
||||
gsettings-desktop-schemas
|
||||
];
|
||||
|
||||
postUnpack = "sed -i '/meson.add_install.*$/d' source/meson.build";
|
||||
|
||||
mesonFlags = lib.optional (!withGui) "-Dgui=false";
|
||||
|
||||
postInstall = lib.optionalString withGui
|
||||
"glib-compile-schemas $out/share/glib-2.0/schemas";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool for communicating with LXI compatible instruments";
|
||||
|
|
|
@ -81,18 +81,42 @@ in lib.makeExtensible (self: {
|
|||
nix_2_9 = common {
|
||||
version = "2.9.2";
|
||||
sha256 = "sha256-uZCaBo9rdWRO/AlQMvVVjpAwzYijB2H5KKQqde6eHkg=";
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# https://github.com/NixOS/nix/pull/7283
|
||||
name = "fix-requires-non-existing-output.patch";
|
||||
url = "https://github.com/NixOS/nix/commit/3ade5f5d6026b825a80bdcc221058c4f14e10a27.patch";
|
||||
sha256 = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0=";
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
nix_2_10 = common {
|
||||
version = "2.10.3";
|
||||
sha256 = "sha256-B9EyDUz/9tlcWwf24lwxCFmkxuPTVW7HFYvp0C4xGbc=";
|
||||
patches = [ ./patches/flaky-tests.patch ];
|
||||
patches = [
|
||||
./patches/flaky-tests.patch
|
||||
(fetchpatch {
|
||||
# https://github.com/NixOS/nix/pull/7283
|
||||
name = "fix-requires-non-existing-output.patch";
|
||||
url = "https://github.com/NixOS/nix/commit/3ade5f5d6026b825a80bdcc221058c4f14e10a27.patch";
|
||||
sha256 = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0=";
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
nix_2_11 = common {
|
||||
version = "2.11.0";
|
||||
sha256 = "sha256-9+rpYzI+SmxJn+EbYxjGv68Ucp22bdFUSy/4LkHkkDQ=";
|
||||
patches = [ ./patches/flaky-tests.patch ];
|
||||
patches = [
|
||||
./patches/flaky-tests.patch
|
||||
(fetchpatch {
|
||||
# https://github.com/NixOS/nix/pull/7283
|
||||
name = "fix-requires-non-existing-output.patch";
|
||||
url = "https://github.com/NixOS/nix/commit/3ade5f5d6026b825a80bdcc221058c4f14e10a27.patch";
|
||||
sha256 = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0=";
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
stable = self.nix_2_11;
|
||||
|
|
|
@ -2704,6 +2704,11 @@ with pkgs;
|
|||
|
||||
gmnitohtml = callPackage ../applications/misc/gmnitohtml { };
|
||||
|
||||
go2tv = darwin.apple_sdk_11_0.callPackage ../applications/video/go2tv {
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa Kernel UserNotifications;
|
||||
};
|
||||
go2tv-lite = go2tv.override { withGui = false; };
|
||||
|
||||
goimapnotify = callPackage ../tools/networking/goimapnotify { };
|
||||
|
||||
gojsontoyaml = callPackage ../development/tools/gojsontoyaml { };
|
||||
|
@ -16254,14 +16259,20 @@ with pkgs;
|
|||
|
||||
autoadb = callPackage ../misc/autoadb { };
|
||||
|
||||
ansible = ansible_2_12;
|
||||
ansible_2_13 = python3Packages.toPythonApplication python3Packages.ansible-core;
|
||||
ansible_2_12 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "2.12.6";
|
||||
ansible = ansible_2_14;
|
||||
ansible_2_14 = python3Packages.toPythonApplication python3Packages.ansible-core;
|
||||
ansible_2_13 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "2.13.6";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
hash = "sha256-XzZuhRFZ2Pcs5o0yuMDt2lbuU3wB6faOyjgr0VEK9l0=";
|
||||
sha256 = "";
|
||||
hash = "sha256-Mf4yK2MpBnSo9zhhEN9QHwBEqkSJC+OrMTpuIluaKc8=";
|
||||
};
|
||||
}));
|
||||
ansible_2_12 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "2.12.10";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
hash = "sha256-/rHfYXOM/B9eiTtCouwafeMpd9Z+hnB7Retj0MXDwjY=";
|
||||
};
|
||||
meta.changelog = "https://github.com/ansible/ansible/blob/v${version}/changelogs/CHANGELOG-v${lib.versions.majorMinor version}.rst";
|
||||
}));
|
||||
|
@ -30200,6 +30211,7 @@ with pkgs;
|
|||
lv2-cpp-tools = callPackage ../applications/audio/lv2-cpp-tools { };
|
||||
|
||||
lxi-tools = callPackage ../tools/networking/lxi-tools { };
|
||||
lxi-tools-gui = callPackage ../tools/networking/lxi-tools { withGui = true; };
|
||||
|
||||
lynx = callPackage ../applications/networking/browsers/lynx { };
|
||||
|
||||
|
@ -30972,7 +30984,7 @@ with pkgs;
|
|||
|
||||
notepad-next = libsForQt5.callPackage ../applications/editors/notepad-next { };
|
||||
|
||||
notepadqq = libsForQt514.callPackage ../applications/editors/notepadqq { };
|
||||
notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { };
|
||||
|
||||
notmuch = callPackage ../applications/networking/mailreaders/notmuch {
|
||||
gmime = gmime3;
|
||||
|
@ -32523,6 +32535,10 @@ with pkgs;
|
|||
|
||||
tudu = callPackage ../applications/office/tudu { };
|
||||
|
||||
tumpa = callPackage ../applications/misc/tumpa {
|
||||
inherit (pkgs.libsForQt5) wrapQtAppsHook;
|
||||
};
|
||||
|
||||
tuna = python3Packages.callPackage ../os-specific/linux/tuna { };
|
||||
|
||||
tunefish = callPackage ../applications/audio/tunefish {
|
||||
|
|
|
@ -137,6 +137,7 @@ mapAliases ({
|
|||
pydrive = throw "pydrive is broken and deprecated and has been replaced with pydrive2."; # added 2022-06-01
|
||||
pyGtkGlade = throw "Glade support for pygtk has been removed"; # added 2022-01-15
|
||||
pycallgraph = throw "pycallgraph has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
|
||||
pychef = throw "pychef has been removed because it's been archived upstream and abandoned since 2017."; # added 2022-11-14
|
||||
pycryptodome-test-vectors = throw "pycryptodome-test-vectors has been removed because it is an internal package to pycryptodome"; # added 2022-05-28
|
||||
pyialarmxr = pyialarmxr-homeassistant; # added 2022-06-07
|
||||
pyialarmxr-homeassistant = throw "The package was removed together with the component support in home-assistant 2022.7.0"; # added 2022-07-07
|
||||
|
@ -206,6 +207,7 @@ mapAliases ({
|
|||
tensorflow-estimator_2 = tensorflow-estimator; # added 2021-11-25
|
||||
tensorflow-tensorboard = tensorboard; # added 2022-03-06
|
||||
tensorflow-tensorboard_2 = tensorflow-tensorboard; # added 2021-11-25
|
||||
tumpa = throw "tumpa was promoted to a top-level attribute"; # added 2022-11-19
|
||||
tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05
|
||||
types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30
|
||||
types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30
|
||||
|
|
|
@ -7595,8 +7595,6 @@ self: super: with self; {
|
|||
|
||||
pychart = callPackage ../development/python-modules/pychart { };
|
||||
|
||||
pychef = callPackage ../development/python-modules/pychef { };
|
||||
|
||||
pychm = callPackage ../development/python-modules/pychm { };
|
||||
|
||||
PyChromecast = callPackage ../development/python-modules/pychromecast { };
|
||||
|
@ -11332,10 +11330,6 @@ self: super: with self; {
|
|||
|
||||
tubeup = callPackage ../development/python-modules/tubeup { };
|
||||
|
||||
tumpa = callPackage ../development/python-modules/tumpa {
|
||||
inherit (pkgs.libsForQt5) wrapQtAppsHook;
|
||||
};
|
||||
|
||||
turnt = callPackage ../development/python-modules/turnt { };
|
||||
|
||||
tuya-iot-py-sdk = callPackage ../development/python-modules/tuya-iot-py-sdk { };
|
||||
|
|
Loading…
Reference in a new issue