Merge staging-next into staging

This commit is contained in:
github-actions[bot]
2024-01-28 18:01:42 +00:00
committed by GitHub
111 changed files with 1800 additions and 6573 deletions
+1 -1
View File
@@ -16120,7 +16120,7 @@
name = "Robert Walter";
};
roconnor = {
email = "roconnor@theorem.ca";
email = "roconnor@r6.ca";
github = "roconnor";
githubId = 852967;
name = "Russell O'Connor";
@@ -116,6 +116,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
release notes of [v19](https://github.com/systemd/mkosi/releases/tag/v19) and
[v20](https://github.com/systemd/mkosi/releases/tag/v20) for a list of changes.
- The `woodpecker-*` packages have been updated to v2 which includes [breaking changes](https://woodpecker-ci.org/docs/next/migrations#200).
- `services.nginx` will no longer advertise HTTP/3 availability automatically. This must now be manually added, preferably to each location block.
Example:
@@ -299,10 +299,7 @@ in
fi
'' + optionalString (cfg.database.passwordFile != null) ''
# create a copy of the supplied password file in a format zabbix can consume
touch ${passwordFile}
chmod 0600 ${passwordFile}
echo -n "DBPassword = " > ${passwordFile}
cat ${cfg.database.passwordFile} >> ${passwordFile}
install -m 0600 <(echo "DBPassword = $(cat ${cfg.database.passwordFile})") ${passwordFile}
'';
serviceConfig = {
@@ -292,10 +292,7 @@ in
fi
'' + optionalString (cfg.database.passwordFile != null) ''
# create a copy of the supplied password file in a format zabbix can consume
touch ${passwordFile}
chmod 0600 ${passwordFile}
echo -n "DBPassword = " > ${passwordFile}
cat ${cfg.database.passwordFile} >> ${passwordFile}
install -m 0600 <(echo "DBPassword = $(cat ${cfg.database.passwordFile})") ${passwordFile}
'';
serviceConfig = {
+2 -1
View File
@@ -204,7 +204,6 @@ in
};
"/" = {
# mixed frontend and backend requests, based on the request headers
proxyPass = "$proxpass";
recommendedProxySettings = true;
extraConfig = ''
set $proxpass "${ui}";
@@ -220,6 +219,8 @@ in
# Cuts off the trailing slash on URLs to make them valid
rewrite ^(.+)/+$ $1 permanent;
proxy_pass $proxpass;
'';
};
};
@@ -133,6 +133,7 @@ let
RestartSec = 20;
EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ] ++ cfg.extraEnvFiles;
WorkingDirectory = cfg.package;
LimitNOFILE = "1024000";
# System Call Filtering
SystemCallFilter = [ ("~" + lib.concatStringsSep " " systemCallsList) "@chown" "pipe" "pipe2" ];
} // cfgService;
@@ -57,6 +57,7 @@ let
"systemd-ask-password-console.service"
"systemd-fsck@.service"
"systemd-halt.service"
"systemd-hibernate-resume.service"
"systemd-journald-audit.socket"
"systemd-journald-dev-log.socket"
"systemd-journald.service"
@@ -14,11 +14,11 @@
stdenv.mkDerivation rec {
pname = "roomeqwizard";
version = "5.30.4";
version = "5.30.5";
src = fetchurl {
url = "https://www.roomeqwizard.com/installers/REW_linux_no_jre_${lib.replaceStrings [ "." ] [ "_" ] version}.sh";
sha256 = "sha256-585xfNzhWFdtNS4E5BE84zjkWDr/p1Nu9CJ3nTJc7dw=";
sha256 = "sha256-lxOI6vvPFtC/oYs2cKV0IhRbvaFzK8wBmSXPUwhAsi0=";
};
dontUnpack = true;
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, unstableGitUpdater }:
stdenv.mkDerivation {
pname = "yuzu-compatibility-list";
version = "unstable-2024-01-21";
version = "unstable-2024-01-27";
src = fetchFromGitHub {
owner = "flathub";
repo = "org.yuzu_emu.yuzu";
rev = "a3dd360e8b6e8c0c93d40f00416534c8b4bcd59a";
hash = "sha256-nXh5cJTS1zCa6GoH+AoisTIohsRruycqosxpmFAsaSw=";
rev = "c01bdbbfda3e2558930fcced63b6d02b646f881b";
hash = "sha256-TDmzBxeJq4gJvU88hJaXN7U3PYOqI1OrkenlH1GJo8g=";
};
buildCommand = ''
+1 -11
View File
@@ -1,4 +1,4 @@
{ qt6Packages, makeScopeWithSplicing', generateSplicesForMkScope, vulkan-headers, fetchFromGitHub }:
{ qt6Packages, makeScopeWithSplicing', generateSplicesForMkScope }:
makeScopeWithSplicing' {
otherSplices = generateSplicesForMkScope "yuzuPackages";
@@ -8,15 +8,5 @@ makeScopeWithSplicing' {
mainline = self.callPackage ./mainline.nix {};
early-access = self.callPackage ./early-access {};
vulkan-headers = vulkan-headers.overrideAttrs(old: rec {
version = "1.3.274";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-Headers";
rev = "v${version}";
hash = "sha256-SsS5VlEnhjOSu8MlIVC0d2r2EAf8QsNJPEAXNtbDOJ4=";
};
});
};
}
@@ -23,6 +23,7 @@ let
'';
rehydratedSrc = fetchgit {
name = "yuzu-ea-rehydrated";
url = gitSrc;
fetchSubmodules = true;
hash = sources.fullHash;
@@ -1,7 +1,7 @@
# Generated by ./update.sh - do not update manually!
# Last updated: 2024-01-22
# Last updated: 2024-01-28
{
version = "4079";
distHash = "sha256:12cwzgdnpla9m24cla1596p773zpdgmi0zlyvdypmdx0qzwgwkpp";
fullHash = "sha256:1zp2nz9blsim2xmwb3pah38nrdysa3yrlqgb051n8b8qp6fp5979";
version = "4093";
distHash = "sha256:0f6ffs0qvq516vcc6w132p9lg888cy6id9cgkdmzc6039aymdgki";
fullHash = "sha256:1scn06anfjvy4ysxmv8qq7p5dzkfqyxbm6h6lpywy3nkpyx1cz15";
}
@@ -31,7 +31,7 @@ log "Unpacking dist..."
tar xf "$eaDist"/*.tar.xz --directory="$eaDistUnpacked" --strip-components=1
log "Rehydrating..."
eaFullHash="$(nix-prefetch-git --fetch-submodules "$eaDistUnpacked" | jq -r '.sha256')"
eaFullHash="$(nix-prefetch-git --fetch-submodules --quiet "$eaDistUnpacked" | jq -r '.sha256')"
cat >sources.nix <<EOF
# Generated by ./update.sh - do not update manually!
@@ -42,7 +42,3 @@ cat >sources.nix <<EOF
fullHash = "sha256:$eaFullHash";
}
EOF
if [ "${COMMIT:-0}" == "1" ]; then
git commit -m "yuzu-ea: ${oldVersion} -> ${newVersion}" ./sources.nix
fi
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, wrapQtAppsHook
, alsa-lib
@@ -47,13 +48,13 @@
}:
stdenv.mkDerivation(finalAttrs: {
pname = "yuzu";
version = "1689";
version = "1696";
src = fetchFromGitHub {
owner = "yuzu-emu";
repo = "yuzu-mainline";
rev = "mainline-0-${finalAttrs.version}";
hash = "sha256-5ITGFWS0OJLXyNoAleZrJob2jz1He1LEOvQzjIlMmPQ=";
hash = "sha256-9xIhOA8hA7rsjtO0sgg1ucqghSzaOtkuTAHyQvmT+y4=";
fetchSubmodules = true;
};
@@ -154,7 +155,7 @@ stdenv.mkDerivation(finalAttrs: {
# provide pre-downloaded tz data
mkdir -p build/externals/nx_tzdb
ln -sf ${nx_tzdb} build/externals/nx_tzdb/${nx_tzdb.version}.zip
ln -s ${nx_tzdb} build/externals/nx_tzdb/nx_tzdb
'';
# This must be done after cmake finishes as it overwrites the file
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, gitUpdater }:
{ stdenv, fetchurl, unzip, gitUpdater }:
stdenv.mkDerivation rec {
pname = "nx_tzdb";
version = "221202";
@@ -8,10 +8,10 @@ stdenv.mkDerivation rec {
hash = "sha256-mRzW+iIwrU1zsxHmf+0RArU8BShAoEMvCz+McXFFK3c=";
};
dontUnpack = true;
nativeBuildInputs = [ unzip ];
buildCommand = ''
cp $src $out
unzip $src -d $out
'';
passthru.updateScript = gitUpdater {
+1 -1
View File
@@ -4,4 +4,4 @@
nix-update -u yuzuPackages.nx_tzdb "$@"
nix-update -u yuzuPackages.compat-list "$@"
nix-update -u yuzuPackages.mainline "$@"
nix-update -u yuzuPackages.early-access "$@"
nix-update -u yuzuPackages.early-access --override-filename pkgs/applications/emulators/yuzu/early-access/sources.nix "$@"
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "felix";
version = "2.11.1";
version = "2.12.0";
src = fetchFromGitHub {
owner = "kyoheiu";
repo = "felix";
rev = "v${version}";
hash = "sha256-Q+D5A4KVhVuas7sGy0CqN95cvTLAw5LWet/BECjJUPg=";
hash = "sha256-pFU1gE1dkW2MmnkS9DWV0GcPTnDPbjd8w8ASy0M+3x4=";
};
cargoHash = "sha256-RfBRm/YiTPxkAN8A+uAoN047DBHEVSL0isQfJgO1Bo0=";
cargoHash = "sha256-nzbgTEl6vVT30xSrMVa4FkIHv5lzeNB5ayBZn4xPxA4=";
nativeBuildInputs = [ pkg-config ];
@@ -49,13 +49,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "imagemagick";
version = "7.1.1-26";
version = "7.1.1-27";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = finalAttrs.version;
hash = "sha256-diJhCRDT0SbAYZdBPoxZJWlrUW2Nz4/d7H0Nnybw0Yw=";
hash = "sha256-jZ5mLqhNZw8V9D61Nv2gB+6Wo9KP+P3KouQ+u2OUL6I=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
@@ -22,16 +22,16 @@
rustPlatform.buildRustPackage rec {
pname = "oculante";
version = "0.8.6";
version = "0.8.7";
src = fetchFromGitHub {
owner = "woelper";
repo = "oculante";
rev = version;
hash = "sha256-AuHiOZuRhO6PVyDyOtmNG6n/CN5brvJ/Ppn25QCshmE=";
hash = "sha256-49reMm9woxekJUqHq7biHvlYii9BmLvq6u9RFkASpUw=";
};
cargoHash = "sha256-EYwey8dDiyYGJa+scENOpaNK2qAVagTJrAPkSZj12w0=";
cargoHash = "sha256-93J0/INcQEvu14pPZeLRfwKECeEGcsch9hUZ0IjYivM=";
nativeBuildInputs = [
cmake
@@ -4,12 +4,12 @@
stdenv.mkDerivation rec {
pname = "ganttproject-bin";
version = "2.8.10";
version = "3.3.3300";
src = let build = "r2364"; in fetchzip {
sha256 = "0cclgyqv4f9pjsdlh93cqvgbzrp8ajvrpc2xszs03sknqz2kdh7r";
url = "https://dl.ganttproject.biz/ganttproject-${version}/"
+ "ganttproject-${version}-${build}.zip";
src = fetchzip {
url = "https://dl.ganttproject.biz/ganttproject-${version}/ganttproject-${version}.zip";
stripRoot = false;
hash = "sha256-U9x64UIBuVtW44zbsdWuMRZyEJhZ8VUWbDVtapTGPMo=";
};
nativeBuildInputs = [ makeWrapper ];
+3 -3
View File
@@ -3,15 +3,15 @@
python3Packages.buildPythonApplication rec {
pname = "hamster";
version = "3.0.2";
version = "3.0.3";
format = "other";
src = fetchFromGitHub {
owner = "projecthamster";
repo = pname;
rev = "v${version}";
sha256 = "09ikiwc2izjvwqbbyp8knn190x5y4anwslkmb9k2h3r3jwrg2vd2";
rev = "refs/tags/v${version}";
sha256 = "sha256-cUmUvJP9Y3de5OaNgIxvigDsX2ww7NNRY5son/gg+WI=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "nwg-menu";
version = "0.1.1";
version = "0.1.2";
src = fetchFromGitHub {
owner = "nwg-piotr";
repo = "nwg-menu";
rev = "v${version}";
sha256 = "sha256-M948RGU9/PwUtFRmf1Po7KlrGxqRPiOZKfS1Vv3vqW8=";
sha256 = "sha256-UFyC0gpKn0Ei5aOPC28iG4YI2BM5lrnl/J7RM4GjInc=";
};
vendorHash = "sha256-HyrjquJ91ddkyS8JijHd9HjtfwSQykXCufa2wzl8RNk=";
vendorHash = "sha256-/kqhZcIuoN/XA0i1ua3lzVGn4ghkekFYScL1o3kgBX4=";
doCheck = false;
@@ -22,18 +22,18 @@
ungoogled-chromium = {
deps = {
gn = {
hash = "sha256-dwluGOfq05swtBM5gg4a6gY3IpFHaKKkD0TV1XW7c7k=";
rev = "e4702d7409069c4f12d45ea7b7f0890717ca3f4b";
hash = "sha256-eD3KORYYuIH+94+BgL+yFD5lTQFvj/MqPU9DPiHc98s=";
rev = "7367b0df0a0aa25440303998d54045bda73935a5";
url = "https://gn.googlesource.com/gn";
version = "2023-10-23";
version = "2023-11-28";
};
ungoogled-patches = {
hash = "sha256-feMWYdxQSgn1ZTdnXTYHUBi3pV1fsaAcKjbf+qHzYnU=";
rev = "120.0.6099.224-1";
hash = "sha256-Fopr+SiezOs3w52juXvMyfxOAzrVXrRO8j0744oeO5k=";
rev = "223fe76bb263a216341739ce2ee333752642cf47";
};
};
hash = "sha256-HFQ7QAL4hcux3jmMmLYFNym3sfWR1o1hWV75bokID4I=";
hash_deb_amd64 = "sha256-dFllEHRYH3yAPg3uaaCzdpiZxSLENEwmtIb/gg53/ZU=";
version = "120.0.6099.224";
hash = "sha256-2TMTLCqoCxdy9PDlZIUa/5oXjmim1T2/LJu+3/Kf4fQ=";
hash_deb_amd64 = "sha256-9vPQAiZPw60oILm0He4Iz9lOc+WvtHCBE9CHA1ejc7s=";
version = "121.0.6167.85";
};
}
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cilium-cli";
version = "0.15.19";
version = "0.15.20";
src = fetchFromGitHub {
owner = "cilium";
repo = pname;
rev = "v${version}";
hash = "sha256-52i3Ek/rXFF9rMMiXNMnRjT2HYsknGKvVtCRrVDmo9U=";
hash = "sha256-uwHy1Wdf9/BXfPgBFc0Lkd3tewqY/+MjqaFnb8dFnH0=";
};
vendorHash = null;
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kubectl-explore";
version = "0.7.1";
version = "0.7.2";
src = fetchFromGitHub {
owner = "keisku";
repo = "kubectl-explore";
rev = "v${version}";
hash = "sha256-4WxvVsA05Mta7AcrGe26B+Up+x/gwdlCnb/PN9Ehu18=";
hash = "sha256-OVPct3EvtchH9pmMulIddsiR9VFoCegx9+O7lkecoJc=";
};
vendorHash = "sha256-z/bPfY9UVqOnrA9jNUtM7jg53/URAMAJQAqH9D5KVPQ=";
vendorHash = "sha256-l6SANWkDQSuLbyixbO/Xr2oRG8HR/qquTT9b/IM+JVg=";
doCheck = false;
meta = with lib; {
@@ -14,16 +14,16 @@
buildNpmPackage rec {
pname = "webcord";
version = "4.6.1";
version = "4.7.0";
src = fetchFromGitHub {
owner = "SpacingBat3";
repo = "WebCord";
rev = "v${version}";
hash = "sha256-4ePjRs9CEnDHq9iVcQNEkefl0YP/tc1ePLhW/w9NPDs=";
hash = "sha256-h0JEIfNoYx0MrHeEg/kwn/10JVxNVXIuvWcTOfellbg=";
};
npmDepsHash = "sha256-UzwLORlUeTMq3RyOHpvBrbxbwgpMBsbmfyXBhpB6pOQ=";
npmDepsHash = "sha256-L6ZrPqi4DjTn1P4O+lWDmvzQwqpsWmSOtnFMBHkNQAI=";
nativeBuildInputs = [
copyDesktopItems
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "treesheets";
version = "unstable-2024-01-21";
version = "unstable-2024-01-26";
src = fetchFromGitHub {
owner = "aardappel";
repo = "treesheets";
rev = "c14f5ef716b9a565ec1d7fbc2e86c73ad144c447";
sha256 = "8QcMdkLkYaN7PA9vNYbzM8wwqZR4k7/mcn6USvSNKXk=";
rev = "a1705796a8e1eddd63cc847f4c4c71634c5c7eb8";
sha256 = "bF24E+30u/8//vAwjXrnUqybieIUlEDYyvI5sHnLkco=";
};
nativeBuildInputs = [
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "eigenmath";
version = "unstable-2024-01-22";
version = "unstable-2024-01-23";
src = fetchFromGitHub {
owner = "georgeweigt";
repo = pname;
rev = "db4b22cd536cefbdf0b6c928f11c793a5580da0b";
hash = "sha256-T1GXh1go08XVTToEg5Dq4BuwTCxxqYwQsx+c8g1RPxg=";
rev = "1d55696b742fee0b4ef8e39b7a420c00c2f1e329";
hash = "sha256-AQdCFKDUWfNKxZoWp82DdxUA2GiMGWyuyh7Fkofm9kc=";
};
checkPhase = let emulator = stdenv.hostPlatform.emulator buildPackages; in ''
@@ -30,13 +30,13 @@
stdenv.mkDerivation (final: {
pname = "contour";
version = "0.4.0.6245";
version = "0.4.1.6292";
src = fetchFromGitHub {
owner = "contour-terminal";
repo = "contour";
rev = "v${final.version}";
hash = "sha256-0A3fGbQPfzV4V4f5GGyjbQLJK+tX7ZVerAL7TkHhjdo=";
hash = "sha256-t1rZixjpwg2JDBESmymNwUlpQd1VLaECxvpPP94jvH0=";
};
patches = [ ./dont-fix-app-bundle.diff ];
File diff suppressed because it is too large Load Diff
@@ -32,14 +32,14 @@
rustPlatform.buildRustPackage rec {
pname = "wezterm";
version = "20230712-072601-f4abf8fd";
version = "20240127-113634-bbcac864";
src = fetchFromGitHub {
owner = "wez";
repo = pname;
rev = version;
fetchSubmodules = true;
hash = "sha256-B6AakLbTWIN123qAMQk/vFN83HHNRSNkqicNRU1GaCc=";
hash = "sha256-OjIwHRso6M05gS+thA9yukUDoDqHvHdEVshFL+ebC7c=";
};
postPatch = ''
@@ -52,9 +52,7 @@ rustPlatform.buildRustPackage rec {
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"image-0.24.5" = "sha256-fTajVwm88OInqCPZerWcSAm1ga46ansQ3EzAmbT58Js=";
"xcb-1.2.1" = "sha256-zkuW5ATix3WXBAj2hzum1MJ5JTX3+uVQ01R1vL6F1rY=";
"xcb-imdkit-0.2.0" = "sha256-L+NKD0rsCk9bFABQF4FZi9YoqBHr4VAZeKAWgsaAegw=";
"xcb-imdkit-0.3.0" = "sha256-fTpJ6uNhjmCWv7dZqVgYuS2Uic36XNYTbqlaly5QBjI=";
};
};
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "git-cola";
version = "4.4.1";
version = "4.5.0";
src = fetchFromGitHub {
owner = "git-cola";
repo = "git-cola";
rev = "v${version}";
hash = "sha256-PtV2mzxOfZ88THiFD4K+qtOi41GeLF1GcdiFFhUR8Ak=";
hash = "sha256-HORGtpiZGWpeRDhr4E9KW5LSAD6r74l7rl6RhhVtiJo=";
};
buildInputs = lib.optionals stdenv.isLinux [ qt5.qtwayland ];
+3 -3
View File
@@ -6,20 +6,20 @@
buildGoModule rec {
pname = "c2FmZQ";
version = "0.4.17";
version = "0.4.18";
src = fetchFromGitHub {
owner = "c2FmZQ";
repo = "c2FmZQ";
rev = "v${version}";
hash = "sha256-xjgoE1HlCmSPZ6TQcemI7fNE9wbIrk/WSrz6vlVt66U=";
hash = "sha256-CWtQMXICCyuXbknR1Z2sLe7GyqN0F2sQGtiTnqppnVA=";
};
ldflags = [ "-s" "-w" ];
sourceRoot = "source/c2FmZQ";
vendorHash = "sha256-lnoEh6etfVLx+GYWNCvra40qOYtzTIH3SC28T6mXC2U=";
vendorHash = "sha256-cTXSFwWGHV2QJM4mX/Z+ZxCXKwr+59lEPvJa/PTA1wU=";
subPackages = [ "c2FmZQ-client" "c2FmZQ-server" ];
+8 -7
View File
@@ -9,13 +9,13 @@
perlPackages.buildPerlPackage rec {
pname = "clamtk";
version = "6.17";
version = "6.18";
src = fetchFromGitHub {
owner = "dave-theunsub";
repo = "clamtk";
rev = "v${version}";
hash = "sha256-2tWVfRijf78OiKBpLUrZWFberIL8mjqtxvW/IjPn1IE=";
hash = "sha256-ClBsBXbGj67zgrkA9EjgK7s3OmXOJA+xV5xLGOcMsbI=";
};
nativeBuildInputs = [ wrapGAppsHook gobject-introspection ];
@@ -46,11 +46,12 @@ perlPackages.buildPerlPackage rec {
installPhase = ''
runHook preInstall
install -D lib/*.pm -t $out/lib/perl5/site_perl/ClamTk
install -D clamtk.desktop -t $out/share/applications
install -D images/* -t $out/share/pixmaps
install -D clamtk.1.gz -t $out/share/man/man1
install -D -m755 clamtk -t $out/bin
install -Dm755 clamtk -t $out/bin
install -Dm444 lib/*.pm -t $out/lib/perl5/site_perl/ClamTk
install -Dm444 clamtk.desktop -t $out/share/applications
install -Dm444 images/* -t $out/share/pixmaps
install -Dm444 clamtk.1.gz -t $out/share/man/man1
install -Dm444 {CHANGES,LICENSE,*.md} -t $out/share/doc/clamtk
runHook postInstall
'';
@@ -6,7 +6,7 @@
}:
stdenvNoCC.mkDerivation {
pname = "gruvbox-gtk-theme";
version = "unstable-2023-05-26";
version = "unstable-2023-05-28";
src = fetchFromGitHub {
owner = "Fausto-Korpsvart";
+29
View File
@@ -0,0 +1,29 @@
{ lib
, fetchzip
, fetchpatch
, stdenv
, gettext
, libtool
, pkg-config
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libbfio";
version = "20221025";
src = fetchzip {
url = "https://github.com/libyal/libbfio/releases/download/${finalAttrs.version}/libbfio-alpha-${finalAttrs.version}.tar.gz";
hash = "sha256-SwKQlmifyUo49yvo8RV+0nfvScPY5u+UrwjRZK2+qAg=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gettext libtool ];
meta = {
description = "Library to provide basic file input/output abstraction";
homepage = "https://github.com/libyal/libbfio";
license = with lib.licenses; [ gpl3Plus lgpl3Plus ];
maintainers = with lib.maintainers; [ d3vil0p3r ];
platforms = with lib.platforms; unix ++ windows;
};
})
+3 -3
View File
@@ -8,18 +8,18 @@
buildGoModule rec {
pname = "mercure";
version = "0.15.6";
version = "0.15.9";
src = fetchFromGitHub {
owner = "dunglas";
repo = "mercure";
rev = "v${version}";
hash = "sha256-sGMjb7Ilm+RqR6bRGLAYB/nciE5oHeitDllr4H11uHU=";
hash = "sha256-4Y+yZSZrBDLPbQXaOCSKk/EY20Ka8CS4ivUg1TEaqXo=";
};
sourceRoot = "source/caddy";
vendorHash = "sha256-v0YKlkflo7eKXh38uqsnxZlLr3+fFl8EMeUsf8UMU48=";
vendorHash = "sha256-N0RmvhBlTiWmBb4TzLmaThD9jVkKgcIO9vPWxJAvLRQ=";
subPackages = [ "mercure" ];
excludedPackages = [ "../cmd/mercure" ];
+3 -3
View File
@@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "paper-age";
version = "1.2.0";
version = "1.2.1";
src = fetchFromGitHub {
owner = "matiaskorhonen";
repo = "paper-age";
rev = "v${version}";
hash = "sha256-7dd1R41CDgkpFI8fUWCJfgz3lr22IjWQYW6vRYEFidc=";
hash = "sha256-JlmiHnST/UnN4WsiDqSva+01odoc5h/J/mlGN3K0OfI=";
};
cargoHash = "sha256-IJDV0dmOsA9gbVKGfPsN3TKJbox3JTNxldArQK6GPt8=";
cargoHash = "sha256-zdq036ag7+mvWg4OJHtbltPlF9j49dCPNJjgVQcQ+u4=";
meta = with lib; {
description = "Easy and secure paper backups of secrets";
+36
View File
@@ -0,0 +1,36 @@
{ lib
, appimageTools
, fetchurl
}:
appimageTools.wrapType2 rec {
pname = "parsify";
version = "2.0.1";
src = fetchurl {
url = "https://github.com/parsify-dev/desktop/releases/download/v${version}/Parsify-${version}-linux-x86_64.AppImage";
hash = "sha256-ltWqRW+cBvuUJzhya62WsBY5zqIua9xhilxfd9gr24A=";
};
extraInstallCommands =
let contents = appimageTools.extract { inherit pname version src; };
in ''
mv $out/bin/${pname}-${version} $out/bin/${pname}
install -m 444 -D ${contents}/@parsifydesktop.desktop -t $out/share/applications
substituteInPlace $out/share/applications/@parsifydesktop.desktop \
--replace "Exec=AppRun" "Exec=${pname}"
cp -r ${contents}/usr/share/* $out/share
'';
meta = with lib; {
description = "Next generation notepad-based calculator, built with extendibility and privacy in mind";
homepage = "https://parsify.app/";
license = licenses.unfree;
maintainers = with maintainers; [ kashw2 ];
platforms = platforms.linux;
mainProgram = "parsify";
};
}
+3 -3
View File
@@ -9,18 +9,18 @@
buildGoModule rec {
pname = "shopware-cli";
version = "0.4.13";
version = "0.4.18";
src = fetchFromGitHub {
repo = "shopware-cli";
owner = "FriendsOfShopware";
rev = version;
hash = "sha256-EetMOCqyzpNzxzCaaFHnSQEkjf9lZyYBWdRKMuxObNM=";
hash = "sha256-LOmGxH/czICSii8AkoXi1cQPL+MErV92iUZtJc2eg64=";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];
nativeCheckInputs = [ git dart-sass ];
vendorHash = "sha256-TRc3VK1Sgpmi/ToMaqkIMIrxHoyYHNUgrtQewTuQ6ts=";
vendorHash = "sha256-KMNPw2B4fLaOdSIFHBIAKXUtnu0sMwksJg3RUZKLDsE=";
postInstall = ''
export HOME="$(mktemp -d)"
@@ -5,11 +5,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "sketchybar-app-font";
version = "1.0.23";
version = "2.0.3";
src = fetchurl {
url = "https://github.com/kvndrsslr/sketchybar-app-font/releases/download/v${finalAttrs.version}/sketchybar-app-font.ttf";
hash = "sha256-9ELXLlYZyffXD0zomcJsG1Adb/Gu6oRTQZyzwK5lZ6I=";
hash = "sha256-KeyUx/u0YARmNdVC9RQtAL3QFOgV59uyg53y0Lknvyw=";
};
dontUnpack = true;
+3 -3
View File
@@ -2,7 +2,7 @@
let
themeName = "Dracula";
version = "unstable-2024-01-16";
version = "unstable-2024-01-24";
in
stdenvNoCC.mkDerivation {
pname = "dracula-theme";
@@ -11,8 +11,8 @@ stdenvNoCC.mkDerivation {
src = fetchFromGitHub {
owner = "dracula";
repo = "gtk";
rev = "90e5a61ac4e69d4971efef07700b43a3fcacd8c5";
hash = "sha256-u7LW/EmCO5JvpwcgDZ1jWyfcolIaCKJee33xF0Urieo=";
rev = "ed505cce4b61831765a128ebb544edf040f57be5";
hash = "sha256-jPZabinmQMCtBPj/P3vuqb3OCUbx9OAuCoar7ZnegPQ=";
};
propagatedUserEnvPkgs = [
@@ -17,11 +17,11 @@
stdenv.mkDerivation rec {
pname = "mate-system-monitor";
version = "1.26.2";
version = "1.26.3";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "vm2X3saPXza94S+KyvGsVkLSOaXSQWGoL/9QZPRQJUQ=";
sha256 = "WFthNBX3bucDt7XlK1WWKUKVB+A8kwVKSq3Pb5xlIkk=";
};
nativeBuildInputs = [
@@ -5,6 +5,7 @@
, runCommandLocal
, bison
, flex
, intel-compute-runtime
, llvmPackages_14
, opencl-clang
, python3
@@ -19,8 +20,8 @@ let
vc_intrinsics_src = fetchFromGitHub {
owner = "intel";
repo = "vc-intrinsics";
rev = "v0.13.0";
hash = "sha256-A9G1PH0WGdxU2u/ODrou53qF9kvrmE0tJSl9cFIOus0=";
rev = "v0.14.0";
hash = "sha256-t7m2y+DiZf0xum1vneXvoCyH767SKMOq4YzMIuZngR8=";
};
inherit (llvmPackages_14) lld llvm;
@@ -30,13 +31,13 @@ in
stdenv.mkDerivation rec {
pname = "intel-graphics-compiler";
version = "1.0.15136.4";
version = "1.0.15610.11";
src = fetchFromGitHub {
owner = "intel";
repo = "intel-graphics-compiler";
rev = "igc-${version}";
hash = "sha256-Qh3FNck1z+rr7eSqxVnNs7YKvgXpKGY5dd3yx1Ft9Mg=";
hash = "sha256-Fu1g5M2lpcnLw6aSHI5gx47VOfx+rIdIhBlwe/Dv8bk=";
};
nativeBuildInputs = [ bison cmake flex (python3.withPackages (ps : with ps; [ mako ])) ];
@@ -73,6 +74,10 @@ stdenv.mkDerivation rec {
"-Wno-dev"
];
passthru.tests = {
inherit intel-compute-runtime;
};
meta = with lib; {
homepage = "https://github.com/intel/intel-graphics-compiler";
description = "LLVM-based compiler for OpenCL targeting Intel Gen graphics hardware";
@@ -28,10 +28,10 @@ let
version = "15.0.0";
rev = "v${version}";
hash = "sha256-OsDohXRxovtEXaWiRGp8gJ0dXmoALyO+ZimeSO8aPVI=";
} else if llvmMajor == "14" then rec{
version = "14.0.0+unstable-2023-06-22";
rev = "23f398bf369093b1fd67459db8071ffcc6b92658";
hash = "sha256-o7cVj5/ZMER2CvfxL4pRb2qCIxC/HFUPiitf2fKtCyk=";
} else if llvmMajor == "14" then {
version = "14.0.0+unstable-2024-01-23";
rev = "582a3024c0c2d624a40fa2731d74b2c9ca3b94ab";
hash = "sha256-1IRX+5Xh8Fj+/1DIZQrN8ijb2y7H39Y3u+IdbqjQgCc=";
} else if llvmMajor == "11" then {
version = "11.0.0+unstable-2022-05-04";
rev = "4ef524240833abfeee1c5b9fff6b1bd53f4806b3"; # 267 commits ahead of v11.0.0
@@ -48,7 +48,7 @@ disable-warnings-if-gcc13 (stdenv.mkDerivation {
inherit (branch) rev hash;
};
patches = [
patches = lib.optionals (lib.versionAtLeast llvmMajor "15") [
# Fixes build after spirv-headers breaking change
(fetchpatch {
url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/0166a0fb86dc6c0e8903436bbc3a89bc3273ebc0.patch";
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, cctools-port
, perl
, CoreServices
, ApplicationServices
@@ -9,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "moarvm";
version = "2023.10";
version = "2024.01";
src = fetchFromGitHub {
owner = "moarvm";
repo = "moarvm";
rev = version;
hash = "sha256-1w6oMoxDro/AHE+QvjKUx9cxNpYuVSXYrRMh31ksgoQ=";
hash = "sha256-vU1fhR6pKz2qnznrJ/mknt9DVx+I1kLaPStXKQvp59g=";
fetchSubmodules = true;
};
@@ -27,13 +26,9 @@ stdenv.mkDerivation rec {
--replace '/usr/bin/arch' "$(type -P true)" \
--replace '/usr/' '/nope/'
substituteInPlace 3rdparty/dyncall/configure \
--replace '`sw_vers -productVersion`' '"$MACOSX_DEPLOYMENT_TARGET"'
--replace '`sw_vers -productVersion`' '"11.0"'
'';
nativeBuildInputs = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
cctools-port
];
buildInputs = [ perl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];
doCheck = false; # MoarVM does not come with its own test suite
+2 -2
View File
@@ -6,14 +6,14 @@
}:
stdenv.mkDerivation rec {
version = "3.3.8";
version = "3.3.9";
pname = "glfw";
src = fetchFromGitHub {
owner = "glfw";
repo = "GLFW";
rev = version;
sha256 = "sha256-4+H0IXjAwbL5mAWfsIVhW0BSJhcWjkQx4j2TrzZ3aIo=";
sha256 = "sha256-DlPRNGCBr6XF9Jn8kWs5lCRTyjPeDt/69PNDzBDhoyg=";
};
# Fix linkage issues on X11 (https://github.com/NixOS/nixpkgs/issues/142583)
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, autoreconfHook
, writeShellScript
, pkg-config
@@ -27,6 +28,14 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
patches = [
(fetchpatch {
name = "CVE-2023-26157.patch";
url = "https://github.com/LibreDWG/libredwg/commit/c8cf03ce4c2315b146caf582ea061c0460193bcc.patch";
hash = "sha256-EEF3YYPW+6SvXRiAw3zz6tWU9w/qmGtc09Tf8wn7hVc=";
})
];
postPatch = let
printVersion = writeShellScript "print-version" ''
echo -n ${lib.escapeShellArg version}
@@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "apprise";
version = "1.7.1";
version = "1.7.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-jUOdCFUEcFJEJd7e5LyKcnZsIWwhjzdyw3QE6y/Yblo=";
hash = "sha256-CeFZspAI5sjpPX/8PBXUGcC7rkFiBAX48tNDK3Ki6b8=";
};
nativeBuildInputs = [
@@ -75,5 +75,6 @@ buildPythonPackage rec {
changelog = "https://github.com/caronc/apprise/releases/tag/v${version}";
license = licenses.bsd3;
maintainers = with maintainers; [ marsam ];
mainProgram = "apprise";
};
}
@@ -23,7 +23,7 @@
}:
buildPythonPackage rec {
pname = "clickhouse-connect";
version = "0.6.23";
version = "0.7.0";
format = "setuptools";
@@ -33,7 +33,7 @@ buildPythonPackage rec {
repo = "clickhouse-connect";
owner = "ClickHouse";
rev = "refs/tags/v${version}";
hash = "sha256-Gaiq5t/u5LJeJR5nNNfBvdNaFEycqgxVCHFETIvsUUU=";
hash = "sha256-RpuBKdjjSjJJ9UU7VW20gD9Rouj0oxv72sZZaUa/BfY=";
};
nativeBuildInputs = [ cython_3 ];
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "daiquiri";
version = "3.2.3";
version = "3.2.5.1";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-P8rvN2/WgIi5I5E3R6t+4S2Lf7Kvf4xfIOWYCZfp6DU=";
hash = "sha256-Xy6G1vyovDjR6a36YFGE32/eo3AuB8oC0Wqj0AQ7Luw=";
};
nativeBuildInputs = [
@@ -25,7 +25,7 @@
buildPythonPackage rec {
pname = "jsonargparse";
version = "4.27.2";
version = "4.27.3";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -34,7 +34,7 @@ buildPythonPackage rec {
owner = "omni-us";
repo = "jsonargparse";
rev = "refs/tags/v${version}";
hash = "sha256-qvc0HpwgYXDayA0q0D598rCb+I3LuaPm2tmmd0E3rrk=";
hash = "sha256-ZhNop6Zo1uWJhX5XEkjTq3XcRw1WzFd6jrk5CpBGCwo=";
};
nativeBuildInputs = [
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "libknot";
version = "3.3.3";
version = "3.3.4";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-w8VAA+llRg1xeAMRe7ISHo8H+qGi247jwOjTZHecFVM=";
hash = "sha256-KRxc34lqOGuYJM2mUsYrjfiVCQNBxcQyO30wPLf17+Q=";
};
postPatch = ''
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "publicsuffixlist";
version = "0.10.0.20240125";
version = "0.10.0.20240127";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-lxyUgACsRULzQLNyU2TFrLdRzdSbQzvECTRaYQP8O04=";
hash = "sha256-6IpNJsLj4IlMXoEneM9FeYcW6K0Vq5/97fPK5jZMFYQ=";
};
nativeBuildInputs = [
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "pyenphase";
version = "1.18.0";
version = "1.19.0";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "pyenphase";
repo = "pyenphase";
rev = "refs/tags/v${version}";
hash = "sha256-lnxHWEQ9nVWT7dK0Vz7cCN/ur9C/RfzJDh6AYpFHJds=";
hash = "sha256-Wj2CkOvH5mS+DaIcbrqHjK+0mG3gfyF5M9tFImeJ/ko=";
};
postPatch = ''
@@ -1,37 +1,50 @@
{ lib
, async-timeout
, buildPythonPackage
, click
, cryptography
, fetchFromGitHub
, hatchling
, pytest-asyncio
, pytest-timeout
, pytestCheckHook
, pythonOlder
, setuptools
, xdg
, zeroconf
}:
buildPythonPackage rec {
pname = "pylutron-caseta";
version = "0.18.3";
format = "pyproject";
version = "0.19.0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "gurumitts";
repo = pname;
repo = "pylutron-caseta";
rev = "refs/tags/v${version}";
hash = "sha256-tjmMu7LUne+hLLTXGqHhci9/PZiuQ10mQaARvL2sdIM=";
hash = "sha256-/xTHtzXEFGL2/oP1oVxJj7GO3fSZ5CwjXDdp6OLhlzM=";
};
nativeBuildInputs = [
setuptools
hatchling
];
propagatedBuildInputs = [
cryptography
] ++ lib.optionals (pythonOlder "3.11") [
async-timeout
];
passthru.optional-dependencies = {
cli = [
click
xdg
zeroconf
];
};
nativeCheckInputs = [
pytest-asyncio
pytest-timeout
@@ -49,6 +49,8 @@ buildPythonPackage rec {
"test_settings_restored"
];
__darwinAllowLocalNetworking = true;
meta = with lib; {
description = "py.test plugin for testing of Django applications";
homepage = "https://pytest-django.readthedocs.org/en/latest/";
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "yalexs";
version = "1.10.0";
version = "1.11.0";
format = "setuptools";
disabled = pythonOlder "3.9";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "bdraco";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-7LFKqC8IHzXKKU5Pw6Qud9jqJFc0lSEJFn636T6CsfQ=";
hash = "sha256-PQPcD2klwXA/7uH1RrdCd26WGaLpcchp7r1M1RXxQ9Y=";
};
propagatedBuildInputs = [
@@ -320,10 +320,16 @@ in
rustPlatform.cargoSetupHook
rustPlatform.bindgenHook
];
disallowedReferences = [
rustc.unwrapped
];
preBuild = ''
cat ../.cargo/config > ext/fast_mmaped_file_rs/.cargo/config.toml
sed -i "s|cargo-vendor-dir|$PWD/../cargo-vendor-dir|" ext/fast_mmaped_file_rs/.cargo/config.toml
'';
postInstall = ''
find $out -type f -name .rustc_info.json -delete
'';
};
glib2 = attrs: {
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "cirrus-cli";
version = "0.108.5";
version = "0.109.0";
src = fetchFromGitHub {
owner = "cirruslabs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-+2rrKty5XLf8AYXAMI/7ngf5SPqD62ELBcA67sETpOI=";
sha256 = "sha256-yXgBQMpBPAaLnAnirkLJzotW14wRnL9Pn3MM6Tsiny8=";
};
vendorHash = "sha256-AGg6R2TUKW2yU0O8QXrK6r37HKl2HQ+YOJjBkMmHVgM=";
vendorHash = "sha256-xJnBMSfYwx6uHuMjyR9IWGHwt3fNajDr6DW8o+J+lj8=";
ldflags = [
"-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}"
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "jenkins";
version = "2.426.2";
version = "2.426.3";
src = fetchurl {
url = "https://get.jenkins.io/war-stable/${version}/jenkins.war";
hash = "sha256-NzG59Elz+78+U1+YqAwhqtlxnLTuqKHlnpdMEf6EaEg=";
hash = "sha256-q0OSQ6agfi54/nw0CMWWCfe+O/JolHrCFGV6+Wq60QY=";
};
nativeBuildInputs = [ makeWrapper ];
@@ -1,18 +1,17 @@
{ lib, fetchFromGitHub }:
{ lib, fetchzip }:
let
version = "1.0.5";
srcHash = "sha256-tkgkhYuLHfmT42P+UMZ7uNB2wBKo0YGiw0a5RoMAu6M=";
vendorHash = "sha256-QTTnTPOgP+FlbqXNCGJc9VuBzQcMujpvFB3+DykYTPY=";
yarnHash = "sha256-TrcTc5svLLSedRC8gCwIBW7/mtHo+uSNZGImtRiVJ0w=";
version = "2.2.2";
srcHash = "sha256-Ld75U7ItpBgoLKPLNQF0Kb5PFg2O5vdm26aNs/HYfcw=";
# The tarball contains vendored dependencies
vendorHash = null;
in
{
inherit version yarnHash vendorHash;
inherit version vendorHash;
src = fetchFromGitHub {
owner = "woodpecker-ci";
repo = "woodpecker";
rev = "v${version}";
src = fetchzip {
url = "https://github.com/woodpecker-ci/woodpecker/releases/download/v${version}/woodpecker-src.tar.gz";
hash = srcHash;
stripRoot = false;
};
postInstall = ''
@@ -26,7 +25,7 @@ in
ldflags = [
"-s"
"-w"
"-X github.com/woodpecker-ci/woodpecker/version.Version=${version}"
"-X go.woodpecker-ci.org/woodpecker/v2/version.Version=${version}"
];
meta = with lib; {
@@ -1,57 +0,0 @@
{ lib, buildPackages, callPackage, fetchFromGitHub, fetchYarnDeps, mkYarnPackage }:
let
common = callPackage ./common.nix { };
esbuild_0_17_19 = buildPackages.esbuild.overrideAttrs (_: rec {
version = "0.17.19";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
hash = "sha256-PLC7OJLSOiDq4OjvrdfCawZPfbfuZix4Waopzrj8qsU=";
};
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
});
in
mkYarnPackage {
pname = "woodpecker-frontend";
inherit (common) version;
src = "${common.src}/web";
packageJSON = ./woodpecker-package.json;
yarnLock = ./yarn.lock;
offlineCache = fetchYarnDeps {
yarnLock = ./yarn.lock;
hash = common.yarnHash;
};
ESBUILD_BINARY_PATH = lib.getExe esbuild_0_17_19;
buildPhase = ''
runHook preBuild
yarn --offline build
runHook postBuild
'';
installPhase = ''
runHook preInstall
cp -R deps/woodpecker-ci/dist $out
echo "${common.version}" > "$out/version"
runHook postInstall
'';
# Do not attempt generating a tarball for woodpecker-frontend again.
doDist = false;
meta = common.meta // {
description = "Woodpecker Continuous Integration server frontend";
};
}
@@ -1,4 +1,4 @@
{ buildGoModule, callPackage, woodpecker-frontend }:
{ buildGoModule, callPackage }:
let
common = callPackage ./common.nix { };
in
@@ -6,17 +6,11 @@ buildGoModule {
pname = "woodpecker-server";
inherit (common) version src ldflags postInstall vendorHash;
postPatch = ''
cp -r ${woodpecker-frontend} web/dist
'';
subPackages = "cmd/server";
CGO_ENABLED = 1;
passthru = {
inherit woodpecker-frontend;
updateScript = ./update.sh;
};
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github jq nix-prefetch pnpm-lock-export
#!nix-shell -i bash -p nix wget jq nix-prefetch
# shellcheck shell=bash
@@ -26,28 +26,9 @@ fi
# strip leading "v"
version="${version#v}"
sed -i -E -e "s#version = \".*\"#version = \"$version\"#" common.nix
# Woodpecker repository
src_hash=$(nix-prefetch-github woodpecker-ci woodpecker --rev "v${version}" | jq -r .hash)
# Go modules
vendorHash=$(nix-prefetch '{ sha256 }: (callPackage (import ./cli.nix) { }).goModules.overrideAttrs (_: { modHash = sha256; })')
# Front-end dependencies
woodpecker_src="https://raw.githubusercontent.com/woodpecker-ci/woodpecker/v$version"
wget "${TOKEN_ARGS[@]}" "$woodpecker_src/web/package.json" -O woodpecker-package.json
trap 'rm -rf pnpm-lock.yaml' EXIT
wget "${TOKEN_ARGS[@]}" "$woodpecker_src/web/pnpm-lock.yaml"
pnpm-lock-export --schema yarn.lock@v1
yarn_hash=$(prefetch-yarn-deps yarn.lock)
# Use friendlier hashes
src_hash=$(nix-prefetch-url --type sha256 --unpack "https://github.com/woodpecker-ci/woodpecker/releases/download/v$version/woodpecker-src.tar.gz")
src_hash=$(nix hash to-sri --type sha256 "$src_hash")
vendorHash=$(nix hash to-sri --type sha256 "$vendorHash")
yarn_hash=$(nix hash to-sri --type sha256 "$yarn_hash")
sed -i -E -e "s#version = \".*\"#version = \"$version\"#" common.nix
sed -i -E -e "s#srcHash = \".*\"#srcHash = \"$src_hash\"#" common.nix
sed -i -E -e "s#vendorHash = \".*\"#vendorHash = \"$vendorHash\"#" common.nix
sed -i -E -e "s#yarnHash = \".*\"#yarnHash = \"$yarn_hash\"#" common.nix
@@ -1,77 +0,0 @@
{
"name": "woodpecker-ci",
"author": "Woodpecker CI",
"version": "0.0.0",
"license": "Apache-2.0",
"engines": {
"node": ">=14"
},
"scripts": {
"start": "vite",
"build": "vite build --base=/BASE_PATH",
"serve": "vite preview",
"lint": "eslint --max-warnings 0 --ext .js,.ts,.vue,.json .",
"formatcheck": "prettier -c .",
"format:fix": "prettier --write .",
"typecheck": "vue-tsc --noEmit",
"test": "echo 'No tests configured' && exit 0"
},
"dependencies": {
"@intlify/unplugin-vue-i18n": "^0.10.1",
"@kyvg/vue3-notification": "^2.9.1",
"@vueuse/core": "^9.13.0",
"ansi_up": "^5.2.1",
"dayjs": "^1.11.9",
"floating-vue": "^2.0.0-beta.24",
"fuse.js": "^6.6.2",
"humanize-duration": "^3.28.0",
"javascript-time-ago": "^2.5.9",
"lodash": "^4.17.21",
"node-emoji": "^1.11.0",
"pinia": "^2.1.4",
"prismjs": "^1.29.0",
"vue": "^3.3.4",
"vue-i18n": "^9.2.2",
"vue-router": "^4.2.2"
},
"devDependencies": {
"@iconify/json": "^2.2.85",
"@types/humanize-duration": "^3.27.1",
"@types/javascript-time-ago": "^2.0.3",
"@types/lodash": "^4.14.195",
"@types/node": "^18.16.19",
"@types/node-emoji": "^1.8.2",
"@types/prismjs": "^1.26.0",
"@typescript-eslint/eslint-plugin": "^5.60.1",
"@typescript-eslint/parser": "^5.60.1",
"@vitejs/plugin-vue": "^4.2.3",
"@vue/compiler-sfc": "^3.3.4",
"eslint": "^8.44.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-airbnb-typescript": "^17.0.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-simple-import-sort": "^10.0.0",
"eslint-plugin-vue": "^9.15.1",
"eslint-plugin-vue-scoped-css": "^2.5.0",
"prettier": "^2.8.8",
"typescript": "5.0.3",
"unplugin-icons": "^0.16.3",
"unplugin-vue-components": "^0.24.1",
"vite": "^4.3.9",
"vite-plugin-prismjs": "^0.0.8",
"vite-plugin-windicss": "^1.9.0",
"vite-svg-loader": "^4.0.0",
"vue-eslint-parser": "^9.3.1",
"vue-tsc": "^1.8.3",
"windicss": "^3.5.6"
},
"pnpm": {
"overrides": {
"semver@<7.5.2": ">=7.5.2",
"postcss@<8.4.31": ">=8.4.31"
}
}
}
File diff suppressed because it is too large Load Diff
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "goimports-reviser";
version = "3.6.3";
version = "3.6.4";
src = fetchFromGitHub {
owner = "incu6us";
repo = "goimports-reviser";
rev = "v${version}";
hash = "sha256-wv09/Do8D05qP289g4HMxluEf7AROaJ/au35ZSVR1DQ=";
hash = "sha256-+GVC/qJnqWm5tsn2Y5BPafapp7ct9kqHWlDNxukEZsM=";
};
vendorHash = "sha256-z+FeAXPXKi653im2X2WOP1R9gRl/x7UBnndoEXoxdwA=";
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "golines";
version = "0.11.0";
version = "0.12.2";
src = fetchFromGitHub {
owner = "segmentio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-2K9KAg8iSubiTbujyFGN3yggrL+EDyeUCs9OOta/19A=";
sha256 = "sha256-D0gI9BA0vgM1DBqwolNTfPsTCWuOGrcu5gAVFEdyVGg=";
};
vendorHash = "sha256-rxYuzn4ezAxaeDhxd8qdOzt+CKYIh03A9zKNdzILq18=";
vendorHash = "sha256-jI3/m1UdZMKrS3H9jPhcVAUCjc1G/ejzHi9SCTy24ak=";
meta = with lib; {
description = "A golang formatter that fixes long lines";
@@ -1,20 +1,26 @@
{ lib
, fetchFromGitHub
, rustPlatform
, stdenv
}:
rustPlatform.buildRustPackage rec {
pname = "beancount-language-server";
version = "1.3.1";
version = "1.3.4";
src = fetchFromGitHub {
owner = "polarmutex";
repo = "beancount-language-server";
rev = "v${version}";
hash = "sha256-9IkbEOG6xcmpowsLj/RHnMFGQxh02JMQsTVli4hvs/M=";
hash = "sha256-C44Z8JaEZvwgocaGjWT3rUAgIBtCRo0xZappMsydR7g=";
};
cargoHash = "sha256-qhN2//hhCaKpm0HAiUL/CfdrtvAXgR34vXBECB8UDxE=";
cargoHash = "sha256-NMSNCURSO1iIWHH27FI5Y0q7+Ghds8VSxRGBOp+fH6A=";
# Workaround for https://github.com/NixOS/nixpkgs/issues/166205
env = lib.optionalAttrs (stdenv.cc.libcxx != null) {
NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}";
};
doInstallCheck = true;
postInstallCheck = ''
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "devspace";
version = "6.3.9";
version = "6.3.10";
src = fetchFromGitHub {
owner = "devspace-sh";
repo = "devspace";
rev = "v${version}";
hash = "sha256-Jy2e1bCCO3YeigQM9qSbbgqrZppXlUq+2oXIiotMKtI=";
hash = "sha256-ExVetF5YP9gf5ifBsdPow7KA867+4iOxe/0OwZwctoc=";
};
vendorHash = null;
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "oh-my-posh";
version = "19.8.0";
version = "19.8.2";
src = fetchFromGitHub {
owner = "jandedobbeleer";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-nCzGvWthu+gmYKKEqnU552Y4Ii4O7Ttel/9wmZo84fY=";
hash = "sha256-Gc8pz+DFP0Wze6YC4hzhgZiSGi61j7Lzak/o3LhdcfI=";
};
vendorHash = "sha256-8ZupQe4b3uCX79Q0oYqggMWZE9CfX5OSFdLIrxT8CHY=";
+2 -2
View File
@@ -5,14 +5,14 @@
python3Packages.buildPythonApplication rec {
pname = "refurb";
version = "1.27.0";
version = "1.28.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "dosisod";
repo = "refurb";
rev = "refs/tags/v${version}";
hash = "sha256-v9zeip7dyEGbn4FVXkd713ybVyf9tvvflCeiS4H7lO0=";
hash = "sha256-b7Id2Oyjw3NZno56IMDIq7fn5u9+jn42nuae8ix90fM=";
};
postPatch = ''
+4 -13
View File
@@ -1,5 +1,4 @@
{ lib
, callPackage
, fetchFromGitHub
, perl
, rustPlatform
@@ -9,20 +8,21 @@
rustPlatform.buildRustPackage rec {
pname = "rover";
version = "0.14.0";
version = "0.22.0";
src = fetchFromGitHub {
owner = "apollographql";
repo = pname;
rev = "v${version}";
sha256 = "sha256-fVgo5Ds/VK0kBpF+F2FdMvBnQj2IB+B5ToOK8ONdq6c=";
sha256 = "sha256-+BsD7SRinU57Alg71N3tdL9iFGGdomVA7SrBE6G1f4E=";
};
cargoSha256 = "sha256-fNqnpLNENLJEhbqxLFUqyjAf8tEPCLoGSRV91gOY9LI=";
cargoSha256 = "sha256-SDvOxvfv8FNUebfwSFnBc6ormK2xpXPjmACwtllHfQE=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.CoreServices
darwin.apple_sdk.frameworks.SystemConfiguration
];
nativeBuildInputs = [
@@ -36,15 +36,6 @@ rustPlatform.buildRustPackage rec {
"-- --skip=latest_plugins_are_valid_versions"
];
# The rover-client's build script (xtask/src/commands/prep/schema.rs) will try to
# download the API's graphql schema at build time to our read-only filesystem.
# To avoid this we pre-download it to a location the build script checks.
preBuild = ''
cp ${./schema}/hash.id crates/rover-client/.schema/
cp ${./schema}/etag.id crates/rover-client/.schema/
cp ${./schema}/schema.graphql crates/rover-client/.schema/
'';
passthru.updateScript = ./update.sh;
# Some tests try to write configuration data to a location in the user's home
@@ -1 +0,0 @@
d35f8c48cb89329f33656944fa9e997de1e778b043b9ca4d78c8accdecfd9046
@@ -1 +0,0 @@
ff145f12604d11312e6a2f8a61a3d226fcdb2ca79f6b7fbc24c5a22aa23ab1af
File diff suppressed because it is too large Load Diff
-24
View File
@@ -49,27 +49,3 @@ cargoSha256=$(
sed --in-place \
"s|cargoSha256 = \".*\"|cargoSha256 = \"$cargoSha256\"|" \
"$dirname/default.nix"
# Update apollo api schema info
response="$(mktemp)"
schemaUrl=https://graphql.api.apollographql.com/api/schema
mkdir -p "$dirname"/schema
# Fetch schema info
echo "Fetching Apollo GraphQL schema"
# include response headers, and append terminating newline to response body
curl --include --write-out "\n" "$schemaUrl" > "$response"
# Parse response headers and write the etag to schema/etag.id
grep \
--max-count=1 \
--only-matching \
--perl-regexp \
'^etag: \K\S*' \
"$response" \
> "$dirname"/schema/etag.id
# Discard headers and blank line (terminated by carriage return), and write the
# response body to schema/schema.graphql
sed '1,/^\r/d' "$response" > "$dirname"/schema/schema.graphql
@@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-license";
version = "0.6.0";
version = "0.6.1";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-hBlyRk23gRfKdYuVnrFoDE883S32X9DFvTIsR2zfJck=";
sha256 = "sha256-qwyWj0vPWQOZYib2ZZutX25a4wwnG1kFAiRCWqGyVms=";
};
cargoHash = "sha256-4P2kR+Jxki62IdUKpMNL7hzBQWci2tKWrQXV5rkMXkw=";
cargoHash = "sha256-ifw/n7eejUWUqhieDLojuO3xgosn28NnjAKkq/ZSLEI=";
meta = with lib; {
description = "Cargo subcommand to see license of dependencies";
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-zigbuild";
version = "0.18.2";
version = "0.18.3";
src = fetchFromGitHub {
owner = "messense";
repo = pname;
rev = "v${version}";
hash = "sha256-qPoPDUx88fBRkxcwirIgGO9wivB/e7B7Yy55JOICvdM=";
hash = "sha256-wL6Rmw5hJI8cJDw2WO9CDOyeOuZv6QoFxrn81JrYBR4=";
};
cargoHash = "sha256-011FySv7BbfTB1uHWh916MvK1gXqbu8Bp38aEkUytqs=";
cargoHash = "sha256-uCZYDh4+Pri77DzqZj12cav7o8eDY2+fgwIwVBdcbHg=";
nativeBuildInputs = [ makeWrapper ];
+3 -3
View File
@@ -13,16 +13,16 @@
rustPlatform.buildRustPackage rec {
pname = "deno";
version = "1.39.2";
version = "1.40.2";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
hash = "sha256-R5LF3PwH8LZeBM7biR+QLo5+MJ9KvM41fk5IHR7oAOs=";
hash = "sha256-ycQN4BKuvK4FRYbHUKFFMVFg0LAG64xFiXbAkmQ46Cs=";
};
cargoHash = "sha256-OPHQltS+3GZTIhMSg6ldLWy6L5skYzZxJLM06rLiDzs=";
cargoHash = "sha256-5OnYtVsuf6q4nQGO1+qL+2WFaKW0k13fNFS29gKaWhk=";
postPatch = ''
# upstream uses lld on aarch64-darwin for faster builds
+5 -5
View File
@@ -10,11 +10,11 @@ let
};
in
fetch_librusty_v8 {
version = "0.82.0";
version = "0.83.1";
shas = {
x86_64-linux = "sha256-2nWOAUuzc7tr0KieeugIqI3zaRruvnLWBPn+ZdHTXsM=";
aarch64-linux = "sha256-vlc60ZoFtT2Ugp0npT0dep6WWnEBAznR7dYFRaMNAKM=";
x86_64-darwin = "sha256-CqyG/JOJe5kWzFJnnkU2Lz4VS/unWe1iucFxm+1HGsU=";
aarch64-darwin = "sha256-ps19JZqCpO3pEAMQZOO+l/Iz7u0dIXLnpYIsnOyAxYk=";
x86_64-linux = "sha256-0cCpFMPpFWTvoU3+HThYDDTQO7DdpdVDDer5k+3HQFY=";
aarch64-linux = "sha256-fOyJiD0raHxl+5tDWSpH/MbdBUqNY+HCKmTulYLXEYI=";
x86_64-darwin = "sha256-JwZ1FrU/MZeEnvSPDojvDdDxIF/bdZBPRCXrjbBb7WM=";
aarch64-darwin = "sha256-ajmr+SGj3L8TT+17NPkNcwQFESpIZuUul12Pp1oJAkY=";
};
}
+3 -3
View File
@@ -35,19 +35,19 @@
stdenv.mkDerivation rec {
pname = "ddnet";
version = "18.0.1";
version = "18.0.2";
src = fetchFromGitHub {
owner = "ddnet";
repo = pname;
rev = version;
hash = "sha256-CgmFljI9/S544Hm9J4CEqvNgepPM02JgJZJ5HX1d3wU=";
hash = "sha256-ywHPs1bRLxx8nd1D5LgMKkSxVPEuqWxaLzF+1nqNkto=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
name = "${pname}-${version}";
inherit src;
hash = "sha256-oGZOgSPMnrzwEyUvXqdfquCWCFslPfD9C0vT8mILI+s=";
hash = "sha256-UPe1EMFwS1We2I9Ba8Ku2DTnnUFEl2wapfbDNiWMb1w";
};
nativeBuildInputs = [
+3 -3
View File
@@ -11,14 +11,14 @@
buildPythonApplication rec {
pname = "gogdl";
version = "0.7.3";
version = "1.0.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "Heroic-Games-Launcher";
repo = "heroic-gogdl";
rev = "89d15f1593cc26f15a5f8f409bb623764c095d37";
hash = "sha256-EECpXGVhcwihKB8fLObVvYzFD8uh7CxYKtFiGc0Jqbk=";
rev = "e1c3e5b98feda53ea88f54f9aa5c614ae9424ef0";
hash = "sha256-MGxpWfDGchZruVmSiea5s1JQV23F9QvQLWrxPmIsBEo=";
};
disabled = pythonOlder "3.8";
+2 -2
View File
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "jitsi-meet-prosody";
version = "1.0.7712";
version = "1.0.7762";
src = fetchurl {
url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
sha256 = "MONg1CxLrfB+cmmXm4r3HqwF1on+vDZ0IODKSr7PsWo=";
sha256 = "AbIr+nJEccZFWDbuo+VeTEpLkreOBzKkrJFZFvY1ppI=";
};
dontBuild = true;
+2 -2
View File
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "fwts";
version = "23.11.00";
version = "24.01.00";
src = fetchzip {
url = "https://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz";
sha256 = "sha256-3cusxMFIYGKJ+ocQPc77bzHkyQhikLo1szSgE59aK9s=";
sha256 = "sha256-MXWmKxcxgSVCSeeGlWsa8JTBa5hLyvGPZ0811w+s+yA=";
stripRoot = false;
};
+23 -22
View File
@@ -227,32 +227,33 @@ stdenv.mkDerivation (finalAttrs: {
] ++ lib.optional stdenv.hostPlatform.isMusl (
let
oe-core = fetchzip {
url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-eb8a86fee9eeae787cc0a58ef2ed087fd48d93eb.tar.gz";
sha256 = "tE2KpXLvOknIpEZFdOnNxvBmDvZrra3kvQp9tKxa51c=";
url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-6fdf03bd950e55ef7881041606f6e76141033716.tar.gz";
sha256 = "/+9aJdOxBY8Y4vJPftOCxmyK8L2nvR82KmJxil1a2aY=";
};
musl-patches = oe-core + "/meta/recipes-core/systemd/systemd";
in
[
(musl-patches + "/0001-Adjust-for-musl-headers.patch")
(musl-patches + "/0005-pass-correct-parameters-to-getdents64.patch")
(musl-patches + "/0006-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch")
(musl-patches + "/0009-missing_type.h-add-comparison_fn_t.patch")
(musl-patches + "/0010-add-fallback-parse_printf_format-implementation.patch")
(musl-patches + "/0011-src-basic-missing.h-check-for-missing-strndupa.patch")
(musl-patches + "/0012-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch")
(musl-patches + "/0013-add-missing-FTW_-macros-for-musl.patch")
(musl-patches + "/0014-Use-uintmax_t-for-handling-rlim_t.patch")
(musl-patches + "/0016-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch")
(musl-patches + "/0017-Define-glibc-compatible-basename-for-non-glibc-syste.patch")
(musl-patches + "/0018-Do-not-disable-buffering-when-writing-to-oom_score_a.patch")
(musl-patches + "/0019-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch")
(musl-patches + "/0020-avoid-redefinition-of-prctl_mm_map-structure.patch")
(musl-patches + "/0021-do-not-disable-buffer-in-writing-files.patch")
(musl-patches + "/0022-Handle-__cpu_mask-usage.patch")
(musl-patches + "/0023-Handle-missing-gshadow.patch")
(musl-patches + "/0024-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch")
(musl-patches + "/0028-sd-event-Make-malloc_trim-conditional-on-glibc.patch")
(musl-patches + "/0029-shared-Do-not-use-malloc_info-on-musl.patch")
(musl-patches + "/0017-Adjust-for-musl-headers.patch")
(musl-patches + "/0016-pass-correct-parameters-to-getdents64.patch")
(musl-patches + "/0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch")
(musl-patches + "/0001-missing_type.h-add-comparison_fn_t.patch")
(musl-patches + "/0002-add-fallback-parse_printf_format-implementation.patch")
(musl-patches + "/0003-src-basic-missing.h-check-for-missing-strndupa.patch")
(musl-patches + "/0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch")
(musl-patches + "/0005-add-missing-FTW_-macros-for-musl.patch")
(musl-patches + "/0006-Use-uintmax_t-for-handling-rlim_t.patch")
(musl-patches + "/0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch")
(musl-patches + "/0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch")
(musl-patches + "/0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch")
(musl-patches + "/0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch")
(musl-patches + "/0011-avoid-redefinition-of-prctl_mm_map-structure.patch")
(musl-patches + "/0012-do-not-disable-buffer-in-writing-files.patch")
(musl-patches + "/0013-Handle-__cpu_mask-usage.patch")
(musl-patches + "/0014-Handle-missing-gshadow.patch")
(musl-patches + "/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch")
(musl-patches + "/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch")
(musl-patches + "/0021-shared-Do-not-use-malloc_info-on-musl.patch")
(musl-patches + "/0022-avoid-missing-LOCK_EX-declaration.patch")
]
);
+2 -2
View File
@@ -2,10 +2,10 @@
let
pname = "jicofo";
version = "1.0-1059";
version = "1.0-1062";
src = fetchurl {
url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
sha256 = "NlBRUI4j/5njFS/TtBTsaV/5ILFtqWd6SF+FqpGp1Uk=";
sha256 = "bU7h7kjs2yu1O+qhKcs6C63DH/omo/R1+Ms40KHkjHU=";
};
in
stdenv.mkDerivation {
+2 -2
View File
@@ -2,10 +2,10 @@
let
pname = "jitsi-videobridge2";
version = "2.3-64-g719465d1";
version = "2.3-67-gb2d4229f";
src = fetchurl {
url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
sha256 = "zZYBSHaMhGzJfONyEUkPUCalxLyB/EjqLqIgJPg2Z8o=";
sha256 = "aE9QFzOJk3jMzNTEitcaBZVKpa1IJ55JahLfNDCujJI=";
};
in
stdenv.mkDerivation {
+4 -4
View File
@@ -12,13 +12,13 @@
}:
let
version = "1.12.1";
version = "1.13.1";
src = fetchFromGitHub {
owner = "axllent";
repo = "mailpit";
rev = "v${version}";
hash = "sha256-Ez34JC8QhOCVS7itZAOtYcspbM9MjtZa+1BP2FEIt8U=";
hash = "sha256-50amJ4pFNVcV7WT303ObPJiCx6tNYWNks3oFnexHRoA=";
};
# Separate derivation, because if we mix this in buildGoModule, the separate
@@ -30,7 +30,7 @@ let
npmDeps = fetchNpmDeps {
inherit src;
hash = "sha256-TjlkWozbZlDOsCOdZnOM6axkBYi5G2BCOlvSY4dZg4c=";
hash = "sha256-KleFztYmbgIPg/3acXJTg1J5uyWsVZUQ0caK+hT1uxQ=";
};
env = lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) {
@@ -56,7 +56,7 @@ buildGoModule {
pname = "mailpit";
inherit src version;
vendorHash = "sha256-mJWSCqgIPChMR1iFS2rXXOCG+lF1HekmmAjwPPa140g=";
vendorHash = "sha256-iNNs9vLvOKqVpLKt65wVmffgq1l/9KOtnbRPg+2kbsM=";
CGO_ENABLED = 0;
+13 -2
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, buildGoModule, fetchFromGitHub, removeReferencesTo
, tzdata, wire
, yarn, nodejs, cacert
, yarn, nodejs, python3, cacert
, jq, moreutils
, nix-update-script, nixosTests
}:
@@ -74,7 +74,7 @@ buildGoModule rec {
vendorHash = "sha256-Gf2A22d7/8xU/ld7kveqGonVKGFCArGNansPRGhfyXM=";
nativeBuildInputs = [ wire yarn jq moreutils removeReferencesTo ];
nativeBuildInputs = [ wire yarn jq moreutils removeReferencesTo python3 ];
postPatch = ''
${patchAwayGrafanaE2E}
@@ -121,9 +121,20 @@ buildGoModule rec {
# Setup node_modules
export HOME="$(mktemp -d)"
# Help node-gyp find Node.js headers
# (see https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks/javascript.section.md#pitfalls-javascript-yarn2nix-pitfalls)
mkdir -p $HOME/.node-gyp/${nodejs.version}
echo 9 > $HOME/.node-gyp/${nodejs.version}/installVersion
ln -sfv ${nodejs}/include $HOME/.node-gyp/${nodejs.version}
export npm_config_nodedir=${nodejs}
yarn config set enableTelemetry 0
yarn config set cacheFolder $offlineCache
yarn --immutable-cache
# The build OOMs on memory constrained aarch64 without this
export NODE_OPTIONS=--max_old_space_size=4096
'';
postBuild = ''
+2 -2
View File
@@ -16,13 +16,13 @@ in
stdenv.mkDerivation rec {
pname = "osmo-bsc";
version = "1.11.0";
version = "1.11.1";
src = fetchFromGitHub {
owner = "osmocom";
repo = "osmo-bsc";
rev = version;
hash = "sha256-9WXK2vw+SvAAaBzhpeB+sBux9cGWyPtJVczRfk4rI6E=";
hash = "sha256-pMdQcIFWiawXYnmHSjTk+3YcZNMrv3qmgWr4gkTknJA=";
};
postPatch = ''
+2 -2
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "osmo-bts";
version = "1.7.1";
version = "1.7.2";
src = fetchFromGitHub {
owner = "osmocom";
repo = "osmo-bts";
rev = version;
hash = "sha256-Y972aa98bNU3IhuGMV80nh4ZjQKUdK6of1Q8H75Ips8=";
hash = "sha256-dje+B1jobsVdQZYyIkLTZzez4HQirCcjyosTQCo/v64=";
};
postPatch = ''
+2 -2
View File
@@ -17,13 +17,13 @@ in
stdenv.mkDerivation rec {
pname = "osmo-iuh";
version = "1.5.0";
version = "1.5.1";
src = fetchFromGitHub {
owner = "osmocom";
repo = "osmo-iuh";
rev = version;
hash = "sha256-rAU2+NxD+j2jntZ7dHvakv2aTsfzAg0+SFDHtSJNpn8=";
hash = "sha256-1G5N74N3BH+XP4hr+w0a1wc2DaE/GXpSu3JiPo8UBhI=";
};
prePatch = ''
+2 -2
View File
@@ -14,13 +14,13 @@ in
stdenv.mkDerivation rec {
pname = "osmo-mgw";
version = "1.12.0";
version = "1.12.2";
src = fetchFromGitHub {
owner = "osmocom";
repo = "osmo-mgw";
rev = version;
hash = "sha256-vsOaWlO6y6qV1XcH/jNjvFzApIHqNrPDzZtDoTIMA5k=";
hash = "sha256-RE16qzL8CXjGzoDniB8gBF0fsIaWzDuIvpdQ/5vUdug=";
};
postPatch = ''
+2 -2
View File
@@ -19,13 +19,13 @@ in
stdenv.mkDerivation rec {
pname = "osmo-msc";
version = "1.11.0";
version = "1.11.1";
src = fetchFromGitHub {
owner = "osmocom";
repo = "osmo-msc";
rev = version;
hash = "sha256-e36k/uEajtQ3cnqn+xvPQPGWuA8ILIlkjOkd96IOvow=";
hash = "sha256-JsfZUkXCpyLucaj0NL+MRCr2sWSCbuZRsipi4O7kFRQ=";
};
postPatch = ''
+2 -2
View File
@@ -72,7 +72,7 @@ in rec {
};
unifi8 = generic {
version = "8.0.26";
sha256 = "96d79cad82656d490f99ea476b6e6b049836f705a9aad594572b46e5f0f535d1";
version = "8.0.28";
sha256 = "sha256-RA3R/iR3u/V+qU2sQTNtaQhYOI8tCQw8TvMWPUlitrw=";
};
}
+2 -2
View File
@@ -13,13 +13,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "uxplay";
version = "1.68.1";
version = "1.68.2";
src = fetchFromGitHub {
owner = "FDH2";
repo = "UxPlay";
rev = "v${finalAttrs.version}";
hash = "sha256-9/fzEaOIgkBnEkmwemMEPTmxMOi1/PYhD9zbb/s2huM=";
hash = "sha256-Ax2RhIIWb7BvBvE8GQlR3lwTSA5P5Qpj45cOc8xZNtY=";
};
postPatch = ''
+3 -3
View File
@@ -18,16 +18,16 @@ let
};
in buildNpmPackage' rec {
pname = "balena-cli";
version = "17.4.12";
version = "17.5.0";
src = fetchFromGitHub {
owner = "balena-io";
repo = "balena-cli";
rev = "v${version}";
hash = "sha256-lyGcsGM/QCkOl9wFy8u1UEHkLHaWPPRfgkcD/uH4MD0=";
hash = "sha256-qc1qYDdWIk3r/0B9mpV0BqNFLvG5in2KSBs+0/s5oCk=";
};
npmDepsHash = "sha256-/kbvJwNdH86oHv7SpGmtns7QwoLTwCgN+LUsZE2A+to=";
npmDepsHash = "sha256-WZoBSZuW8qLaiCc/KY9MO+IeUy3r44OFI5s5wdsNUaE=";
postPatch = ''
ln -s npm-shrinkwrap.json package-lock.json
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "vulkan-caps-viewer";
version = "3.32";
version = "3.33";
src = fetchFromGitHub {
owner = "SaschaWillems";
repo = "VulkanCapsViewer";
rev = version;
hash = "sha256-SPz8AurANjNwtsPHdZ2lCaC3VEcEAKn93st/7DJ0oyU=";
hash = "sha256-eKUgsT3KDua+whO0JdtnniKqoRmBt58LELeUz24goPM=";
# Note: this derivation strictly requires vulkan-header to be the same it was developed against.
# To help us, they've put it in a git-submodule.
# The result will work with any vulkan-loader version.

Some files were not shown because too many files have changed in this diff Show More