mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 19:21:04 +00:00
Merge master into staging-next
This commit is contained in:
commit
bea90dbee0
|
@ -1902,6 +1902,13 @@
|
||||||
githubId = 7745457;
|
githubId = 7745457;
|
||||||
name = "Astavie";
|
name = "Astavie";
|
||||||
};
|
};
|
||||||
|
asterismono = {
|
||||||
|
email = "cmiki@amono.me";
|
||||||
|
github = "AsterisMono";
|
||||||
|
githubId = 54884471;
|
||||||
|
name = "Chatnoir Miki";
|
||||||
|
matrix = "@mikiiki:matrix.org";
|
||||||
|
};
|
||||||
astro = {
|
astro = {
|
||||||
email = "astro@spaceboyz.net";
|
email = "astro@spaceboyz.net";
|
||||||
github = "astro";
|
github = "astro";
|
||||||
|
@ -8083,6 +8090,12 @@
|
||||||
githubId = 1162118;
|
githubId = 1162118;
|
||||||
name = "Harald Gliebe";
|
name = "Harald Gliebe";
|
||||||
};
|
};
|
||||||
|
hakan-demirli = {
|
||||||
|
email = "ehdemirli@proton.me";
|
||||||
|
github = "hakan-demirli";
|
||||||
|
githubId = 78746991;
|
||||||
|
name = "Emre Hakan Demirli";
|
||||||
|
};
|
||||||
hakuch = {
|
hakuch = {
|
||||||
email = "hakuch@gmail.com";
|
email = "hakuch@gmail.com";
|
||||||
github = "hakuch";
|
github = "hakuch";
|
||||||
|
|
|
@ -99,6 +99,10 @@ in
|
||||||
with subtest("sysusers group is created"):
|
with subtest("sysusers group is created"):
|
||||||
print(machine.succeed("getent group sysusers"))
|
print(machine.succeed("getent group sysusers"))
|
||||||
|
|
||||||
|
with subtest("Check files"):
|
||||||
|
print(machine.succeed("grpck -r"))
|
||||||
|
print(machine.succeed("pwck -r"))
|
||||||
|
|
||||||
|
|
||||||
machine.succeed("/run/current-system/specialisation/new-generation/bin/switch-to-configuration switch")
|
machine.succeed("/run/current-system/specialisation/new-generation/bin/switch-to-configuration switch")
|
||||||
|
|
||||||
|
@ -123,5 +127,9 @@ in
|
||||||
|
|
||||||
with subtest("new-group group is created after switching to new generation"):
|
with subtest("new-group group is created after switching to new generation"):
|
||||||
print(machine.succeed("getent group new-group"))
|
print(machine.succeed("getent group new-group"))
|
||||||
|
|
||||||
|
with subtest("Check files"):
|
||||||
|
print(machine.succeed("grpck -r"))
|
||||||
|
print(machine.succeed("pwck -r"))
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,14 +6,14 @@
|
||||||
|
|
||||||
python3.pkgs.buildPythonApplication rec {
|
python3.pkgs.buildPythonApplication rec {
|
||||||
pname = "ad-miner";
|
pname = "ad-miner";
|
||||||
version = "1.5.2";
|
version = "1.6.0";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Mazars-Tech";
|
owner = "Mazars-Tech";
|
||||||
repo = "AD_Miner";
|
repo = "AD_Miner";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-Xb0RFllg3oqW6PhUjRxDkgXd7lv7XD37FfBsnpxrN+s=";
|
hash = "sha256-kWIareupm0r48HGnESk5S/0IEKjDfHtXWi64ehjdAQ4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# All requirements are pinned
|
# All requirements are pinned
|
||||||
|
|
|
@ -4,19 +4,17 @@
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, rustPlatform
|
, rustPlatform
|
||||||
, testers
|
, testers
|
||||||
|
|
||||||
, cachix
|
, cachix
|
||||||
, darwin
|
, darwin
|
||||||
, libgit2
|
, libgit2
|
||||||
, nix
|
, nixVersions
|
||||||
, openssl
|
, openssl
|
||||||
, pkg-config
|
, pkg-config
|
||||||
|
|
||||||
, devenv # required to run version test
|
, devenv # required to run version test
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
devenv_nix = nix.overrideAttrs (old: {
|
devenv_nix = nixVersions.nix_2_24.overrideAttrs (old: {
|
||||||
version = "2.24-devenv";
|
version = "2.24-devenv";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "domenkozar";
|
owner = "domenkozar";
|
||||||
|
|
|
@ -100,7 +100,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
maintainers = with maintainers; [
|
maintainers = with maintainers; [
|
||||||
freezeboy
|
freezeboy
|
||||||
gepbird
|
gepbird
|
||||||
k900
|
|
||||||
];
|
];
|
||||||
license = licenses.sustainableUse;
|
license = licenses.sustainableUse;
|
||||||
mainProgram = "n8n";
|
mainProgram = "n8n";
|
||||||
|
|
|
@ -7,13 +7,13 @@
|
||||||
|
|
||||||
stdenvNoCC.mkDerivation {
|
stdenvNoCC.mkDerivation {
|
||||||
pname = "roddhjav-apparmor-rules";
|
pname = "roddhjav-apparmor-rules";
|
||||||
version = "0-unstable-2024-08-30";
|
version = "0-unstable-2024-09-08";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "roddhjav";
|
owner = "roddhjav";
|
||||||
repo = "apparmor.d";
|
repo = "apparmor.d";
|
||||||
rev = "fb29e8ba74aa9712b5b06c20e935a7f4cd208b8c";
|
rev = "2af1d06f183302037a10f62641b90ee644a65eaf";
|
||||||
hash = "sha256-zv+51x8vxsh3vXRPb1k6hCShYk7GQz6n0MAp7KFQbAw=";
|
hash = "sha256-L+Rj10SonsmoT7D1bi4VPMK//rdUEY7yhKX7eejo9+Q=";
|
||||||
};
|
};
|
||||||
|
|
||||||
dontConfigure = true;
|
dontConfigure = true;
|
||||||
|
|
36
pkgs/by-name/ro/route-detect/package.nix
Normal file
36
pkgs/by-name/ro/route-detect/package.nix
Normal file
|
@ -0,0 +1,36 @@
|
||||||
|
{
|
||||||
|
lib,
|
||||||
|
fetchFromGitHub,
|
||||||
|
python3,
|
||||||
|
semgrep,
|
||||||
|
}:
|
||||||
|
|
||||||
|
python3.pkgs.buildPythonApplication rec {
|
||||||
|
pname = "route-detect";
|
||||||
|
version = "0.8.0";
|
||||||
|
pyproject = true;
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "mschwager";
|
||||||
|
repo = "route-detect";
|
||||||
|
rev = "refs/tags/${version}";
|
||||||
|
hash = "sha256-4WkYjAQyteHJTJvSZoSfVUnBvsDQ3TWb5Ttp3uCgvdU=";
|
||||||
|
};
|
||||||
|
|
||||||
|
build-system = with python3.pkgs; [ poetry-core ];
|
||||||
|
|
||||||
|
dependencies = [ semgrep ];
|
||||||
|
|
||||||
|
nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ];
|
||||||
|
|
||||||
|
pythonImportsCheck = [ "routes" ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Find authentication (authn) and authorization (authz) security bugs in web application routes";
|
||||||
|
homepage = "https://github.com/mschwager/route-detect";
|
||||||
|
changelog = "https://github.com/mschwager/route-detect/blob/${src.rev}/CHANGELOG.md";
|
||||||
|
license = lib.licenses.bsd3;
|
||||||
|
maintainers = with lib.maintainers; [ fab ];
|
||||||
|
mainProgram = "routes";
|
||||||
|
};
|
||||||
|
}
|
75
pkgs/by-name/sq/sqlitestudio/package.nix
Normal file
75
pkgs/by-name/sq/sqlitestudio/package.nix
Normal file
|
@ -0,0 +1,75 @@
|
||||||
|
{
|
||||||
|
stdenv,
|
||||||
|
lib,
|
||||||
|
fetchFromGitHub,
|
||||||
|
libsForQt5,
|
||||||
|
readline,
|
||||||
|
tcl,
|
||||||
|
python3,
|
||||||
|
copyDesktopItems,
|
||||||
|
makeDesktopItem,
|
||||||
|
}:
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "sqlitestudio";
|
||||||
|
version = "3.4.4";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "pawelsalawa";
|
||||||
|
repo = "sqlitestudio";
|
||||||
|
rev = version;
|
||||||
|
hash = "sha256-5oBYv8WxyfVvvqr15XApvn6P/lBxR8b6E+2acRkvX0U=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs =
|
||||||
|
[ copyDesktopItems ]
|
||||||
|
++ (with libsForQt5.qt5; [
|
||||||
|
qmake
|
||||||
|
qttools
|
||||||
|
wrapQtAppsHook
|
||||||
|
]);
|
||||||
|
|
||||||
|
buildInputs =
|
||||||
|
[
|
||||||
|
readline
|
||||||
|
tcl
|
||||||
|
python3
|
||||||
|
]
|
||||||
|
++ (with libsForQt5.qt5; [
|
||||||
|
qtbase
|
||||||
|
qtsvg
|
||||||
|
qtdeclarative
|
||||||
|
qtscript
|
||||||
|
]);
|
||||||
|
|
||||||
|
qmakeFlags = [ "./SQLiteStudio3" ];
|
||||||
|
|
||||||
|
desktopItems = [
|
||||||
|
(makeDesktopItem {
|
||||||
|
name = "sqlitestudio";
|
||||||
|
desktopName = "SQLiteStudio";
|
||||||
|
exec = "sqlitestudio";
|
||||||
|
icon = "sqlitestudio";
|
||||||
|
comment = "Database manager for SQLite";
|
||||||
|
terminal = false;
|
||||||
|
startupNotify = false;
|
||||||
|
categories = [ "Development" ];
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
install -Dm755 \
|
||||||
|
./SQLiteStudio3/guiSQLiteStudio/img/sqlitestudio.svg \
|
||||||
|
$out/share/pixmaps/sqlitestudio.svg
|
||||||
|
'';
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Free, open source, multi-platform SQLite database manager";
|
||||||
|
homepage = "https://sqlitestudio.pl/";
|
||||||
|
license = lib.licenses.gpl3;
|
||||||
|
mainProgram = "sqlitestudio";
|
||||||
|
platforms = lib.platforms.linux;
|
||||||
|
maintainers = with lib.maintainers; [ asterismono ];
|
||||||
|
};
|
||||||
|
}
|
6184
pkgs/by-name/su/surfer/Cargo.lock
generated
Normal file
6184
pkgs/by-name/su/surfer/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load diff
77
pkgs/by-name/su/surfer/package.nix
Normal file
77
pkgs/by-name/su/surfer/package.nix
Normal file
|
@ -0,0 +1,77 @@
|
||||||
|
{
|
||||||
|
lib,
|
||||||
|
fetchFromGitLab,
|
||||||
|
rustPlatform,
|
||||||
|
pkg-config,
|
||||||
|
openssl,
|
||||||
|
wayland,
|
||||||
|
autoPatchelfHook,
|
||||||
|
libxkbcommon,
|
||||||
|
libGL,
|
||||||
|
libX11,
|
||||||
|
libXcursor,
|
||||||
|
libXi,
|
||||||
|
stdenv,
|
||||||
|
makeWrapper,
|
||||||
|
zenity,
|
||||||
|
}:
|
||||||
|
rustPlatform.buildRustPackage rec {
|
||||||
|
pname = "surfer";
|
||||||
|
version = "0.2.0";
|
||||||
|
|
||||||
|
src = fetchFromGitLab {
|
||||||
|
owner = "surfer-project";
|
||||||
|
repo = "surfer";
|
||||||
|
rev = "v${version}";
|
||||||
|
hash = "sha256-C5jyWLs7fdEn2oW5BORZYazQwjXNxf8ketYFwlVkHpA";
|
||||||
|
fetchSubmodules = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
pkg-config
|
||||||
|
autoPatchelfHook
|
||||||
|
makeWrapper
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
openssl
|
||||||
|
stdenv.cc.cc.lib
|
||||||
|
];
|
||||||
|
|
||||||
|
# Wayland and X11 libs are required at runtime since winit uses dlopen
|
||||||
|
runtimeDependencies = [
|
||||||
|
wayland
|
||||||
|
libxkbcommon
|
||||||
|
libGL
|
||||||
|
libX11
|
||||||
|
libXcursor
|
||||||
|
libXi
|
||||||
|
];
|
||||||
|
|
||||||
|
cargoLock = {
|
||||||
|
lockFile = ./Cargo.lock;
|
||||||
|
outputHashes = {
|
||||||
|
"codespan-0.12.0" = "sha256-3F2006BR3hyhxcUTaQiOjzTEuRECKJKjIDyXonS/lrE=";
|
||||||
|
"egui_skia-0.5.0" = "sha256-dpkcIMPW+v742Ov18vjycLDwnn1JMsvbX6qdnuKOBC4=";
|
||||||
|
"tracing-tree-0.2.0" = "sha256-/JNeAKjAXmKPh0et8958yS7joORDbid9dhFB0VUAhZc=";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# Avoid the network attempt from skia. See: https://github.com/cargo2nix/cargo2nix/issues/318
|
||||||
|
doCheck = false;
|
||||||
|
|
||||||
|
postFixup = ''
|
||||||
|
wrapProgram $out/bin/surfer \
|
||||||
|
--prefix PATH : ${lib.makeBinPath [ zenity ]}
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Extensible and Snappy Waveform Viewer";
|
||||||
|
homepage = "https://surfer-project.org/";
|
||||||
|
changelog = "https://gitlab.com/surfer-project/surfer/-/releases/v${version}";
|
||||||
|
license = lib.licenses.eupl12;
|
||||||
|
maintainers = with lib.maintainers; [ hakan-demirli ];
|
||||||
|
platforms = lib.platforms.linux;
|
||||||
|
mainProgram = "surfer";
|
||||||
|
};
|
||||||
|
}
|
35
pkgs/by-name/te/testlib/package.nix
Normal file
35
pkgs/by-name/te/testlib/package.nix
Normal file
|
@ -0,0 +1,35 @@
|
||||||
|
{
|
||||||
|
fetchFromGitHub,
|
||||||
|
stdenvNoCC,
|
||||||
|
lib,
|
||||||
|
nix-update-script,
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||||
|
pname = "testlib";
|
||||||
|
version = "0.9.41";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "MikeMirzayanov";
|
||||||
|
repo = "testlib";
|
||||||
|
rev = "refs/tags/${finalAttrs.version}";
|
||||||
|
hash = "sha256-AttzDYLDlpfL3Zvds6yBR/m6W/3UZKR+1LVylqOTQcw=";
|
||||||
|
};
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
install -Dt $out/include/testlib testlib.h
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
|
||||||
|
passthru.updateScript = nix-update-script { };
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "C++ library to develop competitive programming problems";
|
||||||
|
homepage = "https://github.com/MikeMirzayanov/testlib";
|
||||||
|
changelog = "https://github.com/MikeMirzayanov/testlib/releases/tag/${finalAttrs.version}";
|
||||||
|
license = lib.licenses.mit;
|
||||||
|
maintainers = with lib.maintainers; [ bot-wxt1221 ];
|
||||||
|
platforms = lib.platforms.all;
|
||||||
|
};
|
||||||
|
})
|
|
@ -10,18 +10,18 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "userborn";
|
pname = "userborn";
|
||||||
version = "0.1.0";
|
version = "0.2.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "nikstur";
|
owner = "nikstur";
|
||||||
repo = "userborn";
|
repo = "userborn";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-aptFDrL9RPPTu4wp2ee3LVaEruRdCWtLGIKdOgsR+/s=";
|
hash = "sha256-LEKdgmw1inBOi0sriG8laCrtx0ycqR5ftdnmszadx3U=";
|
||||||
};
|
};
|
||||||
|
|
||||||
sourceRoot = "${src.name}/rust/userborn";
|
sourceRoot = "${src.name}/rust/userborn";
|
||||||
|
|
||||||
cargoHash = "sha256-m39AC26E0Pxu1E/ap2kSwr5uznJNgExf5QUrZ+zTNX0=";
|
cargoHash = "sha256-Pjzu6db2WomNsC+jNK1fr1u7koZwUvWPIY5JHMo1gkA=";
|
||||||
|
|
||||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||||
|
|
||||||
|
@ -52,6 +52,7 @@ rustPlatform.buildRustPackage rec {
|
||||||
homepage = "https://github.com/nikstur/userborn";
|
homepage = "https://github.com/nikstur/userborn";
|
||||||
description = "Declaratively bear (manage) Linux users and groups";
|
description = "Declaratively bear (manage) Linux users and groups";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
|
platforms = platforms.linux;
|
||||||
maintainers = with lib.maintainers; [ nikstur ];
|
maintainers = with lib.maintainers; [ nikstur ];
|
||||||
mainProgram = "userborn";
|
mainProgram = "userborn";
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
{
|
{
|
||||||
"darwin": {
|
"darwin": {
|
||||||
"hash": "sha256-EDhj4Gb0ykFX8W2G8osusjggemcuHO7hkUKb151cQ6g=",
|
"hash": "sha256-EDu3BwNvCsy11pycqwDasSdV1g50fFQCa2eaax3mGTg=",
|
||||||
"version": "0.2024.08.20.08.02.stable_00"
|
"version": "0.2024.09.03.08.02.stable_03"
|
||||||
},
|
},
|
||||||
"linux_x86_64": {
|
"linux_x86_64": {
|
||||||
"hash": "sha256-Uk5pSoAvEppjLnskLc5/ftcCaiJnXATJfCPDP2QpBo8=",
|
"hash": "sha256-yG7Gr2B5VqDuZfB4RJZYZNt7SNOJ2HSwSCM+1iKhshc=",
|
||||||
"version": "0.2024.08.20.08.02.stable_00"
|
"version": "0.2024.09.03.08.02.stable_03"
|
||||||
},
|
},
|
||||||
"linux_aarch64": {
|
"linux_aarch64": {
|
||||||
"hash": "sha256-B0mUAwydIgi7Nhm/iUhEjkV3LL+qLfXZcOz6+7eDZGc=",
|
"hash": "sha256-gg5ACoABFesDUhdVBOlv+bQtliQ3N/RZlmzDMuONef8=",
|
||||||
"version": "0.2024.08.20.08.02.stable_00"
|
"version": "0.2024.09.03.08.02.stable_03"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
set -eu -o pipefail
|
set -eu -o pipefail
|
||||||
|
|
||||||
scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd)
|
scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd)
|
||||||
nixpkgs=$(realpath "$scriptDir"/../../../../..)
|
nixpkgs=$(realpath "$scriptDir"/../../../..)
|
||||||
|
|
||||||
echo >&2 "=== Obtaining version data from https://zoom.us/rest/download ..."
|
echo >&2 "=== Obtaining version data from https://zoom.us/rest/download ..."
|
||||||
linux_data=$(curl -Ls 'https://zoom.us/rest/download?os=linux' | jq .result.downloadVO)
|
linux_data=$(curl -Ls 'https://zoom.us/rest/download?os=linux' | jq .result.downloadVO)
|
||||||
|
@ -20,12 +20,12 @@ echo >&2 "=== Downloading packages and computing hashes..."
|
||||||
# by running `nix-build --system <architecture> -A zoom-us.src` which
|
# by running `nix-build --system <architecture> -A zoom-us.src` which
|
||||||
# causes cross compiling headaches; using nix-prefetch-url with
|
# causes cross compiling headaches; using nix-prefetch-url with
|
||||||
# hard-coded URLs is simpler. Keep these URLs in sync with the ones
|
# hard-coded URLs is simpler. Keep these URLs in sync with the ones
|
||||||
# in default.nix where `srcs` is defined.
|
# in package.nix where `srcs` is defined.
|
||||||
hash_aarch64_darwin=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "https://zoom.us/client/${version_aarch64_darwin}/zoomusInstallerFull.pkg?archType=arm64"))
|
hash_aarch64_darwin=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "https://zoom.us/client/${version_aarch64_darwin}/zoomusInstallerFull.pkg?archType=arm64"))
|
||||||
hash_x86_64_darwin=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "https://zoom.us/client/${version_x86_64_darwin}/zoomusInstallerFull.pkg"))
|
hash_x86_64_darwin=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "https://zoom.us/client/${version_x86_64_darwin}/zoomusInstallerFull.pkg"))
|
||||||
hash_x86_64_linux=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "https://zoom.us/client/${version_x86_64_linux}/zoom_x86_64.pkg.tar.xz"))
|
hash_x86_64_linux=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "https://zoom.us/client/${version_x86_64_linux}/zoom_x86_64.pkg.tar.xz"))
|
||||||
|
|
||||||
echo >&2 "=== Updating default.nix ..."
|
echo >&2 "=== Updating package.nix ..."
|
||||||
# update-source-version expects to be at the root of nixpkgs
|
# update-source-version expects to be at the root of nixpkgs
|
||||||
(cd "$nixpkgs" && update-source-version zoom-us "$version_aarch64_darwin" $hash_aarch64_darwin --system=aarch64-darwin --version-key=versions.aarch64-darwin)
|
(cd "$nixpkgs" && update-source-version zoom-us "$version_aarch64_darwin" $hash_aarch64_darwin --system=aarch64-darwin --version-key=versions.aarch64-darwin)
|
||||||
(cd "$nixpkgs" && update-source-version zoom-us "$version_x86_64_darwin" $hash_x86_64_darwin --system=x86_64-darwin --version-key=versions.x86_64-darwin)
|
(cd "$nixpkgs" && update-source-version zoom-us "$version_x86_64_darwin" $hash_x86_64_darwin --system=x86_64-darwin --version-key=versions.x86_64-darwin)
|
|
@ -11,6 +11,7 @@
|
||||||
release."0.1.9+8.17".sha256 = "sha256-BCsVRKSE9txeKgDfTsu7hQ6MebC+dX2AAqDF9iL7bYE=";
|
release."0.1.9+8.17".sha256 = "sha256-BCsVRKSE9txeKgDfTsu7hQ6MebC+dX2AAqDF9iL7bYE=";
|
||||||
release."0.2.0+8.18".sha256 = "sha256-OByBB1CLmj2N0AEieBXLVvP6OLGqi0HXra2jE9k3hXU=";
|
release."0.2.0+8.18".sha256 = "sha256-OByBB1CLmj2N0AEieBXLVvP6OLGqi0HXra2jE9k3hXU=";
|
||||||
release."0.2.0+8.19".sha256 = "sha256-G/UurWHxR2VzjClZCDHYcz7wAQAaYZt+DsADSXMybdk=";
|
release."0.2.0+8.19".sha256 = "sha256-G/UurWHxR2VzjClZCDHYcz7wAQAaYZt+DsADSXMybdk=";
|
||||||
|
release."0.2.0+8.20".sha256 = "sha256-+KRiYK+YCHC4R6/yDenRI8SqZiZ29X24xlDzegbPfrw=";
|
||||||
|
|
||||||
inherit version;
|
inherit version;
|
||||||
defaultVersion = with lib.versions; lib.switch coq.coq-version [
|
defaultVersion = with lib.versions; lib.switch coq.coq-version [
|
||||||
|
@ -18,6 +19,7 @@
|
||||||
{ case = isEq "8.17"; out = "0.1.9+8.17"; }
|
{ case = isEq "8.17"; out = "0.1.9+8.17"; }
|
||||||
{ case = isEq "8.18"; out = "0.2.0+8.18"; }
|
{ case = isEq "8.18"; out = "0.2.0+8.18"; }
|
||||||
{ case = isEq "8.19"; out = "0.2.0+8.19"; }
|
{ case = isEq "8.19"; out = "0.2.0+8.19"; }
|
||||||
|
{ case = isEq "8.20"; out = "0.2.0+8.20"; }
|
||||||
] null;
|
] null;
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
|
@ -6,7 +6,7 @@ mkCoqDerivation {
|
||||||
owner = "gappa";
|
owner = "gappa";
|
||||||
domain = "gitlab.inria.fr";
|
domain = "gitlab.inria.fr";
|
||||||
inherit version;
|
inherit version;
|
||||||
defaultVersion = if lib.versions.range "8.8" "8.19" coq.coq-version then "1.5.5" else null;
|
defaultVersion = if lib.versions.range "8.8" "8.20" coq.coq-version then "1.5.5" else null;
|
||||||
release."1.5.5".sha256 = "sha256-qxi2Kg3N3o6+ncq7aPNEg98dBmQC5WCa86zROPJSDdo=";
|
release."1.5.5".sha256 = "sha256-qxi2Kg3N3o6+ncq7aPNEg98dBmQC5WCa86zROPJSDdo=";
|
||||||
release."1.5.4".sha256 = "sha256-9PlkXqCu4rbFD7qnMF1GSpPCVmwJ3r593RfAvkJbbdA=";
|
release."1.5.4".sha256 = "sha256-9PlkXqCu4rbFD7qnMF1GSpPCVmwJ3r593RfAvkJbbdA=";
|
||||||
release."1.5.3".sha256 = "sha256-SuMopX5sm4jh2uBuE7zr6vhWhHYZYnab+epjqYJqg+s=";
|
release."1.5.3".sha256 = "sha256-SuMopX5sm4jh2uBuE7zr6vhWhHYZYnab+epjqYJqg+s=";
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
owner = "fbesson";
|
owner = "fbesson";
|
||||||
domain = "gitlab.inria.fr";
|
domain = "gitlab.inria.fr";
|
||||||
|
|
||||||
|
release."8.20.0".sha256 = "sha256-LYKGbI3O6yw6CiTJNUGL11PT4q4o+gJK1kQgKQL0/Hk=";
|
||||||
release."8.19.0".sha256 = "sha256-xKWCF4dYvvlJUVGCZcR2RLCG55vlGzu2GN30MeRvVD4=";
|
release."8.19.0".sha256 = "sha256-xKWCF4dYvvlJUVGCZcR2RLCG55vlGzu2GN30MeRvVD4=";
|
||||||
release."8.18.0".sha256 = "sha256-4mDDnKTeYrf27uRMkydQxO7j2tfgTFXOREW474d40eo=";
|
release."8.18.0".sha256 = "sha256-4mDDnKTeYrf27uRMkydQxO7j2tfgTFXOREW474d40eo=";
|
||||||
release."8.17.0".sha256 = "sha256-fgdnKchNT1Hyrq14gU8KWYnlSfg3qlsSw5A4+RoA26w=";
|
release."8.17.0".sha256 = "sha256-fgdnKchNT1Hyrq14gU8KWYnlSfg3qlsSw5A4+RoA26w=";
|
||||||
|
@ -14,6 +15,7 @@
|
||||||
release."8.13+no".sha256 = "sha256-gXoxtLcHPoyjJkt7WqvzfCMCQlh6kL2KtCGe3N6RC/A=";
|
release."8.13+no".sha256 = "sha256-gXoxtLcHPoyjJkt7WqvzfCMCQlh6kL2KtCGe3N6RC/A=";
|
||||||
inherit version;
|
inherit version;
|
||||||
defaultVersion = with lib.versions; lib.switch coq.coq-version [
|
defaultVersion = with lib.versions; lib.switch coq.coq-version [
|
||||||
|
{ case = isEq "8.20"; out = "8.20.0"; }
|
||||||
{ case = isEq "8.19"; out = "8.19.0"; }
|
{ case = isEq "8.19"; out = "8.19.0"; }
|
||||||
{ case = isEq "8.18"; out = "8.18.0"; }
|
{ case = isEq "8.18"; out = "8.18.0"; }
|
||||||
{ case = isEq "8.17"; out = "8.17.0"; }
|
{ case = isEq "8.17"; out = "8.17.0"; }
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
release = {
|
release = {
|
||||||
|
"8.20.0+0.20.0".sha256 = "sha256-Mll3m7CVfh52yA5zACDzMZk8lwhOONMMliqQ2l/ObKI=";
|
||||||
"8.19.0+0.19.3".sha256 = "sha256-QWRXBTcjtAGskZBeLIuX7WDE95KfH6SxV8MJSMx8B2Q=";
|
"8.19.0+0.19.3".sha256 = "sha256-QWRXBTcjtAGskZBeLIuX7WDE95KfH6SxV8MJSMx8B2Q=";
|
||||||
"8.18.0+0.18.3".sha256 = "sha256-3JGZCyn62LYJVpfXiwnSMxvdA2vQNTL7li2ZBPcjF0M=";
|
"8.18.0+0.18.3".sha256 = "sha256-3JGZCyn62LYJVpfXiwnSMxvdA2vQNTL7li2ZBPcjF0M=";
|
||||||
"8.17.0+0.17.3".sha256 = "sha256-XolzpJd8zs4LLyJO4eWvCiAJ0HJSGBJTGVSBClQRGnw=";
|
"8.17.0+0.17.3".sha256 = "sha256-XolzpJd8zs4LLyJO4eWvCiAJ0HJSGBJTGVSBClQRGnw=";
|
||||||
|
@ -17,10 +18,12 @@ in
|
||||||
|
|
||||||
(mkCoqDerivation {
|
(mkCoqDerivation {
|
||||||
pname = "serapi";
|
pname = "serapi";
|
||||||
|
owner = "ejgallego";
|
||||||
repo = "coq-serapi";
|
repo = "coq-serapi";
|
||||||
inherit version release;
|
inherit version release;
|
||||||
|
|
||||||
defaultVersion = lib.switch coq.version [
|
defaultVersion = lib.switch coq.version [
|
||||||
|
{ case = lib.versions.isEq "8.20"; out = "8.20.0+0.20.0"; }
|
||||||
{ case = lib.versions.isEq "8.19"; out = "8.19.0+0.19.3"; }
|
{ case = lib.versions.isEq "8.19"; out = "8.19.0+0.19.3"; }
|
||||||
{ case = lib.versions.isEq "8.18"; out = "8.18.0+0.18.3"; }
|
{ case = lib.versions.isEq "8.18"; out = "8.18.0+0.18.3"; }
|
||||||
{ case = lib.versions.isEq "8.17"; out = "8.17.0+0.17.3"; }
|
{ case = lib.versions.isEq "8.17"; out = "8.17.0+0.17.3"; }
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
inherit version;
|
inherit version;
|
||||||
defaultVersion = with lib.versions; lib.switch [coq.coq-version mathcomp-ssreflect.version] [
|
defaultVersion = with lib.versions; lib.switch [coq.coq-version mathcomp-ssreflect.version] [
|
||||||
{ cases = [(range "8.18" "8.19") (range "2.1.0" "2.2.0")]; out = "0.2.0"; }
|
{ cases = [(range "8.18" "8.19") (range "2.1.0" "2.2.0")]; out = "0.2.1"; }
|
||||||
# This is the original dependency:
|
# This is the original dependency:
|
||||||
# { cases = ["8.17" "1.18.0"]; out = "0.1.0"; }
|
# { cases = ["8.17" "1.18.0"]; out = "0.1.0"; }
|
||||||
# But it is not loadable. The math-comp nixpkgs configuration
|
# But it is not loadable. The math-comp nixpkgs configuration
|
||||||
|
@ -25,6 +25,7 @@
|
||||||
|
|
||||||
releaseRev = v: "v${v}";
|
releaseRev = v: "v${v}";
|
||||||
|
|
||||||
|
release."0.2.1".sha256 = "sha256-X00q5QFxdcGWeNqOV/PLTOqQyyfqFEinbGUTO7q8bC4=";
|
||||||
release."0.2.0".sha256 = "sha256-GDkWH0LUsW165vAUoYC5of9ndr0MbfBtmrPhsJVXi3o=";
|
release."0.2.0".sha256 = "sha256-GDkWH0LUsW165vAUoYC5of9ndr0MbfBtmrPhsJVXi3o=";
|
||||||
release."0.1.0".sha256 = "sha256-Yj+k+mBsudi3d6bRVlZLyM4UqQnzAX5tHvxtKoIuNTE=";
|
release."0.1.0".sha256 = "sha256-Yj+k+mBsudi3d6bRVlZLyM4UqQnzAX5tHvxtKoIuNTE=";
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "acquire";
|
pname = "acquire";
|
||||||
version = "3.15";
|
version = "3.16";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.9";
|
disabled = pythonOlder "3.9";
|
||||||
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||||
owner = "fox-it";
|
owner = "fox-it";
|
||||||
repo = "acquire";
|
repo = "acquire";
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-+bA/6CW/1k9JfkXBk/JKXgOlrVHcMcKggzOAHyjdkX0=";
|
hash = "sha256-wurnYHvzN5KfpikempYeztR9hkvGfRjR6M3tch6qFo4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [
|
build-system = [
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "dissect-hypervisor";
|
pname = "dissect-hypervisor";
|
||||||
version = "3.14";
|
version = "3.15";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.9";
|
disabled = pythonOlder "3.9";
|
||||||
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||||
owner = "fox-it";
|
owner = "fox-it";
|
||||||
repo = "dissect.hypervisor";
|
repo = "dissect.hypervisor";
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-27GfO1HEy9EWdWuPkznOjju6Xy3W2kjKDP0gF3NqYs0=";
|
hash = "sha256-bSDO8MMkDbyJ8ylB5PXmVHnzp/4UYQ4NKhOTXONVBzc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [
|
build-system = [
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "dissect-squashfs";
|
pname = "dissect-squashfs";
|
||||||
version = "1.6";
|
version = "1.7";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||||
owner = "fox-it";
|
owner = "fox-it";
|
||||||
repo = "dissect.squashfs";
|
repo = "dissect.squashfs";
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-XTVGhTnDtuYTAjEeliwYDjuKfP7ljHIxaQAsQI1x5lk=";
|
hash = "sha256-ZRMCh/ycF594pADnX01S9oVxuY/cnJa4LLXP4ARoDs0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [
|
build-system = [
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "dissect";
|
pname = "dissect";
|
||||||
version = "3.15";
|
version = "3.16";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.9";
|
disabled = pythonOlder "3.9";
|
||||||
|
@ -44,7 +44,7 @@ buildPythonPackage rec {
|
||||||
owner = "fox-it";
|
owner = "fox-it";
|
||||||
repo = "dissect";
|
repo = "dissect";
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-9LRF5WBaxCaj2MEa2q90294seAU+89p5t5JBVa3vb5w=";
|
hash = "sha256-Nj9PPhjj1kNNrZ1Lqt60O26z80HPD63EB1gKZ1ZiSeY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
pythonRelaxDeps = true;
|
pythonRelaxDeps = true;
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "lxmf";
|
pname = "lxmf";
|
||||||
version = "0.4.5";
|
version = "0.5.0";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||||
owner = "markqvist";
|
owner = "markqvist";
|
||||||
repo = "lxmf";
|
repo = "lxmf";
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-/qxAunSHNWCm3O9tBaEXZMkN2m8mZekSDFwQJHh++bM=";
|
hash = "sha256-X5QBWcmBq6RVDVGWop4nrlWXnui6asdvSdabT5YN3Ck=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [ setuptools ];
|
build-system = [ setuptools ];
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "nomadnet";
|
pname = "nomadnet";
|
||||||
version = "0.5.0";
|
version = "0.5.1";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||||
owner = "markqvist";
|
owner = "markqvist";
|
||||||
repo = "NomadNet";
|
repo = "NomadNet";
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-pYlEstApB0SYnkEfQ0kZl53xtbvTkRV+930TrCMqhbA=";
|
hash = "sha256-Tx6pcPGYItjTuWGnQc3O+O3HC1gld/2J5T4O63MOD+U=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [ setuptools ];
|
build-system = [ setuptools ];
|
||||||
|
|
|
@ -44,7 +44,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "optuna";
|
pname = "optuna";
|
||||||
version = "3.6.1";
|
version = "4.0.0";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -53,7 +53,7 @@ buildPythonPackage rec {
|
||||||
owner = "optuna";
|
owner = "optuna";
|
||||||
repo = "optuna";
|
repo = "optuna";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-+ZqMRIza4K5VWTUm7tC87S08SI+C8GKd2Uh3rGoHwd0=";
|
hash = "sha256-ZCK6otX90s8SB91TLkKwJ4net2dGmAKdIESeHXy87K0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, buildGraalvmNativeImage, graalvmCEPackages, removeReferencesTo, fetchurl
|
{ lib, buildGraalvmNativeImage, graalvmCEPackages, fetchurl
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildGraalvmNativeImage rec {
|
buildGraalvmNativeImage rec {
|
||||||
|
@ -13,15 +13,9 @@ buildGraalvmNativeImage rec {
|
||||||
|
|
||||||
graalvmDrv = graalvmCEPackages.graalvm-ce;
|
graalvmDrv = graalvmCEPackages.graalvm-ce;
|
||||||
|
|
||||||
nativeBuildInputs = [ removeReferencesTo ];
|
|
||||||
|
|
||||||
extraNativeImageBuildArgs =
|
extraNativeImageBuildArgs =
|
||||||
[ "-H:+ReportExceptionStackTraces" "--no-fallback" ];
|
[ "-H:+ReportExceptionStackTraces" "--no-fallback" ];
|
||||||
|
|
||||||
postInstall = ''
|
|
||||||
remove-references-to -t ${graalvmDrv} $out/bin/${pname}
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Linter for Clojure code that sparks joy";
|
description = "Linter for Clojure code that sparks joy";
|
||||||
homepage = "https://github.com/clj-kondo/clj-kondo";
|
homepage = "https://github.com/clj-kondo/clj-kondo";
|
||||||
|
|
|
@ -2,14 +2,14 @@
|
||||||
|
|
||||||
python3.pkgs.buildPythonApplication rec {
|
python3.pkgs.buildPythonApplication rec {
|
||||||
pname = "fedifetcher";
|
pname = "fedifetcher";
|
||||||
version = "7.1.6";
|
version = "7.1.7";
|
||||||
format = "other";
|
format = "other";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "nanos";
|
owner = "nanos";
|
||||||
repo = "FediFetcher";
|
repo = "FediFetcher";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-lnBiGBoG5ykKSP+F4NOqJKnvxaLU9oiV3KfbVnjgkgQ=";
|
hash = "sha256-1QLVhqyH0wb8om2pFJfmgJcYp9DTuT5KZpLy5InlRr8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = with python3.pkgs; [
|
propagatedBuildInputs = with python3.pkgs; [
|
||||||
|
|
|
@ -23454,6 +23454,8 @@ with pkgs;
|
||||||
|
|
||||||
serf = callPackage ../development/libraries/serf { };
|
serf = callPackage ../development/libraries/serf { };
|
||||||
|
|
||||||
|
sev-snp-measure = with python3Packages; toPythonApplication sev-snp-measure;
|
||||||
|
|
||||||
sfsexp = callPackage ../development/libraries/sfsexp { };
|
sfsexp = callPackage ../development/libraries/sfsexp { };
|
||||||
|
|
||||||
shhmsg = callPackage ../development/libraries/shhmsg { };
|
shhmsg = callPackage ../development/libraries/shhmsg { };
|
||||||
|
@ -34740,8 +34742,6 @@ with pkgs;
|
||||||
|
|
||||||
zita-njbridge = callPackage ../applications/audio/zita-njbridge { };
|
zita-njbridge = callPackage ../applications/audio/zita-njbridge { };
|
||||||
|
|
||||||
zoom-us = callPackage ../applications/networking/instant-messengers/zoom-us { };
|
|
||||||
|
|
||||||
zotero = callPackage ../applications/office/zotero { };
|
zotero = callPackage ../applications/office/zotero { };
|
||||||
|
|
||||||
zotero_7 = pkgs.zotero-beta;
|
zotero_7 = pkgs.zotero-beta;
|
||||||
|
|
Loading…
Reference in a new issue