Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
76e7973d1c
@ -101,3 +101,7 @@ end_of_line = unset
|
||||
insert_final_newline = unset
|
||||
trim_trailing_whitespace = unset
|
||||
charset = unset
|
||||
|
||||
[lib/tests/*.plist]
|
||||
indent_style = tab
|
||||
insert_final_newline = unset
|
||||
|
||||
@ -355,6 +355,7 @@ rec {
|
||||
# PLIST handling
|
||||
toPlist = {}: v: let
|
||||
isFloat = builtins.isFloat or (x: false);
|
||||
isPath = x: builtins.typeOf x == "path";
|
||||
expr = ind: x: with builtins;
|
||||
if x == null then "" else
|
||||
if isBool x then bool ind x else
|
||||
@ -362,6 +363,7 @@ rec {
|
||||
if isString x then str ind x else
|
||||
if isList x then list ind x else
|
||||
if isAttrs x then attrs ind x else
|
||||
if isPath x then str ind (toString x) else
|
||||
if isFloat x then float ind x else
|
||||
abort "generators.toPlist: should never happen (v = ${v})";
|
||||
|
||||
|
||||
@ -919,6 +919,30 @@ runTests {
|
||||
expected = "«foo»";
|
||||
};
|
||||
|
||||
testToPlist =
|
||||
let
|
||||
deriv = derivation { name = "test"; builder = "/bin/sh"; system = "aarch64-linux"; };
|
||||
in {
|
||||
expr = mapAttrs (const (generators.toPlist { })) {
|
||||
value = {
|
||||
nested.values = rec {
|
||||
int = 42;
|
||||
float = 0.1337;
|
||||
bool = true;
|
||||
emptystring = "";
|
||||
string = "fn\${o}\"r\\d";
|
||||
newlinestring = "\n";
|
||||
path = /. + "/foo";
|
||||
null_ = null;
|
||||
list = [ 3 4 "test" ];
|
||||
emptylist = [];
|
||||
attrs = { foo = null; "foo b/ar" = "baz"; };
|
||||
emptyattrs = {};
|
||||
};
|
||||
};
|
||||
};
|
||||
expected = { value = builtins.readFile ./test-to-plist-expected.plist; };
|
||||
};
|
||||
|
||||
testToLuaEmptyAttrSet = {
|
||||
expr = generators.toLua {} {};
|
||||
|
||||
46
lib/tests/test-to-plist-expected.plist
Normal file
46
lib/tests/test-to-plist-expected.plist
Normal file
@ -0,0 +1,46 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>nested</key>
|
||||
<dict>
|
||||
<key>values</key>
|
||||
<dict>
|
||||
<key>attrs</key>
|
||||
<dict>
|
||||
<key>foo b/ar</key>
|
||||
<string>baz</string>
|
||||
</dict>
|
||||
<key>bool</key>
|
||||
<true/>
|
||||
<key>emptyattrs</key>
|
||||
<dict>
|
||||
|
||||
</dict>
|
||||
<key>emptylist</key>
|
||||
<array>
|
||||
|
||||
</array>
|
||||
<key>emptystring</key>
|
||||
<string></string>
|
||||
<key>float</key>
|
||||
<real>0.133700</real>
|
||||
<key>int</key>
|
||||
<integer>42</integer>
|
||||
<key>list</key>
|
||||
<array>
|
||||
<integer>3</integer>
|
||||
<integer>4</integer>
|
||||
<string>test</string>
|
||||
</array>
|
||||
<key>newlinestring</key>
|
||||
<string>
|
||||
</string>
|
||||
<key>path</key>
|
||||
<string>/foo</string>
|
||||
<key>string</key>
|
||||
<string>fn${o}"r\d</string>
|
||||
</dict>
|
||||
</dict>
|
||||
</dict>
|
||||
</plist>
|
||||
@ -5695,6 +5695,12 @@
|
||||
githubId = 1713676;
|
||||
name = "Luis G. Torres";
|
||||
};
|
||||
giorgiga = {
|
||||
email = "giorgio.gallo@bitnic.it";
|
||||
github = "giorgiga";
|
||||
githubId = 471835;
|
||||
name = "Giorgio Gallo";
|
||||
};
|
||||
GKasparov = {
|
||||
email = "mizozahr@gmail.com";
|
||||
github = "GKasparov";
|
||||
|
||||
@ -100,11 +100,12 @@ def convert_to_throw(date_older_list: list[str]) -> list[tuple[str, str]]:
|
||||
date_older_list.remove(line)
|
||||
continue
|
||||
|
||||
alias = before_equal.strip()
|
||||
alias = before_equal
|
||||
alias_unquoted = before_equal.strip('"')
|
||||
after_equal_list = [x.strip(";:") for x in after_equal.split()]
|
||||
|
||||
converted = (
|
||||
f"{indent}{alias} = throw \"'{alias}' has been renamed to/replaced by"
|
||||
f"{indent}{alias} = throw \"'{alias_unquoted}' has been renamed to/replaced by"
|
||||
f" '{after_equal_list.pop(0)}'\";"
|
||||
f' # Converted to throw {datetime.today().strftime("%Y-%m-%d")}'
|
||||
)
|
||||
|
||||
@ -50,6 +50,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
- [Deepin Desktop Environment](https://github.com/linuxdeepin/dde), an elegant, easy to use and reliable desktop environment. Available as [services.xserver.desktopManager.deepin](options.html#opt-services.xserver.desktopManager.deepin).
|
||||
|
||||
- [system-repart](https://www.freedesktop.org/software/systemd/man/systemd-repart.service.html), grow and add partitions to a partition table. Available as [systemd.repart](options.html#opt-systemd.repart) and [boot.initrd.systemd.repart](options.html#opt-boot.initrd.systemd.repart)
|
||||
|
||||
- [fzf](https://github.com/junegunn/fzf), a command line fuzzyfinder. Available as [programs.fzf](#opt-programs.fzf.fuzzyCompletion).
|
||||
|
||||
- [readarr](https://github.com/Readarr/Readarr), Book Manager and Automation (Sonarr for Ebooks). Available as [services.readarr](options.html#opt-services.readarr.enable).
|
||||
|
||||
@ -25,6 +25,7 @@ let
|
||||
path = makeBinPath [
|
||||
pkgs.jq
|
||||
nixos-enter
|
||||
pkgs.util-linuxMinimal
|
||||
];
|
||||
};
|
||||
|
||||
@ -65,6 +66,9 @@ let
|
||||
name = "nixos-enter";
|
||||
src = ./nixos-enter.sh;
|
||||
inherit (pkgs) runtimeShell;
|
||||
path = makeBinPath [
|
||||
pkgs.util-linuxMinimal
|
||||
];
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
@ -121,7 +121,7 @@ let
|
||||
fi
|
||||
done
|
||||
|
||||
for i in $(find ${toString cfg.modules} -type d); do
|
||||
for i in $(find ${toString cfg.modules} -type d | sort); do
|
||||
if test $(echo $i/*.so* | wc -w) -ne 0; then
|
||||
echo " ModulePath \"$i\"" >> $out
|
||||
fi
|
||||
|
||||
@ -40,7 +40,7 @@ let
|
||||
# This can only be done here because we *cannot* depend on $out
|
||||
# referring to the toplevel, except by living in the toplevel itself.
|
||||
toplevelInjector = lib.escapeShellArgs [
|
||||
"${pkgs.jq}/bin/jq"
|
||||
"${pkgs.buildPackages.jq}/bin/jq"
|
||||
''
|
||||
."org.nixos.bootspec.v1".toplevel = $toplevel |
|
||||
."org.nixos.bootspec.v1".init = $init
|
||||
@ -60,7 +60,7 @@ let
|
||||
children);
|
||||
in
|
||||
lib.escapeShellArgs [
|
||||
"${pkgs.jq}/bin/jq"
|
||||
"${pkgs.buildPackages.jq}/bin/jq"
|
||||
"--sort-keys"
|
||||
''."org.nixos.specialisation.v1" = ($ARGS.named | map_values(. | first))''
|
||||
] + " ${lib.concatStringsSep " " specialisationLoader}";
|
||||
|
||||
@ -16,16 +16,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ncspot";
|
||||
version = "0.13.1";
|
||||
version = "0.13.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrkfdn";
|
||||
repo = "ncspot";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-TZTADhoJloqMSO2UgbwwvJoZqhi8UC1qNDDNxE6Aq54=";
|
||||
hash = "sha256-DdJa4ax/v86OgO+IAsiFA8/u6pEGcCw+N/3MLXzz8DM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-tEk7BxAN8jEquJiv89vC0lYrB/sKeZhThBzs09A9NpA=";
|
||||
cargoHash = "sha256-HkpFboXgHbJMYJFabJ58Syy1ag+InwqkeJAw8MxAr0A=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ lib.optional withClipboard python3;
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ergo";
|
||||
version = "5.0.9";
|
||||
version = "5.0.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
|
||||
sha256 = "sha256-EChnLRoInWFRuRMfnyRlZbZBWB6/QG9yRdwW9+IiMYc=";
|
||||
sha256 = "sha256-T1+xQtXbLyfiV1IAeIiqzIFt1UZuctIkyNGzRc8E+zM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -38,13 +38,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cudatext";
|
||||
version = "1.192.0";
|
||||
version = "1.193.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alexey-T";
|
||||
repo = "CudaText";
|
||||
rev = version;
|
||||
hash = "sha256-uRw4IeTJz5K3EPgEAtvtG938LT0doHh49/y02XlMhzE=";
|
||||
hash = "sha256-vMTE6oe11ajO+Dw5pcgXEKSl8LR+3GI4DHH5KxS3Msw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
16
pkgs/applications/editors/cudatext/deps.json
generated
16
pkgs/applications/editors/cudatext/deps.json
generated
@ -11,18 +11,18 @@
|
||||
},
|
||||
"ATFlatControls": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2023.04.26",
|
||||
"hash": "sha256-OQOIDK3DSWQeKMjHPbJzfB35v+FQXFaoOES0luKSMc0="
|
||||
"rev": "2023.05.04",
|
||||
"hash": "sha256-VdjLHbgj5i7gEavnGLvPlBBlo5HPYUIBX78pkD2CbwI="
|
||||
},
|
||||
"ATSynEdit": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2023.04.26",
|
||||
"hash": "sha256-RD8ZmRy6jf6pUGPDI3Ft2LBYHXklxXlJXaLHjLv3usE="
|
||||
"rev": "2023.05.02",
|
||||
"hash": "sha256-E3XBPzd8D8SMhjXOj16syzdMgryzOVPxnEuZwpO7Czw="
|
||||
},
|
||||
"ATSynEdit_Cmp": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2023.04.26",
|
||||
"hash": "sha256-y5+NaTTSS6GI2gLOOewQnWzfAUB1reximvqnWjavORk="
|
||||
"rev": "2023.05.02",
|
||||
"hash": "sha256-bPib2pJqxb+m9eMGerClj1bvAoHcGH2OTmmKon6UQfo="
|
||||
},
|
||||
"EControl": {
|
||||
"owner": "Alexey-T",
|
||||
@ -31,8 +31,8 @@
|
||||
},
|
||||
"ATSynEdit_Ex": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2023.04.17",
|
||||
"hash": "sha256-ZCRoKuwU+DtXEEZEL2QhhwMfewQMhw+/20vVRgHpHf4="
|
||||
"rev": "2023.05.02",
|
||||
"hash": "sha256-EKJnkwQ7QTUTVaXOA1pi5YUHxaA/hu4qpgpHHaON61k="
|
||||
},
|
||||
"Python-for-Lazarus": {
|
||||
"owner": "Alexey-T",
|
||||
|
||||
@ -27,13 +27,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xemu";
|
||||
version = "0.7.87";
|
||||
version = "0.7.88";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xemu-project";
|
||||
repo = "xemu";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-NPvyXDrTKt7PIspLPrUBo7qs9hsHV+6u7dQlIqdlQtw=";
|
||||
hash = "sha256-rV90ISPaipczaJgGj0vAO1IJYDMJpncVGOdllO3Km2k=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
62
pkgs/applications/file-managers/felix-fm/Cargo.lock
generated
62
pkgs/applications/file-managers/felix-fm/Cargo.lock
generated
@ -127,9 +127,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "chrono"
|
||||
version = "0.4.23"
|
||||
version = "0.4.24"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
|
||||
checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b"
|
||||
dependencies = [
|
||||
"iana-time-zone",
|
||||
"num-integer",
|
||||
@ -306,7 +306,7 @@ dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"scratch",
|
||||
"syn",
|
||||
"syn 1.0.105",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -323,7 +323,7 @@ checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
"syn 1.0.105",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -371,7 +371,7 @@ checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
|
||||
|
||||
[[package]]
|
||||
name = "felix"
|
||||
version = "2.2.6"
|
||||
version = "2.2.7"
|
||||
dependencies = [
|
||||
"chrono",
|
||||
"content_inspector",
|
||||
@ -409,9 +409,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "flate2"
|
||||
version = "1.0.25"
|
||||
version = "1.0.26"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
|
||||
checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
|
||||
dependencies = [
|
||||
"crc32fast",
|
||||
"miniz_oxide",
|
||||
@ -611,9 +611,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "miniz_oxide"
|
||||
version = "0.6.2"
|
||||
version = "0.7.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
|
||||
checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
|
||||
dependencies = [
|
||||
"adler",
|
||||
]
|
||||
@ -796,18 +796,18 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.47"
|
||||
version = "1.0.56"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
|
||||
checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.21"
|
||||
version = "1.0.26"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
|
||||
checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
@ -901,22 +901,22 @@ checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.149"
|
||||
version = "1.0.162"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "256b9932320c590e707b94576e3cc1f7c9024d0ee6612dfbcf1cb106cbe8e055"
|
||||
checksum = "71b2f6e1ab5c2b98c05f0f35b236b22e8df7ead6ffbf51d7808da7f8817e7ab6"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.149"
|
||||
version = "1.0.162"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b4eae9b04cbffdfd550eb462ed33bc6a1b68c935127d008b27444d08380f94e4"
|
||||
checksum = "a2a0814352fd64b58489904a44ea8d90cb1a91dcb6b4f5ebabc32c8318e93cb6"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
"syn 2.0.15",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -1029,6 +1029,17 @@ dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "syntect"
|
||||
version = "5.0.0"
|
||||
@ -1086,7 +1097,7 @@ checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
"syn 1.0.105",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -1150,12 +1161,11 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
|
||||
|
||||
[[package]]
|
||||
name = "walkdir"
|
||||
version = "2.3.2"
|
||||
version = "2.3.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
|
||||
checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
|
||||
dependencies = [
|
||||
"same-file",
|
||||
"winapi",
|
||||
"winapi-util",
|
||||
]
|
||||
|
||||
@ -1186,7 +1196,7 @@ dependencies = [
|
||||
"once_cell",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
"syn 1.0.105",
|
||||
"wasm-bindgen-shared",
|
||||
]
|
||||
|
||||
@ -1208,7 +1218,7 @@ checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
"syn 1.0.105",
|
||||
"wasm-bindgen-backend",
|
||||
"wasm-bindgen-shared",
|
||||
]
|
||||
@ -1333,9 +1343,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "zip"
|
||||
version = "0.6.3"
|
||||
version = "0.6.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "537ce7411d25e54e8ae21a7ce0b15840e7bfcff15b51d697ec3266cc76bdf080"
|
||||
checksum = "0445d0fbc924bb93539b4316c11afb121ea39296f99a3c4c9edad09e3658cdef"
|
||||
dependencies = [
|
||||
"aes",
|
||||
"byteorder",
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "felix";
|
||||
version = "2.2.6";
|
||||
version = "2.2.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyoheiu";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-t/BCRKqCCXZ76bFYyblNnKHB9y0oJ6ajqsbdIGq/YVM=";
|
||||
sha256 = "sha256-ShC6V3NAD5Gv5nLG5e6inoOEEpZn4EuQkaRoGn94Z1g=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
@ -39,8 +39,7 @@ rustPlatform.buildRustPackage rec {
|
||||
checkFlags = [
|
||||
# extra test files not shipped with the repository
|
||||
"--skip=functions::tests::test_list_up_contents"
|
||||
"--skip=magic_image::tests::test_inspect_image"
|
||||
"--skip=magic_packed::tests::test_inspect_signature"
|
||||
"--skip=state::tests::test_has_write_permission"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -14,19 +14,19 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "drawio";
|
||||
version = "21.2.1";
|
||||
version = "21.2.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jgraph";
|
||||
repo = "drawio-desktop";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-sjJZwVQdFAMWdaGUyQbv1qfdJWE2tN90z7eFYyAW9ko=";
|
||||
hash = "sha256-XXtAd29r161rcamZM8QnkJ9mhQeJvqTL4Escdu95me8=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = src + "/yarn.lock";
|
||||
hash = "sha256-YlJ84psoEgeDnCX+O8TvwqhTthm5voJ6dfTvTiZlkuk=";
|
||||
hash = "sha256-H77BfiH3Nqi1a2Uek8N8BgODzMBGgXrBvrcahrKisNo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "asn";
|
||||
version = "0.73.2";
|
||||
version = "0.73.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nitefood";
|
||||
repo = "asn";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-aswssP2l7NdjUEwXO2v0nEiZCk6kArnZA3Jch59W+yA=";
|
||||
sha256 = "sha256-O0Iu+7UAAf+v0gZdGTdBpdn9BZ/9OqTAA/u0WDiz9s8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "civo";
|
||||
version = "1.0.50";
|
||||
version = "1.0.53";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "civo";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-w1Ozj9zmeGzuokX0LgHab5TI0WcdtY29n7w4LfOWthI=";
|
||||
sha256 = "sha256-UE83fnP2cJuRWwyAkZhaF9N64q2Cw4oR/TTnvPbDSxc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-7I4V4DVdHSvr/1ic/YT+Vttreg0tFasRNT/aFe4/0OY=";
|
||||
vendorHash = "sha256-c6Bx/+zyhvV9B1nZ7dJdIsNRSoWeHc2eE81V7Mbkwds=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "clusterctl";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = "cluster-api";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ST/3zoZgeG0P8TwxHEKucZ7DHoD6e6Qx47jv6e+r4Rs=";
|
||||
hash = "sha256-NvCQs6YzQ2zNLQiYgFK/q2c74g/+YkzQIQJWEINOYIE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZJFpzBeC048RZ6YfjXQPyohCO1WagxXvBBacifkfkjE=";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubeshark";
|
||||
version = "40.0";
|
||||
version = "40.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubeshark";
|
||||
repo = "kubeshark";
|
||||
rev = version;
|
||||
sha256 = "sha256-Tmk9xbAqEsJ8nffRX6qw3RKKoBbSO2gmVT5Ff4Cn9DA=";
|
||||
sha256 = "sha256-hRAV8Nnph52Q7fdvW68Ma4DUM0lQdL6e0v1reR/G9Fs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ckIjmrXkn1AVBQRwM6+wdRwwYHytxKm3rKEe+csORdU=";
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "rke2";
|
||||
version = "1.26.4+rke2r1";
|
||||
version = "1.27.1+rke2r1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rancher";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-orxRyCgj3pGLlBoUEjVpyWKw4zfvN4DtaymYKEBXNbs=";
|
||||
hash = "sha256-MPhE4dkFDLMG/Zxn9UqUMmbV95wfNDJU9C5CT8Ap5iA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-YeWyMEwatKuT4FWIpaDK6/xo5TG5IOecoYR+uVidOW4=";
|
||||
vendorHash = "sha256-STpM7GxLdEhe7tfa6n6jyUSQsE9D91pCBvw1n7Q9qMc=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ pkgs, nodejs_16, stdenv, lib, nixosTests }:
|
||||
{ pkgs, stdenv, lib, nixosTests }:
|
||||
|
||||
let
|
||||
nodePackages = import ./node-composition.nix {
|
||||
@ -13,6 +13,7 @@ nodePackages.n8n.override {
|
||||
|
||||
buildInputs = [
|
||||
pkgs.postgresql
|
||||
pkgs.libmongocrypt
|
||||
];
|
||||
|
||||
# Oracle's official package on npm is binary only (WHY?!) and doesn't provide binaries for aarch64.
|
||||
@ -24,6 +25,9 @@ nodePackages.n8n.override {
|
||||
rm -rf node_modules/oracledb
|
||||
'';
|
||||
|
||||
# makes libmongocrypt bindings not look for static libraries in completely wrong places
|
||||
BUILD_TYPE = "dynamic";
|
||||
|
||||
dontNpmInstall = true;
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -530,12 +530,15 @@ let
|
||||
then
|
||||
ln -s $out/lib/node_modules/.bin $out/bin
|
||||
|
||||
# Patch the shebang lines of all the executables
|
||||
# Fixup all executables
|
||||
ls $out/bin/* | while read i
|
||||
do
|
||||
file="$(readlink -f "$i")"
|
||||
chmod u+rwx "$file"
|
||||
patchShebangs "$file"
|
||||
if isScript "$file"
|
||||
then
|
||||
sed -i 's/\r$//' "$file" # convert crlf to lf
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
|
||||
3794
pkgs/applications/networking/n8n/node-packages.nix
generated
3794
pkgs/applications/networking/n8n/node-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -19,12 +19,12 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gitea";
|
||||
version = "1.19.2";
|
||||
version = "1.19.3";
|
||||
|
||||
# not fetching directly from the git repo, because that lacks several vendor files for the web UI
|
||||
src = fetchurl {
|
||||
url = "https://dl.gitea.io/gitea/${version}/gitea-src-${version}.tar.gz";
|
||||
hash = "sha256-L0wedLLQ8NBiw7JQ5AiFa+kQb+Vg0jnBtSGtgIknIDg=";
|
||||
url = "https://dl.gitea.com/gitea/${version}/gitea-src-${version}.tar.gz";
|
||||
hash = "sha256-rSvBeSnJ356Yba7tZXg0S11ZRzYmF3xnOl4ZUJ8XQYw=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
28
pkgs/applications/video/kodi/addons/infotagger/default.nix
Normal file
28
pkgs/applications/video/kodi/addons/infotagger/default.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ lib, buildKodiAddon, fetchFromGitHub, addonUpdateScript }:
|
||||
buildKodiAddon rec {
|
||||
pname = "infotagger";
|
||||
namespace = "script.module.infotagger";
|
||||
version = "0.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jurialmunkey";
|
||||
repo = namespace;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Us7ud0QORGn+ALB4uyISekp0kUYY8nN8uFNg8MlxEB0=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
# Unusual Python path.
|
||||
pythonPath = "resources/modules";
|
||||
updateScript = addonUpdateScript {
|
||||
attrPath = "kodi.packages.infotagger";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/jurialmunkey/script.module.infotagger";
|
||||
description = "Wrapper for new Nexus InfoTagVideo ListItem methods to maintain backwards compatibility";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = teams.kodi.members;
|
||||
};
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, buildKodiAddon, fetchzip, addonUpdateScript, six, requests, inputstreamhelper }:
|
||||
{ lib, buildKodiAddon, fetchzip, addonUpdateScript, six, requests, infotagger, inputstreamhelper }:
|
||||
|
||||
buildKodiAddon rec {
|
||||
pname = "youtube";
|
||||
@ -13,6 +13,7 @@ buildKodiAddon rec {
|
||||
propagatedBuildInputs = [
|
||||
six
|
||||
requests
|
||||
infotagger
|
||||
inputstreamhelper
|
||||
];
|
||||
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ddccontrol-db";
|
||||
version = "20230328";
|
||||
version = "20230424";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ddccontrol";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-74HZqgIEDCKeByPFsuUy3A9zutc5ALNxCrRipi7nbI4=";
|
||||
sha256 = "sha256-qi6dDh6Zk1GpHBpQ+aatAmG9lCdesnJRhK3jVjKYKcQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook intltool ];
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -23,13 +23,13 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "openshadinglanguage";
|
||||
version = "1.12.11.0";
|
||||
version = "1.12.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AcademySoftwareFoundation";
|
||||
repo = "OpenShadingLanguage";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-kN0+dWOUPXK8+xtR7onuPNimdn8WcaKcSRkOnaoi7BQ=";
|
||||
hash = "sha256-kxfDhqF8uTdLqt99rTOk8TWBdN5NF7zm98CT0DbLrW0=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
# defined in trivial-builders.nix
|
||||
# defined in trivial-builders
|
||||
# imported as wrapLua in lua-packages.nix and passed to build-lua-derivation to be used as buildInput
|
||||
makeSetupHook {
|
||||
name = "wrap-lua-hook";
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
# Defined in trivial-builders.nix
|
||||
# Defined in trivial-builders
|
||||
# Imported as wrapOctave in octave/default.nix and passed to octave's buildEnv
|
||||
# as nativeBuildInput
|
||||
# Each of the substitutions is available in the wrap.sh script as @thingSubstituted@
|
||||
|
||||
44
pkgs/development/libraries/libmongocrypt/default.nix
Normal file
44
pkgs/development/libraries/libmongocrypt/default.nix
Normal file
@ -0,0 +1,44 @@
|
||||
{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config, mongoc, openssl }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libmongocrypt";
|
||||
version = "1.7.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mongodb";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-I4KG2BHAovin9EaF8lNzJzucARvi0Qptz5Y9gTt3WkE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix pkg-config files
|
||||
# submitted upstream: https://github.com/mongodb/libmongocrypt/pull/634
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mongodb/libmongocrypt/commit/5514cf0a366c4d0dc1b0f2a62201f0f1161054da.diff";
|
||||
hash = "sha256-eMSn6MRnc3yKfU2u/Bg3juWiupDzY1DUGi1/HSRftIs=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ mongoc openssl ];
|
||||
|
||||
cmakeFlags = [
|
||||
# all three of these are required to use system libbson
|
||||
"-DUSE_SHARED_LIBBSON=ON"
|
||||
"-DMONGOCRYPT_MONGOC_DIR=USE-SYSTEM"
|
||||
"-DENABLE_ONLINE_TESTS=OFF"
|
||||
|
||||
# this pulls in a library we don't have
|
||||
"-DMONGOCRYPT_ENABLE_DECIMAL128=OFF"
|
||||
|
||||
# this avoids a dependency on Python
|
||||
"-DBUILD_VERSION=${version}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Required C library for client-side and queryable encryption in MongoDB";
|
||||
homepage = "https://github.com/mongodb/libmongocrypt";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -176,5 +176,28 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ cpcloud ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
knownVulnerabilities = [
|
||||
# at least some of
|
||||
"CVE-2023-27579"
|
||||
"CVE-2023-25801"
|
||||
"CVE-2023-25676"
|
||||
"CVE-2023-25675"
|
||||
"CVE-2023-25674"
|
||||
"CVE-2023-25673"
|
||||
"CVE-2023-25671"
|
||||
"CVE-2023-25670"
|
||||
"CVE-2023-25669"
|
||||
"CVE-2023-25668"
|
||||
"CVE-2023-25667"
|
||||
"CVE-2023-25665"
|
||||
"CVE-2023-25666"
|
||||
"CVE-2023-25664"
|
||||
"CVE-2023-25663"
|
||||
"CVE-2023-25662"
|
||||
"CVE-2023-25660"
|
||||
"CVE-2023-25659"
|
||||
"CVE-2023-25658"
|
||||
# and many many more
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
38
pkgs/development/node-packages/aliases.nix
Normal file
38
pkgs/development/node-packages/aliases.nix
Normal file
@ -0,0 +1,38 @@
|
||||
pkgs: lib: self: super:
|
||||
|
||||
### Deprecated aliases - for backward compatibility
|
||||
|
||||
with self;
|
||||
|
||||
let
|
||||
# Removing recurseForDerivation prevents derivations of aliased attribute
|
||||
# set to appear while listing all the packages available.
|
||||
removeRecurseForDerivations = alias: with lib;
|
||||
if alias.recurseForDerivations or false
|
||||
then removeAttrs alias ["recurseForDerivations"]
|
||||
else alias;
|
||||
|
||||
# Disabling distribution prevents top-level aliases for non-recursed package
|
||||
# sets from building on Hydra.
|
||||
removeDistribute = alias: with lib;
|
||||
if isDerivation alias then
|
||||
dontDistribute alias
|
||||
else alias;
|
||||
|
||||
# Make sure that we are not shadowing something from node-packages.nix.
|
||||
checkInPkgs = n: alias:
|
||||
if builtins.hasAttr n super
|
||||
then throw "Alias ${n} is still in node-packages.nix"
|
||||
else alias;
|
||||
|
||||
mapAliases = aliases:
|
||||
lib.mapAttrs (n: alias:
|
||||
removeDistribute
|
||||
(removeRecurseForDerivations
|
||||
(checkInPkgs n alias)))
|
||||
aliases;
|
||||
in
|
||||
|
||||
mapAliases ({
|
||||
"@githubnext/github-copilot-cli" = pkgs.github-copilot-cli; # Added 2023-05-02
|
||||
})
|
||||
@ -1,4 +1,4 @@
|
||||
{ pkgs, lib, nodejs, stdenv}:
|
||||
{ config, pkgs, lib, nodejs, stdenv }:
|
||||
|
||||
let
|
||||
inherit (lib) composeManyExtensions extends makeExtensible mapAttrs;
|
||||
@ -15,7 +15,12 @@ let
|
||||
})
|
||||
) (import ./main-programs.nix);
|
||||
|
||||
aliases = final: prev:
|
||||
lib.optionalAttrs config.allowAliases
|
||||
(import ./aliases.nix pkgs lib final prev);
|
||||
|
||||
extensions = composeManyExtensions [
|
||||
aliases
|
||||
mainProgramOverrides
|
||||
(import ./overrides.nix { inherit pkgs nodejs; })
|
||||
];
|
||||
|
||||
@ -20,7 +20,6 @@
|
||||
"@commitlint/cli" = "commitlint";
|
||||
"@forge/cli" = "forge";
|
||||
"@gitbeaker/cli" = "gitbeaker";
|
||||
"@githubnext/github-copilot-cli" = "github-copilot-cli";
|
||||
"@google/clasp" = "clasp";
|
||||
"@medable/mdctl-cli" = "mdctl";
|
||||
"@mermaid-js/mermaid-cli" = "mmdc";
|
||||
|
||||
@ -39,8 +39,6 @@ final: prev: {
|
||||
];
|
||||
};
|
||||
|
||||
"@githubnext/github-copilot-cli" = pkgs.github-copilot-cli;
|
||||
|
||||
"@medable/mdctl-cli" = prev."@medable/mdctl-cli".override (oldAttrs: {
|
||||
nativeBuildInputs = with pkgs; with darwin.apple_sdk.frameworks; [
|
||||
glib
|
||||
|
||||
@ -90,7 +90,13 @@ buildPythonPackage rec {
|
||||
requests
|
||||
];
|
||||
|
||||
preCheck = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) ''
|
||||
preCheck = ''
|
||||
# Scale default timeouts by a factor of 4 to avoid flaky builds
|
||||
# https://github.com/microsoft/debugpy/pull/1286 if merged would
|
||||
# allow us to disable the timeouts altogether
|
||||
export DEBUGPY_PROCESS_SPAWN_TIMEOUT=60
|
||||
export DEBUGPY_PROCESS_EXIT_TIMEOUT=20
|
||||
'' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) ''
|
||||
# https://github.com/python/cpython/issues/74570#issuecomment-1093748531
|
||||
export no_proxy='*';
|
||||
'';
|
||||
|
||||
@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-spanner";
|
||||
version = "3.32.0";
|
||||
version = "3.33.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-/2ktwVBV6CmEKrX8cngxmeOz4Hwhpw2ThOX1rA/yYeQ=";
|
||||
hash = "sha256-k+2s1GPBK/mPCwRK0UzuoNSKNMouwIcoRM7BagXUNS8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -16,14 +16,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-storage";
|
||||
version = "2.8.0";
|
||||
version = "2.9.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Q4jaH/W9ptcp8m28rxv6AgoqUqe5HwqBI+29pRZggCw=";
|
||||
hash = "sha256-m2rntQn8KUvay4TQ8+qOIOLFSotLvjnFcHY1/sIU7/M=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hatasmota";
|
||||
version = "0.6.4";
|
||||
version = "0.6.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "emontnemery";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-fE5klk4ToayRyUmE2xtcMMsH4VKOKZHqvBCa9GG84rU=";
|
||||
hash = "sha256-DqXGvn7vYC3SXOM/u+nMUshgBUe0O6Dcffaxh9vFohk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "onvif-zeep-async";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-HQ8SUr4LSelXjRYZRMJixfk/H38zEYg/Qaj23mdAhV8=";
|
||||
hash = "sha256-y4o3zsLacbOVLZpa3mljdXuzVEGRzkc+Be6pt+UMLrA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyinstrument";
|
||||
version = "4.1.1";
|
||||
version = "4.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "joerick";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4gM60UhzN+VnNMTHw6NSU7/LUPHaMgg105D+dO6SDfg=";
|
||||
hash = "sha256-0GbJkYBgSOIZrHSKM93SW93jXD+ieYN6A01kWoFbyvQ=";
|
||||
};
|
||||
|
||||
# Module import recursion
|
||||
|
||||
@ -43,12 +43,6 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# https://github.com/natekspencer/pylitterbot/issues/73
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'deepdiff = "^5.8.1"' 'deepdiff = ">=5.8.1"'
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pylitterbot"
|
||||
];
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyswitchbee";
|
||||
version = "1.7.21";
|
||||
version = "1.7.26";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "jafar-atili";
|
||||
repo = "pySwitchbee";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-3Ujs9GgdJm69vb8F00ZWaRgWXxkaPguX5DJ71bqOFec=";
|
||||
hash = "sha256-g8g0QSih2AM/xPHdjuYGj6eB+kKqldjNHZ2Co60mUnk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -26,6 +26,7 @@
|
||||
, pytest-django
|
||||
, pytest-emoji
|
||||
, pytest-flask
|
||||
, pytest-mock
|
||||
, pytest-snapshot
|
||||
, pytestCheckHook
|
||||
, python-dateutil
|
||||
@ -41,7 +42,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "strawberry-graphql";
|
||||
version = "0.176.0";
|
||||
version = "0.176.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -50,7 +51,7 @@ buildPythonPackage rec {
|
||||
owner = "strawberry-graphql";
|
||||
repo = "strawberry";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-e61wLFqc3HLCWUiVW3Gzbay1Oi8b7HsLT3+jPnbA4YY=";
|
||||
hash = "sha256-O57gCJiLlR3k45V6cRNd9AHo9EGoWd7WRMmnV/8xFyQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -149,6 +150,7 @@ buildPythonPackage rec {
|
||||
mypy
|
||||
pytest-asyncio
|
||||
pytest-emoji
|
||||
pytest-mock
|
||||
pytest-snapshot
|
||||
pytestCheckHook
|
||||
sanic-testing
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "velbus-aio";
|
||||
version = "2023.2.0";
|
||||
version = "2023.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "Cereal2nd";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-y8M9Zf/CMM7NH0Sr7E9sx7JnOFGlExEk7cFEGrHBi7g=";
|
||||
hash = "sha256-8wRgH7t1s2X7mg3oN38KMvJQfWcn/ePw6rNIl2K9nNA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flow";
|
||||
version = "0.205.0";
|
||||
version = "0.205.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "flow";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+F0NmE9BN8eSmyLnXkgdYy3qdyBvKfRM+hVgYmLvzOg=";
|
||||
sha256 = "sha256-fVs2qfA4Tjn1cqeXAXN5kl3q5Ua7sSu8Xca0EPiDLnI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -3,16 +3,16 @@
|
||||
nixosTests }:
|
||||
buildGoModule rec {
|
||||
pname = "buildkite-agent";
|
||||
version = "3.45.0";
|
||||
version = "3.46.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "buildkite";
|
||||
repo = "agent";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-T1B9eo0LVN5FMI76TJQ4yxIXOfqT9wHNO5DHfVaWHBA=";
|
||||
sha256 = "sha256-4SCQcirphI/vmWa/5OrVh9k8utMmX4pUOYhIE1t1NRU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-kxqwGJBm5cT0ay29TlAqq3cFWheLqMwX/MtHpaHohBc=";
|
||||
vendorHash = "sha256-54v3P4uqU7A77yizjWAIzlvpjUaG8HHmH3j9p8d+LQc=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "google-java-format";
|
||||
version = "1.16.0";
|
||||
version = "1.17.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/google/google-java-format/releases/download/v${version}/google-java-format-${version}-all-deps.jar";
|
||||
sha256 = "sha256-goGaLF9wZ3EuAjNmG4ZMHANPZlfWO45xi0pQ45qwKPY=";
|
||||
sha256 = "sha256-MwaLu9zhCZmC7BFx9eICiY6zXykZz0hhQeQ5/G46QgM=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "controller-tools";
|
||||
version = "0.11.4";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cOXN6DZH8uiJNPRZrSr2QIsENZUQrreqYJB6OFALFeA=";
|
||||
sha256 = "sha256-2nRsaHCqZUF3M1Z0e//IjhYELHRxR6fSCfkWyC1fog4=";
|
||||
};
|
||||
|
||||
patches = [ ./version.patch ];
|
||||
|
||||
vendorHash = "sha256-nZyDoME5fVqRoAeLADjrQ7i6mVf3ujGN2+BUfrSHck8=";
|
||||
vendorHash = "sha256-gztTF8UZ5N4mip8NIyuCfoy16kpJymtggfG0sAcZW6c=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "jsonnet-language-server";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "jsonnet-language-server";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-oPItt1v4wK0W0lSots3hoq5A1ooCRwzJV8cNYV+SBb4=";
|
||||
hash = "sha256-jmeXX4l0A6bVRt9eJI6wDzjOcjPC0/uElT/2YwhWoqw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZyTo79M5nqtqrtTOGanzgHcnSvqCKACacNBWzhYG5nY=";
|
||||
vendorHash = "sha256-lC3GAOJ/XVzn+9kk4PnW/7UwqjiXP7DqYmqauwOqQ+k=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "circleci-cli";
|
||||
version = "0.1.25725";
|
||||
version = "0.1.26343";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CircleCI-Public";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rv+/OSAq/vQIlysbpx8JZuBmtb3COq8hl/tXBYylRwA=";
|
||||
sha256 = "sha256-mEvrcZbQ8vcRHL1CWlxzBJFqXLTJi51DER9BKLxnJ+4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-GBeu/+3Klpb16TI/2joDBG2E5BiwlTIhElSE3278SNs=";
|
||||
vendorHash = "sha256-LzDofZI54cWP4FQfINq3tQbSi4c9/N1v0YH/aSzttNo=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
6
pkgs/development/tools/ruff/Cargo.lock
generated
6
pkgs/development/tools/ruff/Cargo.lock
generated
@ -841,7 +841,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
|
||||
|
||||
[[package]]
|
||||
name = "flake8-to-ruff"
|
||||
version = "0.0.264"
|
||||
version = "0.0.265"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"clap 4.2.4",
|
||||
@ -2004,7 +2004,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ruff"
|
||||
version = "0.0.264"
|
||||
version = "0.0.265"
|
||||
dependencies = [
|
||||
"annotate-snippets 0.9.1",
|
||||
"anyhow",
|
||||
@ -2093,7 +2093,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ruff_cli"
|
||||
version = "0.0.264"
|
||||
version = "0.0.265"
|
||||
dependencies = [
|
||||
"annotate-snippets 0.9.1",
|
||||
"anyhow",
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ruff";
|
||||
version = "0.0.264";
|
||||
version = "0.0.265";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charliermarsh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MDNqoKsXKSM5l351bMs4Z5Voig+HwR2907xlHDFB6x4=";
|
||||
hash = "sha256-b45kPvN2yILZBvP8eSNfWD6gpinwi9RsvmonRGYj0cI=";
|
||||
};
|
||||
|
||||
# We have to use importCargoLock here because `cargo vendor` currently doesn't support workspace
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "probe-run";
|
||||
version = "0.3.8";
|
||||
version = "0.3.9";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-e5HXqqnRnz+6RHOZnZ4VTJhiYKeBSHEjdKBAPKLXf5Q=";
|
||||
hash = "sha256-VNFLX+aPkanX573YpRok2JUWf74O7gtlgmuHkI30y2g=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-8Hpjrjd+dCu9eaFxJ3SRHNBuRaNmvt42vkN2ls3hskA=";
|
||||
cargoHash = "sha256-cjr7lNwzqcIfjXn1CVHKgeRZlsJ0QG+0x9h6q5e3D0o=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rust-analyzer-unwrapped";
|
||||
version = "2023-04-24";
|
||||
cargoSha256 = "sha256-VLN4VNq1ogh0gdeqiFagdFgMOpg28WACHn1hxMYoBjo=";
|
||||
version = "2023-05-01";
|
||||
cargoSha256 = "sha256-ZjJ4EZYUyeO/IpiYcUaEsTx4aaNf36KoUHG3lt9gKbw=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-lang";
|
||||
repo = "rust-analyzer";
|
||||
rev = version;
|
||||
sha256 = "sha256-Z07/byuJdxLK6E8Yb9qNvUMhUCOWEgYAriojU/wZHu8=";
|
||||
sha256 = "sha256-FPQKPvlHIU2DsDF6GMoRtrZhil0vHi6MFd8vpKEx/n8=";
|
||||
};
|
||||
|
||||
cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ];
|
||||
|
||||
@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "supabase-cli";
|
||||
version = "1.50.13";
|
||||
version = "1.55.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "supabase";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-e/jPtNzuETky8uwg1TnFOGKppSPuEkBiEfmPwiUM3V0=";
|
||||
sha256 = "sha256-6Jq9Tc3NVZcvP5Pdy9Bx9yX/pdS3I2X9n1mPirBckB8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-j2iEeAn+4Tn3h8lVKoaYE+6W4R/q+JaAWXxHllZGLNs=";
|
||||
vendorSha256 = "sha256-Kqb5Rici4J4psPx1Yfp3mGnwuXlzEreQvm4yFcWCp8U=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, lib, fetchFromGitHub, runCommand, unzip, meson, ninja, pkg-config, qtbase, qttools, wrapQtAppsHook, luajit }:
|
||||
let
|
||||
dataVersion = "2.29.0";
|
||||
dataVersion = "2.30.1";
|
||||
frontendVersion = "unstable-2023-04-09";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation {
|
||||
owner = "PathOfBuildingCommunity";
|
||||
repo = "PathOfBuilding";
|
||||
rev = "v${dataVersion}";
|
||||
hash = "sha256-uG+Qb50+oG5yd67w2WgnatKpq+/0UA8IfJeJXRKnQXU=";
|
||||
hash = "sha256-2itcALgl8eDkZylb/hmePDMILM4RxW2u5LYLbg+NNJ4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ stdenv, lib, fetchurl, ghostscript, gyre-fonts, texinfo, imagemagick, texi2html, guile
|
||||
, python3, gettext, flex, perl, bison, pkg-config, autoreconfHook, dblatex
|
||||
, fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff
|
||||
, freefont_ttf, makeFontsConf
|
||||
, makeWrapper, t1utils, boehmgc, rsync
|
||||
, texlive, tex ? texlive.combine {
|
||||
inherit (texlive) scheme-small lh metafont epsf fontinst;
|
||||
@ -62,4 +63,8 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with maintainers; [ marcweber yurrriq ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
||||
FONTCONFIG_FILE = lib.optional stdenv.isDarwin (makeFontsConf {
|
||||
fontDirectories = [ freefont_ttf ];
|
||||
});
|
||||
}
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "utm";
|
||||
version = "4.1.6";
|
||||
version = "4.2.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/utmapp/UTM/releases/download/v${version}/UTM.dmg";
|
||||
hash = "sha256-d0xEND95u/PFnKfogLwO2vLgv+tQubMea8XWSJRuZF4=";
|
||||
hash = "sha256-T3TA+CwddNtUL80xASRCSczGA2LLTwPEA2+jnc9m6jY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ undmg makeWrapper ];
|
||||
|
||||
@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xf86-input-wacom";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxwacom";
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "sha256-AYjO7B0Z6G1JqpLdvm9LS+ujz7iUp8UwZ9X1WQ/dGk0=";
|
||||
sha256 = "sha256-PuIfeHlkcoin7w2v822P8uhWBNhYQGuOA7yD62L3qto=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2023.5.1";
|
||||
version = "2023.5.2";
|
||||
components = {
|
||||
"3_day_blinds" = ps: with ps; [
|
||||
];
|
||||
|
||||
@ -321,7 +321,7 @@ let
|
||||
extraBuildInputs = extraPackages python.pkgs;
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2023.5.1";
|
||||
hassVersion = "2023.5.2";
|
||||
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
@ -337,7 +337,7 @@ in python.pkgs.buildPythonApplication rec {
|
||||
# Primary source is the pypi sdist, because it contains translations
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-SnNZE2FFL+PVnAoX661d5d4P1drbSPZQsL25mi4TuNI=";
|
||||
hash = "sha256-vBDYNnwx+9fjiVkMelDoaDtYwBKEq5BibLEs8iwIIFo=";
|
||||
};
|
||||
|
||||
# Secondary source is git for tests
|
||||
@ -345,7 +345,7 @@ in python.pkgs.buildPythonApplication rec {
|
||||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ddD9hBN+UU9Z3zfNsymD7O5Fi5v1Xuh2wMPmfhrsoO8=";
|
||||
hash = "sha256-4YvGxBr8YmOz5kzPJ9ve7mlWxwe9BfkQgLxjst4IIJ8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
||||
@ -4,7 +4,7 @@ buildPythonPackage rec {
|
||||
# the frontend version corresponding to a specific home-assistant version can be found here
|
||||
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
|
||||
pname = "home-assistant-frontend";
|
||||
version = "20230503.2";
|
||||
version = "20230503.3";
|
||||
format = "wheel";
|
||||
|
||||
src = fetchPypi {
|
||||
@ -12,7 +12,7 @@ buildPythonPackage rec {
|
||||
pname = "home_assistant_frontend";
|
||||
dist = "py3";
|
||||
python = "py3";
|
||||
hash = "sha256-Iz7GviL5qRjEE+I15NpquJ3seHFJPnoMasChIti4mYY=";
|
||||
hash = "sha256-BOSXRpHgHUygrbd7LaGHFj5aM+Bfp5VkB791tJ5jCwU=";
|
||||
};
|
||||
|
||||
# there is nothing to strip in this package
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "telegraf";
|
||||
version = "1.26.1";
|
||||
version = "1.26.2";
|
||||
|
||||
excludedPackages = "test";
|
||||
|
||||
@ -12,10 +12,10 @@ buildGoModule rec {
|
||||
owner = "influxdata";
|
||||
repo = "telegraf";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wEmQOnpuJJtjcqw9HLV31wIFjcP48Ojo6bUnyrG3mYA=";
|
||||
sha256 = "sha256-Y3WDhYJ4So0vcJPvd+1l8Fpuqa84vm7A1Teh5G+pOmI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Tt0ZY5gmT40x1cg/XseCKu10Ol3tE+yVv+7EczPRI6s=";
|
||||
vendorHash = "sha256-uEqFst42z8tfTgnNF4l/8+6XakRPsT0qL0YJOQD/z60=";
|
||||
proxyVendor = true;
|
||||
|
||||
ldflags = [
|
||||
|
||||
@ -48,6 +48,8 @@ lib.makeScope newScope (self: with self; {
|
||||
|
||||
pure = callPackage ./pure.nix { };
|
||||
|
||||
sdkman-for-fish = callPackage ./sdkman-for-fish.nix { };
|
||||
|
||||
sponge = callPackage ./sponge.nix { };
|
||||
|
||||
tide = callPackage ./tide.nix { };
|
||||
|
||||
20
pkgs/shells/fish/plugins/sdkman-for-fish.nix
Normal file
20
pkgs/shells/fish/plugins/sdkman-for-fish.nix
Normal file
@ -0,0 +1,20 @@
|
||||
{ lib, buildFishPlugin, fetchFromGitHub }:
|
||||
|
||||
buildFishPlugin rec {
|
||||
pname = "sdkman-for-fish";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "reitzig";
|
||||
repo = "sdkman-for-fish";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bfWQ2al0Xy8bnJt5euziHz/+qhyri4qWy47VDoPwQcg=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Adds support for SDKMAN! to fish";
|
||||
homepage = "https://github.com/reitzig/sdkman-for-fish";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ giorgiga ];
|
||||
};
|
||||
}
|
||||
@ -2,7 +2,7 @@
|
||||
libpng, uthash , which, xnee, xorg, python3Packages }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.7.0";
|
||||
version = "1.7.1";
|
||||
|
||||
pname = "alttab";
|
||||
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "sagb";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-AxHagyGbU3bWJ+sP2S7YjHBHsIbd/doONPgd2tsBtKY=";
|
||||
sha256 = "sha256-1+hk0OeSriXPyefv3wOgeiW781PL4VP5Luvt+RS5jmg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
42
pkgs/tools/admin/proxmove/default.nix
Normal file
42
pkgs/tools/admin/proxmove/default.nix
Normal file
@ -0,0 +1,42 @@
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "proxmove";
|
||||
version = "1.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ossobv";
|
||||
repo = "proxmove";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8xzsmQsogoMrdpf8+mVZRWPGQt9BO0dBT0aKt7ygUe4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
proxmoxer
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
rm -R assets
|
||||
rm -R artwork
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
$out/bin/${pname} --version
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "The Proxmox VM migrator: migrates VMs between different Proxmox VE clusters";
|
||||
homepage = "https://github.com/ossobv/proxmove";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ AngryAnt ];
|
||||
};
|
||||
}
|
||||
@ -1,16 +1,19 @@
|
||||
{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, Foundation }:
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "dua";
|
||||
version = "2.19.2";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ];
|
||||
version = "2.20.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Byron";
|
||||
repo = "dua-cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-A39lYXkHinvppZVm2V9HXmtcbR4jOiHRtABQeryqLG8=";
|
||||
hash = "sha256-yBPzf0ZpL49CupdtxjEo9QiOC5vwTcqdfAC2Q6WcNhE=";
|
||||
# Remove unicode file names which leads to different checksums on HFS+
|
||||
# vs. other filesystems because of unicode normalisation.
|
||||
postFetch = ''
|
||||
@ -18,15 +21,19 @@ rustPlatform.buildRustPackage rec {
|
||||
'';
|
||||
};
|
||||
|
||||
cargoHash = "sha256-7SrNPf1inu8zaIMErJ6zADDFkLMPvR6zCg44Vv1DarM=";
|
||||
cargoHash = "sha256-jgPOC8xtxYyKhYzsJezefwgopVL+1MED+Wf5h6bCYBg=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Foundation
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool to conveniently learn about the disk usage of directories, fast!";
|
||||
description = "A tool to conveniently learn about the disk usage of directories";
|
||||
homepage = "https://github.com/Byron/dua-cli";
|
||||
changelog = "https://github.com/Byron/dua-cli/raw/v${version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/Byron/dua-cli/blob/v${version}/CHANGELOG.md";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ killercup ];
|
||||
maintainers = with maintainers; [ figsoda killercup ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "jfrog-cli";
|
||||
version = "2.36.1";
|
||||
vendorHash = "sha256-i0iZhYcVRxkcCWd9+liX5vvwXCyem3v1sRZYqmsNbgY=";
|
||||
version = "2.37.0";
|
||||
vendorHash = "sha256-0u4sVqquMW3WyF5Uy/DrxwRZLPDARf0rACylc0R22IA=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jfrog";
|
||||
repo = "jfrog-cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-C3XoBtJyTQQDC5QKmNAyvdYt4ZyBhHs33bW4DDlv9lU=";
|
||||
sha256 = "sha256-4BqlKJZQt9X3zIsImGWwGLm9M60XF2oStSV4ef+3L7Q=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
||||
49
pkgs/tools/misc/shopware-cli/default.nix
Normal file
49
pkgs/tools/misc/shopware-cli/default.nix
Normal file
@ -0,0 +1,49 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, makeWrapper
|
||||
, dart-sass-embedded
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "shopware-cli";
|
||||
version = "0.1.62";
|
||||
src = fetchFromGitHub {
|
||||
repo = "shopware-cli";
|
||||
owner = "FriendsOfShopware";
|
||||
rev = version;
|
||||
hash = "sha256-Vxg3hYUCN4UdBGHN57VXDlGdp+qzq8tbUDPAl/Bse44=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||
|
||||
vendorSha256 = "sha256-O3dJX2w+J9TABkytaJ0ubFg9edVpmo7iPArc+Qqh3M4=";
|
||||
|
||||
postInstall = ''
|
||||
export HOME="$(mktemp -d)"
|
||||
installShellCompletion --cmd shopware-cli \
|
||||
--bash <($out/bin/shopware-cli completion bash) \
|
||||
--zsh <($out/bin/shopware-cli completion zsh) \
|
||||
--fish <($out/bin/shopware-cli completion fish)
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram $out/bin/shopware-cli \
|
||||
--prefix PATH : ${lib.makeBinPath [ dart-sass-embedded ]}
|
||||
'';
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X 'github.com/FriendsOfShopware/shopware-cli/cmd.version=${version}'"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command line tool for Shopware 6";
|
||||
homepage = "https://github.com/FriendsOfShopware/shopware-cli";
|
||||
changelog = "https://github.com/FriendsOfShopware/shopware-cli/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ shyim ];
|
||||
};
|
||||
}
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "deploy-rs";
|
||||
version = "unstable-2023-01-19";
|
||||
version = "unstable-2023-05-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "serokell";
|
||||
repo = "deploy-rs";
|
||||
rev = "8c9ea9605eed20528bf60fae35a2b613b901fd77";
|
||||
hash = "sha256-QO1xF7stu5ZMDLbHN30LFolMAwY6TVlzYvQoUs1RD68=";
|
||||
rev = "6b0b6a1c2527e8b1ef370a308b6ef8903004ac47";
|
||||
hash = "sha256-UUxpb5PMkFfP2JGoPMEUvKbxv+wCkTWy4uZs1MyyCes=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-UKiG2Muw3cT17TCl0pZQGfzVdN5tajSZ1ULyGRaZ9tQ=";
|
||||
cargoHash = "sha256-6/VSfCNBstr+fQPdpMl5b2MwNxRjSJvTDuTGKySPGsk=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
CoreServices
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "asnmap";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-7yKOeKSsexqLZ+ep7+mft6GlHrZiwv6OOCeERZu7gAE=";
|
||||
hash = "sha256-nkDa54+4bAMtQ/s/vn7x9hAt7p+ErKMOZ70MoH45CoM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-VmbmRkJB5jme8j/ONMkbsITJxg5inxYnb5AoKUR3Uzg=";
|
||||
vendorHash = "sha256-owpu0oANYipso33HOwwSqL8G0VDT53B9HeLQA/GvmxU=";
|
||||
|
||||
# Tests require network access
|
||||
doCheck = false;
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "vault";
|
||||
version = "1.13.1";
|
||||
version = "1.13.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = "vault";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bYZghlQi2p3XnKWH3H2sehds/XSMW8pbzBophNMa5q4=";
|
||||
sha256 = "sha256-U4V2+O8//6mkuznSHkPWeeJNK6NtUTEhFk7zz3FEe58=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-mNnStWxrSR455zGWkj4dLDFk/kdOXYgk8LKB0wy7K5M=";
|
||||
vendorHash = "sha256-eyXmmhMAbLJiLwQQAR4+baU53n2WY5laUKEGoPjpBg4=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@ -4614,9 +4614,7 @@ with pkgs;
|
||||
|
||||
dtrx = callPackage ../tools/compression/dtrx { };
|
||||
|
||||
dua = callPackage ../tools/misc/dua {
|
||||
inherit (darwin.apple_sdk.frameworks) Foundation;
|
||||
};
|
||||
dua = callPackage ../tools/misc/dua { };
|
||||
|
||||
duf = callPackage ../tools/misc/duf { };
|
||||
|
||||
@ -9666,6 +9664,8 @@ with pkgs;
|
||||
|
||||
libmongo-client = callPackage ../development/libraries/libmongo-client { };
|
||||
|
||||
libmongocrypt = callPackage ../development/libraries/libmongocrypt { };
|
||||
|
||||
libmesode = callPackage ../development/libraries/libmesode { };
|
||||
|
||||
libmsym = callPackage ../development/libraries/science/chemistry/libmsym { };
|
||||
@ -12182,6 +12182,8 @@ with pkgs;
|
||||
|
||||
shrikhand = callPackage ../data/fonts/shrikhand { };
|
||||
|
||||
shopware-cli = callPackage ../tools/misc/shopware-cli { };
|
||||
|
||||
shunit2 = callPackage ../tools/misc/shunit2 { };
|
||||
|
||||
sic = callPackage ../applications/networking/irc/sic { };
|
||||
@ -18820,6 +18822,8 @@ with pkgs;
|
||||
|
||||
procodile = callPackage ../tools/system/procodile { };
|
||||
|
||||
proxmove = callPackage ../tools/admin/proxmove { };
|
||||
|
||||
pry = callPackage ../development/tools/pry { };
|
||||
|
||||
pup = callPackage ../development/tools/pup { };
|
||||
|
||||
@ -120,6 +120,8 @@ let self = rec {
|
||||
|
||||
idna = callPackage ../applications/video/kodi/addons/idna { };
|
||||
|
||||
infotagger = callPackage ../applications/video/kodi/addons/infotagger { };
|
||||
|
||||
inputstream-adaptive = callPackage ../applications/video/kodi/addons/inputstream-adaptive { };
|
||||
|
||||
inputstream-ffmpegdirect = callPackage ../applications/video/kodi/addons/inputstream-ffmpegdirect { };
|
||||
|
||||
@ -101,7 +101,7 @@ let
|
||||
};
|
||||
|
||||
trivialBuilders = self: super:
|
||||
import ../build-support/trivial-builders.nix {
|
||||
import ../build-support/trivial-builders {
|
||||
inherit lib;
|
||||
inherit (self) runtimeShell stdenv stdenvNoCC haskell;
|
||||
inherit (self.pkgsBuildHost) shellcheck;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user