mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-02 15:41:48 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
bcca7c70b6
2
.github/workflows/manual-rendering.yml
vendored
2
.github/workflows/manual-rendering.yml
vendored
@ -54,7 +54,7 @@ jobs:
|
||||
# less noisy until all nixpkgs pull requests have stopped using
|
||||
# docbook for option docs.
|
||||
- name: Comment on failure
|
||||
uses: peter-evans/create-or-update-comment@v2
|
||||
uses: peter-evans/create-or-update-comment@v3
|
||||
if: ${{ failure() && steps.check.conclusion == 'failure' }}
|
||||
with:
|
||||
issue-number: 189318
|
||||
|
||||
2
.github/workflows/periodic-merge-24h.yml
vendored
2
.github/workflows/periodic-merge-24h.yml
vendored
@ -51,7 +51,7 @@ jobs:
|
||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Comment on failure
|
||||
uses: peter-evans/create-or-update-comment@v2
|
||||
uses: peter-evans/create-or-update-comment@v3
|
||||
if: ${{ failure() }}
|
||||
with:
|
||||
issue-number: 105153
|
||||
|
||||
2
.github/workflows/periodic-merge-6h.yml
vendored
2
.github/workflows/periodic-merge-6h.yml
vendored
@ -49,7 +49,7 @@ jobs:
|
||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Comment on failure
|
||||
uses: peter-evans/create-or-update-comment@v2
|
||||
uses: peter-evans/create-or-update-comment@v3
|
||||
if: ${{ failure() }}
|
||||
with:
|
||||
issue-number: 105153
|
||||
|
||||
@ -46,7 +46,7 @@ jobs:
|
||||
run: |
|
||||
git clean -f
|
||||
- name: create PR
|
||||
uses: peter-evans/create-pull-request@v4
|
||||
uses: peter-evans/create-pull-request@v5
|
||||
with:
|
||||
body: |
|
||||
Automatic update by [update-terraform-providers](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/update-terraform-providers.yml) action.
|
||||
|
||||
@ -7101,6 +7101,13 @@
|
||||
fingerprint = "7EB1 C02A B62B B464 6D7C E4AE D1D0 9DE1 69EA 19A0";
|
||||
}];
|
||||
};
|
||||
jfvillablanca = {
|
||||
email = "jmfv.dev@gmail.com";
|
||||
matrix = "@jfvillablanca:matrix.org";
|
||||
github = "jfvillablanca";
|
||||
githubId = 31008330;
|
||||
name = "Jann Marc Villablanca";
|
||||
};
|
||||
jgart = {
|
||||
email = "jgart@dismail.de";
|
||||
github = "jgarte";
|
||||
@ -16938,6 +16945,12 @@
|
||||
githubId = 568532;
|
||||
name = "Christian Zagrodnick";
|
||||
};
|
||||
zahrun = {
|
||||
email = "zahrun@murena.io";
|
||||
github = "zahrun";
|
||||
githubId = 10415894;
|
||||
name = "Zahrun";
|
||||
};
|
||||
zakame = {
|
||||
email = "zakame@zakame.net";
|
||||
github = "zakame";
|
||||
|
||||
@ -197,6 +197,7 @@
|
||||
./programs/mdevctl.nix
|
||||
./programs/mepo.nix
|
||||
./programs/mininet.nix
|
||||
./programs/minipro.nix
|
||||
./programs/miriway.nix
|
||||
./programs/mosh.nix
|
||||
./programs/msmtp.nix
|
||||
|
||||
@ -29,9 +29,9 @@ let
|
||||
configFile = if (cfg.configFile != null) then cfg.configFile else configFile';
|
||||
|
||||
preStart = ''
|
||||
install ${configFile} /run/${RuntimeDirectory}/ddclient.conf
|
||||
install --mode=600 --owner=$USER ${configFile} /run/${RuntimeDirectory}/ddclient.conf
|
||||
${lib.optionalString (cfg.configFile == null) (if (cfg.protocol == "nsupdate") then ''
|
||||
install ${cfg.passwordFile} /run/${RuntimeDirectory}/ddclient.key
|
||||
install --mode=600 --owner=$USER ${cfg.passwordFile} /run/${RuntimeDirectory}/ddclient.key
|
||||
'' else if (cfg.passwordFile != null) then ''
|
||||
"${pkgs.replace-secret}/bin/replace-secret" "@password_placeholder@" "${cfg.passwordFile}" "/run/${RuntimeDirectory}/ddclient.conf"
|
||||
'' else ''
|
||||
|
||||
@ -29,13 +29,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "ryujinx";
|
||||
version = "1.1.692"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
|
||||
version = "1.1.700"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ryujinx";
|
||||
repo = "Ryujinx";
|
||||
rev = "1b41b285ac7f551c3495ced436ce3930ad7223b4";
|
||||
sha256 = "07s42xmdagi97i7c3mm9qak9msgv4c75say10dl4nha784kxkbvp";
|
||||
rev = "a1efd87c45027a347e91fd22d42f33c3eed89030";
|
||||
sha256 = "0ng8ph2sdlcrsy4nlyjhff2n0c76nzkakpnks7qrv6ljr911yck1";
|
||||
};
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_7_0;
|
||||
|
||||
10
pkgs/applications/emulators/ryujinx/deps.nix
generated
10
pkgs/applications/emulators/ryujinx/deps.nix
generated
@ -50,10 +50,10 @@
|
||||
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; })
|
||||
(fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "6.0.0"; sha256 = "08c4fh1n8vsish1vh7h73mva34g0as4ph29s4lvps7kmjb4z64nl"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.27.0"; sha256 = "053c1pkx9bnb9440f5rkzbdv99wgcaw95xnqjp09ncd2crh8kakp"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.27.0"; sha256 = "103qvpahmn1x8yxj0kc920s27xbyjr15z8lf5ikrsrikalb5yjx9"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.27.0"; sha256 = "1c3b0bkmxa24bvzi16jc7lc1nifqcq4jg7ild973bb8mivicagzv"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.27.0"; sha256 = "0h51vdcz6pkv4ky2ygba4vks56rskripqb3fjz95ym0l0xg20s1a"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.28.1"; sha256 = "0g5a5w34263psh90mp1403m9bh3pcfw6z29vlzdpllzbifk0licr"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.28.1"; sha256 = "1smsbv400nk4b6x1y9gsk60rlfjmrdvni26d1jnqsxpm1250zdvf"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.28.1"; sha256 = "15bq83wi4h8f1lqinijdqd7vg6n2v77hyza20mjqcp1h3hl2vj43"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.28.1"; sha256 = "0ckpjjdy2rv1z7ivqrkc7z16rcqygxzs0la80g8df68p4xxfa0c5"; })
|
||||
(fetchNuGet { pname = "Microsoft.IO.RecyclableMemoryStream"; version = "2.3.2"; sha256 = "115bm7dljchr7c02hiv1r3l21r22wpml1j26fyn2amaflaihpq4l"; })
|
||||
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.5.0"; sha256 = "00gz2i8kx4mlq1ywj3imvf7wc6qzh0bsnynhw06z0mgyha1a21jy"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
|
||||
@ -177,7 +177,7 @@
|
||||
(fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; })
|
||||
(fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.0.1"; sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; })
|
||||
(fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.0.1"; sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; })
|
||||
(fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "6.27.0"; sha256 = "0fihix48dk0jrkawby62fs163dv5hsh63vdhdyp7hfz6nabsqs2j"; })
|
||||
(fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "6.28.1"; sha256 = "0pn9bk0n15136z434x7yxikda5ggwjwka2c7k0qkprnkmk3yifcl"; })
|
||||
(fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; })
|
||||
(fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; })
|
||||
(fetchNuGet { pname = "System.IO.Compression"; version = "4.1.0"; sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; })
|
||||
|
||||
@ -14,13 +14,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "diffuse";
|
||||
version = "0.7.7";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MightyCreak";
|
||||
repo = "diffuse";
|
||||
rev = "v${version}";
|
||||
sha256 = "7tidv01znXYYSOKe3cH2+gSBF00aneL9nealcE5avcE=";
|
||||
sha256 = "L+6QwM7w/16IVbiyakBpP7vkbd2/BCGTiRlQG0v1XmU=";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
|
||||
5128
pkgs/applications/misc/onagre/Cargo.lock
generated
Normal file
5128
pkgs/applications/misc/onagre/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
40
pkgs/applications/misc/onagre/default.nix
Normal file
40
pkgs/applications/misc/onagre/default.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, cmake
|
||||
, pkgconf
|
||||
, freetype
|
||||
, expat
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "onagre";
|
||||
version = "1.0.0-alpha.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oknozor";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-hP+slfCWgsTgR2ZUjAmqx9f7+DBu3MpSLvaiZhqNK1Q=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"pop-launcher-1.2.1" = "sha256-LeKaJIvooD2aUlY113P0mzxOcj63sGkrA0SIccNqCLY=";
|
||||
};
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-IOhAGrAiT2mnScNP7k7XK9CETUr6BjGdQVdEUvTYQT4=";
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconf ];
|
||||
buildInputs = [ freetype expat ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A general purpose application launcher for X and wayland inspired by rofi/wofi and alfred";
|
||||
homepage = "https://github.com/oknozor/onagre";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.jfvillablanca ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -19,13 +19,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "p2pool";
|
||||
version = "3.1";
|
||||
version = "3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SChernykh";
|
||||
repo = "p2pool";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-yHxg/9QhaDNlUFzylftsJEk+pJoSoTfA0rJfcolBdTs=";
|
||||
sha256 = "sha256-KJ7KE1Joma4KXSqNQi3z+Q3hhc3HLNEaQjunu79qjUs=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "slade";
|
||||
version = "3.2.1";
|
||||
version = "3.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sirjuddington";
|
||||
repo = "SLADE";
|
||||
rev = version;
|
||||
sha256 = "sha256-KFRX3sfI//Op/h/EfEuAZOY22RO5qNXmvhSksC0aS4U=";
|
||||
sha256 = "sha256-UAxGNJ66o5wO8i/g0CgY395uHfJRJSxTlXlBbhgDAbM=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString (!stdenv.hostPlatform.isx86) ''
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "spicetify-cli";
|
||||
version = "2.16.2";
|
||||
version = "2.17.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spicetify";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-13JWceuiNz1FxgVVQ2KV88zYLIBkEVeTfPF5eEK1oe8=";
|
||||
sha256 = "sha256-hgLJVD3JEehQjPO5T54xk5JxbcVyiBu4PXV+EdOczag=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rmQpS4k/G3s/H7sPxVZ70KtJEvYjsDV2htV97viWttM=";
|
||||
vendorHash = "sha256-mAtwbYuzkHUqG4fr2JffcM8PmBsBrnHWyl4DvVzfJCw=";
|
||||
|
||||
ldflags = [
|
||||
"-s -w"
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "system76-keyboard-configurator";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "keyboard-configurator";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/RIpnbwLoNDdts18qhYqc8lDqsPoA5GW6z7LaZc5dos=";
|
||||
sha256 = "sha256-k9VmEg/HZECUwHaD491ZmfGUxZ14hLOaJD5x3zMK2jI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
|
||||
udev
|
||||
];
|
||||
|
||||
cargoSha256 = "sha256-hxHWfxNGmpX4mWj1ozOhhOyZI9J3aQzv3yvWFst81aU=";
|
||||
cargoHash = "sha256-0SFph9quh4QWR3nU5IJr4FyLGqrYvmHcZHDRli6phsc=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Keyboard configuration application for System76 keyboards and laptops";
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "werf";
|
||||
version = "1.2.217";
|
||||
version = "1.2.219";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "werf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-89r1M9yqvaSZiecNVAMnU02C8elT02GOYwfd8rZvdQM=";
|
||||
hash = "sha256-yenIGKN6OoDxPRn4aHOQu8Msp1WzjLZzTZkSSKq1zlc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-x4FuGAyQmvlI2ZltuCyvo1UFAFDh8P5wnXVeYEoUCyY=";
|
||||
vendorHash = "sha256-lif2Vj8HQH8rZeBIky1lz5J6ISdV2yPyR1vQrPcZLuU=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
||||
511
pkgs/applications/networking/mullvad/Cargo.lock
generated
511
pkgs/applications/networking/mullvad/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -19,32 +19,22 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mullvad";
|
||||
version = "2023.2";
|
||||
version = "2023.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mullvad";
|
||||
repo = "mullvadvpn-app";
|
||||
rev = version;
|
||||
hash = "sha256-UozgUsew6MRplahTW/y688R2VetO50UGQevmVo8/QNs=";
|
||||
hash = "sha256-as/d14xVTqJvb+QxzEyZWh1EMRVpE8cDQRbdc4R4pcU=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"udp-over-tcp-0.2.0" = "sha256-h44xrmRAlfy1Br0PAtZAzOwSMptaUatjXysA/l2Kff8=";
|
||||
"udp-over-tcp-0.3.0" = "sha256-5PeaM7/zhux1UdlaKpnQ2yIdmFy1n2weV/ux9lSRha4=";
|
||||
};
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/mullvad/mullvadvpn-app/pull/4389
|
||||
# can be removed after next release
|
||||
(fetchpatch {
|
||||
name = "mullvad-version-dont-check-git.patch";
|
||||
url = "https://github.com/mullvad/mullvadvpn-app/commit/8062cc74fc94bbe073189e78328901606c859d41.patch";
|
||||
hash = "sha256-1BhCId0J1dxhPM3oOmhZB+07N+k1GlvAT1h6ayfx174=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
protobuf
|
||||
|
||||
@ -3,39 +3,36 @@
|
||||
python3,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
wrapQtAppsHook,
|
||||
qt6,
|
||||
}:
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "nanovna-saver";
|
||||
version = "0.5.4";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NanoVNA-Saver";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CLfgDQt2rOXtWwvEhlXEstPp28nFhuhiAPYL6EjZVu4=";
|
||||
sha256 = "sha256-2vDjAdEL8eNje5bm/1m+Fdi+PCGxpXwpxe2KvlLYB58=";
|
||||
};
|
||||
|
||||
# Fix for https://github.com/NanoVNA-Saver/nanovna-saver/issues/579
|
||||
# Try dropping the patch in the next release after v0.5.4
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "remote-changelog-from-setup-py.patch";
|
||||
url = "https://github.com/NanoVNA-Saver/${pname}/commit/d654ea0441939e4e1c599d1333b587a185394fbe.diff";
|
||||
sha256 = "sha256-ifOhiWD0EYyQZRKp2W3G6crmWslca+/21APmhpfP/xE=";
|
||||
})
|
||||
nativeBuildInputs = [
|
||||
qt6.wrapQtAppsHook
|
||||
qt6.qtbase
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ wrapQtAppsHook ];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
cython
|
||||
scipy
|
||||
pyqt5
|
||||
pyqt6
|
||||
pyserial
|
||||
numpy
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
doCheck = false;
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "git-machete";
|
||||
version = "3.16.1";
|
||||
version = "3.16.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "virtuslab";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Js32YKzQcrQfVt7RWXFPA7guR8Tpd1jCTuwboV1zyw0=";
|
||||
hash = "sha256-pd+ZK34dPSCwl8bOwH388NZ6QNIlU5TqL7EabsWw7kk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
33
pkgs/applications/version-management/gut/default.nix
Normal file
33
pkgs/applications/version-management/gut/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gut";
|
||||
version = "0.2.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "julien040";
|
||||
repo = "gut";
|
||||
rev = version;
|
||||
sha256 = "sha256-qmp6QWmyharyTzUVXlX/oJZWbeyegX/u8/vzi/pTSaA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-E4jr+dskBdVXj/B5RW1AKyxxr+f/+ZW42OTO9XbCLuw=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/julien040/gut/src/telemetry.gutVersion=${version}" ];
|
||||
|
||||
# Checks if `/home` exists
|
||||
doCheck = false;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "An easy-to-use git client for Windows, macOS, and Linux";
|
||||
homepage = "https://github.com/slackhq/go-audit";
|
||||
maintainers = [ lib.maintainers.paveloom ];
|
||||
license = [ lib.licenses.mit ];
|
||||
};
|
||||
}
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "srvc";
|
||||
version = "0.15.0";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "insilica";
|
||||
repo = "rs-srvc";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vShPc+Tz8n2o8E13npr7ZbDzRaAesWBOJQaCO5ljypM=";
|
||||
hash = "sha256-6cullXcSnFlGM5O/g/J5WwBBUPfg1cbvjyPcIZ6yjRE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-fHHJR1OvqCYfJkXe9mVQXJeTETDadR65kf8LMsPdAds=";
|
||||
cargoHash = "sha256-xmHCm4kH4y0ph0ssMXZn+TvLAciYrsggyjmar85zF74=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.CoreServices
|
||||
|
||||
@ -14,6 +14,8 @@
|
||||
|
||||
looking-glass-obs = callPackage ./looking-glass-obs.nix { };
|
||||
|
||||
obs-backgroundremoval = callPackage ./obs-backgroundremoval { };
|
||||
|
||||
obs-gstreamer = callPackage ./obs-gstreamer.nix { };
|
||||
|
||||
obs-hyperion = qt6Packages.callPackage ./obs-hyperion/default.nix { };
|
||||
@ -40,7 +42,5 @@
|
||||
|
||||
obs-websocket = throw "obs-websocket has been removed: Functionality has been integrated into obs-studio itself.";
|
||||
|
||||
obs-backgroundremoval = throw "obs-backgroundremoval has been removed: It does not work anymore and is unmaintained.";
|
||||
|
||||
wlrobs = callPackage ./wlrobs.nix { };
|
||||
}
|
||||
|
||||
@ -0,0 +1,45 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, obs-studio
|
||||
, onnxruntime
|
||||
, opencv
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "obs-backgroundremoval";
|
||||
version = "0.5.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "royshil";
|
||||
repo = "obs-backgroundremoval";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-E+pm/Ma6dZTYlX3DpB49ynTETsRS2TBqgHSCijl/Txc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ obs-studio onnxruntime opencv ];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DUSE_SYSTEM_ONNXRUNTIME=ON"
|
||||
"-DUSE_SYSTEM_OPENCV=ON"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir $out/lib $out/share
|
||||
mv $out/obs-plugins/64bit $out/lib/obs-plugins
|
||||
rm -rf $out/obs-plugins
|
||||
mv $out/data $out/share/obs
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "OBS plugin to replace the background in portrait images and video";
|
||||
homepage = "https://github.com/royshil/obs-backgroundremoval";
|
||||
maintainers = with maintainers; [ zahrun ];
|
||||
license = licenses.mit;
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
};
|
||||
}
|
||||
@ -1,23 +1,33 @@
|
||||
{ stdenv, fetchgit, lib }:
|
||||
{ stdenv, fetchgit, lib, dtc }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "kvmtool";
|
||||
version = "unstable-2022-06-09";
|
||||
version = "unstable-2023-04-06";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git";
|
||||
rev = "f44af23e3a62e46158341807b0d2d132249b96a8";
|
||||
sha256 = "sha256-M83dCCXU/fkh21x10vx6BLg9Wja1714qW7yxl5zY6z0=";
|
||||
rev = "77b108c6a6f1c66fb7f60a80d17596bb80bda8ad";
|
||||
sha256 = "sha256-wPhqjVpc6I9UOdb6lmzGh797sdvJ5q4dap2ssg8OY5E=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isAarch64 [ dtc ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
makeFlags = [ "prefix=${placeholder "out"}" ];
|
||||
|
||||
makeFlags = [
|
||||
"prefix=${placeholder "out"}"
|
||||
] ++ lib.optionals stdenv.hostPlatform.isAarch64 ([
|
||||
"LIBFDT_DIR=${dtc}/lib"
|
||||
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
"CROSS_COMPILE=aarch64-unknown-linux-gnu-"
|
||||
"ARCH=arm64"
|
||||
]);
|
||||
|
||||
meta = with lib; {
|
||||
description = "A lightweight tool for hosting KVM guests";
|
||||
homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/tree/README";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ astro ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "nordzy-icon-theme";
|
||||
version = "1.8.1";
|
||||
version = "1.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alvatip";
|
||||
repo = "Nordzy-icon";
|
||||
rev = version;
|
||||
sha256 = "sha256-JfVcznGoL/HmNbjZk6RUUp/RZIXYIAoOMA3HBpqlUcE=";
|
||||
sha256 = "sha256-3Lv1jwvFjeKxtBmY1ZwgPBjz8xjbqDH5EcwsIb9Vy7g=";
|
||||
};
|
||||
|
||||
# In the post patch phase we should first make sure to patch shebangs.
|
||||
|
||||
@ -1,12 +1,18 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch, readline }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, readline
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mujs";
|
||||
version = "1.3.2";
|
||||
version = "1.3.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://mujs.com/downloads/mujs-${version}.tar.xz";
|
||||
sha256 = "sha256-SIZZP8aIsM3M0x5ey+Wv560b7iOqaeZnuHGv1d/GQMM=";
|
||||
url = "https://mujs.com/downloads/mujs-${version}.tar.gz";
|
||||
hash = "sha256-4sXuVBbf2iIwx6DLeJXfmpstWyBluxjn5k3sKnlqvhs=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.isDarwin [
|
||||
@ -23,6 +29,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
makeFlags = [ "prefix=$(out)" ];
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
# No nicer place to track releases
|
||||
url = "git://git.ghostscript.com/mujs.git";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://mujs.com/";
|
||||
description = "A lightweight, embeddable Javascript interpreter";
|
||||
|
||||
@ -12,13 +12,13 @@ assert mpiSupport -> mpi != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "highfive${lib.optionalString mpiSupport "-mpi"}";
|
||||
version = "2.6.2";
|
||||
version = "2.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BlueBrain";
|
||||
repo = "HighFive";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rUuhhoVH4Jdve7eY0M5THWtoHoIluiujfQwfTYULEiQ=";
|
||||
sha256 = "sha256-apKmIB34uqkqSCtTUzrUOhcRC5a2UG6KCdhp1jnXUgQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -2,26 +2,11 @@
|
||||
, lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchgit
|
||||
, fetchpatch
|
||||
, fetchFromGitHub
|
||||
, makeSetupHook
|
||||
, makeWrapper
|
||||
, bison
|
||||
, cups
|
||||
, harfbuzz
|
||||
, libGL
|
||||
, perl
|
||||
, cmake
|
||||
, ninja
|
||||
, writeText
|
||||
, gstreamer
|
||||
, gst-plugins-base
|
||||
, gst-plugins-good
|
||||
, gst-libav
|
||||
, gst-vaapi
|
||||
, gtk3
|
||||
, dconf
|
||||
, gst_all_1
|
||||
, libglvnd
|
||||
, darwin
|
||||
, buildPackages
|
||||
@ -37,23 +22,28 @@ let
|
||||
mirror = "mirror://qt";
|
||||
};
|
||||
|
||||
qtModule =
|
||||
import ./qtModule.nix
|
||||
{ inherit stdenv lib perl cmake ninja writeText; }
|
||||
{ inherit self srcs; };
|
||||
|
||||
addPackages = self: with self;
|
||||
let
|
||||
callPackage = self.newScope ({ inherit qtModule stdenv srcs; });
|
||||
callPackage = self.newScope ({
|
||||
inherit qtModule srcs;
|
||||
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
|
||||
cmake = cmake.overrideAttrs (attrs: {
|
||||
patches = attrs.patches ++ [
|
||||
./patches/cmake.patch
|
||||
];
|
||||
});
|
||||
});
|
||||
in
|
||||
{
|
||||
|
||||
inherit callPackage qtModule srcs;
|
||||
inherit callPackage srcs;
|
||||
|
||||
qtModule = callPackage ./qtModule.nix { };
|
||||
|
||||
qtbase = callPackage ./modules/qtbase.nix {
|
||||
withGtk3 = true;
|
||||
inherit (srcs.qtbase) src version;
|
||||
inherit bison cups harfbuzz libGL dconf gtk3 developerBuild cmake;
|
||||
inherit developerBuild;
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) AGL AVFoundation AppKit GSS MetalKit;
|
||||
patches = [
|
||||
./patches/qtbase-qmake-mkspecs-mac.patch
|
||||
@ -68,7 +58,7 @@ let
|
||||
})
|
||||
];
|
||||
};
|
||||
env = callPackage ./qt-env.nix {};
|
||||
env = callPackage ./qt-env.nix { };
|
||||
full = env "qt-full-${qtbase.version}" ([
|
||||
qt3d
|
||||
qt5compat
|
||||
@ -111,7 +101,7 @@ let
|
||||
qtlanguageserver = callPackage ./modules/qtlanguageserver.nix { };
|
||||
qtlottie = callPackage ./modules/qtlottie.nix { };
|
||||
qtmultimedia = callPackage ./modules/qtmultimedia.nix {
|
||||
inherit gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi;
|
||||
inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi;
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) VideoToolbox;
|
||||
};
|
||||
qtnetworkauth = callPackage ./modules/qtnetworkauth.nix { };
|
||||
@ -140,19 +130,21 @@ let
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) WebKit;
|
||||
};
|
||||
|
||||
wrapQtAppsHook = makeSetupHook {
|
||||
name = "wrap-qt6-apps-hook";
|
||||
propagatedBuildInputs = [ buildPackages.makeWrapper ];
|
||||
wrapQtAppsHook = makeSetupHook
|
||||
{
|
||||
name = "wrap-qt6-apps-hook";
|
||||
propagatedBuildInputs = [ buildPackages.makeWrapper ];
|
||||
} ./hooks/wrap-qt-apps-hook.sh;
|
||||
|
||||
qmake = makeSetupHook {
|
||||
name = "qmake6-hook";
|
||||
propagatedBuildInputs = [ self.qtbase.dev ];
|
||||
substitutions = {
|
||||
inherit debug;
|
||||
fix_qmake_libtool = ./hooks/fix-qmake-libtool.sh;
|
||||
};
|
||||
} ./hooks/qmake-hook.sh;
|
||||
qmake = makeSetupHook
|
||||
{
|
||||
name = "qmake6-hook";
|
||||
propagatedBuildInputs = [ self.qtbase.dev ];
|
||||
substitutions = {
|
||||
inherit debug;
|
||||
fix_qmake_libtool = ./hooks/fix-qmake-libtool.sh;
|
||||
};
|
||||
} ./hooks/qmake-hook.sh;
|
||||
};
|
||||
|
||||
# TODO(@Artturin): convert to makeScopeWithSplicing
|
||||
|
||||
@ -1,6 +1,4 @@
|
||||
{ stdenv, lib, perl, cmake, ninja, writeText }:
|
||||
|
||||
{ self, srcs, patches ? [ ] }:
|
||||
{ stdenv, lib, perl, cmake, ninja, writeText, qtbase, qmake, srcs, patches ? [ ] }:
|
||||
|
||||
args:
|
||||
|
||||
@ -18,7 +16,7 @@ stdenv.mkDerivation (args // {
|
||||
perl
|
||||
cmake
|
||||
ninja
|
||||
self.qmake
|
||||
qmake
|
||||
];
|
||||
propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or [ ]);
|
||||
|
||||
@ -61,7 +59,7 @@ stdenv.mkDerivation (args // {
|
||||
if [[ -z "$dontSyncQt" && -f sync.profile ]]; then
|
||||
# FIXME: this probably breaks crosscompiling as it's not from nativeBuildInputs
|
||||
# I don't know how to get /libexec from nativeBuildInputs to work, it's not under /bin
|
||||
${lib.getDev self.qtbase}/libexec/syncqt.pl -version "''${version%%-*}"
|
||||
${lib.getDev qtbase}/libexec/syncqt.pl -version "''${version%%-*}"
|
||||
fi
|
||||
'';
|
||||
|
||||
|
||||
@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wangle";
|
||||
version = "2023.02.27.00";
|
||||
version = "2023.04.03.00";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "wangle";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-r+hS9BJWgIYIHZ0xgLosJrLZT/bQCQdwzNlXxxk5xLU=";
|
||||
sha256 = "sha256-ISf/ezcJKCNv5UEGSf+OmHjV+QkanbTNoAm2ci1qy0o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aws-lambda-builders";
|
||||
version = "1.27.0";
|
||||
version = "1.28.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "awslabs";
|
||||
repo = "aws-lambda-builders";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-axg1kwzH6ZRQwyI80oNPjP8ApjAEZ5u0iCIadkEP/Ps=";
|
||||
hash = "sha256-JSN51zwIh9N/Id3fhBXjmwGa2tLK/LoyPlHPl2rbVU4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "duo-client";
|
||||
version = "4.7.0";
|
||||
version = "4.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "duosecurity";
|
||||
repo = "duo_client_python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-FA2ThWQ6VUKYXHgeAy31LcMJGtyvteSzVUcfYtWMSK4=";
|
||||
hash = "sha256-nnKujvhOtuNnlFrbmYtD7L++S7DK0Qqrc0LyAVYe7Xg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -16,14 +16,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-automl";
|
||||
version = "2.11.0";
|
||||
version = "2.11.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-fc/87JW9FExvZPk+pHLuntLHfdj0kRi2e5ohRq5Ujpg=";
|
||||
hash = "sha256-MFYWx791WDdZLClul+f/hNHeTEmlQWEJw5zLs5FVgh8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-container";
|
||||
version = "2.17.4";
|
||||
version = "2.19.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-MG5/znRnPN98NwNYYU9835+4RcXDjaQPatqICnRMWqI=";
|
||||
hash = "sha256-2EsqTVf65OCvT1i0whgCSvKGGHuHHE27bEg1S4kb+a8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-videointelligence";
|
||||
version = "2.11.0";
|
||||
version = "2.11.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-rkqKaHNzbcIjYyCe+AN1WCLvjZ1HjWHH4xeCs8/TkZI=";
|
||||
hash = "sha256-fsC8WTwrMJgXZHlOsI9TfYcM8Q5rKXuArTVM+pHpfqE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -86,7 +86,50 @@ let
|
||||
];
|
||||
};
|
||||
|
||||
bazel-build = buildBazelPackage {
|
||||
# Copy-paste from TF derivation.
|
||||
# Most of these are not really used in jaxlib compilation but it's simpler to keep it
|
||||
# 'as is' so that it's more compatible with TF derivation.
|
||||
tf_system_libs = [
|
||||
"absl_py"
|
||||
"astor_archive"
|
||||
"astunparse_archive"
|
||||
"boringssl"
|
||||
# Not packaged in nixpkgs
|
||||
# "com_github_googleapis_googleapis"
|
||||
# "com_github_googlecloudplatform_google_cloud_cpp"
|
||||
"com_github_grpc_grpc"
|
||||
"com_google_protobuf"
|
||||
# Fails with the error: external/org_tensorflow/tensorflow/core/profiler/utils/tf_op_utils.cc:46:49: error: no matching function for call to 're2::RE2::FullMatch(absl::lts_2020_02_25::string_view&, re2::RE2&)'
|
||||
# "com_googlesource_code_re2"
|
||||
"curl"
|
||||
"cython"
|
||||
"dill_archive"
|
||||
"double_conversion"
|
||||
"flatbuffers"
|
||||
"functools32_archive"
|
||||
"gast_archive"
|
||||
"gif"
|
||||
"hwloc"
|
||||
"icu"
|
||||
"jsoncpp_git"
|
||||
"libjpeg_turbo"
|
||||
"lmdb"
|
||||
"nasm"
|
||||
"opt_einsum_archive"
|
||||
"org_sqlite"
|
||||
"pasta"
|
||||
"png"
|
||||
"pybind11"
|
||||
"six_archive"
|
||||
"snappy"
|
||||
"tblib_archive"
|
||||
"termcolor_archive"
|
||||
"typing_extensions_archive"
|
||||
"wrapt"
|
||||
"zlib"
|
||||
];
|
||||
|
||||
bazel-build = buildBazelPackage rec {
|
||||
name = "bazel-build-${pname}-${version}";
|
||||
|
||||
bazel = bazel_5;
|
||||
@ -169,61 +212,10 @@ let
|
||||
CFG
|
||||
'';
|
||||
|
||||
# Copy-paste from TF derivation.
|
||||
# Most of these are not really used in jaxlib compilation but it's simpler to keep it
|
||||
# 'as is' so that it's more compatible with TF derivation.
|
||||
TF_SYSTEM_LIBS = lib.concatStringsSep "," ([
|
||||
"absl_py"
|
||||
"astor_archive"
|
||||
"astunparse_archive"
|
||||
"boringssl"
|
||||
# Not packaged in nixpkgs
|
||||
# "com_github_googleapis_googleapis"
|
||||
# "com_github_googlecloudplatform_google_cloud_cpp"
|
||||
"com_github_grpc_grpc"
|
||||
"com_google_protobuf"
|
||||
# Fails with the error: external/org_tensorflow/tensorflow/core/profiler/utils/tf_op_utils.cc:46:49: error: no matching function for call to 're2::RE2::FullMatch(absl::lts_2020_02_25::string_view&, re2::RE2&)'
|
||||
# "com_googlesource_code_re2"
|
||||
"curl"
|
||||
"cython"
|
||||
"dill_archive"
|
||||
"double_conversion"
|
||||
"flatbuffers"
|
||||
"functools32_archive"
|
||||
"gast_archive"
|
||||
"gif"
|
||||
"hwloc"
|
||||
"icu"
|
||||
"jsoncpp_git"
|
||||
"libjpeg_turbo"
|
||||
"lmdb"
|
||||
"nasm"
|
||||
"opt_einsum_archive"
|
||||
"org_sqlite"
|
||||
"pasta"
|
||||
"png"
|
||||
"pybind11"
|
||||
"six_archive"
|
||||
"snappy"
|
||||
"tblib_archive"
|
||||
"termcolor_archive"
|
||||
"typing_extensions_archive"
|
||||
"wrapt"
|
||||
"zlib"
|
||||
] ++ lib.optionals (!stdenv.isDarwin) [
|
||||
"nsync" # fails to build on darwin
|
||||
]);
|
||||
|
||||
# Make sure Bazel knows about our configuration flags during fetching so that the
|
||||
# relevant dependencies can be downloaded.
|
||||
bazelFlags = [
|
||||
"-c opt"
|
||||
] ++ lib.optionals (stdenv.targetPlatform.isx86_64 && stdenv.targetPlatform.isUnix) [
|
||||
"--config=avx_posix"
|
||||
] ++ lib.optionals cudaSupport [
|
||||
"--config=cuda"
|
||||
] ++ lib.optionals mklSupport [
|
||||
"--config=mkl_open_source_only"
|
||||
] ++ lib.optionals stdenv.cc.isClang [
|
||||
# bazel depends on the compiler frontend automatically selecting these flags based on file
|
||||
# extension but our clang doesn't.
|
||||
@ -231,21 +223,44 @@ let
|
||||
"--cxxopt=-x" "--cxxopt=c++" "--host_cxxopt=-x" "--host_cxxopt=c++"
|
||||
];
|
||||
|
||||
# We intentionally overfetch so we can share the fetch derivation across all the different configurations
|
||||
fetchAttrs = {
|
||||
TF_SYSTEM_LIBS = lib.concatStringsSep "," tf_system_libs;
|
||||
# we have to force @mkl_dnn_v1 since it's not needed on darwin
|
||||
bazelTargets = bazelTargets ++ [ "@mkl_dnn_v1//:mkl_dnn" ];
|
||||
bazelFlags = bazelFlags ++ [
|
||||
"--config=avx_posix"
|
||||
] ++ lib.optionals cudaSupport [
|
||||
# ideally we'd add this unconditionally too, but it doesn't work on darwin
|
||||
# we make this conditional on `cudaSupport` instead of the system, so that the hash for both
|
||||
# the cuda and the non-cuda deps can be computed on linux, since a lot of contributors don't
|
||||
# have access to darwin machines
|
||||
"--config=cuda"
|
||||
] ++ [
|
||||
"--config=mkl_open_source_only"
|
||||
];
|
||||
|
||||
sha256 =
|
||||
if cudaSupport then
|
||||
"sha256-n8wo+hD9ZYO1SsJKgyJzUmjRlsz45WT6tt5ZLleGvGY="
|
||||
else {
|
||||
x86_64-linux = "sha256-A0A18kxgGNGHNQ67ZPUzh3Yq2LEcRV7CqR9EfP80NQk=";
|
||||
aarch64-linux = "sha256-mU2jzuDu89jVmaG/M5bA3jSd7n7lDi+h8sdhs1z8p1A=";
|
||||
x86_64-darwin = "sha256-9nNTpetvjyipD/l8vKlregl1j/OnZKAcOCoZQeRBvts=";
|
||||
aarch64-darwin = "sha256-FqYwI1YC5eqSv+DYj09DC5IaBfFDUCO97y+TFhGiWAA=";
|
||||
}.${stdenv.system} or (throw "unsupported system ${stdenv.system}");
|
||||
"sha256-4yu4y4SwSQoeaOz9yojhvCRGSC6jp61ycVDIKyIK/l8="
|
||||
else
|
||||
"sha256-CyRfPfJc600M7VzR3/SQX/EAyeaXRJwDQWot5h2XnFU=";
|
||||
};
|
||||
|
||||
buildAttrs = {
|
||||
outputs = [ "out" ];
|
||||
|
||||
TF_SYSTEM_LIBS = lib.concatStringsSep "," (tf_system_libs ++ lib.optionals (!stdenv.isDarwin) [
|
||||
"nsync" # fails to build on darwin
|
||||
]);
|
||||
|
||||
bazelFlags = bazelFlags ++ lib.optionals (stdenv.targetPlatform.isx86_64 && stdenv.targetPlatform.isUnix) [
|
||||
"--config=avx_posix"
|
||||
] ++ lib.optionals cudaSupport [
|
||||
"--config=cuda"
|
||||
] ++ lib.optionals mklSupport [
|
||||
"--config=mkl_open_source_only"
|
||||
];
|
||||
# Note: we cannot do most of this patching at `patch` phase as the deps are not available yet.
|
||||
# 1) Fix pybind11 include paths.
|
||||
# 2) Link protobuf from nixpkgs (through TF_SYSTEM_LIBS when using gcc) to prevent crashes on
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, lxml
|
||||
@ -60,6 +61,9 @@ buildPythonPackage rec {
|
||||
"test_wfs_200_remotemd"
|
||||
"test_wms_130_remotemd"
|
||||
"test_wmts_example_informatievlaanderen"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"test_ogcapi_records_pygeoapi"
|
||||
"test_wms_getfeatureinfo_130"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "plugwise";
|
||||
version = "0.27.9";
|
||||
version = "0.27.10";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
owner = pname;
|
||||
repo = "python-plugwise";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ZxVlMiSMJOr4XxCuSRvTBdcd1295m+d7yqOnNxzRiuI=";
|
||||
hash = "sha256-KH8bhDS1niMsPZIXuHZIcnbEaywxDjvhNAGTZIdxXG4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -11,17 +11,19 @@
|
||||
, libapparmor
|
||||
, libselinux
|
||||
, libseccomp
|
||||
, testers
|
||||
, buildah
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "buildah";
|
||||
version = "1.29.1";
|
||||
version = "1.30.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "buildah";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-l21mirarWEOd+XxyM0YgfDiA1JSEr/uqREmBS22C9fs=";
|
||||
hash = "sha256-h0fipw3lJKy+VkGkh1XbZ6wUOg4001uURoJpjNq7QOs=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
@ -58,6 +60,10 @@ buildGoModule rec {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = buildah;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool which facilitates building OCI images";
|
||||
homepage = "https://buildah.io/";
|
||||
|
||||
@ -41,7 +41,7 @@ let
|
||||
|
||||
in runCommand buildah-unwrapped.name {
|
||||
name = "${buildah-unwrapped.pname}-wrapper-${buildah-unwrapped.version}";
|
||||
inherit (buildah-unwrapped) pname version;
|
||||
inherit (buildah-unwrapped) pname version passthru;
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "karate";
|
||||
version = "1.3.1";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/karatelabs/karate/releases/download/v${version}/karate-${version}.jar";
|
||||
sha256 = "sha256-d0MIiMxENBPFM0Kv8vhtn/je1i650Z7+6PoV6ZZCsFY=";
|
||||
sha256 = "sha256-LTGxS5dsp+UrDzI+eoJJSodShe34KWHWW1QgqnhJawM=";
|
||||
};
|
||||
dontUnpack = true;
|
||||
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "micronaut";
|
||||
version = "3.8.7";
|
||||
version = "3.8.8";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip";
|
||||
sha256 = "sha256-k0elIvsaKnVkerBUmRSEwbP+tl4sEKfzeoWkc4uYWvg=";
|
||||
sha256 = "sha256-LlZ9MrwBjVE5vMOKAy8MrhL8q5JBGibKnjaq8GmXVpM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||
|
||||
@ -24,13 +24,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freeorion";
|
||||
version = "0.4.10.2";
|
||||
version = "0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "freeorion";
|
||||
repo = "freeorion";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-k/YwTg0N2b70igfqRuFl/zwxMQhD2QjbapsazYbi0Ik=";
|
||||
sha256 = "sha256-uJRDU0Xd+sHL2IDvMiElUSOhvchVMW9wYMSLSN7pYtQ=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
# as of 0.4.10.2 FreeOrion doesn't work with "-DOpenGL_GL_PREFERENCE=GLVND"
|
||||
# as of 0.5 FreeOrion doesn't work with "-DOpenGL_GL_PREFERENCE=GLVND"
|
||||
cmakeFlags = [ "-DOpenGL_GL_PREFERENCE=LEGACY" ];
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hyperrogue";
|
||||
version = "12.1l";
|
||||
version = "12.1o";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zenorogue";
|
||||
repo = "hyperrogue";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-816F7+zsVRLM0h6N0g7tU4D2qi0braftN9cxi0Kwtog=";
|
||||
sha256 = "sha256-p7F+A7+wjHb17nJqsULhBZMs2P64s9gDOk2Oh4dc/lQ=";
|
||||
};
|
||||
|
||||
CXXFLAGS = [
|
||||
|
||||
@ -9,11 +9,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "VASSAL";
|
||||
version = "3.6.14";
|
||||
version = "3.6.15";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2";
|
||||
sha256 = "sha256-0/QJyntLV1DLzLJ8p4f+tCXPKl3DMf+j4/gkI+Mt+rc=";
|
||||
sha256 = "sha256-Zm3xrg1Srzd3wUOl4humNXQYhOxakxvNq6NqHHks0TI=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "jackett";
|
||||
version = "0.20.3723";
|
||||
version = "0.20.3846";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha512-Uh/lOBYzE7r4qCTIZbiegWOuqoxvq8W9EWxeh2enWEfkWke7APgAxC6myDNWpmduaPIBSIRJNvhwxaHVykVXvA==";
|
||||
hash = "sha512-RlEFX2XOFBNAtWiIUH6Gx00ApE5dqVFqeBtZ6umQVnaNga00K3KwQL+YroYgSZYUtLxZ73zpBFDqAD3ev6D+Gw==";
|
||||
};
|
||||
|
||||
projectFile = "src/Jackett.Server/Jackett.Server.csproj";
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "klipper";
|
||||
version = "unstable-2023-03-30";
|
||||
version = "unstable-2023-04-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KevinOConnor";
|
||||
repo = "klipper";
|
||||
rev = "fec7ddd8aefd9561fffd7f1ccecd7231002dc884";
|
||||
sha256 = "sha256-Kwmsy0hKOOT6sbmmYx/LVOM+mO06jZv2zxwy1ClZuy4=";
|
||||
rev = "83308a10510ca4efa022c463b5e6455192f8a0a7";
|
||||
sha256 = "sha256-d0xLQFoWfe/cPs4Jk8Y44UTn1Y0sPtSDUUB+Lw3pobQ=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/klippy";
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nut-exporter";
|
||||
version = "2.5.3";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DRuggeri";
|
||||
repo = "nut_exporter";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-I44unG7eKBGxjm2HnCcm1ThlrDpDglXBork7meOOGiw=";
|
||||
sha256 = "sha256-Y8G8nFhZ9Onxx40DJSTi0rnef8ulNTkj4bsPfqylOjQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ji8JlEYChPBakt5y6+zcm1l04VzZ0/fjfGFJ9p+1KHE=";
|
||||
vendorHash = "sha256-DGCNYklINPPzC7kCdEUS7TqVvg2SnKFqe0qHs5RSmzY=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Prometheus exporter for Network UPS Tools";
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kics";
|
||||
version = "1.6.12";
|
||||
version = "1.6.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Checkmarx";
|
||||
repo = "kics";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-aVApx9NEMNbM5e0wh23qrSe/cvcXLxzLhpIfA8PZFnA=";
|
||||
sha256 = "sha256-qNfqu/BaI4FTwQPNo4IGSsjWwznSXmGBFYMog8hQAdQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-fFqqLbhMWhEoJR7gAwJuQ+hXFVBJPtPldQ3l+btRe68=";
|
||||
vendorHash = "sha256-Hk4QLz31kRnrnV0+0X43Obwy45dwssM1Wc2zoPeKDvI=";
|
||||
|
||||
subPackages = [ "cmd/console" ];
|
||||
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mydumper";
|
||||
version = "0.14.1-1";
|
||||
version = "0.14.3-1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mydumper";
|
||||
repo = "mydumper";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-I8COArsIO8+09SNa3DrgoGpvhLj08I8UvT2H9k9mJNQ=";
|
||||
hash = "sha256-qyJGnrBOElQ3s2VoOWfW1luacd33haanmzKidMBgCpc=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" "man" ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mergerfs";
|
||||
version = "2.34.1";
|
||||
version = "2.35.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trapexit";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-67LkMbs3JGpkwMHGWJf03yy8aGfSVb64TF4DPLlLMgY=";
|
||||
sha256 = "sha256-mUnjWMxeZJ9wIpJJDqQIUk2x7oifZ/b2HZlPtQ77q8U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "resvg";
|
||||
version = "0.30.0";
|
||||
version = "0.31.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RazrFalcon";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-uZa0R5Po9d/36z4t3BwqPInfBlRN/ZzwhPYtnaz+pvc=";
|
||||
hash = "sha256-CVMY/bubX+LJs3S1GmL6oPg3A/eEHwtrDpNCObE3YV0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-QtoPWtLgbRpJuvtfUJ4CiSjb0F+4ojVqK3IZePsF8Rk=";
|
||||
cargoHash = "sha256-nM7WhzWALYwRkH4lotYT1PGZeDcBBSa8CtdyBWHSu8Y=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "An SVG rendering library";
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "jfrog-cli";
|
||||
version = "2.35.0";
|
||||
vendorHash = "sha256-vOYfm6V1SyfhT7gX/Nk01hD/Txwh5UXCorzi6Jfl9I8=";
|
||||
version = "2.36.0";
|
||||
vendorHash = "sha256-oAekCcPoaruEq7oENhrpRj2K5l+y2/b6IzqtpQSAzk8=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jfrog";
|
||||
repo = "jfrog-cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kaPGVNS+h+kZjG7+GupRxn6ypUfIU4BefPEl6QNA4cE=";
|
||||
sha256 = "sha256-dyhJuKIUgWalpyM2DASjPsj3tpV9W3Z7AeMlHtWoQrk=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "watchexec";
|
||||
version = "1.22.0";
|
||||
version = "1.22.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5CDiiDmUQllsi07OrhCSERkPOOhQoYSNInGewaBGLzw=";
|
||||
sha256 = "sha256-dO1vIzjsBrrMQ0H3Yv4X5rYPlCrWSlPbFmyooaODPeo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-peHAS+/UvEn0CB94ybhSwu2v7RON0FzVnlhVUJSRQrM=";
|
||||
cargoHash = "sha256-6bLY9m6g7hSlYI3KrLS3fN4ATRkkbtq3Wf5xqS1G30s=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dnsproxy";
|
||||
version = "0.46.5";
|
||||
version = "0.48.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AdguardTeam";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NoRB0S9hdxy6udiIbvYW8yYSuVNXIC12CXuMoNB4nNo=";
|
||||
sha256 = "sha256-fQg9FsqTqSfFeCAiQZISJg6MkXqpAlYiJs8FBzYUmDs=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
ldflags = [ "-s" "-w" "-X" "main.VersionString=${version}" ];
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "q";
|
||||
version = "0.9.0";
|
||||
version = "0.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "natesales";
|
||||
repo = "q";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WPVHMAau3+0jcIrRhRL5dy6h+J13LKj5GwQMJi7hGvo=";
|
||||
sha256 = "sha256-kS3t4bAvxFoZBE5UMM5yJ0WbsN6MqkEYhkl8wiBJKQg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-0Yd8y1SkxmfIFZuSheMGQnurlFv3sxkSDgGrQJLR3iU=";
|
||||
vendorHash = "sha256-jjhDD0qZh4QHjFO14+FsRFxEywByHB2gIxy/w3QOWBk=";
|
||||
|
||||
doCheck = false; # tries to resolve DNS
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, fetchurl, jre, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.4.19";
|
||||
version = "2.4.31";
|
||||
pname = "swagger-codegen";
|
||||
|
||||
jarfilename = "${pname}-cli-${version}.jar";
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://maven/io/swagger/${pname}-cli/${version}/${jarfilename}";
|
||||
sha256 = "04wl5k8k1ziqz7k5w0g7i6zdfn41pbh3k0m8vq434k1886inf8yn";
|
||||
sha256 = "sha256-WEjvyHHKR2w0P0LuDdCtW9GbOLZnCa7oXzLAad9KWN8=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openseachest";
|
||||
version = "23.03";
|
||||
version = "23.03.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Seagate";
|
||||
repo = "openSeaChest";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-D/TvT+LnAVhkQ32U+VdW7AA3BfKurmK4mwIY8vwXIpc=";
|
||||
sha256 = "sha256-jDCCozHeOazB3cM/9TlwHq1pu7yTiD818jykHeQ+RBo=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "google-guest-oslogin";
|
||||
version = "20230217.00";
|
||||
version = "20230406.02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleCloudPlatform";
|
||||
repo = "guest-oslogin";
|
||||
rev = version;
|
||||
sha256 = "sha256-MZpm6JgukqdT8B1qZzKT4tO3LBS8ReoVqRGyY5ykWHw=";
|
||||
sha256 = "sha256-Eo/wgGytOIbpEsNdAiDt88HRrddy5CopRCFJy7pLKb0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubevirt";
|
||||
version = "0.58.0";
|
||||
version = "0.59.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubevirt";
|
||||
repo = "kubevirt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-SZ7NN93/lnN2DsNrxKEziiJsLDkFkaCbWMTcUWYiO+w=";
|
||||
sha256 = "sha256-4mTq/V4X8eq7g+ltgFD2ZFC7k2yiszG2i2QErttPATE=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
subPackages = [ "cmd/virtctl" ];
|
||||
|
||||
|
||||
@ -2045,6 +2045,8 @@ with pkgs;
|
||||
|
||||
gst = callPackage ../applications/version-management/gst { };
|
||||
|
||||
gut = callPackage ../applications/version-management/gut { };
|
||||
|
||||
hred = callPackage ../development/tools/hred { };
|
||||
|
||||
hub = callPackage ../applications/version-management/hub { };
|
||||
@ -23244,20 +23246,7 @@ with pkgs;
|
||||
qtEnv = qt5.env;
|
||||
qt5Full = qt5.full;
|
||||
|
||||
qt6 = recurseIntoAttrs (makeOverridable
|
||||
(import ../development/libraries/qt-6) {
|
||||
inherit newScope;
|
||||
inherit lib fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper writeText;
|
||||
inherit bison cups dconf harfbuzz libGL perl gtk3 ninja;
|
||||
inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi;
|
||||
inherit darwin buildPackages libglvnd;
|
||||
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
|
||||
cmake = cmake.overrideAttrs (attrs: {
|
||||
patches = attrs.patches ++ [
|
||||
../development/libraries/qt-6/patches/cmake.patch
|
||||
];
|
||||
});
|
||||
});
|
||||
qt6 = recurseIntoAttrs (callPackage ../development/libraries/qt-6 { });
|
||||
|
||||
qt6Packages = recurseIntoAttrs (import ./qt6-packages.nix {
|
||||
inherit lib pkgs qt6;
|
||||
@ -25351,6 +25340,8 @@ with pkgs;
|
||||
|
||||
olaris-server = callPackage ../servers/olaris { };
|
||||
|
||||
onagre = callPackage ../applications/misc/onagre { };
|
||||
|
||||
onlyoffice-documentserver = callPackage ../servers/onlyoffice-documentserver { };
|
||||
|
||||
outline = callPackage ../servers/web-apps/outline (lib.fix (super: {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user