b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2022-11-26 00:02:47 +00:00 committed by GitHub
parent 5a876951e5 f6d28946f0
commit 627e652b73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
47 changed files with 347 additions and 177 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/languages-frameworks/javascript.section.md
View file

@ -177,7 +177,7 @@ buildNpmPackage rec {
patches = [ ./remove-prepack-script.patch ];
npmDepsHash = "sha256-s8SpZY/1tKZVd3vt7sA9vsqHvEaNORQBMrSyhWpj048=";
npmDepsHash = "sha256-tuEfyePwlOy2/mOPdXbqJskO6IowvAP4DWg8xSZwbJw=";
NODE_OPTIONS = "--openssl-legacy-provider";

2
pkgs/applications/audio/open-stage-control/default.nix
View file

@ -16,7 +16,7 @@ buildNpmPackage rec {
./package-lock.json.patch
];
npmDepsHash = "sha256-SGLcFjPnmhFoeXtP4gfGr4Qa1dTaXwSnzkweEvYW/1k=";
npmDepsHash = "sha256-5KZXZ4agHcAh3gai5w9YodETIEGJtDq/kyEZOHb9dOc=";
nativeBuildInputs = [
copyDesktopItems

4
pkgs/applications/misc/calibre/default.nix
View file

@ -30,11 +30,11 @@
stdenv.mkDerivation rec {
pname = "calibre";
version = "6.8.0";
version = "6.9.0";
src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
hash = "sha256-d9JaWjAjJzKldjyrdrl6OyX1JSatp9U8agRog7K5n2s=";
hash = "sha256-pAZy9YgAzEks5o4R5r46iGLTcitBrOHyltWg2ZyfzwA=";
};
# https://sources.debian.org/patches/calibre/${version}+dfsg-1

16
pkgs/applications/networking/browsers/chromium/upstream-info.json
View file

@ -1,8 +1,8 @@
{
"stable": {
"version": "107.0.5304.110",
"sha256": "1k7yjsb4i7m8i5mk018v7z25r4x1ypyprz4hnyrn7vk2983lhdfk",
"sha256bin64": "06rlxwbvp7rpw2rdpnjzl1cn7cr1rwlb20wz8r0cndjcjyzd3rjj",
"version": "107.0.5304.121",
"sha256": "12z0fhgxcsdkf6shnsg9maj3v901226cjcy8y2x8m88maw2apc0j",
"sha256bin64": "0dxcf0h5ngrfrdnygwvbxfjbwgaxp9dk3r4x0iin34m3b85mzzim",
"deps": {
"gn": {
"version": "2022-09-14",
@ -45,9 +45,9 @@
}
},
"ungoogled-chromium": {
"version": "107.0.5304.110",
"sha256": "1k7yjsb4i7m8i5mk018v7z25r4x1ypyprz4hnyrn7vk2983lhdfk",
"sha256bin64": "06rlxwbvp7rpw2rdpnjzl1cn7cr1rwlb20wz8r0cndjcjyzd3rjj",
"version": "107.0.5304.122",
"sha256": "0f2jdvlnp1s5ia01lnqk0ykqji2x4ab9g4kxk637n4csf0i1gj85",
"sha256bin64": null,
"deps": {
"gn": {
"version": "2022-09-14",
@ -56,8 +56,8 @@
"sha256": "1c0dvpp4im1hf277bs5w7rgqxz3g2bax266i2g6smi3pl7a8jpnp"
},
"ungoogled-patches": {
"rev": "107.0.5304.110-1",
"sha256": "14z9qi9i9l7kjx7gf74lzs63bpxqyd3wbqqpsvzvqgr2v0cgqahx"
"rev": "107.0.5304.122-1",
"sha256": "109j5jvsbj9dylj8prz7bkzc8czjv2c8bm0albwnkyxymcpd3w6p"
}
}
}

4
pkgs/applications/networking/cluster/cilium/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cilium-cli";
version = "0.12.8";
version = "0.12.9";
src = fetchFromGitHub {
owner = "cilium";
repo = pname;
rev = "v${version}";
sha256 = "sha256-o479F2xRFlX69lu4WJW56oZ9QEQkSk1jG2bedcdOJqI=";
sha256 = "sha256-8SrAxPj4vW5+Je/VaYh30fABTmusWuOUUYQ/DDa7iUI=";
};
vendorSha256 = null;

6
pkgs/applications/networking/instant-messengers/signald/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchFromGitLab, jdk17_headless, coreutils, gradle_6, git, perl
{ lib, stdenv, fetchurl, fetchFromGitLab, jdk17_headless, coreutils, gradle, git, perl
, makeWrapper, fetchpatch, substituteAll, jre_minimal
}:
@ -36,7 +36,7 @@ let
deps = stdenv.mkDerivation {
pname = "${pname}-deps";
inherit src version;
nativeBuildInputs = [ gradle_6 perl ];
nativeBuildInputs = [ gradle perl ];
patches = [ ./0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch ];
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d)
@ -91,7 +91,7 @@ in stdenv.mkDerivation rec {
runHook postInstall
'';
nativeBuildInputs = [ git gradle_6 makeWrapper ];
nativeBuildInputs = [ git gradle makeWrapper ];
doCheck = true;

10
pkgs/applications/science/logic/aspino/default.nix
View file

@ -23,8 +23,10 @@ stdenv.mkDerivation {
postPatch = ''
substituteInPlace Makefile \
--replace "GCC = g++" "GCC = c++"
patchShebangs .
substituteInPlace src/main.cc \
--replace "defined(__linux__)" "defined(__linux__) && defined(__x86_64__)"
substituteInPlace src/MaxSatSolver.cc \
--replace "occ[i][sign(softLiterals[j])] > 0" "occ[i][sign(softLiterals[j])] != 0"
'';
preBuild = ''
@ -45,9 +47,5 @@ stdenv.mkDerivation {
platforms = platforms.unix;
license = licenses.asl20;
homepage = "https://alviano.net/software/maxino/";
# See pkgs/applications/science/logic/glucose/default.nix
badPlatforms = [ "aarch64-linux" ];
# src/MaxSatSolver.cc:280:62: error: ordered comparison between pointer and zero ('unsigned int *' and 'int')
broken = (stdenv.isDarwin && stdenv.isx86_64); # broken since 2019-05-07 on hydra
};
}

3
pkgs/applications/science/logic/avy/default.nix
View file

@ -43,8 +43,5 @@ stdenv.mkDerivation rec {
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ thoughtpolice ];
platforms = lib.platforms.linux;
# See pkgs/applications/science/logic/glucose/default.nix
# (The error is different due to glucose-fenv.patch, but the same)
badPlatforms = [ "aarch64-linux" ];
};
}

40
pkgs/applications/science/logic/avy/glucose-fenv.patch
View file

@ -1,24 +1,15 @@
From d6e0cb60270e8653bda3f339e3a07ce2cd2d6eb0 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 17 Oct 2017 23:01:36 -0500
Subject: [PATCH] glucose: use fenv to set double precision
---
core/Main.cc | 8 ++++++--
simp/Main.cc | 8 ++++++--
utils/System.h | 2 +-
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/core/Main.cc b/core/Main.cc
index c96aadd..994132b 100644
index fd8fca1..37d2ed5 100644
--- a/core/Main.cc
+++ b/core/Main.cc
@@ -96,8 +96,12 @@ int main(int argc, char** argv)
@@ -95,9 +95,13 @@ int main(int argc, char** argv)
setUsageHelp("c USAGE: %s [options] <input-file> <result-output-file>\n\n where input may be either in plain or gzipped DIMACS.\n");
// printf("This is MiniSat 2.0 beta\n");
#if defined(__linux__)
-#if defined(__linux__)
- fpu_control_t oldcw, newcw;
- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);
+#if defined(__linux__) && defined(__x86_64__)
+ fenv_t fenv;
+
+ fegetenv(&fenv);
@ -29,15 +20,17 @@ index c96aadd..994132b 100644
#endif
// Extra options:
diff --git a/simp/Main.cc b/simp/Main.cc
index 4f4772d..70c2e4b 100644
index 4f4772d..c605f6e 100644
--- a/simp/Main.cc
+++ b/simp/Main.cc
@@ -97,8 +97,12 @@ int main(int argc, char** argv)
@@ -96,9 +96,13 @@ int main(int argc, char** argv)
setUsageHelp("c USAGE: %s [options] <input-file> <result-output-file>\n\n where input may be either in plain or gzipped DIMACS.\n");
#if defined(__linux__)
-#if defined(__linux__)
- fpu_control_t oldcw, newcw;
- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);
+#if defined(__linux__) && defined(__x86_64__)
+ fenv_t fenv;
+
+ fegetenv(&fenv);
@ -48,18 +41,17 @@ index 4f4772d..70c2e4b 100644
#endif
// Extra options:
diff --git a/utils/System.h b/utils/System.h
index 004d498..a768e99 100644
index 004d498..2f6d922 100644
--- a/utils/System.h
+++ b/utils/System.h
@@ -22,7 +22,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
@@ -21,8 +21,8 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
#ifndef Glucose_System_h
#define Glucose_System_h
#if defined(__linux__)
-#if defined(__linux__)
-#include <fpu_control.h>
+#if defined(__linux__) && defined(__x86_64__)
+#include <fenv.h>
#endif
#include "glucose/mtl/IntTypes.h"
--
2.14.2

38
pkgs/applications/science/logic/avy/minisat-fenv.patch
View file

@ -1,24 +1,15 @@
From 7f1016ceab9b0f57a935bd51ca6df3d18439b472 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 17 Oct 2017 22:57:02 -0500
Subject: [PATCH] use fenv instead of non-standard fpu_control
---
core/Main.cc | 8 ++++++--
simp/Main.cc | 8 ++++++--
utils/System.h | 2 +-
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/core/Main.cc b/core/Main.cc
index 2b0d97b..8ad95fb 100644
index 2b0d97b..9ba985d 100644
--- a/core/Main.cc
+++ b/core/Main.cc
@@ -78,8 +78,12 @@ int main(int argc, char** argv)
@@ -77,9 +77,13 @@ int main(int argc, char** argv)
setUsageHelp("USAGE: %s [options] <input-file> <result-output-file>\n\n where input may be either in plain or gzipped DIMACS.\n");
// printf("This is MiniSat 2.0 beta\n");
#if defined(__linux__)
-#if defined(__linux__)
- fpu_control_t oldcw, newcw;
- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);
+#if defined(__linux__) && defined(__x86_64__)
+ fenv_t fenv;
+
+ fegetenv(&fenv);
@ -29,15 +20,17 @@ index 2b0d97b..8ad95fb 100644
#endif
// Extra options:
diff --git a/simp/Main.cc b/simp/Main.cc
index 2804d7f..39bfb71 100644
index 2804d7f..7fbdb33 100644
--- a/simp/Main.cc
+++ b/simp/Main.cc
@@ -79,8 +79,12 @@ int main(int argc, char** argv)
@@ -78,9 +78,13 @@ int main(int argc, char** argv)
setUsageHelp("USAGE: %s [options] <input-file> <result-output-file>\n\n where input may be either in plain or gzipped DIMACS.\n");
// printf("This is MiniSat 2.0 beta\n");
#if defined(__linux__)
-#if defined(__linux__)
- fpu_control_t oldcw, newcw;
- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);
+#if defined(__linux__) && defined(__x86_64__)
+ fenv_t fenv;
+
+ fegetenv(&fenv);
@ -48,18 +41,17 @@ index 2804d7f..39bfb71 100644
#endif
// Extra options:
diff --git a/utils/System.h b/utils/System.h
index 1758192..c0ad13a 100644
index 1758192..840bee5 100644
--- a/utils/System.h
+++ b/utils/System.h
@@ -22,7 +22,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
@@ -21,8 +21,8 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
#ifndef Minisat_System_h
#define Minisat_System_h
#if defined(__linux__)
-#if defined(__linux__)
-#include <fpu_control.h>
+#if defined(__linux__) && defined(__x86_64__)
+#include <fenv.h>
#endif
#include "mtl/IntTypes.h"
--
2.14.2

