Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
9c36f57e91
4
.github/workflows/check-by-name.yml
vendored
4
.github/workflows/check-by-name.yml
vendored
@ -107,6 +107,10 @@ jobs:
|
||||
# Adds a result symlink as a GC root
|
||||
nix-store --realise "$toolPath" --add-root result
|
||||
- name: Running nixpkgs-check-by-name
|
||||
env:
|
||||
# Force terminal colors to be enabled. The library that
|
||||
# nixpkgs-check-by-name uses respects: https://bixense.com/clicolors/
|
||||
CLICOLOR_FORCE: 1
|
||||
run: |
|
||||
if result/bin/nixpkgs-check-by-name --base "$base" .; then
|
||||
exit 0
|
||||
|
||||
@ -21898,12 +21898,6 @@
|
||||
githubId = 36407913;
|
||||
name = "Uli Baum";
|
||||
};
|
||||
xfix = {
|
||||
email = "kamila@borowska.pw";
|
||||
github = "KamilaBorowska";
|
||||
githubId = 1297598;
|
||||
name = "Kamila Borowska";
|
||||
};
|
||||
xfnw = {
|
||||
email = "xfnw+nixos@riseup.net";
|
||||
github = "xfnw";
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
name = "caddy";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ xfix Br1ght0ne ];
|
||||
maintainers = [ Br1ght0ne ];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
|
||||
@ -6,7 +6,7 @@ let
|
||||
port = "5232";
|
||||
filesystem_folder = "/data/radicale";
|
||||
|
||||
cli = "${pkgs.calendar-cli}/bin/calendar-cli --caldav-user ${user} --caldav-pass ${password}";
|
||||
cli = "${lib.getExe pkgs.calendar-cli} --caldav-user ${user} --caldav-pass ${password}";
|
||||
in {
|
||||
name = "radicale3";
|
||||
meta.maintainers = with lib.maintainers; [ dotlambda ];
|
||||
|
||||
@ -204,7 +204,6 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with maintainers; [
|
||||
MP2E
|
||||
ashkitten
|
||||
xfix
|
||||
ivar
|
||||
];
|
||||
};
|
||||
|
||||
@ -13,6 +13,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
buildInputs = [ SDL2 ];
|
||||
env = lib.optionalAttrs stdenv.cc.isClang {
|
||||
NIX_CFLAGS_COMPILE = "-std=c89";
|
||||
};
|
||||
|
||||
|
||||
configureFlags = [ "--without-SDL1" ];
|
||||
|
||||
|
||||
@ -65,7 +65,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
artemist
|
||||
benley
|
||||
shamilton
|
||||
xfix
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
||||
@ -120,7 +120,7 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.unfreeRedistributable // {
|
||||
url = "https://github.com/snes9xgit/snes9x/blob/${version}/LICENSE";
|
||||
};
|
||||
maintainers = with maintainers; [ qknight xfix thiagokokada ];
|
||||
maintainers = with maintainers; [ qknight thiagokokada ];
|
||||
platforms = platforms.unix;
|
||||
broken = (withGtk && stdenv.isDarwin);
|
||||
mainProgram = "snes9x";
|
||||
|
||||
@ -67,6 +67,6 @@ python3Packages.buildPythonApplication rec {
|
||||
description = "ROM hacking tool for Pokémon Mystery Dungeon Explorers of Sky";
|
||||
mainProgram = "skytemple";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ xfix marius851000 ];
|
||||
maintainers = with maintainers; [ marius851000 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
{
|
||||
"packageVersion": "124.0.2-1",
|
||||
"packageVersion": "125.0.1-1",
|
||||
"source": {
|
||||
"rev": "124.0.2-1",
|
||||
"sha256": "0qh40l1pif0b6n1amiw18pr13gvmi7rjd89q6n1qz8y14yf9w5xp"
|
||||
"rev": "125.0.1-1",
|
||||
"sha256": "1h2x08gdpw3bldmfkws5qafp73r4w11a7ad3xc6flyg96b8a6h4f"
|
||||
},
|
||||
"settings": {
|
||||
"rev": "8a499ecdab8a5136faee50aae1fdd48997711de6",
|
||||
"sha256": "1c12y7b09rrz8zlpar8nnd9k2nvldjqq3cicbc57g6s1npnf8rz6"
|
||||
"rev": "6b2b6a89fc15a705388955e4d1375f453d8cdc89",
|
||||
"sha256": "0yginhc8pn00k1gh8h7bzvrl4vi2wimbmrrgnmvvblv28bxhwnh0"
|
||||
},
|
||||
"firefox": {
|
||||
"version": "124.0.2",
|
||||
"sha512": "8cf340de6e34812f8ae3363265859a263330af770d981c3dd1ca1e7e0cfe513604d3e68184d4aa1446569aefbdf359d561fbc200faf19a5ed020a1709d9ef10e"
|
||||
"version": "125.0.1",
|
||||
"sha512": "6f2f336de8b0ec9cb19ba20c909407b7b88c0319ee3b2f1f3429133516b0c45b4c7846f287985a0cdb9f34acc7d5378ed14fb48e26bef113c8ac360501a30c4d"
|
||||
}
|
||||
}
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "miriway";
|
||||
version = "unstable-2024-04-04";
|
||||
version = "unstable-2024-04-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Miriway";
|
||||
repo = "Miriway";
|
||||
rev = "add1e0cd695985020328b0d76c91f85cc88207ff";
|
||||
hash = "sha256-Vp9ZbN5lY26t3LhkflapsG84XEy0YQE4Kvxia0VlQyg=";
|
||||
rev = "d7f43ac201e6f1aa7aeee668f5d16683f48917f1";
|
||||
hash = "sha256-hUTK7kd7gTvms4HMF7BgYWomRYZyRkqUfjhVtEF+YRE=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-expand";
|
||||
version = "1.0.84";
|
||||
version = "1.0.85";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dtolnay";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-b98OVx7vkA3sgxp8yPzdV7jAjsTqqTeffibCtK3hoMM=";
|
||||
hash = "sha256-2i9FAWF9b1tNdDbTwCzQY8Mh/h85uigR5IT9kzPft00=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-BH01DgwOdP9f0KFIbbF8RRhl/oivBET2ujxdzZ56lC0=";
|
||||
cargoHash = "sha256-Vl0zC9TPhiFv2SiZtzIUV7GftB1y9K1gLy1ajisP8Y0=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cargo subcommand to show result of macro expansion";
|
||||
|
||||
@ -1,25 +1,34 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, protobuf
|
||||
, installShellFiles
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "clipcat";
|
||||
version = "0.16.6";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xrelkd";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-FSgBTQGl8LSLdv+SOAgQWLWiqFY+PRQBFYYdbmCttcY=";
|
||||
hash = "sha256-e95h8YBVLcy9vubdJpfmeystT2Qw0Y8kap9IbTJW+s8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-TrzHmWUDAe4gbwm+VoTOuC50CWWnFsF99zscM85ammo=";
|
||||
cargoHash = "sha256-+73vnGcdCDRMrav/Pi4Z37IlbArJ/SlYishz9KhF4x0=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Cocoa
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
darwin.apple_sdk.frameworks.SystemConfiguration
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
protobuf
|
||||
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
@ -42,7 +51,7 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "Clipboard Manager written in Rust Programming Language";
|
||||
homepage = "https://github.com/xrelkd/clipcat";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ xrelkd ];
|
||||
mainProgram = "clipcatd";
|
||||
};
|
||||
|
||||
52
pkgs/by-name/cr/crunchy-cli/Cargo.lock
generated
52
pkgs/by-name/cr/crunchy-cli/Cargo.lock
generated
@ -217,9 +217,9 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
|
||||
|
||||
[[package]]
|
||||
name = "chrono"
|
||||
version = "0.4.37"
|
||||
version = "0.4.38"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e"
|
||||
checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
|
||||
dependencies = [
|
||||
"android-tzdata",
|
||||
"iana-time-zone",
|
||||
@ -354,7 +354,7 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
|
||||
|
||||
[[package]]
|
||||
name = "crunchy-cli"
|
||||
version = "3.4.3"
|
||||
version = "3.5.0"
|
||||
dependencies = [
|
||||
"chrono",
|
||||
"clap",
|
||||
@ -367,7 +367,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "crunchy-cli-core"
|
||||
version = "3.4.3"
|
||||
version = "3.5.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-speed-limit",
|
||||
@ -404,9 +404,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "crunchyroll-rs"
|
||||
version = "0.10.7"
|
||||
version = "0.10.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3eaf93641a3697ba4cd6845b3a741089f4b4c692a91ed40dece6d7376c419ef9"
|
||||
checksum = "ccd0a624f3f8ec3fb7af8d83b907142aaee1858579ab697f24f05d00736e5bb2"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"chrono",
|
||||
@ -430,9 +430,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "crunchyroll-rs-internal"
|
||||
version = "0.10.7"
|
||||
version = "0.10.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "48daba6fe0296c2b400cd6545cf2e8ee23870f1a5a35291fa2d61987098a5692"
|
||||
checksum = "85c3614a871ec25ab17425405b08aea3c5869597e2348302b922c2a077aa9c3a"
|
||||
dependencies = [
|
||||
"darling",
|
||||
"quote",
|
||||
@ -486,9 +486,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "dash-mpd"
|
||||
version = "0.16.0"
|
||||
version = "0.16.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6cafa2c33eff2857e1a14c38aa9a432aa565a01e77804a541fce7aec3affb8f8"
|
||||
checksum = "79b4bdd5f1c0c7493d780c645f0bff5b9361e6408210fa88910adb181efca64c"
|
||||
dependencies = [
|
||||
"base64 0.22.0",
|
||||
"base64-serde",
|
||||
@ -831,9 +831,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
|
||||
|
||||
[[package]]
|
||||
name = "hyper"
|
||||
version = "1.2.0"
|
||||
version = "1.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a"
|
||||
checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d"
|
||||
dependencies = [
|
||||
"bytes",
|
||||
"futures-channel",
|
||||
@ -1375,9 +1375,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.79"
|
||||
version = "1.0.81"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
|
||||
checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
@ -1459,9 +1459,9 @@ checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
|
||||
|
||||
[[package]]
|
||||
name = "reqwest"
|
||||
version = "0.12.3"
|
||||
version = "0.12.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3e6cc1e89e689536eb5aeede61520e874df5a4707df811cd5da4aa5fbb2aae19"
|
||||
checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10"
|
||||
dependencies = [
|
||||
"base64 0.22.0",
|
||||
"bytes",
|
||||
@ -1576,9 +1576,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rustls"
|
||||
version = "0.22.3"
|
||||
version = "0.22.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "99008d7ad0bbbea527ec27bddbc0e432c5b87d8175178cee68d2eec9c4a1813c"
|
||||
checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
|
||||
dependencies = [
|
||||
"log",
|
||||
"ring",
|
||||
@ -1668,18 +1668,18 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.197"
|
||||
version = "1.0.198"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
|
||||
checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.197"
|
||||
version = "1.0.198"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
|
||||
checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@ -1688,9 +1688,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "1.0.115"
|
||||
version = "1.0.116"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd"
|
||||
checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
|
||||
dependencies = [
|
||||
"itoa",
|
||||
"ryu",
|
||||
@ -1838,9 +1838,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.58"
|
||||
version = "2.0.60"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687"
|
||||
checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "crunchy-cli";
|
||||
version = "3.4.3";
|
||||
version = "3.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crunchy-labs";
|
||||
repo = "crunchy-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/7zJbmMPoHEpcsDPe1eVenxGenPCU6CcHE8nTBTHil8=";
|
||||
hash = "sha256-ykE4TqsBv6VEOgwKixo8IvgJt8CwCSTl5DcKfNGycdI=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
||||
@ -9,18 +9,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "shopware-cli";
|
||||
version = "0.4.35";
|
||||
version = "0.4.36";
|
||||
src = fetchFromGitHub {
|
||||
repo = "shopware-cli";
|
||||
owner = "FriendsOfShopware";
|
||||
rev = version;
|
||||
hash = "sha256-RJKne2Nq8mrVBgiOkXoM1HKIJ/BU0MQckbequ/0THGk=";
|
||||
hash = "sha256-14Za64G/UpFa6Dfyx7EAQqXMmCWyl5MIQEdutqMQrxE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||
nativeCheckInputs = [ git dart-sass ];
|
||||
|
||||
vendorHash = "sha256-jQCTdvJVe99sL8C9AkJZDsQV9tUoAXY18ar3+FNXEdM=";
|
||||
vendorHash = "sha256-Zl84hA2YPG4p3t0V8ZPnLYGz4ggoTSln/koC40nbNZ4=";
|
||||
|
||||
postInstall = ''
|
||||
export HOME="$(mktemp -d)"
|
||||
|
||||
@ -57,7 +57,7 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://github.com/Universal-Debloater-Alliance/universal-android-debloater-next-generation";
|
||||
license = licenses.gpl3Only;
|
||||
mainProgram = "uad-ng";
|
||||
maintainers = with maintainers; [ xfix ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "ytDownloader";
|
||||
version = "3.17.3";
|
||||
version = "3.17.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aandrew-me";
|
||||
repo = "ytDownloader";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-aqQGOqPLKKTBjWjL3KyRD4paBGCQLhCBjXwVVhoHDSk=";
|
||||
hash = "sha256-GW+17DfPiFxw2QyJ5KTMZLDWmqXfnHfkg+QpM5XOP0M=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-lhFyiWy9dgnxxaElavzqA4YpRm7cVC23pvL5Kwve58E=";
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
let
|
||||
ocamlDependencies = version:
|
||||
if lib.versionAtLeast version "4.2"
|
||||
then with ocaml-ng.ocamlPackages_4_12; [
|
||||
if lib.versionAtLeast version "4.3"
|
||||
then with ocaml-ng.ocamlPackages_4_14; [
|
||||
ocaml
|
||||
findlib
|
||||
sedlex
|
||||
@ -126,7 +126,7 @@ in {
|
||||
sha256 = "0rns6d28qzkbai6yyws08yzbyvxfn848nj0fsji7chdi0y7pzzj0";
|
||||
};
|
||||
haxe_4_3 = generic {
|
||||
version = "4.3.3";
|
||||
sha256 = "sha256-sMklqQkVbWCYCKpOU23AjkuxzcVV7Aa8ljlFpruam9Y=";
|
||||
version = "4.3.4";
|
||||
sha256 = "sha256-XGV4VG8nUofHGjHbtrLA+2kIpnnPqw5IlcNrP3EsL+Q=";
|
||||
};
|
||||
}
|
||||
|
||||
@ -56,7 +56,7 @@ let
|
||||
then tools.bintools
|
||||
else bootBintools;
|
||||
|
||||
in rec {
|
||||
in {
|
||||
|
||||
libllvm = callPackage ../common/llvm {
|
||||
src = fetch "llvm" "1pzx9zrmd7r3481sbhwvkms68fwhffpp4mmz45dgrkjpyl2q96kx";
|
||||
@ -119,7 +119,7 @@ let
|
||||
./clang/gnu-install-dirs.patch
|
||||
(substituteAll {
|
||||
src = ../common/clang/clang-11-15-LLVMgold-path.patch;
|
||||
libllvmLibdir = "${libllvm.lib}/lib";
|
||||
libllvmLibdir = "${tools.libllvm.lib}/lib";
|
||||
})
|
||||
];
|
||||
inherit clang-tools-extra_src llvm_meta;
|
||||
|
||||
@ -82,7 +82,7 @@ in let
|
||||
then tools.bintools
|
||||
else bootBintools;
|
||||
|
||||
in rec {
|
||||
in {
|
||||
|
||||
libllvm = callPackage ../common/llvm {
|
||||
patches = [
|
||||
@ -145,7 +145,7 @@ in let
|
||||
../common/clang/add-nostdlibinc-flag.patch
|
||||
(substituteAll {
|
||||
src = ../common/clang/clang-11-15-LLVMgold-path.patch;
|
||||
libllvmLibdir = "${libllvm.lib}/lib";
|
||||
libllvmLibdir = "${tools.libllvm.lib}/lib";
|
||||
})
|
||||
];
|
||||
inherit llvm_meta;
|
||||
|
||||
@ -78,7 +78,7 @@ in let
|
||||
then tools.bintools
|
||||
else bootBintools;
|
||||
|
||||
in rec {
|
||||
in {
|
||||
|
||||
libllvm = callPackage ../common/llvm {
|
||||
patches = [
|
||||
@ -115,7 +115,7 @@ in let
|
||||
../common/clang/add-nostdlibinc-flag.patch
|
||||
(substituteAll {
|
||||
src = ../common/clang/clang-11-15-LLVMgold-path.patch;
|
||||
libllvmLibdir = "${libllvm.lib}/lib";
|
||||
libllvmLibdir = "${tools.libllvm.lib}/lib";
|
||||
})
|
||||
];
|
||||
inherit llvm_meta;
|
||||
|
||||
@ -84,7 +84,7 @@ in let
|
||||
then tools.bintools
|
||||
else bootBintools;
|
||||
|
||||
in rec {
|
||||
in {
|
||||
|
||||
libllvm = callPackage ../common/llvm {
|
||||
patches = [
|
||||
@ -159,7 +159,7 @@ in let
|
||||
../common/clang/add-nostdlibinc-flag.patch
|
||||
(substituteAll {
|
||||
src = ../common/clang/clang-11-15-LLVMgold-path.patch;
|
||||
libllvmLibdir = "${libllvm.lib}/lib";
|
||||
libllvmLibdir = "${tools.libllvm.lib}/lib";
|
||||
})
|
||||
];
|
||||
inherit llvm_meta;
|
||||
|
||||
@ -85,7 +85,7 @@ in let
|
||||
then tools.bintools
|
||||
else bootBintools;
|
||||
|
||||
in rec {
|
||||
in {
|
||||
|
||||
libllvm = callPackage ../common/llvm {
|
||||
patches = [
|
||||
@ -153,7 +153,7 @@ in let
|
||||
../common/clang/add-nostdlibinc-flag.patch
|
||||
(substituteAll {
|
||||
src = ../common/clang/clang-at-least-16-LLVMgold-path.patch;
|
||||
libllvmLibdir = "${libllvm.lib}/lib";
|
||||
libllvmLibdir = "${tools.libllvm.lib}/lib";
|
||||
})
|
||||
];
|
||||
inherit llvm_meta;
|
||||
|
||||
@ -80,7 +80,7 @@ in let
|
||||
then tools.bintools
|
||||
else bootBintools;
|
||||
|
||||
in rec {
|
||||
in {
|
||||
|
||||
libllvm = callPackage ../common/llvm {
|
||||
patches = [
|
||||
@ -148,7 +148,7 @@ in let
|
||||
../common/clang/add-nostdlibinc-flag.patch
|
||||
(substituteAll {
|
||||
src = ../common/clang/clang-at-least-16-LLVMgold-path.patch;
|
||||
libllvmLibdir = "${libllvm.lib}/lib";
|
||||
libllvmLibdir = "${tools.libllvm.lib}/lib";
|
||||
})
|
||||
];
|
||||
inherit llvm_meta;
|
||||
|
||||
@ -80,7 +80,7 @@ in let
|
||||
then tools.bintools
|
||||
else bootBintools;
|
||||
|
||||
in rec {
|
||||
in {
|
||||
|
||||
libllvm = callPackage ../common/llvm {
|
||||
patches = [
|
||||
@ -148,7 +148,7 @@ in let
|
||||
../common/clang/add-nostdlibinc-flag.patch
|
||||
(substituteAll {
|
||||
src = ../common/clang/clang-at-least-16-LLVMgold-path.patch;
|
||||
libllvmLibdir = "${libllvm.lib}/lib";
|
||||
libllvmLibdir = "${tools.libllvm.lib}/lib";
|
||||
})
|
||||
];
|
||||
inherit llvm_meta;
|
||||
|
||||
@ -85,7 +85,7 @@ in let
|
||||
then tools.bintools
|
||||
else bootBintools;
|
||||
|
||||
in rec {
|
||||
in {
|
||||
|
||||
libllvm = callPackage ../common/llvm {
|
||||
patches = [
|
||||
@ -153,7 +153,7 @@ in let
|
||||
../common/clang/add-nostdlibinc-flag.patch
|
||||
(substituteAll {
|
||||
src = ../common/clang/clang-at-least-16-LLVMgold-path.patch;
|
||||
libllvmLibdir = "${libllvm.lib}/lib";
|
||||
libllvmLibdir = "${tools.libllvm.lib}/lib";
|
||||
})
|
||||
];
|
||||
inherit llvm_meta;
|
||||
|
||||
@ -55,7 +55,11 @@ stdenv.mkDerivation rec {
|
||||
# Workaround build failure on -fno-common toolchains like upstream
|
||||
# gcc-10. Otherwise build fails as:
|
||||
# ld: types.o:(.bss+0x11b0): multiple definition of `current_file'; y.tab.o:(.bss+0x70): first defined here
|
||||
env.NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
env.NIX_CFLAGS_COMPILE = toString ([
|
||||
"-fcommon"
|
||||
] ++ lib.optionals stdenv.cc.isClang [
|
||||
"-Wno-error=int-conversion"
|
||||
]);
|
||||
|
||||
makeFlags = [
|
||||
"CC=${stdenv.cc.targetPrefix}cc"
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
, libmpc
|
||||
, mpfr
|
||||
, stdenv
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@ -23,12 +24,15 @@ rustPlatform.buildRustPackage rec {
|
||||
cargoSha256 = "sha256-q8s6HAJhKnMhsgZk5plR+ar3CpLKNqjrD14roDWLwfo=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl gmp libmpc mpfr ];
|
||||
|
||||
buildInputs = [ openssl gmp libmpc mpfr ]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.SystemConfiguration
|
||||
];
|
||||
|
||||
CARGO_FEATURE_USE_SYSTEM_LIBS = true;
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "A modern Prolog implementation written mostly in Rust";
|
||||
mainProgram = "scryer-prolog";
|
||||
homepage = "https://github.com/mthom/scryer-prolog";
|
||||
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "grisha";
|
||||
owner = "gumbo-parser";
|
||||
repo = "gumbo-parser";
|
||||
rev = version;
|
||||
hash = "sha256-d4V4bI08Prmg3U0KGu4yIwpHcvTJT3NAd4lbzdBU/AE=";
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "C99 HTML parsing algorithm";
|
||||
homepage = "https://github.com/google/gumbo-parser";
|
||||
homepage = "https://codeberg.org/gumbo-parser/gumbo-parser";
|
||||
maintainers = [ maintainers.nico202 ];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
license = licenses.asl20;
|
||||
|
||||
@ -19,6 +19,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/SkyTemple/dungeon-eos";
|
||||
description = "A package that simulates PMD EoS dungeon generation";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ marius851000 xfix ];
|
||||
maintainers = with maintainers; [ marius851000 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -64,6 +64,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/SkyTemple/explorerscript";
|
||||
description = "A programming language + compiler/decompiler for creating scripts for Pokémon Mystery Dungeon Explorers of Sky";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ marius851000 xfix ];
|
||||
maintainers = with maintainers; [ marius851000 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -19,14 +19,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "marimo";
|
||||
version = "0.4.0";
|
||||
version = "0.4.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-IiM7iJs3CIl6WjstgvtJzIylVL49jRG246GU5G5GEG0=";
|
||||
hash = "sha256-wFDx90zTaPF9gHLZnWBJQlMBuz8iZQRHkcS8BAxcZRA=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@ -35,6 +35,6 @@ buildPythonPackage rec {
|
||||
description = "Python library for many Nintendo DS file formats";
|
||||
homepage = "https://github.com/RoadrunnerWMC/ndspy";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ xfix ];
|
||||
maintainers = with maintainers; [ marius851000 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
setuptools
|
||||
uplc
|
||||
ordered-set
|
||||
] ++ lib.optionals (pythonOlder "3.9") graphlib-backport;
|
||||
] ++ lib.optional (pythonOlder "3.9") graphlib-backport;
|
||||
|
||||
pythonImportsCheck = [ "pluthon" ];
|
||||
|
||||
|
||||
@ -27,6 +27,6 @@ buildPythonPackage rec {
|
||||
description = "Autogenerated and statically check-able pmdsky-debug symbol definitions for Python";
|
||||
homepage = "https://github.com/SkyTemple/pmdsky-debug-py";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ marius851000 xfix ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -64,6 +64,6 @@ buildPythonPackage rec {
|
||||
description = "Python library to interface with DeSmuME, the Nintendo DS emulator";
|
||||
homepage = "https://github.com/SkyTemple/py-desmume";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ marius851000 xfix ];
|
||||
maintainers = with maintainers; [ marius851000 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -39,6 +39,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/koehlma/pygtkspellcheck";
|
||||
description = "A Python spell-checking library for GtkTextViews based on Enchant";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ xfix ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -17,6 +17,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://qwertyquerty.github.io/pypresence/html/index.html";
|
||||
description = "Discord RPC client written in Python";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ xfix ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "recurring-ical-events";
|
||||
version = "2.1.3";
|
||||
version = "2.2.0";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -25,14 +25,14 @@ buildPythonPackage rec {
|
||||
owner = "niccokunzmann";
|
||||
repo = "python-recurring-ical-events";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-K2pflwHpzuYDMNUB7YQu6NX21O0aOwRChBgjdiwFQ+Y=";
|
||||
hash = "sha256-Njd+sc35jlA96iVf2uuVN2BK92ctwUDfBAUfpgqtPs0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
icalendar
|
||||
pytz
|
||||
python-dateutil
|
||||
|
||||
@ -25,6 +25,6 @@ buildPythonPackage rec {
|
||||
description = "setuptools extension for building non-Python Dynamic Shared Objects";
|
||||
homepage = "https://github.com/mdavidsaver/setuptools_dso";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ marius851000 xfix ];
|
||||
maintainers = with maintainers; [ marius851000 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -38,6 +38,6 @@ buildPythonPackage rec {
|
||||
description = "A format for standardized rule-based tilesets with 256 adjacency combinations";
|
||||
homepage = "https://github.com/SkyTemple/skytemple-dtef";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ marius851000 xfix ];
|
||||
maintainers = with maintainers; [ marius851000 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -19,6 +19,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/SkyTemple/skytemple-eventserver";
|
||||
description = "Websocket server that emits SkyTemple UI events";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ marius851000 xfix ];
|
||||
maintainers = with maintainers; [ marius851000 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -89,7 +89,7 @@ buildPythonPackage rec {
|
||||
description = "Python library to edit the ROM of Pokémon Mystery Dungeon Explorers of Sky";
|
||||
mainProgram = "skytemple_export_maps";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ xfix marius851000 ];
|
||||
maintainers = with maintainers; [ marius851000 ];
|
||||
broken = stdenv.isDarwin; # pyobjc is missing
|
||||
};
|
||||
}
|
||||
|
||||
@ -19,6 +19,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/SkyTemple/skytemple-icons";
|
||||
description = "Icons for SkyTemple";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ xfix ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -40,6 +40,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/SkyTemple/skytemple-rust";
|
||||
description = "Binary Rust extensions for SkyTemple";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ xfix marius851000 ];
|
||||
maintainers = with maintainers; [ marius851000 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -58,6 +58,6 @@ buildPythonPackage rec {
|
||||
description = "Script Engine Debugger for Pokémon Mystery Dungeon Explorers of Sky";
|
||||
mainProgram = "skytemple-ssb-debugger";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ marius851000 xfix ];
|
||||
maintainers = with maintainers; [ marius851000 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -73,6 +73,6 @@ buildPythonPackage rec {
|
||||
description = "SkyTemple Script Engine Debugger Emulator Backend";
|
||||
homepage = "https://github.com/SkyTemple/skytemple-ssb-emulator";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ marius851000 xfix ];
|
||||
maintainers = with maintainers; [ marius851000 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -51,7 +51,7 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/SkyTemple/tilequant";
|
||||
changelog = "https://github.com/SkyTemple/tilequant/releases/tag/${version}";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ marius851000 xfix ];
|
||||
maintainers = with maintainers; [ marius851000 ];
|
||||
mainProgram = "tilequant";
|
||||
};
|
||||
}
|
||||
|
||||
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Command-line tools for converting between MessagePack and JSON";
|
||||
homepage = "https://github.com/ludocode/msgpack-tools";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ alibabzo ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pscale";
|
||||
version = "0.191.0";
|
||||
version = "0.195.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "planetscale";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+QGzLPJQbIql5Xomve/v3vGB5kdCDamxkRM6weIZMMw=";
|
||||
sha256 = "sha256-Dgp4N4R239NSewHJ7iVhWwfoppXsnhhL8ZrDEbiM9v4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-dcMKi12YFTpQShGRm97Zptiw9JK55CAXm0r8UG+c1Dg=";
|
||||
vendorHash = "sha256-0rzX54AdlFvvYhfZvS3qBxV4bIF2li8HwKdtm0jS04g=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "turso-cli";
|
||||
version = "0.90.7";
|
||||
version = "0.92.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tursodatabase";
|
||||
repo = "turso-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+pd2bRyu1BFhzJ1iGDmBv/DR8oZHC0hGZBgZZIxpaYo=";
|
||||
hash = "sha256-L118k+NOvO9jBqBzPkrx/U+RjgY318b1Q0u5X7uT7i0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-2NjdjB09WYzHjQEl2hMUWN1/xsj/Hlr8lVYU/pkxTqQ=";
|
||||
|
||||
@ -54,6 +54,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://www.artsoft.org/rocksndiamonds/";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ orivej xfix ];
|
||||
maintainers = with maintainers; [ orivej ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dolt";
|
||||
version = "1.35.8";
|
||||
version = "1.35.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dolthub";
|
||||
repo = "dolt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-JpRJbAxu6Bz47vJ/DB3QpUZk2LcGHe/vUVpzbnsG+FI=";
|
||||
sha256 = "sha256-VTScVd9GHbwHGZDGquld05zP6CrvqfdfhRO9GHH2zHA=";
|
||||
};
|
||||
|
||||
modRoot = "./go";
|
||||
subPackages = [ "cmd/dolt" ];
|
||||
vendorHash = "sha256-Hk9ILvK9b/3Eh7D6NQT7W6ZCW0J3unuALqy/po46cm8=";
|
||||
vendorHash = "sha256-4lmwDD9LKTATA8vJiWaWaWueIoSFrfW+C0O5uCh3TJw=";
|
||||
proxyVendor = true;
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lantern";
|
||||
pname = "postgresql-lantern";
|
||||
version = "0.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@ -69,6 +69,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Programmable completion for the bash shell";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.xfix ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -13,11 +13,11 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "borgmatic";
|
||||
version = "1.8.9";
|
||||
version = "1.8.10";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-YfDV2BJzi2DVi/eoWg3KeqmJjUv5+TrLpYdF8R7YuPY=";
|
||||
sha256 = "sha256-hR2q49gCD9BZsk+jQ90EfKkkq7mX9qAO+gRsvdnuDec=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ] ++ passthru.optional-dependencies.apprise;
|
||||
|
||||
@ -26,7 +26,7 @@ buildGoModule rec {
|
||||
description = "Backup ZFS snapshots to cloud storage such as Google, Amazon, Azure, etc";
|
||||
homepage = "https://github.com/someone1/zfsbackup-go";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ xfix ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "zfsbackup-go";
|
||||
};
|
||||
|
||||
@ -25,7 +25,7 @@ stdenv.mkDerivation {
|
||||
description = "A patcher for IPS and BPS files";
|
||||
homepage = "https://github.com/Alcaro/Flips";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = [ maintainers.xfix ];
|
||||
maintainers = [ ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "flips";
|
||||
};
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, perlPackages
|
||||
, shortenPerlShebang
|
||||
}:
|
||||
|
||||
perlPackages.buildPerlPackage rec {
|
||||
@ -26,6 +28,8 @@ perlPackages.buildPerlPackage rec {
|
||||
YAMLSyck
|
||||
];
|
||||
|
||||
nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
|
||||
|
||||
prePatch = ''
|
||||
touch Makefile.PL
|
||||
'';
|
||||
@ -33,7 +37,11 @@ perlPackages.buildPerlPackage rec {
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm555 -t $out/bin shelldap
|
||||
runHook preInstall
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postInstall = lib.optionalString stdenv.isDarwin ''
|
||||
shortenPerlShebang $out/bin/shelldap
|
||||
'';
|
||||
|
||||
# no make target 'test', not tests provided by source
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "calendar-cli";
|
||||
version = "1.0.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tobixen";
|
||||
@ -15,7 +16,11 @@ python3.pkgs.buildPythonApplication rec {
|
||||
hash = "sha256-w35ySLnfxXZR/a7BrPLYqXs2kqkuYhh5PcgNxJqjDtE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
build-system = with python3.pkgs; [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = with python3.pkgs; [
|
||||
icalendar
|
||||
caldav
|
||||
pytz
|
||||
@ -36,6 +41,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
description = "Simple command-line CalDav client";
|
||||
homepage = "https://github.com/tobixen/calendar-cli";
|
||||
license = licenses.gpl3Plus;
|
||||
mainProgram = "calendar-cli";
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0r9q45y55z4i0askkxmxrx0jr1620ypd870vz0hx2a6n9skimdy0";
|
||||
};
|
||||
|
||||
makeFlags = [ "CFLAGS=-O2" ];
|
||||
preBuild = ''
|
||||
makeFlagsArray+=(CFLAGS="-O2 -std=c89")
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -Dm755 snow -t $out/bin
|
||||
|
||||
@ -32,7 +32,7 @@ buildGoModule rec {
|
||||
homepage = "https://smallstep.com/cli/";
|
||||
changelog = "https://github.com/smallstep/cli/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ xfix ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
mainProgram = "step";
|
||||
};
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cri-tools";
|
||||
version = "1.29.0";
|
||||
version = "1.30.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-64vjN0tm6P+nXjrNPeTviXOQdibuH7YbQm/LjYLxatM=";
|
||||
hash = "sha256-MuyXcdV29sLn9Vt0WE31nXtY9ofjEC0b5zSrmGXR0mw=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user