Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
1505981287
@ -144,6 +144,20 @@ rec {
|
||||
*/
|
||||
concatLines = concatMapStrings (s: s + "\n");
|
||||
|
||||
/*
|
||||
Replicate a string n times,
|
||||
and concatenate the parts into a new string.
|
||||
|
||||
Type: replicate :: int -> string -> string
|
||||
|
||||
Example:
|
||||
replicate 3 "v"
|
||||
=> "vvv"
|
||||
replicate 5 "hello"
|
||||
=> "hellohellohellohellohello"
|
||||
*/
|
||||
replicate = n: s: concatStrings (lib.lists.replicate n s);
|
||||
|
||||
/* Construct a Unix-style, colon-separated search path consisting of
|
||||
the given `subDir` appended to each of the given paths.
|
||||
|
||||
|
||||
@ -191,6 +191,11 @@ runTests {
|
||||
expected = "a\nb\nc\n";
|
||||
};
|
||||
|
||||
testReplicateString = {
|
||||
expr = strings.replicate 5 "hello";
|
||||
expected = "hellohellohellohellohello";
|
||||
};
|
||||
|
||||
testSplitStringsSimple = {
|
||||
expr = strings.splitString "." "a.b.c.d";
|
||||
expected = [ "a" "b" "c" "d" ];
|
||||
|
||||
@ -4215,6 +4215,12 @@
|
||||
githubId = 12224254;
|
||||
name = "Delta";
|
||||
};
|
||||
delta231 = {
|
||||
email = "swstkbaranwal@gmail.com";
|
||||
github = "Delta456";
|
||||
githubId = 28479139;
|
||||
name = "Swastik Baranwal";
|
||||
};
|
||||
deltadelta = {
|
||||
email = "contact@libellules.eu";
|
||||
name = "Dara Ly";
|
||||
|
||||
@ -18,29 +18,16 @@ in {
|
||||
|
||||
options = {
|
||||
|
||||
hardware.enableAllFirmware = mkOption {
|
||||
default = false;
|
||||
type = types.bool;
|
||||
description = lib.mdDoc ''
|
||||
Turn on this option if you want to enable all the firmware.
|
||||
'';
|
||||
};
|
||||
hardware.enableAllFirmware = mkEnableOption "all firmware regardless of license";
|
||||
|
||||
hardware.enableRedistributableFirmware = mkOption {
|
||||
hardware.enableRedistributableFirmware = mkEnableOption "firmware with a license allowing redistribution" // {
|
||||
default = config.hardware.enableAllFirmware;
|
||||
defaultText = lib.literalExpression "config.hardware.enableAllFirmware";
|
||||
type = types.bool;
|
||||
description = lib.mdDoc ''
|
||||
Turn on this option if you want to enable all the firmware with a license allowing redistribution.
|
||||
'';
|
||||
};
|
||||
|
||||
hardware.wirelessRegulatoryDatabase = mkOption {
|
||||
default = false;
|
||||
type = types.bool;
|
||||
description = lib.mdDoc ''
|
||||
Load the wireless regulatory database at boot.
|
||||
'';
|
||||
hardware.wirelessRegulatoryDatabase = mkEnableOption "loading the wireless regulatory database at boot" // {
|
||||
default = cfg.enableRedistributableFirmware || cfg.enableAllFirmware;
|
||||
defaultText = literalMD "Enabled if proprietary firmware is allowed via {option}`enableRedistributableFirmware` or {option}`enableAllFirmware`.";
|
||||
};
|
||||
|
||||
};
|
||||
@ -65,7 +52,6 @@ in {
|
||||
++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [
|
||||
rtl8723bs-firmware
|
||||
];
|
||||
hardware.wirelessRegulatoryDatabase = true;
|
||||
})
|
||||
(mkIf cfg.enableAllFirmware {
|
||||
assertions = [{
|
||||
|
||||
@ -19,7 +19,7 @@ let
|
||||
{
|
||||
${pkgs.coreutils}/bin/cat << EOF
|
||||
From: smartd on ${host} <${nm.sender}>
|
||||
To: undisclosed-recipients:;
|
||||
To: ${nm.recipient}
|
||||
Subject: $SMARTD_SUBJECT
|
||||
|
||||
$SMARTD_FULLMESSAGE
|
||||
|
||||
@ -28,6 +28,15 @@ in {
|
||||
'';
|
||||
};
|
||||
|
||||
services.journald.storage = mkOption {
|
||||
default = "persistent";
|
||||
type = types.enum [ "persistent" "volatile" "auto" "none" ];
|
||||
description = mdDoc ''
|
||||
Controls where to store journal data. See
|
||||
{manpage}`journald.conf(5)` for further information.
|
||||
'';
|
||||
};
|
||||
|
||||
services.journald.rateLimitBurst = mkOption {
|
||||
default = 10000;
|
||||
type = types.int;
|
||||
@ -100,7 +109,7 @@ in {
|
||||
environment.etc = {
|
||||
"systemd/journald.conf".text = ''
|
||||
[Journal]
|
||||
Storage=persistent
|
||||
Storage=${cfg.storage}
|
||||
RateLimitInterval=${cfg.rateLimitInterval}
|
||||
RateLimitBurst=${toString cfg.rateLimitBurst}
|
||||
${optionalString (cfg.console != "") ''
|
||||
|
||||
@ -252,11 +252,10 @@ let
|
||||
text = ''
|
||||
${cfg.backend} rm -f ${name} || true
|
||||
${optionalString (isValidLogin container.login) ''
|
||||
cat ${container.login.passwordFile} | \
|
||||
${cfg.backend} login \
|
||||
${container.login.registry} \
|
||||
--username ${container.login.username} \
|
||||
--password-stdin
|
||||
--password-stdin < ${container.login.passwordFile}
|
||||
''}
|
||||
${optionalString (container.imageFile != null) ''
|
||||
${cfg.backend} load -i ${container.imageFile}
|
||||
|
||||
@ -10,7 +10,7 @@ import ./make-test-python.nix ({ lib, ... }:
|
||||
meta.maintainers = with lib.maintainers; [ minijackson erictapen ];
|
||||
|
||||
nodes.server =
|
||||
{ ... }:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
services.mobilizon = {
|
||||
enable = true;
|
||||
@ -25,6 +25,8 @@ import ./make-test-python.nix ({ lib, ... }:
|
||||
};
|
||||
};
|
||||
|
||||
services.postgresql.package = pkgs.postgresql_14;
|
||||
|
||||
security.pki.certificateFiles = [ certs.ca.cert ];
|
||||
|
||||
services.nginx.virtualHosts."${mobilizonDomain}" = {
|
||||
|
||||
@ -54,9 +54,8 @@ let
|
||||
services.postgresql = {
|
||||
enable = true;
|
||||
initialScript = pkgs.writeText "postgresql-init.sql" ''
|
||||
CREATE DATABASE bitwarden;
|
||||
CREATE USER bitwardenuser WITH PASSWORD '${dbPassword}';
|
||||
GRANT ALL PRIVILEGES ON DATABASE bitwarden TO bitwardenuser;
|
||||
CREATE DATABASE bitwarden WITH OWNER bitwardenuser;
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ lib, fetchFromGitHub, pythonPackages, mopidy }:
|
||||
{ lib, fetchFromGitHub, pythonPackages, mopidy, unstableGitUpdater }:
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
pname = "mopidy-spotify";
|
||||
version = "unstable-2023-04-21";
|
||||
version = "unstable-2023-11-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mopidy";
|
||||
repo = "mopidy-spotify";
|
||||
rev = "984151ac96c5f9c35892055bff20cc11f46092d5";
|
||||
hash = "sha256-4e9Aj0AOFR4/FK54gr1ZyPt0nYZDMrMetV4FPtBxapU=";
|
||||
rev = "48faaaa2642647b0152231798b46ccd9631694f5";
|
||||
hash = "sha256-RwkUdcbDU7/ndVnPteG/iXB2dloljvCHQlvPk4tacuA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -22,6 +22,8 @@ pythonPackages.buildPythonApplication rec {
|
||||
|
||||
pythonImportsCheck = [ "mopidy_spotify" ];
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/mopidy/mopidy-spotify";
|
||||
description = "Mopidy extension for playing music from Spotify";
|
||||
|
||||
@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kbt";
|
||||
version = "1.2.3";
|
||||
version = "2.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bloznelis";
|
||||
repo = "kbt";
|
||||
rev = version;
|
||||
hash = "sha256-AhMl8UuSVKLiIj+EnnmJX8iURjytLByDRLqDkgHGBr0=";
|
||||
hash = "sha256-G5/Sb/suTUkpR6OGlOawLVGLTthcrp78Y+5mxlndfA4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-pgdI+BoYrdSdQpVN0pH4QMcNAKbjbnrUbAmMpmtfd2s=";
|
||||
cargoHash = "sha256-7P93mttZ9W76lpGPKN33cgr4nEaHRlDQWov+TUbDHkM=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [
|
||||
pkg-config
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cloudflared";
|
||||
version = "2023.8.2";
|
||||
version = "2023.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = "cloudflared";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-8khwpGOBSpbAHnKeKFZUrJoE0dgQB3bN6Y/W2gwRfCM=";
|
||||
hash = "sha256-T+hxNvsckL8PAVb4GjXhnkVi3rXMErTjRgGxCUypwVA=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hubble";
|
||||
version = "0.12.1";
|
||||
version = "0.12.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cilium";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YJrL4fLJnTkfzZQp4MzPZL8ZZOGhFbHUzOpvaA5JrOA=";
|
||||
sha256 = "sha256-nnW0dLFPHex4fYJeBPFy8SP7Uc6cs5eN+dv0kIfCUYs=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "deck";
|
||||
version = "1.27.1";
|
||||
version = "1.28.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kong";
|
||||
repo = "deck";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9eMcbmRCr92ebJsPTyDFnwGn3gsRpR7aAkzV6Qfntgo=";
|
||||
hash = "sha256-glCZdaIsV8bim3iQuFKlIVmDm/YhDohVC6wIYvQuJAM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
@ -21,7 +21,7 @@ buildGoModule rec {
|
||||
];
|
||||
|
||||
proxyVendor = true; # darwin/linux hash mismatch
|
||||
vendorHash = "sha256-ikgD17+lnKpxCzrIkOXOq332X48qEdSWXIIRoq76fB4=";
|
||||
vendorHash = "sha256-tDaFceewyNW19HMmfdDC2qL12hUCw5TUa3TX5TXfvVo=";
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd deck \
|
||||
|
||||
@ -38,13 +38,13 @@
|
||||
|
||||
let
|
||||
pname = "pcloud";
|
||||
version = "1.14.1";
|
||||
code = "XZ5iuiVZQsuexQaMmmLAS7FGWNh1TkXRWJR7";
|
||||
version = "1.14.2";
|
||||
code = "XZAwMrVZidapyDxpd2pCNlGy3BcjdbYCf1Yk";
|
||||
|
||||
# Archive link's codes: https://www.pcloud.com/release-notes/linux.html
|
||||
src = fetchzip {
|
||||
url = "https://api.pcloud.com/getpubzip?code=${code}&filename=${pname}-${version}.zip";
|
||||
hash = "sha256-6IHt9qxMuDe9f1T+t8JXfPXLUCVe865Od8/ixPR3gso=";
|
||||
hash = "sha256-5dTo0/R+RA+C0PKzaCmcSy7YwzT3Qlwq1xMw6wPJt28=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
{ fetchurl, lib, stdenv, gtk, pkg-config, libofx, intltool, wrapGAppsHook
|
||||
, libsoup, gnome }:
|
||||
, libsoup_3, gnome }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "homebank";
|
||||
version = "5.6.6";
|
||||
version = "5.7.1";
|
||||
src = fetchurl {
|
||||
url = "http://homebank.free.fr/public/sources/homebank-${version}.tar.gz";
|
||||
hash = "sha256-ZW/N8YUU8r7SYY/+hqVYrqYW/KQqtuChfQJxXftl3A4=";
|
||||
hash = "sha256-fwqSnXde7yalqfKfo8AT8+762/aYLMCGp8dd3bm09Ck=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ];
|
||||
buildInputs = [ gtk libofx libsoup gnome.adwaita-icon-theme];
|
||||
buildInputs = [ gtk libofx libsoup_3 gnome.adwaita-icon-theme];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Free, easy, personal accounting for everyone";
|
||||
|
||||
@ -41,12 +41,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zotero";
|
||||
version = "6.0.27";
|
||||
version = "6.0.30";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
"https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
|
||||
hash = "sha256-+nCPLVVBkEu0g2Kxt/XYAt6sYxYm05nPcmPNS2OejRs=";
|
||||
hash = "sha256-4XQZ1xw9Qtk3SzHMsEUk+HuIYtHDAOMgpwzbAd5QQpU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
@ -153,6 +153,5 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.agpl3Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ i077 ];
|
||||
knownVulnerabilities = [ "CVE-2023-5217" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
openssl
|
||||
zlib
|
||||
lmdb
|
||||
(curl.override { inherit openssl; })
|
||||
curl
|
||||
wxGTK32
|
||||
];
|
||||
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "poethepoet";
|
||||
version = "0.24.1";
|
||||
version = "0.24.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nat-n";
|
||||
repo = "poethepoet";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cIIMwQF0jqGQhNyX2qDBeKZlUNvdC6sBTv5LCxk8MMQ=";
|
||||
hash = "sha256-tumEwaHXFLSXOmyQba4wBU5irvzZBL3BsCtF+Nlly+c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wiremock";
|
||||
version = "3.2.0";
|
||||
version = "3.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://maven/org/wiremock/wiremock-standalone/${version}/wiremock-standalone-${version}.jar";
|
||||
hash = "sha256-voO9UAxhxQlWWs4jMji93TBUCcFWht/4Cea+UpBmL3Q=";
|
||||
hash = "sha256-VgUJeQJeHNmmX1cS2s5hTljQZ8fIYr9uHYWMXjZjJzY=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "papirus-folders";
|
||||
version = "1.12.1";
|
||||
version = "1.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PapirusDevelopmentTeam";
|
||||
repo = "papirus-folders";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Dus9f2m5Wj46Url7N3UYEvBAankppzGzdJHGPH3CT3g=";
|
||||
sha256 = "sha256-BY1hnAGz31Deffy/EGKy/nuPKmpAA0u8FzPYgr1Plfs=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -57,15 +57,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
inherit arch platform hareflags;
|
||||
};
|
||||
in
|
||||
''
|
||||
runHook preConfigure
|
||||
''
|
||||
runHook preConfigure
|
||||
|
||||
export HARECACHE="$NIX_BUILD_TOP/.harecache"
|
||||
export BINOUT="$NIX_BUILD_TOP/.bin"
|
||||
cat ${config-file} > config.mk
|
||||
export HARECACHE="$NIX_BUILD_TOP/.harecache"
|
||||
export BINOUT="$NIX_BUILD_TOP/.bin"
|
||||
cat ${config-file} > config.mk
|
||||
|
||||
runHook postConfigure
|
||||
'';
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
@ -81,9 +81,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
qbe
|
||||
];
|
||||
in
|
||||
''
|
||||
wrapProgram $out/bin/hare --prefix PATH : ${binPath}
|
||||
'';
|
||||
''
|
||||
wrapProgram $out/bin/hare --prefix PATH : ${binPath}
|
||||
'';
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description =
|
||||
"A systems programming language designed to be simple, stable, and robust";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ onemoresuza ];
|
||||
inherit (harec.meta) platforms badPlatforms;
|
||||
};
|
||||
})
|
||||
|
||||
@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "http://harelang.org/";
|
||||
description = "Bootstrapping Hare compiler written in C for POSIX systems";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ onemoresuza ];
|
||||
# The upstream developers do not like proprietary operating systems; see
|
||||
# https://harelang.org/platforms/
|
||||
# UPDATE: https://github.com/hshq/harelang provides a MacOS port
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, fetchFromGitHub, glfw, freetype, openssl, makeWrapper, upx, boehmgc, xorg, binaryen, darwin }:
|
||||
|
||||
let
|
||||
version = "weekly.2023.42";
|
||||
version = "weekly.2023.44";
|
||||
ptraceSubstitution = ''
|
||||
#include <sys/types.h>
|
||||
#include <sys/ptrace.h>
|
||||
@ -9,12 +9,12 @@ let
|
||||
# Required for bootstrap.
|
||||
vc = stdenv.mkDerivation {
|
||||
pname = "v.c";
|
||||
version = "unstable-2023-10-17";
|
||||
version = "unstable-2023-10-30";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vlang";
|
||||
repo = "vc";
|
||||
rev = "bbfdece2ef5cab8a52b03c4df1ca0f803639069b";
|
||||
hash = "sha256-UdifiUDTivqJ94NJB25mF/xXeiEAE55QaIUwWwdAllQ=";
|
||||
rev = "66b89ab916c13c5781753797d1f4ff08e427bb6b";
|
||||
hash = "sha256-5Y7/rlcoIHjbf79A1rqFysNFc5+p6CY09MRPQalo7Ak=";
|
||||
};
|
||||
|
||||
# patch the ptrace reference for darwin
|
||||
@ -30,8 +30,8 @@ let
|
||||
markdown = fetchFromGitHub {
|
||||
owner = "vlang";
|
||||
repo = "markdown";
|
||||
rev = "3a173bee57a48dcfc1c0177555e45116befac48e";
|
||||
hash = "sha256-TWiCUMzAzHidtzXEYtUQ7uuksW+EIjE/fZ+s2Mr+uWI=";
|
||||
rev = "61c47ea0a6c0c79e973a119dcbab3b8fdd0973ca";
|
||||
hash = "sha256-XBD30Pc9CGXzU1Gy6U0pDpTozYVwfgAvZRjIsnXp8ZM=";
|
||||
};
|
||||
boehmgcStatic = boehmgc.override {
|
||||
enableStatic = true;
|
||||
@ -45,7 +45,7 @@ stdenv.mkDerivation {
|
||||
owner = "vlang";
|
||||
repo = "v";
|
||||
rev = version;
|
||||
hash = "sha256-sQ3M6tMufL560lvtWoa5f5MpOT4D8K5uq4kDPHNmUog=";
|
||||
hash = "sha256-1yFuheSyKfvm4GqKIbXycdzKx3XcD9LSmmuKlcJmteg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ glfw freetype openssl ]
|
||||
@ -111,7 +111,7 @@ stdenv.mkDerivation {
|
||||
homepage = "https://vlang.io/";
|
||||
description = "Simple, fast, safe, compiled language for developing maintainable software";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ Madouura ];
|
||||
maintainers = with maintainers; [ Madouura delta231 ];
|
||||
mainProgram = "v";
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "argparse";
|
||||
version = "2.9";
|
||||
version = "3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "p-ranav";
|
||||
repo = "argparse";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vbf4kePi5gfg9ub4aP1cCK1jtiA65bUS9+5Ghgvxt/E=";
|
||||
sha256 = "sha256-0fgMy7Q9BiQ/C1tmhuNpQgad8yzaLYxh5f6Ps38f2mk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -7,9 +7,12 @@
|
||||
, libtermkey
|
||||
, unibilium
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libtickit";
|
||||
let
|
||||
version = "0.4.3";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "libtickit";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "leonerd";
|
||||
@ -18,25 +21,33 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-QCrym8g5J1qwsFpU/PB8zZIWdM3YzOySknISSbQE4Sc=";
|
||||
};
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=$(out)"
|
||||
"LIBTOOL=${lib.getExe libtool}"
|
||||
patches = [
|
||||
# Disabled on darwin, since test assumes TERM=linux
|
||||
./001-skip-test-18term-builder-on-macos.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
libtool
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libtermkey
|
||||
unibilium
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ perl ];
|
||||
|
||||
patches = [
|
||||
./skipTestMacOS.patch
|
||||
makeFlags = [
|
||||
"LIBTOOL=${lib.getExe libtool}"
|
||||
];
|
||||
|
||||
installFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ callPackage }:
|
||||
|
||||
callPackage ./generic.nix {
|
||||
version = "2.28.4";
|
||||
hash = "sha256-88Lnj9NgS5PWg2hydvb9cwi6s6BG3UMvkUH2Ny1jmtE=";
|
||||
version = "2.28.5";
|
||||
hash = "sha256-Gl4UQMSvAwYbOi2b/AUMz+zgkOl1o0UA2VveF/3ek8o=";
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ callPackage }:
|
||||
|
||||
callPackage ./generic.nix {
|
||||
version = "3.4.1";
|
||||
hash = "sha256-NIjyRcVbg6lT6+RlTz5Jt6V9T85mvta5grOSLIAK9Ts=";
|
||||
version = "3.5.0";
|
||||
hash = "sha256-uHHQmaAmFS8Vd7PrAfRpK+aNi3pJ76XBC7rFWcd16NU=";
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "trompeloeil";
|
||||
version = "45";
|
||||
version = "46";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rollbear";
|
||||
repo = "trompeloeil";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oCDsvpH9P5onME/t+o7VGttk1cHUpneODz21/0RkVkk=";
|
||||
sha256 = "sha256-x/Chzho6RTfyOb/Is7bAM8KrvipEqQ/+a6pVCuTG108=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bandcamp-api";
|
||||
version = "0.2.2";
|
||||
version = "0.2.3";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "bandcamp_api";
|
||||
inherit version;
|
||||
hash = "sha256-v/iACVcBFC/3x4v7Q/1p+aHGhfw3AQ43eU3sKz5BskI=";
|
||||
hash = "sha256-7/WXMo7fCDMHATp4hEB8b7fNJWisUv06hbP+O878Phs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "einops";
|
||||
version = "0.6.1";
|
||||
version = "0.7.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "arogozhnikov";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+TaxaxOc5jAm79tIK0NHZ58HgcgdCANrSo/602YaF8E=";
|
||||
hash = "sha256-wCs3rMnYCk07kJ3iPItxwCQATflKBYHk6tfBCjiF+bc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ hatchling ];
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "globus-sdk";
|
||||
version = "3.29.0";
|
||||
version = "3.31.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "globus";
|
||||
repo = "globus-sdk-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-s5o7vp7D/b73QQyIebrFT2zlhpJKYQDDXpgmDgN0+Nk=";
|
||||
hash = "sha256-MJW0B3AXDYSVgNkv8iBA2+pOKrlI7pZeJfunMMxABx8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gspread";
|
||||
version = "5.11.3";
|
||||
version = "5.12.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "burnash";
|
||||
repo = "gspread";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-O6uhT8zfCGiGr0v8pEMZ4uLuDAdFpiTie7EC3rphZQI=";
|
||||
hash = "sha256-v6kpje5rw3/OfcoMWdSCZdkmETyIJ08cly8lLUt9j64=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hg-evolve";
|
||||
version = "11.0.2";
|
||||
version = "11.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-qDURFcDm7zvDEv1Z+aoXtFfbilul6q6KlkjBvhkeYkM=";
|
||||
hash = "sha256-sMvHvHwLuMT0LaH2XFDePuePbwCXjvl66QGdERR0k6g=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "holoviews";
|
||||
version = "1.17.1";
|
||||
version = "1.18.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-yjDGYVCLIunowRnbw+Sl2FGYe0PDBWXbGAspHY/XcKQ=";
|
||||
hash = "sha256-urcpYat6GHlNsmk1HZBVI/Kq3K1ZOzIVEpJ86T3J35E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jc";
|
||||
version = "1.23.5";
|
||||
version = "1.23.6";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kellyjonbrazil";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-lIIUJL9NOtDpPQeuFi9xvFG0fPzYYEBv40s7Q+JSmN8=";
|
||||
hash = "sha256-vAPWMv5vYFl45ZTl+p4HHAXeZ/10VSvubKINoyGPRq4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ];
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "manifestoo-core";
|
||||
version = "1.0";
|
||||
version = "1.3";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "manifestoo_core";
|
||||
hash = "sha256-cnEbws2NDxVkLEgLsYw2VQQWP69nC1SVixl9a6vHPmo=";
|
||||
hash = "sha256-psgUg55NiyONo3ob4UIMrO793UrxGMZV73hj4HRCR8E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "manimpango";
|
||||
version = "0.4.4";
|
||||
version = "0.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "ManimCommunity";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-M7Wd4s9q+oNioi4JlcQcKSyLRliGgoMzkiXcIznpR5o=";
|
||||
hash = "sha256-EBSbvjQyQIXOzvQMbuTwOoV8xSAOYDlCBZ56NLneuQI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mkdocs-swagger-ui-tag";
|
||||
version = "0.6.5";
|
||||
version = "0.6.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "Blueswen";
|
||||
repo = "mkdocs-swagger-ui-tag";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-08/nwJC7p5pwSXJicoJbZ8Xsc3yOvxWxzaCIS6aQ9uI=";
|
||||
hash = "sha256-NEFogrLJjOh98rChlJuxAeTj31yyL4OoE/jBUcHbBZM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nunavut";
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-+wqQ7JKC4aSgdM8YcYlO289CRpwX4VPxVqNlSABJJ0U=";
|
||||
hash = "sha256-23C3biUUs10Po5qzn3EFaq4+HeWCXIC6WzxOKy59VgM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyoverkiz";
|
||||
version = "1.12.2";
|
||||
version = "1.13.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "iMicknl";
|
||||
repo = "python-overkiz-api";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-TmdiUca87ViuBHB3ZvD3kv1VjKSmYx1G78Uowf3/w5Q=";
|
||||
hash = "sha256-3sfsaVf7yatxsfxbKPTewi8hGSW5IJP1jczBGz6Qqmw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "radian";
|
||||
version = "0.6.7";
|
||||
version = "0.6.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "randy3k";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-MEstbQj1dOcrukgDvMwL330L9INEZcIupebrSYMOrZk=";
|
||||
hash = "sha256-zI6oUHO4rY/BbbHhvzSNIKCpTDRm0cK46rIKN/ISgY0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rchitect";
|
||||
version = "0.4.2";
|
||||
version = "0.4.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "randy3k";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-e0xCUp5WBP4UKPkwPfrouNNYTBEnhlHHlkBQmghQfdk=";
|
||||
hash = "sha256-igrYMgPemYVGDR+eWiqtxFxFjroCyOfKEU0wj8D7ZS8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -40,7 +40,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sentry-sdk";
|
||||
version = "1.32.0";
|
||||
version = "1.33.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -49,7 +49,7 @@ buildPythonPackage rec {
|
||||
owner = "getsentry";
|
||||
repo = "sentry-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-chDgy3U29X/xk+aQok9uODcN0iAds1H39yXk98/3Yzc=";
|
||||
hash = "sha256-a73SZssiS1i3pfble0dMw6st5Hq4AIdJA+dnT617kXg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
with skawarePackages;
|
||||
let
|
||||
version = "2.9.3.0";
|
||||
version = "2.9.4.0";
|
||||
|
||||
# Maintainer of manpages uses following versioning scheme: for every
|
||||
# upstream $version he tags manpages release as ${version}.1, and,
|
||||
@ -19,7 +19,7 @@ in buildPackage {
|
||||
inherit version;
|
||||
|
||||
pname = "execline";
|
||||
sha256 = "yAJ/pwki0RfN7ozCDSd+ONA/2WDm0TbYzsMmA9TsI40=";
|
||||
sha256 = "mrVdVhU536dv9Kl5BvqZX8SiiOPeUiXLGp2PqenrxJs=";
|
||||
|
||||
description = "A small scripting language, to be used in place of a shell in non-interactive scripts";
|
||||
|
||||
|
||||
@ -4,8 +4,8 @@ with skawarePackages;
|
||||
|
||||
buildPackage {
|
||||
pname = "mdevd";
|
||||
version = "0.1.6.2";
|
||||
sha256 = "rC/PkATweQRZLFiU4sQB4VuwJ+zze8uOpmHip5k0R74=";
|
||||
version = "0.1.6.3";
|
||||
sha256 = "9uzw73zUjQTvx1rLLa2WfYULyIFb2wCY8cnvBDOU1DA=";
|
||||
|
||||
description = "mdev-compatible Linux hotplug manager daemon";
|
||||
platforms = lib.platforms.linux;
|
||||
|
||||
@ -4,8 +4,8 @@ with skawarePackages;
|
||||
|
||||
buildPackage {
|
||||
pname = "nsss";
|
||||
version = "0.2.0.3";
|
||||
sha256 = "seOX7VsydhGnwsjB3GDpH+81PFT+rUZPiHcgvAkUFI4=";
|
||||
version = "0.2.0.4";
|
||||
sha256 = "ObUE+FvY9rUj0zTlz6YsAqOV2zWZG3XyBt8Ku9Z2Gq0=";
|
||||
|
||||
description = "An implementation of a subset of the pwd.h, group.h and shadow.h family of functions.";
|
||||
|
||||
|
||||
@ -4,8 +4,8 @@ with skawarePackages;
|
||||
|
||||
buildPackage {
|
||||
pname = "s6-dns";
|
||||
version = "2.3.5.5";
|
||||
sha256 = "VpebXVElw4BxqAtePfDUprKnxSu4Y6JBC249eX/+Hug=";
|
||||
version = "2.3.6.0";
|
||||
sha256 = "AefHUyzF56a4kVRhsBwvcGt/IhF4KSPiXqpU7gxtx8c=";
|
||||
|
||||
description = "A suite of DNS client programs and libraries for Unix systems";
|
||||
|
||||
|
||||
@ -4,8 +4,8 @@ with skawarePackages;
|
||||
|
||||
buildPackage {
|
||||
pname = "s6-linux-init";
|
||||
version = "1.1.1.0";
|
||||
sha256 = "rUg/NTJleQB+Wn48ufH9EXfq9x7FwRxHzXhKBClWqO4=";
|
||||
version = "1.1.2.0";
|
||||
sha256 = "sha256-Ea4I0KZiELXla2uu4Pa5sbafvtsF/aEoWxFaMcpGx38=";
|
||||
|
||||
description = "A set of minimalistic tools used to create a s6-based init system, including a /sbin/init binary, on a Linux kernel";
|
||||
platforms = lib.platforms.linux;
|
||||
|
||||
@ -4,8 +4,8 @@ with skawarePackages;
|
||||
|
||||
buildPackage {
|
||||
pname = "s6-linux-utils";
|
||||
version = "2.6.1.2";
|
||||
sha256 = "2GPcXXgt535GUEFFGI+1fbsLZiUGF6Z9NB6wy0qdnNk=";
|
||||
version = "2.6.2.0";
|
||||
sha256 = "j5RGM8qH09I+DwPJw4PRUC1QjJusFtOMP79yOl6rK7c=";
|
||||
|
||||
description = "A set of minimalistic Linux-specific system utilities";
|
||||
platforms = lib.platforms.linux;
|
||||
|
||||
@ -19,8 +19,8 @@ assert sslSupportEnabled -> sslLibs ? ${sslSupport};
|
||||
|
||||
buildPackage {
|
||||
pname = "s6-networking";
|
||||
version = "2.5.1.3";
|
||||
sha256 = "oJ5DyVn/ngyqj/QAJgjnPA9X+H8EqNnCTmya/v5F6Xc=";
|
||||
version = "2.6.0.0";
|
||||
sha256 = "MdHWj7BdY5zr6VFLui9npU5YAfJsDRYvh1XNSxYuGLA=";
|
||||
|
||||
description = "A suite of small networking utilities for Unix systems";
|
||||
|
||||
|
||||
@ -4,8 +4,8 @@ with skawarePackages;
|
||||
|
||||
buildPackage {
|
||||
pname = "s6-portable-utils";
|
||||
version = "2.3.0.2";
|
||||
sha256 = "hxQmkTTwEmUNqsBA5WRjct6lZYucDYmnygO7Kr7E0eg=";
|
||||
version = "2.3.0.3";
|
||||
sha256 = "PkSSBV0WDCX7kBU/DvwnfX1Sv5gbvj6i6d/lHEk1Yf8=";
|
||||
|
||||
description = "A set of tiny general Unix utilities optimized for simplicity and small size";
|
||||
|
||||
|
||||
@ -4,8 +4,8 @@ with skawarePackages;
|
||||
|
||||
buildPackage {
|
||||
pname = "s6-rc";
|
||||
version = "0.5.4.1";
|
||||
sha256 = "1yaMq3xUIzBc+VmKM9T82rijFZUrPsgPechbjLdhWPY=";
|
||||
version = "0.5.4.2";
|
||||
sha256 = "AL36WW+nFhUS6XLskoKiq9j9DjHwkXe616K8PY8oOYI=";
|
||||
|
||||
description = "A service manager for s6-based systems";
|
||||
platforms = lib.platforms.unix;
|
||||
|
||||
@ -4,8 +4,8 @@ with skawarePackages;
|
||||
|
||||
buildPackage {
|
||||
pname = "s6";
|
||||
version = "2.11.3.2";
|
||||
sha256 = "fBYTitLw/74O0q6N0M7K2p98eH7dM6aQhNIZEQaT33Q=";
|
||||
version = "2.12.0.0";
|
||||
sha256 = "sha256-mBjDqeIYGSQGJw9B00K+23oZ8Z3gBbqzxitACTAz72w=";
|
||||
|
||||
description = "skarnet.org's small & secure supervision software suite";
|
||||
|
||||
@ -35,7 +35,6 @@ buildPackage {
|
||||
rm $(find -type f -mindepth 1 -maxdepth 1 -executable)
|
||||
rm libs6.*
|
||||
rm ./libs6auto.a.xyzzy
|
||||
rm ./libs6lockd.a.xyzzy
|
||||
|
||||
mv doc $doc/share/doc/s6/html
|
||||
mv examples $doc/share/doc/s6/examples
|
||||
|
||||
@ -4,8 +4,8 @@ with skawarePackages;
|
||||
|
||||
buildPackage {
|
||||
pname = "skalibs";
|
||||
version = "2.13.1.1";
|
||||
sha256 = "snKhq3mff6xEubT7Ws54qWFrL+SIIVl1S4CIxNgZnjM=";
|
||||
version = "2.14.0.0";
|
||||
sha256 = "p0X9NM+EvsdDmO/6G29MOcVXNnM5ObEmA45SstXcwdI=";
|
||||
|
||||
description = "A set of general-purpose C programming libraries";
|
||||
|
||||
|
||||
@ -4,8 +4,8 @@ with skawarePackages;
|
||||
|
||||
buildPackage {
|
||||
pname = "utmps";
|
||||
version = "0.1.2.1";
|
||||
sha256 = "BCPfx0vxOQ5G4uDCECIbsgX8247yMn5x7QhQd3xdyb0=";
|
||||
version = "0.1.2.2";
|
||||
sha256 = "sha256-9/+jcUxllzu5X7zxUBwG/AR42TpRzqGzc+xoEcJCX1I=";
|
||||
|
||||
description = "A secure utmpx and wtmp implementation";
|
||||
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kdoctor";
|
||||
version = "1.0.1";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Kotlin/${finalAttrs.pname}/releases/download/v${finalAttrs.version}/kdoctor_${finalAttrs.version}+92.zip";
|
||||
hash = "sha256-rGK5U1JeXID9OcT8uzO3oO6f9MZgrW69LUHbEtj0SSQ=";
|
||||
url = "https://github.com/Kotlin/${finalAttrs.pname}/releases/download/v${finalAttrs.version}/kdoctor_${finalAttrs.version}+97.zip";
|
||||
hash = "sha256-H4lpdMf1AIU8BC+6DlvcwM1wLuEl+Hd9xBli/TGFMV4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "vhdl-ls";
|
||||
version = "0.66.0";
|
||||
version = "0.67.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VHDL-LS";
|
||||
repo = "rust_hdl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tVeGfPm5WdZjARp7n4WD3YQzMUWA3M3TJo2oVivtkiA=";
|
||||
hash = "sha256-3ixU1OWRgDNG4aFAZTqqTSt1Hw41mB+mScVsozA01gM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-bXz216QvTpBuUNAi5sF0Lga+1ubjlokqPglUyAVXThg=";
|
||||
cargoHash = "sha256-SDXWFb0SDMqAmKrPOUryiMgPxv0yffcrqFVvFt4VPS4=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace vhdl_lang/src/config.rs \
|
||||
|
||||
@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
|
||||
buildInputs = [
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
darwin.apple_sdk.frameworks.SystemConfiguration
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "scip";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sourcegraph";
|
||||
repo = "scip";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8CH5rIWvCXZGspAyF6c8Qs/gntpfdpPrxrvxW3bZ/ww=";
|
||||
hash = "sha256-lZ3W2Z69P5QQN+PgF9+Apj/uEXWaTS+5QOg17m1mGPU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3Tq2cexcxHjaH6WIz2hneE1QeBSGoMINBncKbqxODxQ=";
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "symfony-cli";
|
||||
version = "5.7.0";
|
||||
vendorHash = "sha256-Sq3Cr/iVW3OSHLujnR2fE5ZtJhYLiobkmKXKz8hjSus=";
|
||||
version = "5.7.2";
|
||||
vendorHash = "sha256-xC5EHP4Zb9lgvbxVkoVBxdQ4+f34zqRf4XapntZMTTc=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "symfony-cli";
|
||||
repo = "symfony-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wq+4czVQXQHV2Ci0zUV66+RiRREWawjH4i1i18T8RrA=";
|
||||
hash = "sha256-2/2Hx+9MnnY4GMm/Zt6ssCTdtYgcP1gPRXe1yQMgXTE=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "twilio-cli";
|
||||
version = "5.15.0";
|
||||
version = "5.16.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz";
|
||||
sha256 = "sha256-KV5afgfQmQOJAPLNUjELB0+JZ8Qlz9wqOphZm/IBJcc=";
|
||||
sha256 = "sha256-J/0g0HLn25KwQvphCq32qgX4Pdu+OmZT3UImcTS1o1M=";
|
||||
};
|
||||
|
||||
buildInputs = [ nodejs ];
|
||||
|
||||
@ -13,16 +13,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "deno";
|
||||
version = "1.37.2";
|
||||
version = "1.38.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "denoland";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-F04Dxt3pLtUaku6bWGDSwJQwk/NUyBfZPhT7zLyBq48=";
|
||||
hash = "sha256-x01KggCu/sJnVvfJW/NZ+ARcl2Nl9LKn9dPBVmZcLi4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-PfChqb2yMFk4HAAspkKHjstlxCTkEA2k+VRMf8MVwTw=";
|
||||
cargoHash = "sha256-PEKdQoAYhPpeHfv2pKGTsNaA1EANpf/GJw/3s+6TCoA=";
|
||||
|
||||
postPatch = ''
|
||||
# upstream uses lld on aarch64-darwin for faster builds
|
||||
|
||||
@ -11,11 +11,11 @@ let
|
||||
};
|
||||
in
|
||||
fetch_librusty_v8 {
|
||||
version = "0.79.2";
|
||||
version = "0.81.0";
|
||||
shas = {
|
||||
x86_64-linux = "sha256-efpB4BayPvB7KrP9v+U/jlS+Vs7QeURmPm5dnGmDD8Q=";
|
||||
aarch64-linux = "sha256-agtWSohMkkhxfKU+BQvHXomZSxVQLafma4IfiDO7vvo=";
|
||||
x86_64-darwin = "sha256-UWZAm7punliDUOOdD+vqZXpChyMXw5AMw8kgJ6nclzs=";
|
||||
aarch64-darwin = "sha256-p8lulv3E9A48nMH1KdROSY0L3Q/hqPVtTp9qIpUl1SM=";
|
||||
x86_64-linux = "sha256-e77LYm/sus7EY4eiRuEp6G25djDaT4wSD4FBCxy4vcE=";
|
||||
aarch64-linux = "sha256-wPfUcuT2Z2sy5nLf8xR3QjGQKk6OsM/45jnYv/Hw+Zs=";
|
||||
x86_64-darwin = "sha256-UbnRiywM7b7q3rITZzNeWAuKU+HXXAqVapQ9j5ND6go=";
|
||||
aarch64-darwin = "sha256-42d3VGBv5lW1InfzYfWr6Xj0GpyJ6GWswVNtUa8ID30=";
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildOpenRAEngine {
|
||||
build = "release";
|
||||
version = "20230225";
|
||||
sha256 = "sha256-f1OwyxNNn1Wh5sfz4s81bbHDY6ot2tvjMD8EK87Hc7k=";
|
||||
version = "20231010";
|
||||
sha256 = "sha256-klJkRoDLTcU7j2iwo4yT9CaKy8QXWDkYw7ApkopSDNM=";
|
||||
deps = ./deps.nix;
|
||||
}
|
||||
|
||||
29
pkgs/games/openra/engines/release/deps.nix
generated
29
pkgs/games/openra/engines/release/deps.nix
generated
@ -3,29 +3,27 @@
|
||||
|
||||
{ fetchNuGet }: [
|
||||
(fetchNuGet { pname = "DiscordRichPresence"; version = "1.1.3.18"; sha256 = "0p4bhaggjjfd4gl06yiphqgncxgcq2bws4sjkrw0n2ldf3hgrps3"; })
|
||||
(fetchNuGet { pname = "Linguini.Bundle"; version = "0.3.1"; sha256 = "14dz8idlr8pxv1psqbc4v3v460naj2kixwv2kwr5y11v4dj6vnvj"; })
|
||||
(fetchNuGet { pname = "Linguini.Shared"; version = "0.3.0"; sha256 = "0hvml8qkb73408aqyb49dp6b168jrr6g1n0qszdhmgax4mgxdqxf"; })
|
||||
(fetchNuGet { pname = "Linguini.Syntax"; version = "0.3.0"; sha256 = "1qgj6vbdjjl30cqcyn8df30jj15c2ahj7clgb5fwcja47mnw3jd8"; })
|
||||
(fetchNuGet { pname = "Linguini.Bundle"; version = "0.5.0"; sha256 = "0515ifvvqhmhwdf7kw1wpamxn588hi150v6b8p4jfmr07y1dc4ml"; })
|
||||
(fetchNuGet { pname = "Linguini.Shared"; version = "0.5.0"; sha256 = "1y45lf6ipa53469sdz110d16rxfyrkdr2xscgagwg07lr2833nbb"; })
|
||||
(fetchNuGet { pname = "Linguini.Syntax"; version = "0.5.0"; sha256 = "06438fc5mizi702n8d7pqa21n5i7kwl1bwzxfy1l883j9gh64gjp"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "6.0.0"; sha256 = "08c4fh1n8vsish1vh7h73mva34g0as4ph29s4lvps7kmjb4z64nl"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.1"; sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.2"; sha256 = "0i42rn8xmvhn08799manpym06kpw89qy9080myyy2ngy565pqh0a"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net461"; version = "1.0.2"; sha256 = "0js3dp26nszx82q0phv7hmsm5z23dva7javbmk6a91lbkm07y8p2"; })
|
||||
(fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; })
|
||||
(fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; })
|
||||
(fetchNuGet { pname = "Mono.Nat"; version = "3.0.3"; sha256 = "1b3alh1wz28y62cflwl1jppigv499cndm8sds32xsmvwpdwiq4yl"; })
|
||||
(fetchNuGet { pname = "Mono.Nat"; version = "3.0.4"; sha256 = "10zvyq60wy02q21dszrk1h3ww23b7bkgjxaapx1ans4d9nwsmlrm"; })
|
||||
(fetchNuGet { pname = "MP3Sharp"; version = "1.0.5"; sha256 = "14h506d27g5j5c374dvw7iwn9sl0p7xp58kk95dacnpkzk0hv8yv"; })
|
||||
(fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; })
|
||||
(fetchNuGet { pname = "NuGet.CommandLine"; version = "4.4.1"; sha256 = "1szk5hbw22c1k5747dk95mzsy5vjw7qmvwv1wc9h080h9xzj9aab"; })
|
||||
(fetchNuGet { pname = "NVorbis"; version = "0.10.4"; sha256 = "0l4f3vhqc6ly7s8mszwarszgirz6ywx1rjsr1jx0fdlsjl02x6p9"; })
|
||||
(fetchNuGet { pname = "OpenRA-Eluant"; version = "1.0.20"; sha256 = "0nq52kdpwsvmhxgcv26wajvn3yxd5l89918rnrzxa463hmyb2rmv"; })
|
||||
(fetchNuGet { pname = "OpenRA-Freetype6"; version = "1.0.9"; sha256 = "1i5clsxszmdkhjcdkp9324zidhzp0dsvn7cbcgrnafs18yabjmzq"; })
|
||||
(fetchNuGet { pname = "NVorbis"; version = "0.10.5"; sha256 = "0yiqqlb8mmnz04yq4iykkxq9np4m29z29bjwm5ic0adyq8fr4cnl"; })
|
||||
(fetchNuGet { pname = "OpenRA-Eluant"; version = "1.0.22"; sha256 = "134ar57v7k5i4zb7xl9j2f6abwjjhl5kwx3cap5zrb5jdfb1x42p"; })
|
||||
(fetchNuGet { pname = "OpenRA-Freetype6"; version = "1.0.11"; sha256 = "1gb1mpckj2ji64fyca6cd1lbl7adyfjl5czgvhllhgv5h2jfwir1"; })
|
||||
(fetchNuGet { pname = "OpenRA-FuzzyLogicLibrary"; version = "1.0.1"; sha256 = "0kn0b8491srbllkpqvvkml02dkixs18y5hgcalnpbw8l5kkmwvim"; })
|
||||
(fetchNuGet { pname = "OpenRA-OpenAL-CS"; version = "1.0.19"; sha256 = "1ywm3b15qywrxby3s9wjs9flfjq7vld0gqz0xw4psgvz38gdgh7p"; })
|
||||
(fetchNuGet { pname = "OpenRA-SDL2-CS"; version = "1.0.36"; sha256 = "1vywf2bfqkq0mr58gfd5kafv12rri2bzfajajcj8ha9fmhdibj3s"; })
|
||||
(fetchNuGet { pname = "Pfim"; version = "0.10.3"; sha256 = "1myjs99g14q1yj3j5hzhx8ic7i3rqh2mi3qy9gdfzi6n9dlz1b3d"; })
|
||||
(fetchNuGet { pname = "OpenRA-OpenAL-CS"; version = "1.0.22"; sha256 = "05bxqdams1s4la5fqlsijzmja1wf59gcy5y04jh91996q9glkq1d"; })
|
||||
(fetchNuGet { pname = "OpenRA-SDL2-CS"; version = "1.0.40"; sha256 = "0ysrryn63akysiv92mh0mra87pd8l8zvahp8pbxsliapdfq2n2qk"; })
|
||||
(fetchNuGet { pname = "Pfim"; version = "0.11.2"; sha256 = "1mf91sfxa4c5xp5qmgyc85v84aprhgdy951f1f41xmygvmkk94mp"; })
|
||||
(fetchNuGet { pname = "rix0rrr.BeaconLib"; version = "1.0.2"; sha256 = "0f0yi7hp8v6jvhhv7k4whv8hqqxnx15nvbkll4f1ykaa1w2pr754"; })
|
||||
(fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; })
|
||||
(fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; })
|
||||
@ -62,8 +60,9 @@
|
||||
(fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; })
|
||||
(fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; })
|
||||
(fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; })
|
||||
(fetchNuGet { pname = "SharpZipLib"; version = "1.3.3"; sha256 = "1gij11wfj1mqm10631cjpnhzw882bnzx699jzwhdqakxm1610q8x"; })
|
||||
(fetchNuGet { pname = "StyleCop.Analyzers"; version = "1.1.118"; sha256 = "0hj4ax64cay2lvrh9693m0g4pmis0fi5wpm12xwzvc7lkizvac0a"; })
|
||||
(fetchNuGet { pname = "SharpZipLib"; version = "1.4.2"; sha256 = "0ijrzz2szxjmv2cipk7rpmg14dfaigdkg7xabjvb38ih56m9a27y"; })
|
||||
(fetchNuGet { pname = "StyleCop.Analyzers"; version = "1.2.0-beta.435"; sha256 = "0dirz0av24ds2k7hgpss15y4wlhwlzz22qdjvkq0n3g3sxcckrsy"; })
|
||||
(fetchNuGet { pname = "StyleCop.Analyzers.Unstable"; version = "1.2.0.435"; sha256 = "1jv4ha4y2c9922n21yf2dvfkmi8qfa8z28gk5zsqdyck08izp9mh"; })
|
||||
(fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; })
|
||||
(fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; })
|
||||
(fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; })
|
||||
@ -110,5 +109,5 @@
|
||||
(fetchNuGet { pname = "System.Threading.Channels"; version = "6.0.0"; sha256 = "1qbyi7yymqc56frqy7awvcqc1m7x3xrpx87a37dgb3mbrjg9hlcj"; })
|
||||
(fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; })
|
||||
(fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; })
|
||||
(fetchNuGet { pname = "TagLibSharp"; version = "2.2.0"; sha256 = "0jb0f84p4jd59ha36spyk9q08g6fjap3xywq32rcs2xwzhhqiq0y"; })
|
||||
(fetchNuGet { pname = "TagLibSharp"; version = "2.3.0"; sha256 = "1z7v9lrkss1f8s42sclsq3az9zjihgmhyxnwhjyf0scgk1amngrw"; })
|
||||
]
|
||||
|
||||
@ -59,11 +59,11 @@ rec {
|
||||
# Vulkan developer beta driver
|
||||
# See here for more information: https://developer.nvidia.com/vulkan-driver
|
||||
vulkan_beta = generic rec {
|
||||
version = "535.43.15";
|
||||
version = "535.43.16";
|
||||
persistencedVersion = "535.98";
|
||||
settingsVersion = "535.98";
|
||||
sha256_64bit = "sha256-DyEBrVV9DmeeOU2C0eitQLh9mGo4kxG3xxRsImrIFyo=";
|
||||
openSha256 = "sha256-eW0Z70BTF0j8TmsOiVzbLOyiyScR/7hgEp9GYI9RZbA=";
|
||||
sha256_64bit = "sha256-c93CJSMPlGZgk+jhp9zTHCKSZ0LdnJu+ifLo+qMvIIk=";
|
||||
openSha256 = "sha256-509KaBavGIOOpzdrdJuAR1PYq91Clwo8n+nhruxO1wM=";
|
||||
settingsSha256 = "sha256-jCRfeB1w6/dA27gaz6t5/Qo7On0zbAPIi74LYLel34s=";
|
||||
persistencedSha256 = "sha256-WviDU6B50YG8dO64CGvU3xK8WFUX8nvvVYm/fuGyroM=";
|
||||
url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux";
|
||||
|
||||
@ -17,6 +17,10 @@
|
||||
url = "https://framagit.org/framasoft/mobilizon/-/commit/856d236b141c96705e1211e780e3f0e8950bb48e.patch";
|
||||
sha256 = "sha256-uEPvoTPVWHdg/KPWMG/Ck2qUjC+EUO3hyZnzpFxuoL0=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://framagit.org/framasoft/mobilizon/-/commit/3936eb4cc5125b838b73adc7e49ca6ce3b2f73ce.patch";
|
||||
sha256 = "sha256-Srq691J1DbG3d26AKYZxkiMg0DfM33o3AllZpCjG2PQ=";
|
||||
})
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
|
||||
openssl
|
||||
zlib
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
darwin.apple_sdk.frameworks.SystemConfiguration
|
||||
];
|
||||
|
||||
env = {
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gotify-desktop";
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "desbma";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-EDLOSxmODC7OzVSZJxwKNnFA2yh+QKE8aXmYJ+Dnv40=";
|
||||
sha256 = "sha256-aJBgvgDG3PIogTP7jZtncKeXc7NAnJdtjpBOk303wzs=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-opSXndOjdmYG5DJ3CDUHWhN6O7AQp4Cleldzq1Hfr1o=";
|
||||
cargoHash = "sha256-JJlTS22XveuLd53ck7zduQVvEk1E/yOGkBSTvDf/XEQ=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "krapslog";
|
||||
version = "0.5.3";
|
||||
version = "0.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "acj";
|
||||
repo = "krapslog-rs";
|
||||
rev = version;
|
||||
sha256 = "sha256-Y5OdRi9OhVeT04BnHCCcNBr1G9vxSFwvNl1aL38AFWQ=";
|
||||
sha256 = "sha256-nYKqPaO7sA9aWPqngLoTq2PkpAi9zCADFZhYwIK1L2s=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-fdrcV4XmxaWiAVOL51sRUfTEDnnCKduYgj7I5unLpRI=";
|
||||
cargoHash = "sha256-Ybz2hNRMWSRuF6tWKsm0Ka7TOKwKvssA9/i6Hqk1tEE=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin libiconv;
|
||||
|
||||
|
||||
@ -33,7 +33,7 @@ xorg,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.40.2";
|
||||
version = "1.40.4";
|
||||
|
||||
rpath = lib.makeLibraryPath [
|
||||
alsa-lib
|
||||
@ -82,7 +82,7 @@ let
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb";
|
||||
sha256 = "sha256-arSC8Vcpwhu7UXwwfp75WorWmmYER18qq4LCE0pE6Gw=";
|
||||
sha256 = "sha256-PETvcHlR11hdi/KirPXKkH4mrLUyVpyQDtxf3SMx9tw=";
|
||||
}
|
||||
else
|
||||
throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}";
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, fetchurl, jre, makeWrapper }:
|
||||
{ lib, stdenv, fetchurl, jre, makeWrapper, testers, swagger-codegen3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.0.36";
|
||||
version = "3.0.50";
|
||||
pname = "swagger-codegen";
|
||||
|
||||
jarfilename = "${pname}-cli-${version}.jar";
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://maven/io/swagger/codegen/v3/${pname}-cli/${version}/${jarfilename}";
|
||||
sha256 = "sha256-nJsjGTtTM9ZjsqZCKKZFrLPZ4jIp1F0Spi6RzeuCzak=";
|
||||
sha256 = "sha256-UbUXzNpLXMZdcZO/xLdC425LOV2jsZdqcqHTNShwNMY=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
@ -24,11 +24,17 @@ stdenv.mkDerivation rec {
|
||||
--add-flags "-jar $out/share/java/${jarfilename}"
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = swagger-codegen3;
|
||||
command = "swagger-codegen3 version";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Allows generation of API client libraries (SDK generation), server stubs and documentation automatically given an OpenAPI Spec";
|
||||
homepage = "https://github.com/swagger-api/swagger-codegen/tree/3.0.0";
|
||||
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers._1000101 ];
|
||||
mainProgram = "swagger-codegen3";
|
||||
};
|
||||
}
|
||||
|
||||
952
pkgs/tools/security/vaultwarden/Cargo.lock
generated
952
pkgs/tools/security/vaultwarden/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -9,13 +9,13 @@ in
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "vaultwarden";
|
||||
version = "1.29.2";
|
||||
version = "1.30.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dani-garcia";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-ByMPS68GBOvjB/RpoLAvgE+NcbbIa1qfU1TQ4yhbH+I=";
|
||||
hash = "sha256-mBKedJvb67FR4e8ZzdL8umg9XTgch1OWhbR1k46Lkn4=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ writeShellScript
|
||||
{ writeShellApplication
|
||||
, lib
|
||||
, nix
|
||||
, nix-prefetch-git
|
||||
@ -8,20 +8,23 @@
|
||||
, gnugrep
|
||||
, gnused
|
||||
, jq
|
||||
, yq
|
||||
}:
|
||||
|
||||
writeShellScript "update-vaultwarden" ''
|
||||
PATH=${lib.makeBinPath [ curl git gnugrep gnused jq nix nix-prefetch-git nix-update ]}
|
||||
lib.getExe (writeShellApplication {
|
||||
name = "update-vaultwarden";
|
||||
runtimeInputs = [ curl git gnugrep gnused jq yq nix nix-prefetch-git nix-update ];
|
||||
|
||||
set -euxo pipefail
|
||||
text = ''
|
||||
VAULTWARDEN_VERSION=$(curl --silent https://api.github.com/repos/dani-garcia/vaultwarden/releases/latest | jq -r '.tag_name')
|
||||
nix-update "vaultwarden" --version "$VAULTWARDEN_VERSION"
|
||||
|
||||
VAULTWARDEN_VERSION=$(curl --silent https://api.github.com/repos/dani-garcia/vaultwarden/releases/latest | jq -r '.tag_name')
|
||||
nix-update "vaultwarden" --version "$VAULTWARDEN_VERSION"
|
||||
|
||||
URL="https://raw.githubusercontent.com/dani-garcia/vaultwarden/''${VAULTWARDEN_VERSION}/docker/Dockerfile.j2"
|
||||
WEBVAULT_VERSION=$(curl --silent "$URL" | grep "set vault_version" | sed -E "s/.*\"v([^\"]+)\".*/\\1/")
|
||||
old_hash=$(nix --extra-experimental-features nix-command eval -f default.nix --raw vaultwarden.webvault.bw_web_builds.outputHash)
|
||||
new_hash=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-git https://github.com/dani-garcia/bw_web_builds.git --rev "v$WEBVAULT_VERSION" | jq --raw-output ".sha256"))
|
||||
sed -e "s#$old_hash#$new_hash#" -i pkgs/tools/security/vaultwarden/webvault.nix
|
||||
nix-update "vaultwarden.webvault" --version "$WEBVAULT_VERSION"
|
||||
''
|
||||
URL="https://raw.githubusercontent.com/dani-garcia/vaultwarden/''${VAULTWARDEN_VERSION}/docker/DockerSettings.yaml"
|
||||
WEBVAULT_VERSION="$(curl --silent "$URL" | yq -r ".vault_version" | sed s/^v//)"
|
||||
old_hash="$(nix --extra-experimental-features nix-command eval -f default.nix --raw vaultwarden.webvault.bw_web_builds.outputHash)"
|
||||
new_hash="$(nix-prefetch-git https://github.com/dani-garcia/bw_web_builds.git --rev "v$WEBVAULT_VERSION" | jq --raw-output ".sha256")"
|
||||
new_hash_sri="$(nix --extra-experimental-features nix-command hash to-sri --type sha256 "$new_hash")"
|
||||
sed -e "s#$old_hash#$new_hash_sri#" -i pkgs/tools/security/vaultwarden/webvault.nix
|
||||
nix-update "vaultwarden.webvault" --version "$WEBVAULT_VERSION"
|
||||
'';
|
||||
})
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2023.7.1";
|
||||
version = "2023.10.0";
|
||||
|
||||
bw_web_builds = fetchFromGitHub {
|
||||
owner = "dani-garcia";
|
||||
repo = "bw_web_builds";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-B7FGLKuwxldlHnIIzQbDjZT9cs5+lixo/fBtlexNLQc=";
|
||||
hash = "sha256-5vfmMJIGKyZlTQDi/t1YKAALbW/6BFAcWODfkypk/eA=";
|
||||
};
|
||||
in buildNpmPackage rec {
|
||||
pname = "vaultwarden-webvault";
|
||||
@ -23,10 +23,10 @@ in buildNpmPackage rec {
|
||||
owner = "bitwarden";
|
||||
repo = "clients";
|
||||
rev = "web-v${lib.removeSuffix "b" version}";
|
||||
hash = "sha256-HEEUboaIY/Zi/wUhp9y7oIOuQl6csjo97eygTLPNfNo=";
|
||||
hash = "sha256-egXToXWfb9XV7JuCRBYJO4p/e+WOwMncPKz0oBgeALQ=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-8Epkvjzllt//kdrKT4jUDOhj47Fnb0qSFU1qJthL2Mo=";
|
||||
npmDepsHash = "sha256-iO8ZozVl1vOOqowQARnRJWSFUFnau46+dKfcMSkyU3o=";
|
||||
|
||||
postPatch = ''
|
||||
ln -s ${bw_web_builds}/{patches,resources} ..
|
||||
|
||||
@ -8,32 +8,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yersinia";
|
||||
version = "0.8.2";
|
||||
version = "unstable-2022-11-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tomac";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "06yfpf9iyi525rly1ychsihzvw3sas8kp0nxxr99xkwiqp5dc78b";
|
||||
rev = "867b309eced9e02b63412855440cd4f5f7727431";
|
||||
sha256 = "sha256-VShg9Nzd8dzUNiqYnKcDzRgqjwar/8XRGEJCJL25aR0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# ncurses-6.3 support, included in next release
|
||||
(fetchpatch {
|
||||
name = "ncurses-6.3.patch";
|
||||
url = "https://github.com/tomac/yersinia/commit/d91bbf6f475e7ea39f131b77ce91b2de9646d5ca.patch";
|
||||
sha256 = "fl1pZKWA+nLtBm9+3FBFqaeuVZjszQCNkNl6Cf++BAI=";
|
||||
})
|
||||
|
||||
# Pull upstream fix for -fno-common toolchain support:
|
||||
# https://github.com/tomac/yersinia/pull/66
|
||||
(fetchpatch {
|
||||
name = "fno-common.patch";
|
||||
url = "https://github.com/tomac/yersinia/commit/36247225dc7a6f38c4ba70537e20351f04762749.patch";
|
||||
sha256 = "KHaN8gfgNROEico27gWnYiP9ZVhpWz0KjFYy2t5tPBo=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
buildInputs = [ libpcap libnet ncurses ]
|
||||
++ lib.optional withGtk gtk2;
|
||||
@ -58,7 +41,5 @@ stdenv.mkDerivation rec {
|
||||
# so not sure, but it could work on openbsd, illumos, and freebsd
|
||||
# if you have a machine to test with, feel free to add these
|
||||
platforms = with platforms; linux;
|
||||
# never built on aarch64-linux since first introduction in nixpkgs
|
||||
broken = stdenv.isLinux && stdenv.isAarch64;
|
||||
};
|
||||
}
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gtree";
|
||||
version = "1.9.12";
|
||||
version = "1.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ddddddO";
|
||||
repo = "gtree";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-N4gw2SaNAcQULNxE+v4I+UhfziLH7zLs0cIP5mHGUx0=";
|
||||
hash = "sha256-sfw+Si6g6NVUWZdB6q3wnoabMAqIR9/KT1HsXtbafDY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3VNcis7G0k/WTt8APvFaVBoYTo+RhjpnT1cGWhQhXK0=";
|
||||
vendorHash = "sha256-3g47EuDElz1lrw7pgzD1jtTAs2Up97WWWFHe6aFE9zk=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/gtree"
|
||||
|
||||
@ -6029,8 +6029,8 @@ with pkgs;
|
||||
moar = callPackage ../tools/misc/moar { };
|
||||
|
||||
mobilizon = callPackage ../servers/mobilizon {
|
||||
elixir = elixir_1_14;
|
||||
beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_14; });
|
||||
elixir = elixir_1_15;
|
||||
beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_15; });
|
||||
mobilizon-frontend = callPackage ../servers/mobilizon/frontend.nix { };
|
||||
};
|
||||
|
||||
@ -35930,9 +35930,7 @@ with pkgs;
|
||||
|
||||
toxiproxy = callPackage ../development/tools/toxiproxy { };
|
||||
|
||||
tqsl = callPackage ../applications/radio/tqsl {
|
||||
openssl = openssl_1_1;
|
||||
};
|
||||
tqsl = callPackage ../applications/radio/tqsl { };
|
||||
trustedqsl = tqsl; # Alias added 2019-02-10
|
||||
|
||||
transcode = callPackage ../applications/audio/transcode { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user