7
pkgs/applications/science/logic/glucose/default.nix
View file

@ -8,6 +8,11 @@ stdenv.mkDerivation rec {
sha256 = "0aahrkaq7n0z986fpqz66yz946nxardfi6dh8calzcfjpvqiraji";
};
postPatch = ''
substituteInPlace Main.cc \
--replace "defined(__linux__)" "defined(__linux__) && defined(__x86_64__)"
'';
buildInputs = [ zlib ];
sourceRoot = "glucose-syrup-${version}/simp";
@ -23,7 +28,5 @@ stdenv.mkDerivation rec {
license = licenses.mit;
platforms = platforms.unix;
maintainers = with maintainers; [ gebner ];
# Build uses _FPU_EXTENDED macro
badPlatforms = [ "aarch64-linux" ];
};
}

4
pkgs/build-support/node/build-npm-package/default.nix
View file

@ -4,7 +4,9 @@
, src ? null
, srcs ? null
, sourceRoot ? null
, prePatch ? ""
, patches ? [ ]
, postPatch ? ""
, nativeBuildInputs ? [ ]
, buildInputs ? [ ]
# The output hash of the dependencies for this project.
@ -30,7 +32,7 @@
let
npmDeps = fetchNpmDeps {
inherit src srcs sourceRoot patches;
inherit src srcs sourceRoot prePatch patches postPatch;
name = "${name}-npm-deps";
hash = npmDepsHash;
};

2
pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh
View file

@ -27,7 +27,7 @@ npmInstallHook() {
local -r nodeModulesPath="$packageOut/node_modules"
if [ ! -d "$nodeModulesPath" ]; then
npm prune --omit dev $npmInstallFlags "${npmInstallFlagsArray[@]}" $npmFlags "${npmFlagsArray[@]}"
npm prune --omit dev --no-save $npmInstallFlags "${npmInstallFlagsArray[@]}" $npmFlags "${npmFlagsArray[@]}"
find node_modules -maxdepth 1 -type d -empty -delete
cp -r node_modules "$nodeModulesPath"

8
pkgs/build-support/node/fetch-npm-deps/default.nix
View file

@ -84,7 +84,7 @@
hash = "sha256-X9mCwPqV5yP0S2GonNvpYnLSLJMd/SUIked+hMRxDpA=";
};
hash = "sha256-5Mg7KDJLMM5e/7BCHGinGAnBRft2ySQzvKW06p3u/0o=";
hash = "sha256-tEdElWJ+KBTxBobzXBpPopQSwK2usGW/it1+yfbVzBw=";
};
linkDependencies = makeTest {
@ -107,7 +107,7 @@
hash = "sha256-1fGNxYJi1I4cXK/jinNG+Y6tPEOhP3QAqWOBEQttS9E=";
};
hash = "sha256-8xF8F74nHwL9KPN2QLsxnfvsk0rNCKOZniYJQCD5u/I=";
hash = "sha256-+KA8/orSBJ4EhuSyQO8IKSxsN/FAsYU3lOzq+awuxNQ=";
};
};
@ -140,14 +140,14 @@
buildPhase = ''
runHook preBuild
if [[ ! -f package-lock.json ]]; then
if [[ ! -e package-lock.json ]]; then
echo
echo "ERROR: The package-lock.json file does not exist!"
echo
echo "package-lock.json is required to make sure that npmDepsHash doesn't change"
echo "when packages are updated on npm."
echo
echo "Hint: You can use the patches attribute to add a package-lock.json manually to the build."
echo "Hint: You can copy a vendored package-lock.json file via postPatch."
echo
exit 1

2
pkgs/build-support/node/fetch-npm-deps/src/main.rs
View file

@ -421,7 +421,7 @@ fn main() -> anyhow::Result<()> {
data = Command::new("tar")
.args([
"--sort=name",
"--mtime=0",
"--mtime=@0",
"--owner=0",
"--group=0",
"--numeric-owner",

4
pkgs/development/interpreters/j/default.nix
View file

@ -25,6 +25,10 @@ stdenv.mkDerivation rec {
bc
];
patches = [
./fix-install-path.patch
];
dontConfigure = true;
# emulating build_all.sh configuration variables

10
pkgs/development/interpreters/j/fix-install-path.patch Normal file
View file

@ -0,0 +1,10 @@
--- a/jlibrary/bin/profile.ijs 2022-11-23 18:45:50.049675025 +0100
+++ b/jlibrary/bin/profile.ijs 2022-11-23 18:47:43.798532581 +0100
@@ -13,6 +13,7 @@
fhs=. (FHS"_)^:(0=4!:0<'FHS')(5=systype)*.0=#1!:0<BINPATH,'/../system/util/boot.ijs'
install=. (0&~:fhs){::install;install,'/share/j/',omitversion{::'9.03';'0'
install=. (INSTALLROOT"_)^:(0=4!:0<'INSTALLROOT') install
+install=. bin,'/../share/j'
addons=. install,'/addons'
system=. install,'/system'
tools=. install,'/tools'

57
pkgs/development/interpreters/wasmer/default.nix
View file

@ -2,44 +2,61 @@
, lib
, rustPlatform
, fetchFromGitHub
, cmake
, llvmPackages
, pkg-config
, libffi
, libxml2
, CoreFoundation
, SystemConfiguration
, Security
, withLLVM ? !stdenv.isDarwin
, withSinglepass ? !(stdenv.isDarwin && stdenv.isx86_64)
}:
rustPlatform.buildRustPackage rec {
pname = "wasmer";
version = "2.3.0";
version = "3.0.1";
src = fetchFromGitHub {
owner = "wasmerio";
repo = pname;
rev = version;
sha256 = "sha256-25wWgMNybbsEf/1xmm+8BPcjx8CSW9ZBzxGKT/DbBXw=";
fetchSubmodules = true;
rev = "v${version}";
sha256 = "sha256-os1TvqDTn+WJjX0fREFlNsd8bASdnOOvnCyAkplTVrA=";
};
cargoSha256 = "sha256-tswsbijNN5UcSZovVmy66yehcEOpQDGMdRgR/1mkuE8=";
cargoSha256 = "sha256-zfGtRoCpTKomsq3xjfMC1VWUGbpb/qjdWNZ8pgwZfMQ=";
nativeBuildInputs = [ cmake pkg-config ];
nativeBuildInputs = [ rustPlatform.bindgenHook ];
# cranelift+jit works everywhere, see:
# https://github.com/wasmerio/wasmer/blob/master/Makefile#L22
buildFeatures = [ "cranelift" "jit" ];
cargoBuildFlags = [
# must target manifest and desired output bin, otherwise output is empty
"--manifest-path" "lib/cli/Cargo.toml"
"--bin" "wasmer"
buildInputs = lib.optionals withLLVM [
llvmPackages.llvm
libffi
libxml2
] ++ lib.optionals stdenv.isDarwin [
CoreFoundation
SystemConfiguration
Security
];
# Can't use test-jit:
# error: Package `wasmer-workspace v2.3.0 (/build/source)` does not have the feature `test-jit`
checkFeatures = [ "test-cranelift" ];
LLVM_SYS_120_PREFIX = lib.optionalString withLLVM llvmPackages.llvm.dev;
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
# check references to `compiler_features` in Makefile on update
buildFeatures = checkFeatures ++ [
"webc_runner"
];
checkFeatures = [
"cranelift"
"wasmer-artifact-create"
"static-artifact-create"
"wasmer-artifact-load"
"static-artifact-load"
]
++ lib.optional withLLVM "llvm"
++ lib.optional withSinglepass "singlepass";
cargoBuildFlags = [ "--manifest-path" "lib/cli/Cargo.toml" "--bin" "wasmer" ];
meta = with lib; {
broken = stdenv.isDarwin;
description = "The Universal WebAssembly Runtime";
longDescription = ''
Wasmer is a standalone WebAssembly runtime for running WebAssembly outside

2
pkgs/development/libraries/aws-sdk-cpp/default.nix
View file

@ -92,6 +92,8 @@ stdenv.mkDerivation rec {
# propagation is needed for Security.framework to be available when linking
propagatedBuildInputs = [ aws-crt-cpp ];
# Ensure the linker is using atomic when compiling for RISC-V, otherwise fails
LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic";
cmakeFlags = [
"-DBUILD_DEPS=OFF"

3
pkgs/development/libraries/nlohmann_json/default.nix
View file

@ -24,7 +24,8 @@ in stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ cmake ];
cmakeFlags = [
"-DBuildTests=${if finalAttrs.doCheck then "ON" else "OFF"}"
"-DJSON_BuildTests=${if finalAttrs.doCheck then "ON" else "OFF"}"
"-DJSON_FastTests=ON"
"-DJSON_MultipleHeaders=ON"
] ++ lib.optional finalAttrs.doCheck "-DJSON_TestDataDirectory=${testData}";

5
pkgs/development/libraries/py3c/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, python2, python3 }:
{ lib, stdenv, fetchFromGitHub, python3 }:
stdenv.mkDerivation rec {
pname = "py3c";
@ -25,10 +25,11 @@ stdenv.mkDerivation rec {
doCheck = true;
checkInputs = [
python2
python3
];
checkTarget = "test-python";
meta = with lib; {
homepage = "https://github.com/encukou/py3c";
description = "Python 2/3 compatibility layer for C extensions";

4
pkgs/development/libraries/qpdf/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "qpdf";
version = "11.1.1";
version = "11.2.0";
src = fetchFromGitHub {
owner = "qpdf";
repo = "qpdf";
rev = "v${version}";
hash = "sha256-m0yMOaWX9LqSCrUdx62zXZ73xXH/iW6x7bXkz1Fm8zA=";
hash = "sha256-AkLuclDm9qjVbpFqenlbgTWt/GAWzOj9d1lqgt6aPNo=";
};
nativeBuildInputs = [ cmake perl ];

3
pkgs/development/libraries/qt-5/5.12/default.nix
View file

@ -16,7 +16,7 @@ top-level attribute to `top-level/all-packages.nix`.
{ newScope
, lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper
, bison, cups ? null, harfbuzz, libGL, perl
, bison, cups ? null, harfbuzz, libGL, perl, python2
, gstreamer, gst-plugins-base, gtk3, dconf
, darwin
, buildPackages
@ -205,6 +205,7 @@ let
qtwayland = callPackage ../modules/qtwayland.nix {};
qtwebchannel = callPackage ../modules/qtwebchannel.nix {};
qtwebengine = callPackage ../modules/qtwebengine.nix {
python = python2;
inherit (darwin) cctools libobjc libunwind xnu;
inherit (darwin.apple_sdk.libs) sandbox;
inherit (darwin.apple_sdk.frameworks) ApplicationServices AVFoundation Foundation ForceFeedback GameController AppKit

3
pkgs/development/libraries/qt-5/5.14/default.nix
View file

@ -16,7 +16,7 @@ top-level attribute to `top-level/all-packages.nix`.
{ newScope
, lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper
, bison, cups ? null, harfbuzz, libGL, perl
, bison, cups ? null, harfbuzz, libGL, perl, python2
, gstreamer, gst-plugins-base, gtk3, dconf
, darwin
, buildPackages
@ -204,6 +204,7 @@ let
qtwayland = callPackage ../modules/qtwayland.nix {};
qtwebchannel = callPackage ../modules/qtwebchannel.nix {};
qtwebengine = callPackage ../modules/qtwebengine.nix {
python = python2;
inherit (darwin) cctools libobjc libunwind xnu;
inherit (darwin.apple_sdk.libs) sandbox;
inherit (darwin.apple_sdk.frameworks) ApplicationServices AVFoundation Foundation ForceFeedback GameController AppKit

21
pkgs/development/libraries/qt-5/5.15/default.nix
View file

@ -9,7 +9,7 @@ Check for any minor version changes.
{ newScope
, lib, stdenv, fetchurl, fetchgit, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper
, bison, cups ? null, harfbuzz, libGL, perl
, bison, cups ? null, harfbuzz, libGL, perl, python3
, gstreamer, gst-plugins-base, gtk3, dconf
, darwin
, buildPackages
@ -63,7 +63,18 @@ let
];
qtscript = [ ./qtscript.patch ];
qtserialport = [ ./qtserialport.patch ];
qtwebengine = lib.optionals stdenv.isDarwin [
qtwebengine = [
(fetchpatch {
url = "https://github.com/archlinux/svntogit-packages/raw/372ae3de526f783bdcb5d51b997fbf511055466a/trunk/qt5-webengine-python3.patch";
hash = "sha256-rUSDwTucXVP3Obdck7LRTeKZ+JYQSNhQ7+W31uHZ9yM=";
})
(fetchpatch {
url = "https://github.com/archlinux/svntogit-packages/raw/372ae3de526f783bdcb5d51b997fbf511055466a/trunk/qt5-webengine-chromium-python3.patch";
stripLen = 1;
extraPrefix = "src/3rdparty/";
hash = "sha256-BODOw1ksPPns2fmMrk6KC5Po513xB0f1ycbsIL9MmHE=";
})
] ++ lib.optionals stdenv.isDarwin [
./qtwebengine-darwin-no-platform-check.patch
./qtwebengine-mac-dont-set-dsymutil-path.patch
];
@ -164,6 +175,12 @@ let
qtwebchannel = callPackage ../modules/qtwebchannel.nix {};
qtwebengine = callPackage ../modules/qtwebengine.nix {
inherit (srcs.qtwebengine) version;
python = python3;
postPatch = ''
# update catapult for python3 compatibility
rm -r src/3rdparty/chromium/third_party/catapult
cp -r ${srcs.catapult} src/3rdparty/chromium/third_party/catapult
'';
inherit (darwin) cctools libobjc libunwind xnu;
inherit (darwin.apple_sdk.libs) sandbox;
inherit (darwin.apple_sdk.frameworks) ApplicationServices AVFoundation Foundation ForceFeedback GameController AppKit

6
pkgs/development/libraries/qt-5/5.15/srcs.nix
View file

@ -34,6 +34,12 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json)
version = "5.212.0-alpha4";
};
catapult = fetchgit {
url = "https://chromium.googlesource.com/catapult";
rev = "5eedfe23148a234211ba477f76fc2ea2e8529189";
hash = "sha256-LPfBCEB5tJOljXpptsNk0sHGtJf/wIRL7fccN79Nh6o=";
};
qtwebengine =
let
branchName = "5.15.11";

7
pkgs/development/libraries/qt-5/modules/qtwebengine.nix
View file

@ -1,7 +1,7 @@
{ qtModule
, qtdeclarative, qtquickcontrols, qtlocation, qtwebchannel
, bison, flex, git, gperf, ninja, pkg-config, python2, which
, bison, flex, git, gperf, ninja, pkg-config, python, which
, nodejs, qtbase, perl
, xorg, libXcursor, libXScrnSaver, libXrandr, libXtst
@ -24,13 +24,14 @@
, qtCompatVersion
, pipewireSupport ? stdenv.isLinux
, pipewire_0_2
, postPatch ? ""
}:
qtModule {
pname = "qtwebengine";
qtInputs = [ qtdeclarative qtquickcontrols qtlocation qtwebchannel ];
nativeBuildInputs = [
bison flex git gperf ninja pkg-config python2 which gn nodejs
bison flex git gperf ninja pkg-config python which gn nodejs
] ++ lib.optional stdenv.isDarwin xcbuild;
doCheck = true;
outputs = [ "bin" "dev" "out" ];
@ -102,7 +103,7 @@ qtModule {
'' else ''
substituteInPlace src/3rdparty/chromium/base/mac/mach_port_broker.mm \
--replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]"
''));
'')) + postPatch;
NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [
# with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit

25
pkgs/development/python-modules/appthreat-vulnerability-db/default.nix
View file

@ -1,20 +1,21 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, requests
, appdirs
, tabulate
, buildPythonPackage
, cvss
, fetchFromGitHub
, msgpack
, orjson
, semver
, packageurl-python
, pythonOlder
, pytestCheckHook
, pythonOlder
, requests
, semver
, tabulate
}:
buildPythonPackage rec {
pname = "appthreat-vulnerability-db";
version = "2.0.9";
version = "3.0.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -23,17 +24,18 @@ buildPythonPackage rec {
owner = "AppThreat";
repo = "vulnerability-db";
rev = "refs/tags/v${version}";
sha256 = "sha256-A5mphFJEjOkTG5Rv7tb4hm5eDMSir69gqkbHYn6109I=";
sha256 = "sha256-y+ZOTvWnqSHBpuqquA0IvkWj1B/BmovTUqg1Oddjd5c=";
};
propagatedBuildInputs = [
requests
appdirs
tabulate
cvss
msgpack
orjson
semver
packageurl-python
requests
semver
tabulate
];
checkInputs = [
@ -62,6 +64,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Vulnerability database and package search for sources such as OSV, NVD, GitHub and npm";
homepage = "https://github.com/appthreat/vulnerability-db";
changelog = "https://github.com/AppThreat/vulnerability-db/releases/tag/v${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};

51
pkgs/development/python-modules/cvss/default.nix Normal file
View file

@ -0,0 +1,51 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, jsonschema
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "cvss";
version = "2.5";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "RedHatProductSecurity";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-6S646cvm+UwdpRGOtCuNijWcUxhZD6IG407hNBz+NA4=";
};
checkInputs = [
jsonschema
pytestCheckHook
];
pythonImportsCheck = [
"cvss"
];
disabledTests = [
# Tests require additional data
"test_calculator"
"test_cvsslib"
"test_json_ordering"
"test_json_schema_repr"
"test_random"
"test_rh_vector"
"test_simple"
"test_simple_31"
];
meta = with lib; {
description = "Library for CVSS2/3";
homepage = "https://github.com/RedHatProductSecurity/cvss";
changelog = "https://github.com/RedHatProductSecurity/cvss/releases/tag/v${version}";
license = with licenses; [ lgpl3Plus ];
maintainers = with maintainers; [ fab ];
};
}

9
pkgs/development/python-modules/faraday-plugins/default.nix
View file

@ -8,6 +8,7 @@
, lxml
, pytestCheckHook
, python-dateutil
, pythonOlder
, pytz
, requests
, simplejson
@ -19,6 +20,8 @@ buildPythonPackage rec {
version = "1.8.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "infobyte";
repo = "faraday_plugins";
@ -26,6 +29,11 @@ buildPythonPackage rec {
hash = "sha256-KAfy2AQWZYFT/+rX8dNe8aWTFI0kkGg5IaSHhwYGk3A=";
};
postPatch = ''
substituteInPlace setup.py \
--replace "version=version," "version='${version}',"
'';
propagatedBuildInputs = [
beautifulsoup4
click
@ -64,6 +72,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Security tools report parsers for Faraday";
homepage = "https://github.com/infobyte/faraday_plugins";
changelog = "https://github.com/infobyte/faraday_plugins/releases/tag/${version}";
license = with licenses; [ gpl3Only ];
maintainers = with maintainers; [ fab ];
};

17
pkgs/development/python-modules/statmake/default.nix
View file

@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "daltonmaag";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-BpxjAr65ZQEJ0PSUIPtS78UvJbMG91qkV8py2K/+W2E=";
hash = "sha256-BpxjAr65ZQEJ0PSUIPtS78UvJbMG91qkV8py2K/+W2E=";
};
nativeBuildInputs = [
@ -50,21 +50,20 @@ buildPythonPackage rec {
ufoLib2
];
postPatch = ''
# https://github.com/daltonmaag/statmake/pull/41
substituteInPlace pyproject.toml \
--replace 'requires = ["poetry>=1.0.0"]' 'requires = ["poetry-core"]' \
--replace 'build-backend = "poetry.masonry.api"' 'build-backend = "poetry.core.masonry.api"' \
--replace 'cattrs = "^1.1"' 'cattrs = ">= 1.1"'
'';
pythonImportsCheck = [
"statmake"
];
disabledTests = [
# Test requires an update as later cattrs is present in Nixpkgs
# https://github.com/daltonmaag/statmake/issues/42
"test_load_stylespace_broken_range"
];
meta = with lib; {
description = "Applies STAT information from a Stylespace to a variable font";
homepage = "https://github.com/daltonmaag/statmake";
changelog = "https://github.com/daltonmaag/statmake/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ jtojnar ];
};

4
pkgs/development/tools/appthreat-depscan/default.nix
View file

@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "appthreat-depscan";
version = "3.0.3";
version = "3.1.1";
src = fetchFromGitHub {
owner = "AppThreat";
repo = "dep-scan";
rev = "refs/tags/v${version}";
hash = "sha256-JxaimM9sL6khTGJoSUFO2Dzlki6uoyqXEJznk6UHK/0=";
hash = "sha256-dOZ1EwTjOQzojvtL6sF1tTaOsi4dAHU3u/9HFD7VQy0=";
};
propagatedBuildInputs = with python3.pkgs; [

4
pkgs/development/tools/doctl/default.nix
View file

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "doctl";
version = "1.87.0";
version = "1.88.0";
vendorSha256 = null;
@ -31,7 +31,7 @@ buildGoModule rec {
owner = "digitalocean";
repo = "doctl";
rev = "v${version}";
sha256 = "sha256-y5RHICd82FLWDkygCcmrnPwISEv/WuRwQiXXqS6cSKg=";
sha256 = "sha256-Z1c+h+o2x5GeYK8DN5l2NXWJJNwg6NKvFpCuFMVSCeA=";
};
meta = with lib; {

4
pkgs/development/tools/goda/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "goda";
version = "0.5.3";
version = "0.5.4";
src = fetchFromGitHub {
owner = "loov";
repo = "goda";
rev = "v${version}";
sha256 = "sha256-qBuhwIQvfUZMyzCJ/7Kedc+InrGwpcLhDLvX9i0ws2A=";
sha256 = "sha256-5MkErXgRJtaXbThJYjGWyvt+RAbtULTe0VoXKU3HQug=";
};
vendorSha256 = "sha256-BYYuB4ZlCWD8NILkf4qrgM4q72ZTy7Ze3ICUXdoI5Ms=";

9
pkgs/development/tools/toluapp/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, sconsPackages, lua }:
{ lib, stdenv, fetchFromGitHub, cmake, lua }:
stdenv.mkDerivation rec {
version = "1.0.93";
@ -11,16 +11,11 @@ stdenv.mkDerivation rec {
sha256 = "0zd55bc8smmgk9j4cf0jpibb03lgsvl0knpwhplxbv93mcdnw7s0";
};
nativeBuildInputs = [ sconsPackages.scons_3_0_1 ];
nativeBuildInputs = [ cmake ];
buildInputs = [ lua ];
patches = [ ./environ-and-linux-is-kinda-posix.patch ./headers.patch ];
preConfigure = ''
substituteInPlace config_posix.py \
--replace /usr/local $out
'';
meta = with lib; {
description = "A tool to integrate C/Cpp code with Lua";
homepage = "http://www.codenix.com/~tolua/";

6
pkgs/development/web/flyctl/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "flyctl";
version = "0.0.433";
version = "0.0.435";
src = fetchFromGitHub {
owner = "superfly";
repo = "flyctl";
rev = "v${version}";
sha256 = "sha256-1dGsCUMa4FFS88sEH8WJdm6KB40lYe5MnjklAwAtyzs=";
sha256 = "sha256-7x+FTiH2JjXhlpi16rTPWx7L5EXyDaVcR3+unCZ8u9Q=";
};
vendorSha256 = "sha256-8Vf9JRahGkp8/5D5oDt0fnbeeLAD0q656XWdUDtceq8=";
vendorSha256 = "sha256-I9pA6rcdCZvDgR5gEx5t+VQcPltiFInWme3HlIdLz3U=";
subPackages = [ "." ];

16
pkgs/os-specific/linux/kernel/common-config.nix
View file

@ -54,7 +54,6 @@ let
DEBUG_DEVRES = no;
DYNAMIC_DEBUG = yes;
DEBUG_STACK_USAGE = no;
DEBUG_STACKOVERFLOW = option no;
RCU_TORTURE_TEST = no;
SCHEDSTATS = no;
DETECT_HUNG_TASK = yes;
@ -400,7 +399,7 @@ let
EXT4_FS_POSIX_ACL = yes;
EXT4_FS_SECURITY = yes;
EXT4_ENCRYPTION = option yes;
EXT4_ENCRYPTION = whenOlder "5.1" yes;
NTFS_FS = whenAtLeast "5.15" no;
NTFS3_LZX_XPRESS = whenAtLeast "5.15" yes;
@ -426,7 +425,7 @@ let
F2FS_FS = module;
F2FS_FS_SECURITY = option yes;
F2FS_FS_ENCRYPTION = option yes;
F2FS_FS_ENCRYPTION = whenOlder "5.1" yes;
F2FS_FS_COMPRESSION = whenAtLeast "5.6" yes;
UDF_FS = module;
@ -507,7 +506,7 @@ let
MODULE_SIG = no; # r13y, generates a random key during build and bakes it in
# Depends on MODULE_SIG and only really helps when you sign your modules
# and enforce signatures which we don't do by default.
SECURITY_LOCKDOWN_LSM = option no;
SECURITY_LOCKDOWN_LSM = whenAtLeast "5.4" no;
# provides a register of persistent per-UID keyrings, useful for encrypting storage pools in stratis
PERSISTENT_KEYRINGS = yes;
@ -620,10 +619,8 @@ let
XEN_PVH = option yes;
XEN_PVHVM = option yes;
XEN_SAVE_RESTORE = option yes;
XEN_SCRUB_PAGES = option yes;
XEN_SELFBALLOONING = option yes;
XEN_STUB = option yes;
XEN_TMEM = option yes;
XEN_SCRUB_PAGES = whenOlder "4.19" yes;
XEN_SELFBALLOONING = whenOlder "5.3" yes;
};
media = {
@ -709,7 +706,8 @@ let
LOCK_TORTURE_TEST = option no;
MTD_TESTS = option no;
NOTIFIER_ERROR_INJECTION = option no;
RCU_PERF_TEST = option no;
RCU_PERF_TEST = whenBetween "4.13" "5.9" no;
RCU_SCALE_TEST = whenAtLeast "5.10" no;
RCU_TORTURE_TEST = option no;
TEST_ASYNC_DRIVER_PROBE = option no;
WW_MUTEX_SELFTEST = option no;

53
pkgs/os-specific/linux/lkrg/default.nix Normal file
View file

@ -0,0 +1,53 @@
{ lib, stdenv, fetchpatch, fetchFromGitHub, kernel }:
let
isKernelRT = (kernel.structuredExtraConfig ? PREEMPT_RT) && (kernel.structuredExtraConfig.PREEMPT_RT == lib.kernel.yes);
in
stdenv.mkDerivation rec {
name = "${pname}-${version}-${kernel.version}";
pname = "lkrg";
version = "0.9.5";
src = fetchFromGitHub {
owner = "lkrg-org";
repo = "lkrg";
rev = "v${version}";
sha256 = "sha256-+yIKkTvfVbLnFBoXSKGebB1A8KqpaRmsLh8SsNuI9Dc=";
};
patches = [
(fetchpatch {
name = "fix-aarch64.patch";
url = "https://github.com/lkrg-org/lkrg/commit/a4e5c00f13f7081b346bc3736e4c035e3d17d3f7.patch";
sha256 = "sha256-DPscqi+DySHwFxGuGe7P2itPkoyb3XGu5Xp2S/ezP4Y=";
})
];
hardeningDisable = [ "pic" ];
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags = kernel.makeFlags ++ [
"KERNEL=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
dontConfigure = true;
prePatch = ''
substituteInPlace Makefile --replace "KERNEL := " "KERNEL ?= "
'';
installPhase = ''
runHook preInstall
install -D lkrg.ko $out/lib/modules/${kernel.modDirVersion}/extra/lkrg.ko
runHook postInstall
'';
meta = with lib; {
description = "LKRG Linux Kernel module";
longDescription = "LKRG performs runtime integrity checking of the Linux kernel and detection of security vulnerability exploits against the kernel.";
homepage = "https://lkrg.org/";
license = licenses.gpl2Only;
maintainers = with maintainers; [ chivay ];
platforms = platforms.linux;
broken = kernel.kernelOlder "5.10" || kernel.kernelAtLeast "6.1" || isKernelRT;
};
}

6
pkgs/tools/misc/chezmoi/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "chezmoi";
version = "2.27.1";
version = "2.27.2";
src = fetchFromGitHub {
owner = "twpayne";
repo = "chezmoi";
rev = "v${version}";
sha256 = "sha256-FyudjneWKbvXraytx+vpm58cJpULiAhgY77W6tEOaw0=";
sha256 = "sha256-H+9DFJm8V7MCeq7/iXNsCPe2NZFirf+nQfluihxNCFw=";
};
vendorSha256 = "sha256-XY5D74fIgOCLtnUpQf+kGYARuAulhlQIG7G+GriDOSw=";
vendorSha256 = "sha256-yfT32MxnzYQr+UXqZEgGLuAxbMDfc/PWhmhDUXAIRhA=";
doCheck = false;

8
pkgs/tools/misc/duf/default.nix
View file

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, buildGoModule }:
{ lib, fetchFromGitHub, buildGoModule, installShellFiles }:
buildGoModule rec {
pname = "duf";
@ -15,6 +15,12 @@ buildGoModule rec {
ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
installManPage duf.1
'';
meta = with lib; {
homepage = "https://github.com/muesli/duf/";
description = "Disk Usage/Free Utility";

6
pkgs/tools/security/faraday-agent-dispatcher/default.nix
View file

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "faraday-agent-dispatcher";
version = "2.3.0";
version = "2.4.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "infobyte";
repo = "faraday_agent_dispatcher";
rev = "refs/tags/${version}";
hash = "sha256-lsSpD3XJ6Yw9viRCRB7zhl/KTC6Nwle2vnZ9xWr4Ujo=";
hash = "sha256-gZXA+2zW25Dl8JmBgg7APZt6ZdpFOEFZXAkiZ+tn/4g=";
};
nativeBuildInputs = with python3.pkgs; [
@ -25,6 +25,7 @@ python3.pkgs.buildPythonApplication rec {
faraday-agent-parameters-types
faraday-plugins
itsdangerous
psutil
python-gvm
python-owasp-zap-v2-4
pyyaml
@ -64,6 +65,7 @@ python3.pkgs.buildPythonApplication rec {
meta = with lib; {
description = "Tool to send result from tools to the Faraday Platform";
homepage = "https://github.com/infobyte/faraday_agent_dispatcher";
changelog = "https://github.com/infobyte/faraday_agent_dispatcher/releases/tag/${version}";
license = with licenses; [ gpl3Only ];
maintainers = with maintainers; [ fab ];
};

5
pkgs/tools/security/faraday-cli/default.nix
View file

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "faraday-cli";
version = "2.1.7";
version = "2.1.8";
format = "setuptools";
src = fetchFromGitHub {
owner = "infobyte";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-kZqJVJ6XrCC3iDSTJP8AmIs4WkxiAFimFIexl0L/HT0=";
hash = "sha256-b2vFejsksLcEchUqo+kw01S+dT2UMD5MPAzSWmpREgQ=";
};
propagatedBuildInputs = with python3.pkgs; [
@ -44,6 +44,7 @@ python3.pkgs.buildPythonApplication rec {
meta = with lib; {
description = "Command Line Interface for Faraday";
homepage = "https://github.com/infobyte/faraday-cli";
changelog = "https://github.com/infobyte/faraday-cli/releases/tag/${version}";
license = with licenses; [ gpl3Only ];
maintainers = with maintainers; [ fab ];
};

7
pkgs/tools/system/automatic-timezoned/default.nix
View file

@ -5,20 +5,21 @@
rustPlatform.buildRustPackage rec {
pname = "automatic-timezoned";
version = "1.0.41";
version = "1.0.43";
src = fetchFromGitHub {
owner = "maxbrunet";
repo = pname;
rev = "v${version}";
sha256 = "sha256-KT1mVP2pMn6M8BPBdBgK94iLuAuoUwGo24L5IT5fVAQ=";
sha256 = "sha256-AZkLUGFl0XMh0ZLGz+ZSB1l/0VzcuCjy6OCHGF1OT4k=";
};
cargoSha256 = "sha256-hfhSbpNVJm6OE/wL3aPNRV+kJGIZnpoTh8e/trRG21c=";
cargoSha256 = "sha256-xAp9VI9SFhQfLYIybSRU50AzekZw6eItqNcKhaY4y7A=";
meta = with lib; {
description = "Automatically update system timezone based on location";
homepage = "https://github.com/maxbrunet/automatic-timezoned";
changelog = "https://github.com/maxbrunet/automatic-timezoned/blob/v${version}/CHANGELOG.md";
license = licenses.gpl3;
maintainers = with maintainers; [ maxbrunet ];
platforms = platforms.linux;

15
pkgs/top-level/all-packages.nix
View file

@ -22002,7 +22002,7 @@ with pkgs;
(import ../development/libraries/qt-5/5.12) {
inherit newScope;
inherit lib fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper;
inherit bison cups dconf harfbuzz libGL perl gtk3;
inherit bison cups dconf harfbuzz libGL perl gtk3 python2;
inherit (gst_all_1) gstreamer gst-plugins-base;
inherit darwin;
inherit buildPackages;
@ -22015,7 +22015,7 @@ with pkgs;
(import ../development/libraries/qt-5/5.14) {
inherit newScope;
inherit lib fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper;
inherit bison cups dconf harfbuzz libGL perl gtk3;
inherit bison cups dconf harfbuzz libGL perl gtk3 python2;
inherit (gst_all_1) gstreamer gst-plugins-base;
inherit darwin;
inherit buildPackages;
@ -22028,7 +22028,7 @@ with pkgs;
(import ../development/libraries/qt-5/5.15) {
inherit newScope;
inherit lib stdenv fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper;
inherit bison cups dconf harfbuzz libGL perl gtk3;
inherit bison cups dconf harfbuzz libGL perl gtk3 python3;
inherit (gst_all_1) gstreamer gst-plugins-base;
inherit darwin;
inherit buildPackages;
@ -28142,9 +28142,7 @@ with pkgs;
echoip = callPackage ../servers/echoip { };
eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse {
jdk = jdk11;
});
eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { });
ecpdap = callPackage ../development/embedded/fpga/ecpdap {
inherit (darwin.apple_sdk.frameworks) AppKit;
@ -37492,7 +37490,10 @@ with pkgs;
wacomtablet = libsForQt5.callPackage ../tools/misc/wacomtablet { };
wasmer = callPackage ../development/interpreters/wasmer { };
wasmer = callPackage ../development/interpreters/wasmer {
llvmPackages = llvmPackages_12;
inherit (darwin.apple_sdk.frameworks) CoreFoundation SystemConfiguration Security;
};
yabasic = callPackage ../development/interpreters/yabasic { };

2
pkgs/top-level/linux-kernels.nix
View file

@ -325,6 +325,8 @@ in {
liquidtux = callPackage ../os-specific/linux/liquidtux {};
lkrg = callPackage ../os-specific/linux/lkrg {};
v4l2loopback = callPackage ../os-specific/linux/v4l2loopback { };
lttng-modules = callPackage ../os-specific/linux/lttng-modules { };

2
pkgs/top-level/python-packages.nix
View file

@ -2082,6 +2082,8 @@ self: super: with self; {
cvelib = callPackage ../development/python-modules/cvelib { };
cvss = callPackage ../development/python-modules/cvss { };
cvxopt = callPackage ../development/python-modules/cvxopt { };
cvxpy = callPackage ../development/python-modules/cvxpy { };

2
pkgs/top-level/release-lib.nix
View file

@ -27,6 +27,7 @@ rec {
pkgs_x86_64_linux = packageSet' { system = "x86_64-linux"; };
pkgs_i686_linux = packageSet' { system = "i686-linux"; };
pkgs_aarch64_linux = packageSet' { system = "aarch64-linux"; };
pkgs_riscv64_linux = packageSet' { system = "riscv64-linux"; };
pkgs_aarch64_darwin = packageSet' { system = "aarch64-darwin"; };
pkgs_armv6l_linux = packageSet' { system = "armv6l-linux"; };
pkgs_armv7l_linux = packageSet' { system = "armv7l-linux"; };
@ -40,6 +41,7 @@ rec {
if system == "x86_64-linux" then pkgs_x86_64_linux
else if system == "i686-linux" then pkgs_i686_linux
else if system == "aarch64-linux" then pkgs_aarch64_linux
else if system == "riscv64-linux" then pkgs_riscv64_linux
else if system == "aarch64-darwin" then pkgs_aarch64_darwin
else if system == "armv6l-linux" then pkgs_armv6l_linux
else if system == "armv7l-linux" then pkgs_armv7l_linux