Merge remote-tracking branch 'origin/master' into staging-next

This commit is contained in:
K900 2024-10-27 09:10:05 +03:00
commit 280a9f86c8
99 changed files with 8560 additions and 3628 deletions

View File

@ -40,6 +40,9 @@ d1c1a0c656ccd8bd3b25d3c4287f2d075faf3cf3
# fix indentation in meteor default.nix
a37a6de881ec4c6708e6b88fd16256bbc7f26bbd
# pkgs/stdenv/make-derivation: Reindent
b4cc2a2479a7ab0f6440b2e1319221920ef72699
# treewide: automatically md-convert option descriptions
2e751c0772b9d48ff6923569adfa661b030ab6a2

View File

@ -6265,6 +6265,12 @@
github = "elliottslaughter";
githubId = 3129;
};
ElliottSullingeFarrall = {
name = "Elliott Sullinge-Farrall";
email = "elliott.chalford@gmail.com";
github = "ElliottSullingeFarrall";
githubId = 108588212;
};
elliottvillars = {
email = "elliottvillars@gmail.com";
github = "elliottvillars";
@ -16361,6 +16367,11 @@
githubId = 33182938;
name = "Pankaj";
};
PapayaJackal = {
github = "PapayaJackal";
githubId = 145766029;
name = "PapayaJackal";
};
paperdigits = {
email = "mica@silentumbrella.com";
github = "paperdigits";
@ -19740,6 +19751,12 @@
github = "shikanime";
githubId = 22115108;
};
shiphan = {
email = "timlin940511@gmail.com";
name = "Shiphan";
github = "Shiphan";
githubId = 140245703;
};
shiryel = {
email = "contact@shiryel.com";
name = "Shiryel";
@ -23282,6 +23299,12 @@
githubId = 28888242;
name = "WORLDofPEACE";
};
WoutSwinkels = {
name = "Wout Swinkels";
email = "nixpkgs@woutswinkels.com";
github = "WoutSwinkels";
githubId = 113464111;
};
wozeparrot = {
email = "wozeparrot@gmail.com";
github = "wozeparrot";

View File

@ -53,5 +53,6 @@ crystal.buildCrystalPackage rec {
license = licenses.mit;
mainProgram = "tijolo";
maintainers = with maintainers; [ sund3RRR ];
broken = true;
};
}

View File

@ -1,6 +1,6 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
version = 4
[[package]]
name = "aho-corasick"
@ -11,6 +11,12 @@ dependencies = [
"memchr",
]
[[package]]
name = "autocfg"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
[[package]]
name = "bincode"
version = "1.3.3"
@ -33,41 +39,45 @@ dependencies = [
name = "blink-cmp-fuzzy"
version = "0.1.0"
dependencies = [
"c-marshalling",
"frizbee",
"generator",
"heed",
"lazy_static",
"libc",
"lua-marshalling",
"mlua",
"regex",
"serde",
]
[[package]]
name = "bstr"
version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c"
dependencies = [
"memchr",
"serde",
]
[[package]]
name = "byteorder"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "c-marshalling"
version = "0.2.0"
source = "git+https://github.com/distil/rust_lua_ffi#30820cdc9282c938dbf8e7bb0a1ea31cf56b25a6"
dependencies = [
"libc",
"quick-error",
]
[[package]]
name = "cc"
version = "1.1.29"
version = "1.1.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "58e804ac3194a48bb129643eb1d62fcc20d18c6b8c181704489353d13120bcd1"
checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f"
dependencies = [
"shlex",
]
[[package]]
name = "cfg-if"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "crossbeam-queue"
version = "0.3.11"
@ -83,27 +93,6 @@ version = "0.8.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
[[package]]
name = "derive-c-marshalling-library"
version = "0.1.0"
source = "git+https://github.com/distil/rust_lua_ffi#30820cdc9282c938dbf8e7bb0a1ea31cf56b25a6"
dependencies = [
"libc",
"quote 0.4.2",
"syn 0.12.15",
]
[[package]]
name = "derive-lua-marshalling"
version = "0.2.0"
source = "git+https://github.com/distil/rust_lua_ffi#30820cdc9282c938dbf8e7bb0a1ea31cf56b25a6"
dependencies = [
"derive-c-marshalling-library",
"libc",
"quote 0.4.2",
"syn 0.12.15",
]
[[package]]
name = "doxygen-rs"
version = "0.4.2"
@ -125,22 +114,12 @@ dependencies = [
[[package]]
name = "frizbee"
version = "0.1.0"
source = "git+https://github.com/saghen/frizbee#d910bec53b867ce06702520c7e05f9862bf78dd9"
source = "git+https://github.com/saghen/frizbee#cc186f587fd2e844ab5c3b8f164e5e3b1f846605"
dependencies = [
"memchr",
"smith_waterman_macro",
]
[[package]]
name = "generator"
version = "2.0.0"
source = "git+https://github.com/distil/rust_lua_ffi#30820cdc9282c938dbf8e7bb0a1ea31cf56b25a6"
dependencies = [
"parser",
"quote 0.4.2",
"syn 0.12.15",
]
[[package]]
name = "heed"
version = "0.20.5"
@ -203,9 +182,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
[[package]]
name = "libc"
version = "0.2.159"
version = "0.2.161"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
[[package]]
name = "lmdb-master-sys"
@ -219,14 +198,13 @@ dependencies = [
]
[[package]]
name = "lua-marshalling"
version = "0.3.0"
source = "git+https://github.com/distil/rust_lua_ffi#30820cdc9282c938dbf8e7bb0a1ea31cf56b25a6"
name = "lock_api"
version = "0.4.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
dependencies = [
"c-marshalling",
"derive-lua-marshalling",
"lazy_static",
"libc",
"autocfg",
"scopeguard",
]
[[package]]
@ -235,6 +213,51 @@ version = "2.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
[[package]]
name = "mlua"
version = "0.10.0-rc.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7928e85ce39d4ea4d11dc850fde2acb503fc114a76f53e8606dd9ed237a491e9"
dependencies = [
"bstr",
"mlua-sys",
"mlua_derive",
"num-traits",
"parking_lot",
"rustc-hash",
]
[[package]]
name = "mlua-sys"
version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ebe026d6bd1583a9cf9080e189030ddaea7e6f5f0deb366a8e26f8a26c4135b8"
dependencies = [
"cc",
"cfg-if",
"pkg-config",
]
[[package]]
name = "mlua_derive"
version = "0.10.0-rc.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e110f0addea6b8d2f2378717e94f63b36a74274760b4895943b3a5650fa7513e"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.85",
]
[[package]]
name = "num-traits"
version = "0.2.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
dependencies = [
"autocfg",
]
[[package]]
name = "once_cell"
version = "1.20.2"
@ -252,12 +275,26 @@ dependencies = [
]
[[package]]
name = "parser"
version = "0.2.0"
source = "git+https://github.com/distil/rust_lua_ffi#30820cdc9282c938dbf8e7bb0a1ea31cf56b25a6"
name = "parking_lot"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
dependencies = [
"quote 0.4.2",
"syn 0.12.15",
"lock_api",
"parking_lot_core",
]
[[package]]
name = "parking_lot_core"
version = "0.9.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
dependencies = [
"cfg-if",
"libc",
"redox_syscall",
"smallvec",
"windows-targets",
]
[[package]]
@ -294,9 +331,9 @@ checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
dependencies = [
"phf_generator",
"phf_shared",
"proc-macro2 1.0.87",
"quote 1.0.37",
"syn 2.0.79",
"proc-macro2",
"quote",
"syn 2.0.85",
]
[[package]]
@ -309,45 +346,27 @@ dependencies = [
]
[[package]]
name = "proc-macro2"
version = "0.2.3"
name = "pkg-config"
version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd07deb3c6d1d9ff827999c7f9b04cdfd66b1b17ae508e14fe47b620f2282ae0"
dependencies = [
"unicode-xid",
]
checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
[[package]]
name = "proc-macro2"
version = "1.0.87"
version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a"
checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
dependencies = [
"unicode-ident",
]
[[package]]
name = "quick-error"
version = "1.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
[[package]]
name = "quote"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1eca14c727ad12702eb4b6bfb5a232287dcf8385cb8ca83a3eeaf6519c44c408"
dependencies = [
"proc-macro2 0.2.3",
]
[[package]]
name = "quote"
version = "1.0.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
dependencies = [
"proc-macro2 1.0.87",
"proc-macro2",
]
[[package]]
@ -365,6 +384,15 @@ version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
[[package]]
name = "redox_syscall"
version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
dependencies = [
"bitflags",
]
[[package]]
name = "regex"
version = "1.11.0"
@ -394,6 +422,12 @@ version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
[[package]]
name = "rustc-hash"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
[[package]]
name = "ryu"
version = "1.0.18"
@ -401,30 +435,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
[[package]]
name = "serde"
version = "1.0.210"
name = "scopeguard"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]]
name = "serde"
version = "1.0.213"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.210"
version = "1.0.213"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5"
dependencies = [
"proc-macro2 1.0.87",
"quote 1.0.37",
"syn 2.0.79",
"proc-macro2",
"quote",
"syn 2.0.85",
]
[[package]]
name = "serde_json"
version = "1.0.128"
version = "1.0.132"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
dependencies = [
"itoa",
"memchr",
@ -445,24 +485,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
[[package]]
name = "smith_waterman_macro"
version = "0.1.0"
source = "git+https://github.com/saghen/frizbee#d910bec53b867ce06702520c7e05f9862bf78dd9"
dependencies = [
"proc-macro2 1.0.87",
"quote 1.0.37",
"syn 1.0.109",
]
name = "smallvec"
version = "1.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
[[package]]
name = "syn"
version = "0.12.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c97c05b8ebc34ddd6b967994d5c6e9852fa92f8b82b3858c39451f97346dcce5"
name = "smith_waterman_macro"
version = "0.1.0"
source = "git+https://github.com/saghen/frizbee#cc186f587fd2e844ab5c3b8f164e5e3b1f846605"
dependencies = [
"proc-macro2 0.2.3",
"quote 0.4.2",
"unicode-xid",
"proc-macro2",
"quote",
"syn 1.0.109",
]
[[package]]
@ -471,19 +506,19 @@ version = "1.0.109"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
dependencies = [
"proc-macro2 1.0.87",
"quote 1.0.37",
"proc-macro2",
"quote",
"unicode-ident",
]
[[package]]
name = "syn"
version = "2.0.79"
version = "2.0.85"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"
dependencies = [
"proc-macro2 1.0.87",
"quote 1.0.37",
"proc-macro2",
"quote",
"unicode-ident",
]
@ -532,12 +567,6 @@ dependencies = [
"tinyvec",
]
[[package]]
name = "unicode-xid"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
[[package]]
name = "url"
version = "2.5.2"
@ -570,3 +599,67 @@ name = "winapi-x86_64-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "windows-targets"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
dependencies = [
"windows_aarch64_gnullvm",
"windows_aarch64_msvc",
"windows_i686_gnu",
"windows_i686_gnullvm",
"windows_i686_msvc",
"windows_x86_64_gnu",
"windows_x86_64_gnullvm",
"windows_x86_64_msvc",
]
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
[[package]]
name = "windows_aarch64_msvc"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
[[package]]
name = "windows_i686_gnu"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
[[package]]
name = "windows_i686_gnullvm"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
[[package]]
name = "windows_i686_msvc"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
[[package]]
name = "windows_x86_64_gnu"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
[[package]]
name = "windows_x86_64_msvc"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"

View File

@ -6,12 +6,12 @@
vimUtils,
}:
let
version = "0.3.1";
version = "0.4.1";
src = fetchFromGitHub {
owner = "Saghen";
repo = "blink.cmp";
rev = "refs/tags/v${version}";
hash = "sha256-bvhLOM0NMx5S069uX2OecEpzYaR3hV4r8nCIPD0f0XQ=";
hash = "sha256-jWRXrFh83lTRsgm0gSZuRORltqo147BAg1zVcd7rIMg=";
};
libExt = if stdenv.hostPlatform.isDarwin then "dylib" else "so";
blink-fuzzy-lib = rustPlatform.buildRustPackage {
@ -24,8 +24,7 @@ let
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"c-marshalling-0.2.0" = "sha256-eL6nkZOtuLLQ0r31X7uroUUDYZsWOJ9KNXl4NCVNRuw=";
"frizbee-0.1.0" = "sha256-zO2S282DVCjnALMXu3GxmAfjCXsPNUZ7+xgiqITfGmU=";
"frizbee-0.1.0" = "sha256-eYth+xOIqwGPkH39OxNCMA9zE+5CTNpsuX8Ue/mySIA=";
};
};
};

View File

@ -11,13 +11,13 @@
buildDotnetModule rec {
pname = "ArchiSteamFarm";
# nixpkgs-update: no auto update
version = "6.0.6.4";
version = "6.0.7.5";
src = fetchFromGitHub {
owner = "JustArchiNET";
repo = "ArchiSteamFarm";
rev = version;
hash = "sha256-U4RApOUtrZ9su4O1jamjDbVrjozujW+vYRI1R7rSzpc=";
hash = "sha256-YmwbANzwpda/ZJyGZ5lqa/4AVz7QNTXqHXOJNiZcc/M=";
};
dotnet-runtime = dotnetCorePackages.aspnetcore_8_0;

View File

@ -61,8 +61,9 @@
(fetchNuGet { pname = "Markdig.Signed"; version = "0.37.0"; hash = "sha256-hYyyZz0iETAE2HydbyudPdoOUi6wHQRG0BjuS87Tnl0="; })
(fetchNuGet { pname = "Microsoft.ApplicationInsights"; version = "2.22.0"; hash = "sha256-mUQ63atpT00r49ca50uZu2YCiLg3yd6r3HzTryqcuEA="; })
(fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; hash = "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="; })
(fetchNuGet { pname = "Microsoft.CodeAnalysis.ResxSourceGenerator"; version = "3.11.0-beta1.24324.1"; hash = "sha256-+YEdFt4em1e8SMC3PnRAwOfyMZLwWPJo7/loTt7l9kQ="; })
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.10.0"; hash = "sha256-yQFwqVChRtIRpbtkJr92JH2i+O7xn91NGbYgnKs8G2g="; })
(fetchNuGet { pname = "Microsoft.Bcl.TimeProvider"; version = "8.0.1"; hash = "sha256-TQRaWjk1aZu+jn/rR8oOv8BJEG31i6mPkf3BkIR7C+c="; })
(fetchNuGet { pname = "Microsoft.CodeAnalysis.ResxSourceGenerator"; version = "3.11.0-beta1.24415.1"; hash = "sha256-mZISof2BEaehgkVhw/G/vb6yvnNJtfoDEdGOHqAiWAg="; })
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.11.0"; hash = "sha256-XglInnx5GePUYHG7n2NLX+WfK7kJnornsWOW/5FnOXE="; })
(fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; hash = "sha256-RJjBWz+UHxkQE2s7CeGYdTZ218mCufrxl0eBykZdIt4="; })
(fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; hash = "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="; })
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; hash = "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="; })
@ -78,33 +79,33 @@
(fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; hash = "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="; })
(fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; hash = "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI="; })
(fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; hash = "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "8.0.2"; hash = "sha256-j37WWYrYgINKVn5eWhytGad7k2GwQPCemumJXU7cHsw="; })
(fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "8.0.2"; hash = "sha256-siKloYOZKBRV//apM/O+A+KwhAWTZ0ZnnCI7Pq+pxMs="; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "8.0.2"; hash = "sha256-Ref5E5JXHXDAdog/Yix25fsYO7R4eCHP8L/GIJz70p8="; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "8.0.2"; hash = "sha256-VM5Tw4lS1XxVajmA8PB4yn8J+Abi388U//5//0aNOHo="; })
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.10.0"; hash = "sha256-rkHIqB2mquNXF89XBTFpUL2z5msjTBsOcyjSBCh36I0="; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "8.1.0"; hash = "sha256-BupPW6gN3p1LhIdDTcCVFmAMx3kMl7+Oq4kNWpbPsp4="; })
(fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "8.1.0"; hash = "sha256-TzyHvyQQ/v1pr5IXOcyubLiB2l1uZLYiZyrg/QZADiM="; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "8.1.0"; hash = "sha256-focc7oT7KbA3hDs6huy7PrPorH6EhRaVnaCkhrXPfq8="; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "8.1.0"; hash = "sha256-wH3TDd7NcbGlMy1Z5clPcH/DjCNbDV1EJtDJcg9YcHA="; })
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.11.0"; hash = "sha256-WjyA78+PG9ZloWTt9Hf1ek3VVj2FfJ9fAjqklnN+fWw="; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; })
(fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.6.14"; hash = "sha256-dSJUic2orPGfYVgto9DieRckbtLpPyxHtf+RJ2tmKPM="; })
(fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.3.2"; hash = "sha256-q6ZGafMpM3HunHtjVATcIa+gPUM1ef4y3Do8Syf2pa4="; })
(fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.3.2"; hash = "sha256-0+O40vygEoX0K2NDMSv1zFB4H10su0FAA1QTqzi1KcA="; })
(fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.3.2"; hash = "sha256-H8dK/+S39mXZWnM9dB0CQhu23vQD9JRAaHivnutUDEY="; })
(fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.3.2"; hash = "sha256-1H34nSpdSL+P91F5Ynjr8590eNFcm+1Rp27vYclx2Xc="; })
(fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.3.2"; hash = "sha256-1SVTVvrFqStKoxuQSqaKBuKp+qDHZkCTpIECPuEEdQI="; })
(fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.10.0"; hash = "sha256-3YjVGK2zEObksBGYg8b/CqoJgLQ1jUv4GCWNjDhLRh4="; })
(fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.10.0"; hash = "sha256-+yzP3FY6WoOosSpYnB7duZLhOPUZMQYy8zJ1d3Q4hK4="; })
(fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.4.0"; hash = "sha256-j9D+ts+CoP1xj/ZM7Eucp3Dx16NUQ7FsyALB7ArmJCw="; })
(fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.4.0"; hash = "sha256-k3DIWLQe2Y8Q1lV75wNTqzvnbfhIyp/gOGLB6u8hBZs="; })
(fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.4.0"; hash = "sha256-P+Sy651SvEE+4/e5jsm79xhWJ4D/qUoTYEqgLEN6hUc="; })
(fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.4.0"; hash = "sha256-xTBi8jb1e8xF5n/HPYnAjNRPM/zS8gVR/51hJXx7Vkg="; })
(fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.4.0"; hash = "sha256-xW9SRkROePnNMX6BQYHOFmivmPaSbJ5/YeuwcJNrzQg="; })
(fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.11.0"; hash = "sha256-mCI3MCV6nyrGLrBat5VvK5LrXTEKlsdp9NkpZyJYwVg="; })
(fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.11.0"; hash = "sha256-gViDLobza22kuLvB4JdlGtbANqwBHRwf1wLmIHMw9Eo="; })
(fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; hash = "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="; })
(fetchNuGet { pname = "MSTest"; version = "3.5.2"; hash = "sha256-BZLyxq2WtJL338s9cIVlpodvVInsrjZ6L7vYalIFk5Y="; })
(fetchNuGet { pname = "MSTest.Analyzers"; version = "3.5.2"; hash = "sha256-Jwmtm/+yk8DoPnjOqauDXknVtmVzsrmqJwZuP6QfHvw="; })
(fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.5.2"; hash = "sha256-tbKREqe9w5Tkhib4AfWR9vB7DYLmvAjEov8UM2D2gA0="; })
(fetchNuGet { pname = "MSTest.TestFramework"; version = "3.5.2"; hash = "sha256-ZudwTMNhxbxehLz9hCOgrhTzegVs4P6avUpFiez+u10="; })
(fetchNuGet { pname = "MSTest"; version = "3.6.0"; hash = "sha256-p1w/OOAdFOy+WLV16cn2adGl5MeyDhltDllrDpPhYLE="; })
(fetchNuGet { pname = "MSTest.Analyzers"; version = "3.6.0"; hash = "sha256-/EdgXvk5a38DjpAcu3+13Xm9yjZUYHqBy3Q3UQxAEVo="; })
(fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.6.0"; hash = "sha256-XpSVWgNU36VVUssPUc11R/StiyzzmSu7imXu7kBzLkE="; })
(fetchNuGet { pname = "MSTest.TestFramework"; version = "3.6.0"; hash = "sha256-3j4Gp+BOhhKZav23gED/dtAnsoOrG+wtI9+p6IHNVMA="; })
(fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; })
(fetchNuGet { pname = "Nito.AsyncEx.Coordination"; version = "5.1.2"; hash = "sha256-NHMnIBkGzzuoZL0qHKAwFC35doB08IDvmCQptC2uu2s="; })
(fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; hash = "sha256-W5jxZZ0pbPHte6TkWTq4FDtHOejvlrdyb1Inw+Yhl4c="; })
(fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; hash = "sha256-6Pmz6XQ+rY32O21Z3cUDVQsLH+i53LId18UCPTAxRZQ="; })
(fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; hash = "sha256-FKDLUWysqroSHLU2kLjK1m0g417AAPh6n2TIkwiapcM="; })
(fetchNuGet { pname = "NLog"; version = "5.3.3"; hash = "sha256-M6IbNKj4cUplxS7vi54m2SZe4bQdmMusDTMmsjqmZKg="; })
(fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.12"; hash = "sha256-KAqPPDIXrqM85yb1TfhqHUhBYrHug/bOlrEepV+0BEc="; })
(fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.12"; hash = "sha256-ZnPQeBLrGkP4EqfoJtDjJuuPqCZW5AMv/3XJaB0o0L0="; })
(fetchNuGet { pname = "NLog"; version = "5.3.4"; hash = "sha256-Cwr1Wu9VbOcRz3GdVKkt7lIpNwC1E4Hdb0g+qEkEr3k="; })
(fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.13"; hash = "sha256-H1u+mccp7XYHJePISiV6PgqGLJ/gAnK/+Q/wBf4jq+w="; })
(fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.14"; hash = "sha256-slCdA4LZ6nDhBirE5/dXyDmVuWKCZiUgLvB6wCgkCKE="; })
(fetchNuGet { pname = "OpenTelemetry"; version = "1.9.0"; hash = "sha256-QVV6ecnVk73bvi4Lw1RnTsaEUH/6CT0/zIJkYdg6CGg="; })
(fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.9.0"; hash = "sha256-raXpHi2DZ3mSLn9dnJYF64XaP23epdfu8zgagSpm8+4="; })
(fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.9.0"; hash = "sha256-Yy3EcKBW7XH7nhLcvwQB0NIfxiGChuy6UPc7MJpxEbE="; })
@ -115,12 +116,12 @@
(fetchNuGet { pname = "OpenTelemetry.Instrumentation.Runtime"; version = "1.9.0"; hash = "sha256-Xov89h4Py7MCz6SAOjV0tjtZvvjHbx7NyPXZsY1PZhk="; })
(fetchNuGet { pname = "protobuf-net"; version = "3.2.30"; hash = "sha256-keRy5OWT+/tlZt3D7x+9PEdjTvEJcZdYsf/i1ZBtciE="; })
(fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.30"; hash = "sha256-GMpJNecoBfrV2VgpYOhcZnKZaLFDObNLcX2LBTThrwY="; })
(fetchNuGet { pname = "SteamKit2"; version = "3.0.0-beta.2"; hash = "sha256-aQ1zMyWPOvGFcDYYscn/qTpnWS4HfK/k1NLk37zeVAE="; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.7.2"; hash = "sha256-clFYZAy7v6mbWr1a+yy0BVbqoQGlqDvzXGlVMXzqg9s="; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.7.2"; hash = "sha256-tBsLIRSWAknFWvNu524sSFmOB4aIKuYX9I3Wp9AHxwE="; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.7.2"; hash = "sha256-cH+/13iri7PMxlymzLUT+YEoJKxlXNNK56x8oQAkuAs="; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.7.2"; hash = "sha256-EzHxMjlwAsyNOFdHZTiQ7Wk6ZEWpRJqwoQGSe/eFoJE="; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.7.2"; hash = "sha256-4+aBYecxcA/Et8sAxoJ2+e86WO7s3rYT6xd9MOaQIxQ="; })
(fetchNuGet { pname = "SteamKit2"; version = "3.0.0-beta.3"; hash = "sha256-G3Apy5g0TT273Ake6/4DnrJGY4lWrTbyHDJMntiSuzE="; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.8.0"; hash = "sha256-2CMwJt9QDVrQ0FCGol0TTInEbchcXItVjgwh2HeJts4="; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.8.0"; hash = "sha256-ADbd0g8R79X1lQ2A5SDX3yYvNFnMiztuDd6OtNC5It0="; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.8.0"; hash = "sha256-tqJRsvb4snA/1EmAh2oKzGFBC6atFCkg4+b1PMSmfoo="; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.8.0"; hash = "sha256-g7D+WGZAmUccExd5IzGwNGypJKcve85YdT3kof1w/LI="; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.8.0"; hash = "sha256-45+fRCATI+MKYa9/rXIylBItVXV+pJhY2y7iO3ida+o="; })
(fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; hash = "sha256-WMMAUqoxT3J1gW9DI8v31VAuhwqTc4Posose5jq1BNo="; })
(fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; hash = "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk="; })
(fetchNuGet { pname = "System.Composition"; version = "8.0.0"; hash = "sha256-rA118MFj6soKN++BvD3y9gXAJf0lZJAtGARuznG5+Xg="; })

View File

@ -2,7 +2,7 @@
buildNpmPackage rec {
pname = "asf-ui";
version = "1641151b9f430908bc63bbe9927fa8414538e7f1";
version = "9f5672d65a1bd3b0f5d16ea6a1b5d220d670223c";
src = fetchFromGitHub {
owner = "JustArchiNET";
@ -10,10 +10,10 @@ buildNpmPackage rec {
# updated by the update script
# this is always the commit that should be used with asf-ui from the latest asf version
rev = version;
hash = "sha256-0qfX0vHaDY4Mv9N6nXcn2/9DgRAAl07c8eNHBC3rX6I=";
hash = "sha256-ngIPUy3iAkC5yFsH9lZlRcBlFs4sEkzfTrJ+ajB+weo=";
};
npmDepsHash = "sha256-/DRkzwU32RgXR+58MrD2KbxF55nJJxnMAnU3kafqtXg=";
npmDepsHash = "sha256-GKkXh0FjsorllAukg6hYBSU0JEP6Bv7tvzEgRM4zAgw=";
installPhase = ''
runHook preInstall

View File

@ -1,11 +0,0 @@
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -295,7 +295,7 @@ dependencies = [
[[package]]
name = "doctave"
-version = "0.4.0"
+version = "0.4.2"
dependencies = [
"alphanumeric-sort",
"ascii",

View File

@ -1,31 +0,0 @@
{ lib, rustPlatform, fetchFromGitHub, stdenv, CoreServices }:
rustPlatform.buildRustPackage rec {
pname = "doctave";
version = "0.4.2";
src = fetchFromGitHub {
owner = "doctave";
repo = pname;
rev = version;
sha256 = "1780pqvnlbxxhm7rynnysqr0vihdkwmc6rmgp43bmj1k18ar4qgj";
};
# Cargo.lock is outdated
cargoPatches = [ ./cargo-lock.patch ];
cargoHash = "sha256-keLcNttdM9JUnn3qi/bWkcObIHl3MRACDHKPSZuScOc=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
CoreServices
];
meta = with lib; {
description = "Batteries-included developer documentation site generator";
homepage = "https://github.com/doctave/doctave";
changelog = "https://github.com/doctave/doctave/blob/${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
mainProgram = "doctave";
};
}

View File

@ -32,7 +32,10 @@ rustPlatform.buildRustPackage rec {
openssl
dbus
sqlite
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ];
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.SystemConfiguration
];
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd leetcode \

View File

@ -1,10 +1,10 @@
{ lib, appimageTools, fetchurl, asar }: let
pname = "todoist-electron";
version = "8.10.1";
version = "9.8.0";
src = fetchurl {
url = "https://electron-dl.todoist.com/linux/Todoist-linux-x86_64-${version}.AppImage";
hash = "sha256-Yp4wfibymHLGlaPDzu2rhSXxanwdXoNpF/d6+S0r+1U=";
url = "https://electron-dl.todoist.com/linux/Todoist-linux-${version}-x86_64-latest.AppImage";
hash = "sha256-ZuoeeQ7SusRhr5BXBYEWCZ9pjdcWClKoR0mnom1XkPg=";
};
appimageContents = (appimageTools.extract { inherit pname version src; }).overrideAttrs (oA: {

View File

@ -1,18 +1,21 @@
{ lib
, fetchFromGitHub
, python3Packages
, nix-update-script
}:
python3Packages.buildPythonApplication rec {
pname = "lieer";
version = "1.5";
version = "1.6";
format = "setuptools";
passthru.updateScript = nix-update-script { };
src = fetchFromGitHub {
owner = "gauteh";
repo = "lieer";
rev = "refs/tags/v${version}";
sha256 = "sha256-z3OGCjLsOi6K1udChlSih8X6e2qvT8kNhh2PWBGB9zU=";
sha256 = "sha256-U3+Y634oGmvIrvcbSKrrJ8PzLRsMoN0Fd/+d9WE1Q7U=";
};
propagatedBuildInputs = with python3Packages; [

View File

@ -66,9 +66,6 @@
, remmina
}:
let
cmFlag = flag: if flag then "ON" else "OFF";
in
stdenv.mkDerivation (finalAttrs: {
pname = "freerdp";
version = "3.8.0";
@ -171,9 +168,9 @@ stdenv.mkDerivation (finalAttrs: {
# https://github.com/FreeRDP/FreeRDP/issues/8526#issuecomment-1357134746
cmakeFlags = [
"-Wno-dev"
"-DCMAKE_INSTALL_LIBDIR=lib"
"-DDOCBOOKXSL_DIR=${docbook-xsl-nons}/xml/xsl/docbook"
] ++ lib.mapAttrsToList (k: v: "-D${k}=${cmFlag v}") {
(lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
(lib.cmakeFeature "DOCBOOKXSL_DIR" "${docbook-xsl-nons}/xml/xsl/docbook")
] ++ lib.mapAttrsToList lib.cmakeBool {
BUILD_TESTING = false; # false is recommended by upstream
WITH_CAIRO = cairo != null;
WITH_CUPS = cups != null;
@ -192,7 +189,9 @@ stdenv.mkDerivation (finalAttrs: {
WITH_WEBVIEW = false; # avoid introducing webkit2gtk-4.0
WITH_VAAPI = false; # false is recommended by upstream
WITH_X11 = true;
};
} ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
(lib.cmakeBool "SDL_USE_COMPILED_RESOURCES" false)
];
env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [
"-DTARGET_OS_IPHONE=0"

View File

@ -34,6 +34,14 @@ stdenv.mkDerivation (finalAttrs: {
else if stdenv.hostPlatform.avx512Support then "arch=avx512"
else "arch=sse41")
];
env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
NIX_CFLAGS_COMPILE = toString [
"-Wno-error=register"
"-Wno-error=implicit-function-declaration"
];
};
enableParallelBuilding = true;
installPhase = ''
runHook preInstall

View File

@ -39,13 +39,13 @@ let
in
stdenv.mkDerivation rec {
pname = "crun";
version = "1.17";
version = "1.18";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = version;
hash = "sha256-d2YBpW8KivWYPRPpvXlT5tWPX8hvTCaSkMxdSuswYRA=";
hash = "sha256-t04jmLfkxZhvlfW79s8G7cc4W9ptFUQsD2a4/VODAC8=";
fetchSubmodules = true;
};

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ddev";
version = "1.23.4";
version = "1.23.5";
src = fetchFromGitHub {
owner = "ddev";
repo = "ddev";
rev = "v${version}";
hash = "sha256-+Ou9YbFwUVu6AqR041ngnVb9TpiO1UMph2w1zsbEMEM=";
hash = "sha256-1zhHiVSwSsc9CFrOV1juJPiczr0e0SYkIJrLKetul/4=";
};
vendorHash = null;

View File

@ -6,6 +6,7 @@
nodejs,
makeDesktopItem,
copyDesktopItems,
icoutils,
}:
buildNpmPackage rec {
@ -15,7 +16,7 @@ buildNpmPackage rec {
src = fetchFromGitHub {
owner = "antares-sql";
repo = "antares";
rev = "v${version}";
rev = "refs/tags/v${version}";
hash = "sha256-3zgr3Eefx3WDUW9/1NOaneUbFy3GTnJ3tGgivtW1K/g=";
};
@ -30,7 +31,10 @@ buildNpmPackage rec {
buildInputs = [ nodejs ];
nativeBuildInputs = [ copyDesktopItems ];
nativeBuildInputs = [
copyDesktopItems
icoutils
];
npmBuildScript = "compile";
@ -45,7 +49,8 @@ buildNpmPackage rec {
# Install icon files
mkdir -pv $out/share/icon/
cp assets/icon.ico $out/share/icon/antares.ico
icotool -x assets/icon.ico
cp icon_1_256x256x32.png $out/share/icon/antares.png
'';
npmFlags = [ "--legacy-peer-deps" ];
@ -66,10 +71,11 @@ buildNpmPackage rec {
})
];
meta = with lib; {
meta = {
description = "Modern, fast and productivity driven SQL client with a focus in UX";
homepage = "https://github.com/antares-sql/antares";
license = licenses.mit;
maintainers = with maintainers; [ eymeric ];
changelog = "https://github.com/antares-sql/antares/blob/v${version}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ eymeric ];
};
}

View File

@ -20,12 +20,19 @@
, runCommand
, rustc
, rustPlatform
, stdenv
}:
let
description = "Secure and free password manager for all of your devices";
icon = "bitwarden";
electron = electron_32;
bitwardenDesktopNativeArch = {
aarch64 = "arm64";
x86_64 = "x64";
}.${stdenv.hostPlatform.parsed.cpu.name} or (throw "bitwarden-desktop: unsupported CPU family ${stdenv.hostPlatform.parsed.cpu.name}");
in buildNpmPackage rec {
pname = "bitwarden-desktop";
version = "2024.9.0";
@ -121,7 +128,7 @@ in buildNpmPackage rec {
pushd apps/desktop
# desktop_native/index.js loads a file of that name regarldess of the libc being used
mv desktop_native/napi/desktop_napi.* desktop_native/napi/desktop_napi.linux-x64-musl.node
mv desktop_native/napi/desktop_napi.* desktop_native/napi/desktop_napi.linux-${bitwardenDesktopNativeArch}-musl.node
npm exec electron-builder -- \
--dir \
@ -159,7 +166,7 @@ in buildNpmPackage rec {
mkdir $out
pushd apps/desktop/dist/linux-unpacked
pushd apps/desktop/dist/linux-${lib.optionalString stdenv.isAarch64 "arm64-"}unpacked
mkdir -p $out/opt/Bitwarden
cp -r locales resources{,.pak} $out/opt/Bitwarden
popd
@ -205,7 +212,7 @@ in buildNpmPackage rec {
homepage = "https://bitwarden.com";
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ amarshall ];
platforms = [ "x86_64-linux" ];
platforms = [ "x86_64-linux" "aarch64-linux" ];
mainProgram = "bitwarden";
};
}

View File

@ -26,20 +26,20 @@ let
in
buildNpmPackage' rec {
pname = "bruno";
version = "1.32.1";
version = "1.34.0";
src = fetchFromGitHub {
owner = "usebruno";
repo = "bruno";
rev = "v${version}";
hash = "sha256-n/3zNS3aME7ZSoJ7TQ7gqVod469g7PGTsLcdNIwB09Y=";
hash = "sha256-6UcByIiKBAIicH3dNF+6byuj/WsEb4Xi+iPvfjPsQkA=";
postFetch = ''
${lib.getExe npm-lockfile-fix} $out/package-lock.json
'';
};
npmDepsHash = "sha256-p3kdYuDiPZ9SmtrFajXd76Ohd+VUqn/Y8SpAPFrTBZA=";
npmDepsHash = "sha256-z8d1paC5VQ/XsXJuQ6Z7PjSwC6abN6kRmG0sfI9aCqw=";
npmFlags = [ "--legacy-peer-deps" ];
nativeBuildInputs =

View File

@ -1,4 +1,9 @@
{ lib, fetchFromGitHub, python3Packages }:
{
lib,
fetchFromGitHub,
python3Packages,
makeWrapper,
}:
python3Packages.buildPythonApplication rec {
pname = "charge-lnd";
@ -6,9 +11,9 @@ python3Packages.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "accumulator";
repo = pname;
repo = "charge-lnd";
rev = "refs/tags/v${version}";
sha256 = "sha256-mNU8bhiZqvYbNUU8vJNk9WbpAVrCTi9Fy3hlIpb06ac=";
hash = "sha256-mNU8bhiZqvYbNUU8vJNk9WbpAVrCTi9Fy3hlIpb06ac=";
};
propagatedBuildInputs = with python3Packages; [
@ -21,20 +26,35 @@ python3Packages.buildPythonApplication rec {
termcolor
];
nativeBuildInputs = [
makeWrapper
];
postInstall = ''
install README.md -Dt $out/share/doc/charge-lnd
wrapProgram $out/bin/charge-lnd \
--set PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION "python"
'';
doInstallCheck = true;
installCheckPhase = ''
$out/bin/charge-lnd --help > /dev/null
'';
meta = with lib; {
env = {
PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python";
};
meta = {
description = "Simple policy-based fee manager for lightning network daemon";
homepage = "https://github.com/accumulator/charge-lnd";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ mmilata mariaa144 ];
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [
mmilata
mariaa144
];
mainProgram = "charge-lnd";
};
}

View File

@ -1,27 +1,31 @@
{ lib
, stdenv
, fetchFromGitHub
, desktop-file-utils
, ffmpeg
, granite
, gtk
, imagemagick
, meson
, ninja
, pkg-config
, python
, vala
, wrapGAppsHook3
{
lib,
desktop-file-utils,
fetchFromGitHub,
ffmpeg,
gtk3,
imagemagick,
meson,
ninja,
pantheon,
pkg-config,
python3,
stdenv,
vala,
wrapGAppsHook3,
}:
stdenv.mkDerivation rec {
let
inherit (pantheon) granite;
in
stdenv.mkDerivation (finalAttrs: {
pname = "ciano";
version = "0.2.4";
src = fetchFromGitHub {
owner = "robertsanseries";
repo = pname;
rev = version;
repo = "ciano";
rev = finalAttrs.version;
hash = "sha256-nubm6vBWwsHrrmvFAL/cIzYPxg9B1EhnpC79IJMNuFY=";
};
@ -30,7 +34,7 @@ stdenv.mkDerivation rec {
meson
ninja
pkg-config
python
python3
vala
wrapGAppsHook3
];
@ -39,33 +43,36 @@ stdenv.mkDerivation rec {
ffmpeg
imagemagick
granite
gtk
gtk3
];
dontWrapGApps = true;
strictDeps = true;
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
'';
dontWrapGApps = true;
postFixup = let
binPath = lib.makeBinPath [
ffmpeg
imagemagick
];
in
postFixup =
let
binPath = lib.makeBinPath [
ffmpeg
imagemagick
];
in
''
wrapProgram $out/bin/com.github.robertsanseries.ciano \
--prefix PATH : ${binPath} "''${gappsWrapperArgs[@]}"
ln -s $out/bin/com.github.robertsanseries.ciano $out/bin/ciano
'';
meta = with lib; {
meta = {
homepage = "https://github.com/robertsanseries/ciano";
description = "Multimedia file converter focused on simplicity";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.linux;
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.linux;
};
}
})

View File

@ -0,0 +1,39 @@
{
fetchFromGitHub,
gcc10Stdenv,
lib,
cmake,
}:
gcc10Stdenv.mkDerivation rec {
pname = "COLLADA2GLTF";
version = "2.1.5";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "COLLADA2GLTF";
rev = "refs/tags/v${version}";
hash = "sha256-3Eo1qS6S5vlc/d2WB4iDJTjUnwMUrx9+Ln6n8PYU5qA=";
fetchSubmodules = true;
};
installPhase = ''
runHook preInstall
install -Dm755 COLLADA2GLTF-bin $out/bin/COLLADA2GLTF
runHook postInstall
'';
nativeBuildInputs = [
cmake
];
meta = {
description = "Command-line tool to convert COLLADA (.dae) files to glTF";
homepage = "https://github.com/KhronosGroup/COLLADA2GLTF";
license = lib.licenses.bsd3;
mainProgram = "COLLADA2GLTF";
maintainers = with lib.maintainers; [ shaddydc ];
platforms = with lib.platforms; unix ++ windows;
};
}

View File

@ -1,14 +1,15 @@
{ lib
, stdenv
, buildGoModule
, fetchFromGitHub
, pkg-config
, cairo
, gdk-pixbuf
, glib
, adwaita-icon-theme
, wrapGAppsHook3
, gtk3
{
lib,
stdenv,
buildGoModule,
fetchFromGitHub,
pkg-config,
cairo,
gdk-pixbuf,
glib,
adwaita-icon-theme,
wrapGAppsHook3,
gtk3,
}:
buildGoModule {
@ -24,16 +25,30 @@ buildGoModule {
vendorHash = "sha256-zG7r/Db6XiwKoHRduGj3tEh/KT1hsuBoSGLYaZ+qO0Y=";
nativeBuildInputs = [ pkg-config wrapGAppsHook3 ];
nativeBuildInputs = [
pkg-config
wrapGAppsHook3
];
buildInputs = [ glib cairo gdk-pixbuf gtk3 adwaita-icon-theme ];
buildInputs = [
glib
cairo
gdk-pixbuf
gtk3
adwaita-icon-theme
];
postPatch = ''
# fixes build on aarch64
rm -v windows_amd64_icon.syso
'';
meta = {
description = "Safe and secure chat client";
mainProgram = "coyim";
homepage = "https://coy.im/";
license = lib.licenses.gpl3;
platforms = [ "x86_64-linux" "x86_64-darwin" ];
broken = stdenv.hostPlatform.isDarwin;
maintainers = with lib.maintainers; [ PapayaJackal ];
};
}

View File

@ -3,48 +3,45 @@
, fetchFromGitLab
, cmake
, extra-cmake-modules
, qttools
, kwayland
, leptonica
, libsForQt5
, qt5
, tesseract4
, qtmultimedia
, qtx11extras
, wrapQtAppsHook
, gst_all_1
, testers
}:
stdenv.mkDerivation (finalAttrs: {
pname = "crow-translate";
version = "3.0.0";
version = "3.1.0";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "office";
repo = "crow-translate";
rev = "v${finalAttrs.version}";
hash = "sha256-hdrhxbv44DlxoF1JU1d2auP/vR8a3IJI+hN7PhdPMaY=";
hash = "sha256-zL+Ucw6rzIoEaBHi/uqKQB0cnR6aAcF8MPOG3hwK3iA=";
fetchSubmodules = true;
};
postPatch = ''
substituteInPlace data/org.kde.CrowTranslate.desktop.in \
--subst-var-by QT_BIN_DIR ${lib.getBin qttools}/bin
--subst-var-by QT_BIN_DIR ${lib.getBin qt5.qttools}/bin
'';
nativeBuildInputs = [
cmake
extra-cmake-modules
qttools
wrapQtAppsHook
qt5.qttools
qt5.wrapQtAppsHook
];
buildInputs = [
kwayland
libsForQt5.kwayland
leptonica
tesseract4
qtmultimedia
qtx11extras
qt5.qtmultimedia
qt5.qtx11extras
] ++ (with gst_all_1; [
gstreamer
gst-plugins-base

View File

@ -0,0 +1,92 @@
{
pnpm,
nodejs,
stdenv,
clang,
buildGoModule,
fetchFromGitHub,
lib,
}:
let
pname = "daed";
version = "0.8.0";
src = fetchFromGitHub {
owner = "daeuniverse";
repo = "daed";
rev = "refs/tags/v${version}";
hash = "sha256-h1j91XIumuzuJnMxgkCjhuXYPLXoDuFFsfmDwmzlTEI=";
fetchSubmodules = true;
};
web = stdenv.mkDerivation {
inherit pname version src;
pnpmDeps = pnpm.fetchDeps {
inherit pname version src;
hash = "sha256-pNP/Ut5vRE+tqBYNHEkulCIeXnowHAIZKJe73cA0BB0=";
};
nativeBuildInputs = [
nodejs
pnpm.configHook
];
buildPhase = ''
runHook preBuild
pnpm build
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out
cp -R dist/* $out/
runHook postInstall
'';
};
in
buildGoModule rec {
inherit pname version src;
sourceRoot = "${src.name}/wing";
vendorHash = "sha256-TBR3MmpTdwIwyekU+nrHhzsN31E30+Rqd3FoBL3dl4U=";
proxyVendor = true;
nativeBuildInputs = [ clang ];
hardeningDisable = [ "zerocallusedregs" ];
prePatch = ''
substituteInPlace Makefile \
--replace-fail /bin/bash /bin/sh
# ${web} does not have write permission
mkdir dist
cp -r ${web}/* dist
chmod -R 755 dist
'';
buildPhase = ''
runHook preBuild
make CFLAGS="-D__REMOVE_BPF_PRINTK -fno-stack-protector -Wno-unused-command-line-argument" \
NOSTRIP=y \
WEB_DIST=dist \
AppName=${pname} \
VERSION=${version} \
OUTPUT=$out/bin/daed \
bundle
runHook postBuild
'';
meta = {
description = "Modern dashboard with dae";
homepage = "https://github.com/daeuniverse/daed";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ oluceps ];
platforms = lib.platforms.linux;
mainProgram = "daed";
};
}

View File

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "dms";
version = "1.6.0";
version = "1.7.1";
src = fetchFromGitHub {
owner = "anacrolix";
repo = "dms";
rev = "refs/tags/v${version}";
hash = "sha256-QwRLNCXDu/dKh2o17AyASlVQPIEOX6e4kTINa2ZzZkU=";
hash = "sha256-dObY2MNrrQqn5i/y2LDlKvd9S04EArmsalIsfXsrth0=";
};
vendorHash = "sha256-Z0DoVmL0zJ4l9hrO+zGp6FcExvhbiPu5+N3Mfyxi5DE=";
vendorHash = "sha256-f6Jl78ZPLD7Oq4Bq8MBQpHEKnBvpyTWZ9qHa1fGOlgA=";
meta = {
homepage = "https://github.com/anacrolix/dms";

1639
pkgs/by-name/do/doctave/Cargo.lock generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,43 @@
{
lib,
rustPlatform,
fetchFromGitHub,
stdenv,
darwin,
}:
rustPlatform.buildRustPackage rec {
pname = "doctave";
version = "0.4.2";
src = fetchFromGitHub {
owner = "doctave";
repo = "doctave";
rev = version;
hash = "sha256-8mGSFQozyLoGua9mwyqfDcYNMtbeWp9Phb0vaje+AJ0=";
};
postPatch = ''
ln -sf ${./Cargo.lock} Cargo.lock
'';
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"doctave-markdown-0.9.0" = "sha256-DDeb91DgLx7vOYHwoDy6+/532q/3/myJUZDqjq7ejJ0=";
};
};
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.CoreServices
];
meta = {
description = "Batteries-included developer documentation site generator";
homepage = "https://github.com/doctave/doctave";
changelog = "https://github.com/doctave/doctave/blob/${version}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ figsoda ];
mainProgram = "doctave";
};
}

View File

@ -1,27 +1,55 @@
{ stdenv, makeWrapper, lib, fetchurl, libpng, libjpeg, libwebp
, erlang, openssl, expat, libyaml, bash, gnused, gnugrep, coreutils, util-linux, procps, gd
, autoreconfHook
, gawk
, rebar3WithPlugins
, fetchFromGitHub
, fetchgit
, fetchHex
, beamPackages
, nixosTests
, withMysql ? false
, withPgsql ? false
, withSqlite ? false, sqlite
, withPam ? false, pam
, withZlib ? true, zlib
, withSip ? false
, withLua ? false
, withTools ? false
, withRedis ? false
, withImagemagick ? false, imagemagick
{
stdenv,
makeWrapper,
lib,
libpng,
libjpeg,
libwebp,
erlang,
openssl,
expat,
libyaml,
bash,
gnused,
gnugrep,
coreutils,
util-linux,
procps,
gd,
autoreconfHook,
gawk,
rebar3WithPlugins,
fetchFromGitHub,
fetchgit,
fetchHex,
beamPackages,
nixosTests,
withMysql ? false,
withPgsql ? false,
withSqlite ? false,
sqlite,
withPam ? false,
pam,
withZlib ? true,
zlib,
withSip ? false,
withLua ? false,
withTools ? false,
withRedis ? false,
withImagemagick ? false,
imagemagick,
}:
let
ctlpath = lib.makeBinPath [ bash gnused gnugrep gawk coreutils util-linux procps ];
ctlpath = lib.makeBinPath [
bash
gnused
gnugrep
gawk
coreutils
util-linux
procps
];
provider_asn1 = beamPackages.buildRebar3 {
name = "provider_asn1";
@ -44,7 +72,8 @@ let
beamDeps = [ ];
};
allBeamDeps = import ./rebar-deps.nix { # TODO(@chuangzhu) add updateScript
allBeamDeps = import ./rebar-deps.nix {
# TODO(@chuangzhu) add updateScript
inherit fetchHex fetchgit fetchFromGitHub;
builder = lib.makeOverridable beamPackages.buildRebar3;
@ -55,7 +84,12 @@ let
stringprep = prev.stringprep.override { buildPlugins = [ beamPackages.pc ]; };
p1_acme = prev.p1_acme.override { buildPlugins = [ beamPackages.pc ]; };
eimp = prev.eimp.override {
buildInputs = [ gd libwebp libpng libjpeg ];
buildInputs = [
gd
libwebp
libpng
libjpeg
];
buildPlugins = [ beamPackages.pc ];
};
fast_tls = prev.fast_tls.override {
@ -71,7 +105,10 @@ let
buildPlugins = [ beamPackages.pc ];
};
xmpp = prev.xmpp.override {
buildPlugins = [ beamPackages.pc provider_asn1 ];
buildPlugins = [
beamPackages.pc
provider_asn1
];
};
# Optional deps
sqlite3 = prev.sqlite3.override {
@ -91,19 +128,35 @@ let
};
};
beamDeps = builtins.removeAttrs allBeamDeps [ "sqlite3" "p1_pgsql" "p1_mysql" "luerl" "esip" "eredis" "epam" "ezlib" ];
beamDeps = builtins.removeAttrs allBeamDeps [
"sqlite3"
"p1_pgsql"
"p1_mysql"
"luerl"
"esip"
"eredis"
"epam"
"ezlib"
];
in stdenv.mkDerivation rec {
in
stdenv.mkDerivation (finalAttrs:{
pname = "ejabberd";
version = "24.07";
nativeBuildInputs = [
makeWrapper
autoreconfHook
(rebar3WithPlugins { plugins = [ provider_asn1 rebar3_hex ]; })
(rebar3WithPlugins {
plugins = [
provider_asn1
rebar3_hex
];
})
];
buildInputs = [ erlang ]
buildInputs =
[ erlang ]
++ builtins.attrValues beamDeps
++ lib.optional withMysql allBeamDeps.p1_mysql
++ lib.optional withPgsql allBeamDeps.p1_pgsql
@ -112,13 +165,13 @@ in stdenv.mkDerivation rec {
++ lib.optional withZlib allBeamDeps.ezlib
++ lib.optional withSip allBeamDeps.esip
++ lib.optional withLua allBeamDeps.luerl
++ lib.optional withRedis allBeamDeps.eredis
;
++ lib.optional withRedis allBeamDeps.eredis;
src = fetchurl {
url = "https://www.process-one.net/downloads/downloads-action.php?file=/${version}/ejabberd-${version}.tar.gz";
hash = "sha256-wPt0asuoGl20Hel8A5aMH2gaE7G2waiVtxguM4IMGNk=";
# remember to update rebar-deps.nix
src = fetchFromGitHub {
owner = "processone";
repo = "ejabberd";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-4wEQBumWrHqN2uNrDxAJhgv2ok7pgQlAEPpL96ZOsTQ=";
};
passthru.tests = {
@ -153,15 +206,21 @@ in stdenv.mkDerivation rec {
-e '2iexport PATH=${ctlpath}:$PATH' \
-e "s,\(^ *ERL_LIBS=.*\),\1:$ERL_LIBS," \
$out/sbin/ejabberdctl
${lib.optionalString withImagemagick ''wrapProgram $out/lib/ejabberd-*/priv/bin/captcha.sh --prefix PATH : "${lib.makeBinPath [ imagemagick ]}"''}
${lib.optionalString withImagemagick ''wrapProgram $out/lib/ejabberd-*/priv/bin/captcha.sh --prefix PATH : "${
lib.makeBinPath [ imagemagick ]
}"''}
'';
meta = with lib; {
meta = {
description = "Open-source XMPP application server written in Erlang";
mainProgram = "ejabberdctl";
license = licenses.gpl2Plus;
license = lib.licenses.gpl2Plus;
homepage = "https://www.ejabberd.im";
platforms = platforms.linux;
maintainers = with maintainers; [ sander abbradar chuangzhu ];
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [
sander
abbradar
chuangzhu
];
};
}
})

View File

@ -1,6 +1,14 @@
# Generated by rebar3_nix
let fetchOnly = { src, ... }: src;
in { builder ? fetchOnly, fetchHex, fetchgit, fetchFromGitHub, overrides ? (x: y: { }) }:
let
fetchOnly = { src, ... }: src;
in
{
builder ? fetchOnly,
fetchHex,
fetchgit,
fetchFromGitHub,
overrides ? (x: y: { }),
}:
let
self = packages // (overrides self packages);
packages = with self; {
@ -52,7 +60,14 @@ let
version = "1.8.3";
sha256 = "sha256-7XAGX5qJqBjc/0O3TAgMnn9PFBThBRvt23KA24Ca9xE=";
};
beamDeps = [ ezlib fast_tls fast_xml idna p1_utils stringprep ];
beamDeps = [
ezlib
fast_tls
fast_xml
idna
p1_utils
stringprep
];
};
stun = builder {
name = "stun";
@ -62,7 +77,10 @@ let
version = "1.2.14";
sha256 = "sha256-4TSAext6jf/ZTmTu/uAOZce0BC89FOFvj0NWbSA3FYM=";
};
beamDeps = [ fast_tls p1_utils ];
beamDeps = [
fast_tls
p1_utils
];
};
stringprep = builder {
name = "stringprep";
@ -142,7 +160,13 @@ let
version = "1.0.23";
sha256 = "sha256-jOGW8m49IuoQt4CRIpUEZYeMEn+Adn4yUgeu1+jQ3Vk=";
};
beamDeps = [ base64url idna jiffy jose yconf ];
beamDeps = [
base64url
idna
jiffy
jose
yconf
];
};
mqtree = builder {
name = "mqtree";
@ -232,7 +256,11 @@ let
version = "1.0.54";
sha256 = "sha256-gYevgZ1yWc2t2vaXJsI572BMmwsCmKXy0+aHv14iN+4=";
};
beamDeps = [ fast_tls p1_utils stun ];
beamDeps = [
fast_tls
p1_utils
stun
];
};
eredis = builder {
name = "eredis";
@ -275,4 +303,5 @@ let
beamDeps = [ p1_utils ];
};
};
in self
in
self

View File

@ -0,0 +1,54 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
extra-cmake-modules,
gettext,
json_c,
icu,
fmt,
gtest,
fcitx5,
nix-update-script,
}:
stdenv.mkDerivation rec {
pname = "fcitx5-mcbopomofo";
version = "2.7";
src = fetchFromGitHub {
owner = "openvanilla";
repo = "fcitx5-mcbopomofo";
rev = version;
hash = "sha256-7AuH/Ns5syMmcGeIPxi0KepMn2VzOnqopqKuQ2zxucc=";
};
nativeBuildInputs = [
cmake
extra-cmake-modules
gettext
json_c
icu
fmt
gtest
];
buildInputs = [
fcitx5
];
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
];
passthru.updateScript = nix-update-script { };
meta = {
description = "McBopomofo for fcitx5";
homepage = "https://github.com/openvanilla/fcitx5-mcbopomofo";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ shiphan ];
platforms = lib.platforms.linux;
};
}

View File

@ -0,0 +1,59 @@
From aaa07b6430c555a8c41f458ccf0eca2213e82317 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sat, 28 Sep 2024 11:06:40 +0800
Subject: [PATCH] update time
---
Cargo.lock | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 282fe41..8b308d5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -952,6 +952,12 @@ dependencies = [
"minimal-lexical",
]
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
[[package]]
name = "object"
version = "0.32.2"
@@ -1313,12 +1319,13 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.31"
+version = "0.3.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
dependencies = [
"deranged",
"itoa",
+ "num-conv",
"powerfmt",
"serde",
"time-core",
@@ -1333,10 +1340,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
[[package]]
name = "time-macros"
-version = "0.2.16"
+version = "0.2.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
dependencies = [
+ "num-conv",
"time-core",
]
--
2.46.0

View File

@ -1,31 +1,31 @@
{ lib
, fetchFromGitHub
, rustPlatform
, pkg-config
, fontconfig
, freetype
{
lib,
fetchFromGitHub,
rustPlatform,
pkg-config,
fontconfig,
freetype,
}:
let
inherit (rustPlatform) buildRustPackage bindgenHook;
version = "0.3.2";
in
buildRustPackage {
rustPlatform.buildRustPackage rec {
pname = "figma-agent";
inherit version;
version = "0.3.2";
src = fetchFromGitHub {
owner = "neetly";
repo = "figma-agent-linux";
rev = version;
rev = "refs/tags/${version}";
sha256 = "sha256-iXLQOc8gomOik+HIIoviw19II5MD6FM0W5DT3aqtIcM=";
};
cargoHash = "sha256-ulYDKMMtKfBYur34CVhac4uaU0kfdkeBCCP/heuUZek=";
cargoPatches = [
./0001-update-time.patch
];
cargoHash = "sha256-4X1sFgvrJuBeEPbcxrAt6tClOG63kwJ6eUzIRIv8tBs=";
nativeBuildInputs = [
pkg-config
bindgenHook
rustPlatform.bindgenHook
];
buildInputs = [
@ -33,13 +33,11 @@ buildRustPackage {
freetype
];
doCheck = true;
meta = with lib; {
meta = {
homepage = "https://github.com/neetly/figma-agent-linux";
description = "Figma Agent for Linux (a.k.a. Font Helper)";
license = licenses.mit;
maintainers = with maintainers; [ ercao ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ ercao ];
mainProgram = "figma-agent";
};
}

View File

@ -34,6 +34,11 @@ stdenv.mkDerivation (finalAttrs: {
dontWrapQtApps = true;
postPatch = ''
substituteInPlace setup.py \
--replace-fail "distutils.core" "setuptools"
'';
preFixup = ''
wrapQtApp "$out/bin/fs-uae-launcher" \
--set PYTHONPATH "$PYTHONPATH"

View File

@ -21,14 +21,14 @@
python3Packages.buildPythonApplication rec {
pname = "gearlever";
version = "2.0.7";
version = "2.1.0";
pyproject = false; # Built with meson
src = fetchFromGitHub {
owner = "mijorus";
repo = "gearlever";
rev = "refs/tags/${version}";
hash = "sha256-Zp0w6ZJFRV5IANF0sY/n8jqgG+3h9J2eV/dUP+we8PY=";
hash = "sha256-OpNzJwEjLni/vG1RtRSH29wovMRwKzJn+Vep1vZDEFM=";
};
postPatch =

View File

@ -1,27 +1,32 @@
{ stdenv
, lib
, buildGoModule
, fetchFromGitHub
, installShellFiles
, buildPackages
, testers
, goreleaser
{
stdenv,
lib,
buildGoModule,
fetchFromGitHub,
installShellFiles,
buildPackages,
testers,
goreleaser,
}:
buildGoModule rec {
pname = "goreleaser";
version = "2.2.0";
version = "2.3.2";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
hash = "sha256-E/jLCjyXId5XsIBiDUxi7w9Dybb4SZJRc5gkCwHsTww=";
hash = "sha256-YKcduPxcXU1Ixexr/DxeVRfLxYdHNFcGNLbBiH6cIUU=";
};
vendorHash = "sha256-+7SWKJGJlFyYkPjU3N5bWHbIzXBzG/fc9Yhy/jXt2lc=";
vendorHash = "sha256-3gC2wZz3t6ObqAJ2g80kTrW2OEAyBptdqmN7cQKqZ/w=";
ldflags =
[ "-s" "-w" "-X main.version=${version}" "-X main.builtBy=nixpkgs" ];
ldflags = [
"-s"
"-w"
"-X main.version=${version}"
"-X main.builtBy=nixpkgs"
];
# tests expect the source files to be a build repo
doCheck = false;
@ -29,8 +34,10 @@ buildGoModule rec {
nativeBuildInputs = [ installShellFiles ];
postInstall =
let emulator = stdenv.hostPlatform.emulator buildPackages;
in ''
let
emulator = stdenv.hostPlatform.emulator buildPackages;
in
''
${emulator} $out/bin/goreleaser man > goreleaser.1
installManPage ./goreleaser.1
installShellCompletion --cmd goreleaser \

View File

@ -1,27 +1,30 @@
{ bash
, buildGoModule
, fetchFromGitHub
{
bash,
buildGoModule,
fetchFromGitHub,
nix-update-script,
versionCheckHook,
, withFish ? false
, fish
withFish ? false,
fish,
, lib
, makeWrapper
, xdg-utils
lib,
makeWrapper,
xdg-utils,
}:
buildGoModule rec {
pname = "granted";
version = "0.34.1";
version = "0.35.2";
src = fetchFromGitHub {
owner = "common-fate";
repo = pname;
rev = "v${version}";
sha256 = "sha256-iNGagF4+Lz73Ctvh8Qs90E+xvuGi7LWHV/VbjjqMqRY=";
sha256 = "sha256-8Ou1TkPGAsrRfV75ntPKpXTUEhVkwgtaXErrRX8hR0E=";
};
vendorHash = "sha256-uKzs+plk1W2S7iPv2J1Mi1Ff88+82zrIXLy2eTzD/Hc=";
vendorHash = "sha256-XCq+hDxK7C9XYlKe+lUArQlPheWALx806o1IeCRD7vs=";
nativeBuildInputs = [ makeWrapper ];
@ -73,18 +76,26 @@ buildGoModule rec {
# Insert below the #!/bin/sh shebang
echo "$addToPath" | sed "/#!\/bin\/sh/r /dev/stdin" $src/scripts/assume >> $out/bin/assume
'' + lib.optionalString withFish ''
# Install fish script
install -Dm755 $src/scripts/assume.fish $out/share/assume.fish
substituteInPlace $out/share/assume.fish \
--replace /bin/fish ${fish}/bin/fish
'';
''
+ lib.optionalString withFish ''
# Install fish script
install -Dm755 $src/scripts/assume.fish $out/share/assume.fish
substituteInPlace $out/share/assume.fish \
--replace /bin/fish ${fish}/bin/fish
'';
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
passthru.updateScript = nix-update-script { };
meta = with lib; {
description = "Easiest way to access your cloud";
homepage = "https://github.com/common-fate/granted";
changelog = "https://github.com/common-fate/granted/releases/tag/${version}";
license = licenses.mit;
maintainers = [ maintainers.ivankovnatsky ];
maintainers = with maintainers; [
jlbribeiro
];
};
}

View File

@ -0,0 +1,50 @@
{
lib,
stdenv,
cmake,
pkg-config,
fetchFromGitHub,
hyprutils,
kdePackages,
polkit,
qt6,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "hyprpolkitagent";
version = "0.1.1";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "hyprpolkitagent";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-fhG6YqByDW0DAixXXX6AwTJOH3MqDlQ2XrVvpusZ3Ek=";
};
nativeBuildInputs = [
cmake
pkg-config
qt6.wrapQtAppsHook
];
buildInputs = [
hyprutils
kdePackages.kirigami-addons
kdePackages.polkit-qt-1
polkit
qt6.qtbase
qt6.qtsvg
qt6.qtwayland
];
meta = {
description = "Polkit authentication agent written in QT/QML";
homepage = "https://github.com/hyprwm/hyprpolkitagent";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [
fufexan
johnrtitor
];
mainProgram = "hyprpolkitagent";
platforms = lib.platforms.linux;
};
})

View File

@ -3,7 +3,42 @@
, src
, meta
, appimageTools
, libgpg-error
}:
appimageTools.wrapType2 {
inherit pname version src meta;
let
src' = appimageTools.extract {
inherit pname version;
src = src;
# Because of https://github.com/NixOS/nixpkgs/issues/267408
postExtract = ''
cp ${libgpg-error}/lib/* $out/usr/lib/
'';
};
in
appimageTools.wrapAppImage rec {
inherit pname version meta;
src = src';
extraPkgs = pkgs: with pkgs; [
libgpg-error
fontconfig
libGL
mesa
wayland
pipewire
fribidi
harfbuzz
freetype
libthai
e2fsprogs
zlib
libp11
xorg.libX11
xorg.libSM
];
multiArch = true;
}

View File

@ -0,0 +1,72 @@
From 731d5be8e39bdf28266057ef06705a1a5fd45750 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Tue, 22 Oct 2024 11:46:12 +0800
Subject: [PATCH] fix build
---
go.mod | 11 +++++++++--
go.sum | 35 ++++++++---------------------------
2 files changed, 17 insertions(+), 29 deletions(-)
diff --git a/go.mod b/go.mod
index b65ec67..84cc7ca 100644
--- a/go.mod
+++ b/go.mod
@@ -1,5 +1,12 @@
module github.com/gordonklaus/ineffassign
-go 1.14
+go 1.22.0
-require golang.org/x/tools v0.1.5
+toolchain go1.23.2
+
+require golang.org/x/tools v0.26.0
+
+require (
+ golang.org/x/mod v0.21.0 // indirect
+ golang.org/x/sync v0.8.0 // indirect
+)
diff --git a/go.sum b/go.sum
index 6483b19..486c8d4 100644
--- a/go.sum
+++ b/go.sum
@@ -1,27 +1,8 @@
-github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
-golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.5 h1:ouewzE6p+/VEB31YYnTbEJdi8pFqKp4P4n85vwo3DHA=
-golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
+golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
+golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
+golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ=
+golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=
--
2.46.1

View File

@ -0,0 +1,39 @@
{
lib,
buildGoModule,
fetchFromGitHub,
nix-update-script,
}:
buildGoModule rec {
pname = "ineffassign";
version = "0.1.0";
src = fetchFromGitHub {
owner = "gordonklaus";
repo = "ineffassign";
rev = "refs/tags/v${version}";
hash = "sha256-JVrAIspRL6XvDd/AnPFt9IJPQ0hY1KPwXvldAfwYkzU=";
};
patches = [
./0001-fix-build.patch # run go get -u. Old dependency can't run correctly on go 1.23
];
vendorHash = "sha256-WpX5I9PK7xuln6BkIEW2qIF1K/BgaEu/gkJsz+ThVk0=";
passthru.updateScript = nix-update-script { };
allowGoReference = true;
meta = {
description = "Detect ineffectual assignments in Go code";
mainProgram = "ineffassign";
homepage = "https://github.com/gordonklaus/ineffassign";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
kalbasit
bot-wxt1221
];
};
}

View File

@ -9,14 +9,14 @@
, copyDesktopItems
, makeDesktopItem
}:
flutterPackages.v3_19.buildFlutterApplication rec {
flutterPackages.stable.buildFlutterApplication rec {
pname = "intiface-central";
version = "2.6.0";
version = "2.6.4";
src = fetchFromGitHub {
owner = "intiface";
repo = "intiface-central";
rev = "v${version}";
hash = "sha256-7+rw0cD8MJPFOkgmfHD6y+EojTGQhb15o1mn2p14eoE=";
hash = "sha256-QBNEKhjBfKxArBykUq/fE4lftCYzGdAaWYD1F7rar5Y=";
};
patches = [
./corrosion.patch
@ -28,7 +28,7 @@ flutterPackages.v3_19.buildFlutterApplication rec {
name = "${pname}-${version}-cargo-deps";
inherit src;
sourceRoot = "${src.name}/intiface-engine-flutter-bridge";
hash = "sha256-tPkLZmHReY1TU2qcY4aGWsQPhLFowrqxTPwmTHZ5fDE=";
hash = "sha256-S3Yy0IIMiRUUpFNlLvS1PGwpvxePMB1sO5M6mpm1OgY=";
};
cargoRoot = "intiface-engine-flutter-bridge";

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,39 @@
{
lib,
fetchFromGitHub,
python3Packages,
}:
python3Packages.buildPythonApplication rec {
pname = "jtbl";
version = "1.6.0";
pyproject = true;
src = fetchFromGitHub {
owner = "kellyjonbrazil";
repo = "jtbl";
rev = "v${version}";
hash = "sha256-ILQwUpjNueaYR5hxOWd5kZSPhVoFnnS2FcttyKSTPr8=";
};
build-system = with python3Packages; [
setuptools
wheel
];
dependencies = with python3Packages; [
tabulate
];
pythonImportsCheck = [ "jtbl" ];
meta = {
description = "CLI tool to convert JSON and JSON Lines to terminal, CSV, HTTP, and markdown tables";
homepage = "https://kellyjonbrazil.github.io/jtbl";
downloadPage = "https://github.com/kellyjonbrazil/jtbl/releases/tag/${src.rev}";
changelog = "https://github.com/kellyjonbrazil/jtbl/blob/${src.rev}/CHANGELOG";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ ElliottSullingeFarrall ];
mainProgram = "jtbl";
};
}

View File

@ -1,4 +1,13 @@
{ stdenv, lib, fetchFromSourcehut, meson, ninja, pkg-config, wayland }:
{
stdenv,
lib,
fetchFromSourcehut,
meson,
ninja,
pkg-config,
wayland,
nix-update-script,
}:
stdenv.mkDerivation rec {
pname = "libscfg";
@ -11,9 +20,15 @@ stdenv.mkDerivation rec {
hash = "sha256-aTcvs7QuDOx17U/yP37LhvIGxmm2WR/6qFYRtfjRN6w=";
};
nativeBuildInputs = [ meson ninja pkg-config ];
nativeBuildInputs = [
meson
ninja
pkg-config
];
buildInputs = [ wayland ];
passthru.updateScript = nix-update-script { };
meta = with lib; {
homepage = "https://sr.ht/~emersion/libscfg";
description = "Simple configuration file format";

View File

@ -19,13 +19,13 @@ let
linux = flutter324.buildFlutterApplication rec {
inherit pname;
version = "1.15.4-unstable-2024-09-25";
version = "1.15.4-unstable-2024-10-26";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "61f3ffdb8dd8b1116ced2e7b585f2f6662ce7d5f";
hash = "sha256-s7cR5ty8bygOCzHbLwNTBNlhlQ+2y25/ijlNqWYrqVw=";
rev = "d0e864ddf6ebe1c55188b33f8fdccd534d203c75";
hash = "sha256-qaW9LoRQge4K/CAQwbjNxmlUkQmxvaZyBJdAjXbbTw4=";
};
sourceRoot = "${src.name}/app";
@ -33,7 +33,8 @@ let
pubspecLock = lib.importJSON ./pubspec.lock.json;
gitHashes = {
"permission_handler_windows" = "sha256-+TP3neqlQRZnW6BxHaXr2EbmdITIx1Yo7AEn5iwAhwM=";
permission_handler_windows = "sha256-+TP3neqlQRZnW6BxHaXr2EbmdITIx1Yo7AEn5iwAhwM=";
pasteboard = "sha256-lJA5OWoAHfxORqWMglKzhsL1IFr9YcdAQP/NVOLYB4o=";
};
nativeBuildInputs = [
@ -43,16 +44,11 @@ let
buildInputs = [ libayatana-appindicator ];
postUnpack = ''
substituteInPlace $sourceRoot/linux/my_application.cc \
--replace-fail "gtk_widget_realize(GTK_WIDGET(window))" "gtk_widget_show(GTK_WIDGET(window))"
'';
postInstall = ''
for s in 32 128 256 512; do
d=$out/share/icons/hicolor/''${s}x''${s}/apps
mkdir -p $d
ln -s $out/app/data/flutter_assets/assets/img/logo-''${s}.png $d/localsend.png
cp ./assets/img/logo-''${s}.png $d/localsend.png
done
'';

View File

@ -56,16 +56,6 @@
"source": "hosted",
"version": "2.0.3"
},
"app_group_directory": {
"dependency": "direct main",
"description": {
"name": "app_group_directory",
"sha256": "ad89800fd55133b46e1f6940ac6b974562f7fb6394c662c0f4422b90167f2416",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.0"
},
"archive": {
"dependency": "transitive",
"description": {
@ -469,11 +459,11 @@
"dependency": "transitive",
"description": {
"name": "extended_image",
"sha256": "8ad4917eaae7271ce6d975d5c0040c7903010262908fbdb49ff2798fca754d3b",
"sha256": "69d4299043334ecece679996e47d0b0891cd8c29d8da0034868443506f1d9a78",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "8.3.0"
"version": "8.3.1"
},
"extended_image_library": {
"dependency": "transitive",
@ -539,41 +529,41 @@
"dependency": "transitive",
"description": {
"name": "file_selector_android",
"sha256": "b8c9717a0177ca6fa035554b82cd6c83b838ddc66b7704eb6df0f77f027ecc90",
"sha256": "00aafa9ae05a8663d0b4f17abd2a02316911ca0f46f9b9dacb9578b324d99590",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.5.1+7"
"version": "0.5.1+9"
},
"file_selector_ios": {
"dependency": "transitive",
"description": {
"name": "file_selector_ios",
"sha256": "38ebf91ecbcfa89a9639a0854ccaed8ab370c75678938eebca7d34184296f0bb",
"sha256": "94b98ad950b8d40d96fee8fa88640c2e4bd8afcdd4817993bd04e20310f45420",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.5.3"
"version": "0.5.3+1"
},
"file_selector_linux": {
"dependency": "transitive",
"description": {
"name": "file_selector_linux",
"sha256": "045d372bf19b02aeb69cacf8b4009555fb5f6f0b7ad8016e5f46dd1387ddd492",
"sha256": "712ce7fab537ba532c8febdb1a8f167b32441e74acd68c3ccb2e36dcb52c4ab2",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.9.2+1"
"version": "0.9.3"
},
"file_selector_macos": {
"dependency": "transitive",
"description": {
"name": "file_selector_macos",
"sha256": "cb284e267f8e2a45a904b5c094d2ba51d0aabfc20b1538ab786d9ef7dc2bf75c",
"sha256": "271ab9986df0c135d45c3cdb6bd0faa5db6f4976d3e4b437cf7d0f258d941bfc",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.9.4+1"
"version": "0.9.4+2"
},
"file_selector_platform_interface": {
"dependency": "transitive",
@ -599,11 +589,11 @@
"dependency": "transitive",
"description": {
"name": "file_selector_windows",
"sha256": "2ad726953f6e8affbc4df8dc78b77c3b4a060967a291e528ef72ae846c60fb69",
"sha256": "8f5d2f6590d51ecd9179ba39c64f722edc15226cc93dcc8698466ad36a4a85a4",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.9.3+2"
"version": "0.9.3+3"
},
"fixnum": {
"dependency": "transitive",
@ -681,11 +671,11 @@
"dependency": "transitive",
"description": {
"name": "flutter_plugin_android_lifecycle",
"sha256": "9ee02950848f61c4129af3d6ec84a1cfc0e47931abc746b03e7a3bc3e8ff6eda",
"sha256": "9b78450b89f059e96c9ebb355fa6b3df1d6b330436e0b885fb49594c41721398",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.22"
"version": "2.0.23"
},
"flutter_test": {
"dependency": "transitive",
@ -843,11 +833,11 @@
"dependency": "transitive",
"description": {
"name": "image_picker_android",
"sha256": "c0a6763d50b354793d0192afd0a12560b823147d3ded7c6b77daf658fa05cc85",
"sha256": "d3e5e00fdfeca8fd4ffb3227001264d449cc8950414c2ff70b0e06b9c628e643",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.8.12+13"
"version": "0.8.12+15"
},
"image_picker_for_web": {
"dependency": "transitive",
@ -913,11 +903,11 @@
"dependency": "transitive",
"description": {
"name": "image_size_getter",
"sha256": "f98c4246144e9b968899d2dfde69091e22a539bb64bc9b0bea51505fbb490e57",
"sha256": "0511799498340b70993d2dfb34b55a2247b5b801d75a6cdd4543acfcafdb12b0",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.3"
"version": "2.2.0"
},
"in_app_purchase": {
"dependency": "direct main",
@ -933,11 +923,11 @@
"dependency": "transitive",
"description": {
"name": "in_app_purchase_android",
"sha256": "25eb8694819caca282a527c26d5a1775164965c554ee99b9c10f3a0e44675c75",
"sha256": "bee60266e443d4ae0e4809bae7f9cd4d6be75ab5ec6bb3d2ca737774a274a3bd",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.3.6+8"
"version": "0.3.6+9"
},
"in_app_purchase_platform_interface": {
"dependency": "transitive",
@ -1252,11 +1242,12 @@
"pasteboard": {
"dependency": "direct main",
"description": {
"name": "pasteboard",
"sha256": "7bf733f3a00c7188ec1f2c6f0612854248b302cf91ef3611a2b7bb141c0f9d55",
"url": "https://pub.dev"
"path": "packages/pasteboard",
"ref": "58748dae405df5e68a131e4905d48e75d0624be2",
"resolved-ref": "58748dae405df5e68a131e4905d48e75d0624be2",
"url": "https://github.com/Seidko/flutter-plugins.git"
},
"source": "hosted",
"source": "git",
"version": "0.3.0"
},
"path": {
@ -1293,14 +1284,14 @@
"dependency": "transitive",
"description": {
"name": "path_provider_android",
"sha256": "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7",
"sha256": "c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.2.10"
"version": "2.2.12"
},
"path_provider_foundation": {
"dependency": "transitive",
"dependency": "direct main",
"description": {
"name": "path_provider_foundation",
"sha256": "f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16",
@ -1414,11 +1405,11 @@
"dependency": "transitive",
"description": {
"name": "photo_manager",
"sha256": "2b5c0d02014b64b971e57aa840ae7d7ffd81b0482a082579eb17ff83e5dc408e",
"sha256": "32a1ce1095aeaaa792a29f28c1f74613aa75109f21c2d4ab85be3ad9964230a4",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.4.0"
"version": "3.5.0"
},
"photo_manager_image_provider": {
"dependency": "transitive",
@ -1654,21 +1645,21 @@
"dependency": "transitive",
"description": {
"name": "shared_preferences_android",
"sha256": "480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e",
"sha256": "3b9febd815c9ca29c9e3520d50ec32f49157711e143b7a4ca039eb87e8ade5ab",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.3.2"
"version": "2.3.3"
},
"shared_preferences_foundation": {
"dependency": "transitive",
"description": {
"name": "shared_preferences_foundation",
"sha256": "c4b35f6cb8f63c147312c054ce7c2254c8066745125264f0c88739c417fc9d9f",
"sha256": "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.5.2"
"version": "2.5.3"
},
"shared_preferences_linux": {
"dependency": "transitive",
@ -2030,11 +2021,11 @@
"dependency": "transitive",
"description": {
"name": "url_launcher_android",
"sha256": "e35a698ac302dd68e41f73250bd9517fe3ab5fa4f18fe4647a0872db61bacbab",
"sha256": "8fc3bae0b68c02c47c5c86fa8bfa74471d42687b0eded01b78de87872db745e2",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.3.10"
"version": "6.3.12"
},
"url_launcher_ios": {
"dependency": "transitive",
@ -2140,41 +2131,41 @@
"dependency": "transitive",
"description": {
"name": "video_player",
"sha256": "e30df0d226c4ef82e2c150ebf6834b3522cf3f654d8e2f9419d376cdc071425d",
"sha256": "4a8c3492d734f7c39c2588a3206707a05ee80cef52e8c7f3b2078d430c84bc17",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.9.1"
"version": "2.9.2"
},
"video_player_android": {
"dependency": "transitive",
"description": {
"name": "video_player_android",
"sha256": "38d8fe136c427abdce68b5e8c3c08ea29d7a794b453c7a51b12ecfad4aad9437",
"sha256": "ae5287ca367e206eb74d7b3dc1ce0b8912ab9a3fc0597b6a101a0a5239f229d3",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.7.3"
"version": "2.7.9"
},
"video_player_avfoundation": {
"dependency": "transitive",
"description": {
"name": "video_player_avfoundation",
"sha256": "d1e9a824f2b324000dc8fb2dcb2a3285b6c1c7c487521c63306cc5b394f68a7c",
"sha256": "cd5ab8a8bc0eab65ab0cea40304097edc46da574c8c1ecdee96f28cd8ef3792f",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.6.1"
"version": "2.6.2"
},
"video_player_platform_interface": {
"dependency": "transitive",
"description": {
"name": "video_player_platform_interface",
"sha256": "236454725fafcacf98f0f39af0d7c7ab2ce84762e3b63f2cbb3ef9a7e0550bc6",
"sha256": "229d7642ccd9f3dc4aba169609dd6b5f3f443bb4cc15b82f7785fcada5af9bbb",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.2.2"
"version": "6.2.3"
},
"video_player_web": {
"dependency": "transitive",
@ -2290,11 +2281,11 @@
"dependency": "transitive",
"description": {
"name": "win32",
"sha256": "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a",
"sha256": "4d45dc9069dba4619dc0ebd93c7cec5e66d8482cb625a370ac806dcc8165f2ec",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "5.5.4"
"version": "5.5.5"
},
"win32_registry": {
"dependency": "direct main",
@ -2330,11 +2321,11 @@
"dependency": "transitive",
"description": {
"name": "xdg_directories",
"sha256": "faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d",
"sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.0.4"
"version": "1.1.0"
},
"xml": {
"dependency": "transitive",

File diff suppressed because it is too large Load Diff

View File

@ -1,86 +1,55 @@
{
lib,
stdenv,
stdenvNoCC,
fetchFromGitHub,
rustPlatform,
buildGoModule,
nix-update-script,
modrinth-app-unwrapped,
cacert,
cargo-tauri,
desktop-file-utils,
esbuild,
darwin,
jq,
desktop-file-utils,
libsoup,
moreutils,
pnpm_8,
nodejs,
openssl,
pkg-config,
pnpm_9,
turbo,
webkitgtk_4_0,
}:
rustPlatform.buildRustPackage {
let
pnpm = pnpm_9;
in
rustPlatform.buildRustPackage rec {
pname = "modrinth-app-unwrapped";
version = "0.7.1";
version = "0.8.2";
src = fetchFromGitHub {
owner = "modrinth";
repo = "theseus";
rev = "v${modrinth-app-unwrapped.version}";
hash = "sha256-JWR0e2vOBvOLosr22Oo2mAlR0KAhL+261RRybhNctlM=";
repo = "code";
rev = "a0bd011b808cdc998ef27960f610a8d99550c914";
hash = "sha256-zpFJq7if5gOx7jvwpE73lqH4Vpif0MJMPIGsgtThKVk=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"tauri-plugin-single-instance-0.0.0" = "sha256-Mf2/cnKotd751ZcSHfiSLNe2nxBfo4dMBdoCwQhe7yI=";
"sqlx-0.8.0-alpha.0" = "sha256-M1bumCMTzgDcQlgSYB6ypPp794e35ZSQCLzkbrFV4qY=";
"tauri-plugin-single-instance-0.0.0" = "sha256-DZWTO2/LevbQJCJbeHbTc2rhesV3bNrs+BoYm2eMakA=";
};
};
pnpm-deps = stdenvNoCC.mkDerivation (finalAttrs: {
pname = "${modrinth-app-unwrapped.pname}-pnpm-deps";
inherit (modrinth-app-unwrapped) version src;
sourceRoot = "${finalAttrs.src.name}/theseus_gui";
dontConfigure = true;
dontBuild = true;
doCheck = false;
nativeBuildInputs = [
cacert
jq
moreutils
pnpm_8
];
# https://github.com/NixOS/nixpkgs/blob/763e59ffedb5c25774387bf99bc725df5df82d10/pkgs/applications/misc/pot/default.nix#L56
installPhase = ''
export HOME=$(mktemp -d)
pnpm config set store-dir "$out"
pnpm install --frozen-lockfile --ignore-script --force
# remove timestamp and sort json files
rm -rf "$out"/v3/tmp
for f in $(find "$out" -name "*.json"); do
sed -i -E -e 's/"checkedAt":[0-9]+,//g' $f
jq --sort-keys . "$f" | sponge "$f"
done
'';
dontFixup = true;
outputHashMode = "recursive";
outputHash = "sha256-g/uUGfC9TQh0LE8ed51oFY17FySoeTvfaeEpzpNeMao=";
});
pnpmDeps = pnpm.fetchDeps {
inherit pname version src;
hash = "sha256-Ye9GHvkO+xZj87NIc1JLmhIJFqdkJMg7HvfTltx9krw=";
};
nativeBuildInputs = [
cacert # required for turbo
cargo-tauri.hook
desktop-file-utils
pnpm_8
nodejs
pkg-config
pnpm.configHook
];
buildInputs =
@ -100,35 +69,9 @@ rustPlatform.buildRustPackage {
);
env = {
ESBUILD_BINARY_PATH = lib.getExe (
esbuild.override {
buildGoModule = args: buildGoModule (args // rec {
version = "0.20.2";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
hash = "sha256-h/Vqwax4B4nehRP9TaYbdixAZdb1hx373dNxNHvDrtY=";
};
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
});
}
);
TURBO_BINARY_PATH = lib.getExe turbo;
};
postPatch = ''
export HOME=$(mktemp -d)
export STORE_PATH=$(mktemp -d)
pushd theseus_gui
cp -rT ${modrinth-app-unwrapped.pnpm-deps} "$STORE_PATH"
chmod -R +w "$STORE_PATH"
pnpm config set store-dir "$STORE_PATH"
pnpm install --offline --frozen-lockfile --ignore-script
popd
'';
postInstall =
lib.optionalString stdenv.hostPlatform.isDarwin ''
mv "$out"/Applications/Modrinth\ App.app/Contents/MacOS/Modrinth\ App "$out"/bin/modrinth-app
@ -144,25 +87,20 @@ rustPlatform.buildRustPackage {
$out/share/applications/modrinth-app.desktop
'';
passthru = {
updateScript = nix-update-script { };
};
meta = {
description = "Modrinth's game launcher";
longDescription = ''
A unique, open source launcher that allows you to play your favorite mods,
and keep them up to date, all in one neat little package
'';
mainProgram = "modrinth-app";
homepage = "https://modrinth.com";
changelog = "https://github.com/modrinth/theseus/releases/tag/v${modrinth-app-unwrapped.version}";
license = with lib.licenses; [
gpl3Plus
unfreeRedistributable
];
maintainers = with lib.maintainers; [ getchoo ];
platforms = lib.platforms.linux ++ lib.platforms.darwin;
mainProgram = "modrinth-app";
platforms = with lib; platforms.linux ++ platforms.darwin;
# this builds on architectures like aarch64, but the launcher itself does not support them yet
broken = !stdenv.hostPlatform.isx86_64;
};

View File

@ -3,10 +3,9 @@
stdenv,
symlinkJoin,
modrinth-app-unwrapped,
wrapGAppsHook3,
addDriverRunpath,
alsa-lib,
flite,
glib,
glib-networking,
jdk8,
jdk17,
@ -17,10 +16,14 @@
jdk21
],
libGL,
libjack2,
libpulseaudio,
pipewire,
udev,
wrapGAppsHook3,
xorg,
}:
symlinkJoin rec {
name = "${pname}-${version}";
pname = "modrinth-app";
@ -28,37 +31,44 @@ symlinkJoin rec {
paths = [ modrinth-app-unwrapped ];
buildInputs = [
glib
glib-networking
];
nativeBuildInputs = [ wrapGAppsHook3 ];
nativeBuildInputs = [
wrapGAppsHook3
];
buildInputs = [ glib-networking ];
runtimeDependencies = lib.optionalString stdenv.hostPlatform.isLinux (lib.makeLibraryPath [
addDriverRunpath.driverLink
flite # narrator support
runtimeDependencies = lib.optionalString stdenv.hostPlatform.isLinux (
lib.makeLibraryPath [
addDriverRunpath.driverLink
udev # oshi
# glfw
libGL
xorg.libX11
xorg.libXcursor
xorg.libXext
xorg.libXrandr
xorg.libXxf86vm
# lwjgl
libGL
libpulseaudio
stdenv.cc.cc.lib
xorg.libX11
xorg.libXcursor
xorg.libXext
xorg.libXxf86vm
xorg.libXrandr
]);
# lwjgl
stdenv.cc.cc.lib
# narrator support
flite
# openal
alsa-lib
libjack2
libpulseaudio
pipewire
# oshi
udev
]
);
postBuild = ''
gappsWrapperArgs+=(
--prefix PATH : ${lib.makeSearchPath "bin/java" jdks}
${lib.optionalString stdenv.hostPlatform.isLinux ''
--prefix PATH : ${lib.makeBinPath [xorg.xrandr]}
--prefix PATH : ${lib.makeBinPath [ xorg.xrandr ]}
--set LD_LIBRARY_PATH $runtimeDependencies
''}
)
@ -66,5 +76,16 @@ symlinkJoin rec {
wrapGAppsHook
'';
inherit (modrinth-app-unwrapped) meta;
meta = {
inherit (modrinth-app-unwrapped.meta)
description
longDescription
homepage
license
maintainers
mainProgram
platforms
broken
;
};
}

View File

@ -2,6 +2,7 @@
lib,
stdenv,
fetchurl,
testers,
}:
let
@ -28,7 +29,7 @@ let
inherit (versionInfo) version sha256 url;
in
stdenv.mkDerivation {
stdenv.mkDerivation (finalAttrs: {
pname = "ngrok";
inherit version;
@ -55,7 +56,10 @@ stdenv.mkDerivation {
runHook postInstall
'';
passthru.updateScript = ./update.sh;
passthru = {
updateScript = ./update.sh;
tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
};
# Stripping causes SEGFAULT on darwin
dontStrip = stdenv.hostPlatform.isDarwin;
@ -74,4 +78,4 @@ stdenv.mkDerivation {
];
mainProgram = "ngrok";
};
}
})

View File

@ -1,38 +1,38 @@
{
"linux-386": {
"sys": "linux-386",
"url": "https://bin.equinox.io/a/2pDJvg1WeN6/ngrok-v3-3.16.0-linux-386",
"sha256": "225ea2210a068f977a608352dd22fd20be619473cf3501df271c39c63905a521",
"version": "3.16.0"
"url": "https://bin.equinox.io/a/cPMgrL2ncCb/ngrok-v3-3.18.1-linux-386",
"sha256": "f0b85d6a2f7ab3bd48186100e0f619acd18d4bdf56df2cd7044e6b35745c17a4",
"version": "3.18.1"
},
"linux-amd64": {
"sys": "linux-amd64",
"url": "https://bin.equinox.io/a/kxzmCLDbo6M/ngrok-v3-3.16.0-linux-amd64",
"sha256": "fc1973917b056ac11d74687b0ba513a0fbab41f923e648875b8882d3e6cf07e0",
"version": "3.16.0"
"url": "https://bin.equinox.io/a/gnpHP5YLEsK/ngrok-v3-3.18.1-linux-amd64",
"sha256": "7d0a1f40bfb10fd7304081dcc27d7b8d2bed86f39cd46825c07679d8c888975f",
"version": "3.18.1"
},
"linux-arm": {
"sys": "linux-arm",
"url": "https://bin.equinox.io/a/iE6KPEx6SuX/ngrok-v3-3.16.0-linux-arm",
"sha256": "3cb21e33be918ad4e547db5f0401d0c6fea61876ae46c14daf39f1038f80a1af",
"version": "3.16.0"
"url": "https://bin.equinox.io/a/mke1muTU2zp/ngrok-v3-3.18.1-linux-arm",
"sha256": "6e7b4723a3a2c936157e4ec7be0bcbf95b49c672223ba0621d54165e8009fd78",
"version": "3.18.1"
},
"linux-arm64": {
"sys": "linux-arm64",
"url": "https://bin.equinox.io/a/3gbE6TuMrs4/ngrok-v3-3.16.0-linux-arm64",
"sha256": "e9cb9a3e65f92fa095101884291f9e5ed0989633cff480353a65877cf710399e",
"version": "3.16.0"
"url": "https://bin.equinox.io/a/jYPr353ESuj/ngrok-v3-3.18.1-linux-arm64",
"sha256": "0dbdfdf94b3acb777741e9eeeb27a256cb1975b7d366d1ba404804b863b8fcbb",
"version": "3.18.1"
},
"darwin-amd64": {
"sys": "darwin-amd64",
"url": "https://bin.equinox.io/a/aWAe4Kvgqei/ngrok-v3-3.16.0-darwin-amd64",
"sha256": "5c2fb13ab825876f183bcff82f98b0979f9f5250638a8cb88e5f987f2b109b6c",
"version": "3.16.0"
"url": "https://bin.equinox.io/a/iTdNrZisjJj/ngrok-v3-3.18.1-darwin-amd64",
"sha256": "9a1319caf566ee7f85c1a9b2982ee95c08bd549e90d56ac99ef863d5da92b4a4",
"version": "3.18.1"
},
"darwin-arm64": {
"sys": "darwin-arm64",
"url": "https://bin.equinox.io/a/4wpGQDJrfrm/ngrok-v3-3.16.0-darwin-arm64",
"sha256": "3fe7cc8f0d6b1978487c502cd6b832a1963287ad0f7c171904ac2c27d81bf9be",
"version": "3.16.0"
"url": "https://bin.equinox.io/a/6wGwyzYTbRX/ngrok-v3-3.18.1-darwin-arm64",
"sha256": "9cc3fee7d81157e6bc645f160f6aa5562577c4b9f72db8675143e16d07703816",
"version": "3.18.1"
}
}

View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "novops";
version = "0.16.0";
version = "0.17.0";
src = fetchFromGitHub {
owner = "PierreBeucher";
repo = pname;
rev = "v${version}";
hash = "sha256-Hqm3bKMRUyIZ/wD+kjAhUuKcJdaA8LT7bnourda6nuw=";
hash = "sha256-/sb9LqBZRkJeGyWZzz3RDgWm2tEtiaEXrEX/OO5ja6o=";
};
cargoHash = "sha256-ObbCJQw4DgUH1/XuI7ZgqFY9O9OH1uGUkfaQRjcGkAY=";
cargoHash = "sha256-gvM0I+om4I8Yy+m0CzD5/WpL8xdIs3ecKQgmaq9S3VI=";
buildInputs = [
openssl # required for openssl-sys

View File

@ -11,7 +11,7 @@
python3Packages.buildPythonApplication rec {
pname = "openapi-python-client";
version = "0.21.5";
version = "0.21.6";
pyproject = true;
src = fetchFromGitHub {
@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
owner = "openapi-generators";
repo = "openapi-python-client";
rev = "refs/tags/v${version}";
hash = "sha256-/m/XXNqsr0FjYSEGMSw4zIUpWJDOqu9BzNuJKyb7fKY=";
hash = "sha256-hmVRPQ3+20ZBRCkQltX+S+pGGy2unsBSztyif93sKsw=";
};
nativeBuildInputs =

File diff suppressed because it is too large Load Diff

View File

@ -5,20 +5,21 @@
pkg-config,
openssl,
libsoup,
webkitgtk_4_0,
webkitgtk_4_1,
fetchFromGitHub,
libayatana-appindicator,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
pname = "overlayed";
version = "0.5.0";
version = "0.6.2";
src = fetchFromGitHub {
owner = "overlayeddev";
repo = "overlayed";
rev = "refs/tags/v${version}";
hash = "sha256-yS1u7pp7SfmqzoH0QOAH060uo3nFb/N9VIng0T21tVw=";
hash = "sha256-3GFg8czBf1csojXUNC51xFXJnGuXltP6D46fCt6q24I=";
};
sourceRoot = "${src.name}/apps/desktop/src-tauri";
@ -33,7 +34,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [
openssl
webkitgtk_4_0
webkitgtk_4_1
libsoup
];
@ -44,9 +45,9 @@ rustPlatform.buildRustPackage rec {
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"tauri-plugin-window-state-0.1.1" = "sha256-2cdO+5YAP7MOK0/YKclQemK4N9ci2JX3AfmMaeauwNI=";
"tauri-nspanel-0.0.0" = "sha256-tQHY0OX37b4dqhs89phYIzw7JzEPmMJo5e/jlyzxdMg=";
"tauri-plugin-single-instance-0.0.0" = "sha256-S1nsT/Dr0aIJdiPnW1FGamCth7CDMNAp4v34tpWqjHg=";
"system-notification-0.1.0" = "sha256-T9SnKBy4x0Y5Ul6oECHJ/lvsYS2TPY8Nrg1R9JtJUXs=";
"tauri-nspanel-2.0.0-beta" = "sha256-PhMkSrmmc6fJ0GmT9lPwYMsyBap7/g8vIp210l2nFU4=";
"tauri-plugin-window-state-2.0.0-rc.1" = "sha256-8GR9q1+eiULDOtWlLy+sLylOzfAOUO5Q61EP/XvP6c0=";
};
};
@ -54,8 +55,8 @@ rustPlatform.buildRustPackage rec {
substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
--replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
substituteInPlace ./tauri.conf.json \
--replace-fail '"distDir": "../dist",' '"distDir": "${webui}",' \
--replace-fail '"beforeBuildCommand": "pnpm build"' '"beforeBuildCommand": ""'
--replace-fail '../dist' '${webui}' \
--replace-fail 'pnpm build' ' '
'';
meta = {

View File

@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) src pname version;
hash = "sha256-YTZ6uT1hcNSh+xhRvOq4q/opMOEksXT/MH3BgCnccrA=";
hash = "sha256-+yyxoodcDfqJ2pkosd6sMk77/71RDsGthedo1Oigwto=";
};
nativeBuildInputs = [

View File

@ -1,30 +1,42 @@
{ lib
, stdenv
, buildGoModule
, fetchFromGitHub
, libax25
, installShellFiles
{
lib,
stdenv,
buildGoModule,
fetchFromGitHub,
libax25,
installShellFiles,
fetchpatch,
}:
buildGoModule rec {
pname = "pat";
version = "0.15.1";
version = "0.16.0";
src = fetchFromGitHub {
owner = "la5nta";
repo = "pat";
rev = "v${version}";
hash = "sha256-wNWqqGc4mf3z0ejMpU+jWhqCbjNJ2b6+pbBjDYKwKK8=";
hash = "sha256-JlqYdsAXs3pS5i59tiel+gxQsTrn5mUs0qLzjHxGZU0=";
};
vendorHash = "sha256-m5yb6+TfRApw0ZROx9ZA3RPiKV+1DHo/73CNQpIfMlU=";
ldflags = [ "-s" "-w" ];
nativeBuildInputs = [
installShellFiles
# Remove upon next release since upstream is fixed
# https://github.com/la5nta/pat/pull/449
patches = [
(fetchpatch {
url = "https://github.com/la5nta/pat/commit/5604eac8853216d96d49d7d9947bdc514e195538.patch";
sha256 = "sha256-Z9uoZLlhdCslULUxGkc4ao4ptC4ImWzSrfabSA5S/PE=";
})
];
vendorHash = "sha256-Z6p0wiOY5l++nch64BJWGXleBgUNecTDm+yVCnmXvtU=";
ldflags = [
"-s"
"-w"
];
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optional stdenv.hostPlatform.isLinux [ libax25 ];
# Needed by wl2k-go go module for libax25 to include support for Linux' AX.25 stack by linking against libax25.
@ -39,7 +51,10 @@ buildGoModule rec {
description = "Pat is a cross platform Winlink client written in Go";
homepage = "https://getpat.io/";
license = licenses.mit;
maintainers = with maintainers; [ dotemup sarcasticadmin ];
maintainers = with maintainers; [
dotemup
sarcasticadmin
];
platforms = platforms.unix;
mainProgram = "pat";
};

View File

@ -37,20 +37,20 @@ let
};
};
version = "2024.3.0";
version = "2024.3.1";
src = fetchFromGitHub {
owner = "pretalx";
repo = "pretalx";
rev = "v${version}";
hash = "sha256-Xv3VwYrwCGgOUf1ilD58ATj+bkehF9+im4124ivCaEU=";
hash = "sha256-y3BsNmLh9M5NgDPURCjCGWYci40hYcQtDVqsu2HqPRU=";
};
meta = with lib; {
description = "Conference planning tool: CfP, scheduling, speaker management";
mainProgram = "pretalx-manage";
homepage = "https://github.com/pretalx/pretalx";
changelog = "https://docs.pretalx.org/en/latest/changelog.html";
changelog = "https://docs.pretalx.org/changelog/#${version}";
license = licenses.asl20;
maintainers = with maintainers; [ hexa] ++ teams.c3d2.members;
platforms = platforms.linux;

View File

@ -5,20 +5,20 @@
}:
beamPackages.mixRelease rec {
pname = "protoc-gen-elixir";
version = "0.12.0";
version = "0.13.0";
src = fetchFromGitHub {
owner = "elixir-protobuf";
repo = "protobuf";
rev = "refs/tags/v${version}";
hash = "sha256-wLU3iM9jI/Zc96/HfPUjNvjteGryWos6IobIb/4zqpw=";
hash = "sha256-TnuIlXYr36hx1sVktPHj4J4cJLCFK5F1xaX0V9/+ICQ=";
};
mixFodDeps = beamPackages.fetchMixDeps {
inherit version src;
pname = "protoc-gen-elixir-deps";
hash = "sha256-H7yiBHoxuiqWcNbWwPU5X0Nnv8f6nM8z/ZAfZAGPZjE=";
hash = "sha256-lFfAfKAM4O+yIBXgdCA+EPe1XAOaTIjTfpOFjITpvQ4=";
};
postBuild = ''

View File

@ -8,16 +8,16 @@
buildNpmPackage rec {
pname = "redocly";
version = "1.25.5";
version = "1.25.9";
src = fetchFromGitHub {
owner = "Redocly";
repo = "redocly-cli";
rev = "@redocly/cli@${version}";
hash = "sha256-pVSmrORa6KcAwllYepwra8QpnlfFoB9+noevLSmoWzY=";
hash = "sha256-QOD1EqigHa/daanwajoiQAy0fJRi8yWJKj41k0SZyJo=";
};
npmDepsHash = "sha256-nFRKC3xM+vq9SDeIelUqE/ZSSCSke0G0Qm629/s6WO8=";
npmDepsHash = "sha256-Bo8Zdft+AfjSXDnxXvKq+AEpU4vtB+XBkmzqLRuHLrw=";
npmBuildScript = "prepare";
@ -36,7 +36,7 @@ buildNpmPackage rec {
makeWrapper $out/lib/node_modules/@redocly/cli/node_modules/@redocly/cli/bin/cli.js \
$out/bin/redocly \
--set-default REDOCLY_TELEMETRY off \
--set-default CI true # Silence update messages
--set-default REDOCLY_SUPPRESS_UPDATE_NOTICE true
# Symlink for backwards compatibility. Remove after 24.05.
ln -s $out/bin/redocly $out/bin/redocly-cli

View File

@ -42,8 +42,8 @@ let
# Please keep the version x.y.0.z and do not update to x.y.76.z because the
# source of the latter disappears much faster.
version = "8.130.0.205";
revision = "368";
version = "8.131.0.202";
revision = "370";
rpath =
lib.makeLibraryPath [
@ -103,7 +103,7 @@ let
fetchurl {
name = "skypeforlinux-${version}-${revision}.snap";
url = "https://api.snapcraft.io/api/v1/snaps/download/QRDEfjn4WJYnm0FzDKwqqRZZI77awQEV_${revision}.snap";
hash = "sha512-eDSJQndUDxSsRg9bSevWUih1iXDp3n1kU0RdRAu3GsHeRC/JJx3m4vKxP0F/Rcf2Toxd3MPG2r6Oa1Wa7upcGg==";
hash = "sha512-POCDkJe58ie78PIze6qADPIbjfFxNhLJt5z7ooHNIna6IrJoeqpFYIrRo9uosHkUURu83MfueeyYd6z0j+P/RQ==";
}
else
throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";

View File

@ -20,14 +20,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "snoop";
version = "0.4";
version = "0.4.1";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "philippun1";
repo = "snoop";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-JrSUGxhlr4wCGoh589AkPRhNmfsi7msv9EO2k1pHlKY=";
hash = "sha256-v4+A0q04+THBJ+U5izICVhofXPEC3db73MzYonXcDvU=";
};
patchPhase = ''

View File

@ -12,6 +12,7 @@
libXcursor,
libXi,
stdenv,
darwin,
makeWrapper,
zenity,
}:
@ -27,19 +28,21 @@ rustPlatform.buildRustPackage rec {
fetchSubmodules = true;
};
nativeBuildInputs = [
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
pkg-config
autoPatchelfHook
makeWrapper
];
buildInputs = [
openssl
stdenv.cc.cc.lib
];
buildInputs =
lib.optionals stdenv.hostPlatform.isLinux [
openssl
stdenv.cc.cc.lib
]
++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ];
# Wayland and X11 libs are required at runtime since winit uses dlopen
runtimeDependencies = [
runtimeDependencies = lib.optionals stdenv.hostPlatform.isLinux [
wayland
libxkbcommon
libGL
@ -60,7 +63,7 @@ rustPlatform.buildRustPackage rec {
# Avoid the network attempt from skia. See: https://github.com/cargo2nix/cargo2nix/issues/318
doCheck = false;
postFixup = ''
postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
wrapProgram $out/bin/surfer \
--prefix PATH : ${lib.makeBinPath [ zenity ]}
'';
@ -71,7 +74,7 @@ rustPlatform.buildRustPackage rec {
changelog = "https://gitlab.com/surfer-project/surfer/-/releases/v${version}";
license = lib.licenses.eupl12;
maintainers = with lib.maintainers; [ hakan-demirli ];
platforms = lib.platforms.linux;
platforms = lib.platforms.linux ++ lib.platforms.darwin;
mainProgram = "surfer";
};
}

View File

@ -0,0 +1,26 @@
{
rustPlatform,
fetchFromGitHub,
lib,
}:
rustPlatform.buildRustPackage rec {
pname = "tpi";
version = "1.0.6";
src = fetchFromGitHub {
owner = "turing-machines";
repo = "tpi";
rev = "v${version}";
hash = "sha256-rkqkb3iJL4obHjTkGEUbVPJmUmfT9KKP4yoQ71cbpKs=";
};
cargoHash = "sha256-hSWDr1XuD6x96QV2QIdhGPQ00Sg7G5O5bkFNTdUx0ug=";
meta = {
description = "CLI tool to control your Turing Pi 2 board";
homepage = "https://github.com/turing-machines/tpi";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ WoutSwinkels ];
mainProgram = "tpi";
};
}

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,31 @@
{
lib,
rustPlatform,
fetchFromGitHub,
}:
rustPlatform.buildRustPackage rec {
pname = "tun2proxy";
version = "0.5.4";
src = fetchFromGitHub {
owner = "tun2proxy";
repo = "tun2proxy";
rev = "v${version}";
hash = "sha256-EeSXEPg4TxbjQXoM2jx8T9+VOT7VndBnxhy7pwwQ8Kk=";
};
cargoHash = "sha256-WwCUSnXSlSrO+YfqpZlC9WWsX/pM6ixYlqU1pZY4e5o=";
cargoPatches = [
./Cargo.lock.patch
];
meta = {
homepage = "https://github.com/tun2proxy/tun2proxy";
description = "Tunnel (TUN) interface for SOCKS and HTTP proxies";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
mainProgram = "tun2proxy-bin";
maintainers = with lib.maintainers; [ mksafavi ];
};
}

View File

@ -1,7 +0,0 @@
{
"branch": "master",
"commit_hash": "d446a98850abccfe28a78363c96468a2a8109cfc",
"commit_message": "Update packages",
"date": "2024-09-22",
"tag": "v5.18.2"
}

View File

@ -14,13 +14,13 @@
}:
stdenvNoCC.mkDerivation rec {
pname = "yandex-music";
version = "5.18.2";
version = "5.23.2";
src = fetchFromGitHub {
owner = "cucumber-sp";
repo = "yandex-music-linux";
rev = "v${version}";
hash = "sha256-y+T2ckrnhrOiiPKBUlnvDb4FwrIfbaIXwVi16AoX/bQ=";
hash = "sha256-nhy4D2PgTMsQOs8hPY39Z+I+Tldgf1ASZbatfxWqNTw=";
};
nativeBuildInputs = [
@ -38,8 +38,8 @@ stdenvNoCC.mkDerivation rec {
ym_info = builtins.fromJSON (builtins.readFile ./ym_info.json);
in
fetchurl {
url = ym_info.ym.exe_link;
sha256 = ym_info.ym.exe_sha256;
url = ym_info.exe_link;
hash = ym_info.exe_hash;
};
buildPhase = ''
@ -77,10 +77,10 @@ stdenvNoCC.mkDerivation rec {
'';
meta = {
description = "Yandex Music - Personal recommendations, selections for any occasion and new music";
description = "Personal recommendations, selections for any occasion and new music";
homepage = "https://music.yandex.ru/";
downloadPage = "https://music.yandex.ru/download/";
changelog = "https://github.com/cucumber-sp/yandex-music-linux/releases/tag/v5.13.2";
changelog = "https://github.com/cucumber-sp/yandex-music-linux/releases/tag/v${version}";
license = lib.licenses.unfree;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ shved ];

View File

@ -11,15 +11,10 @@ RAW="https://raw.githubusercontent.com/$OWNER/$REPO"
latest_release="$(curl --silent "$URL/releases/latest")"
latest_tag="$(curl --silent "$URL/tags?per_page=1")"
commit_hash="$(jq -r '.[0].commit.sha' <<<"$latest_tag")"
latest_commit="$(curl --silent "$URL/commits/$commit_hash"'')"
commit_message="$(jq -r '.commit.message' <<<"$latest_commit")"
tag=$(jq -r '.tag_name' <<<"$latest_release")
# drop 'v' prefix
version="${tag#v}"
branch=$(jq -r '.target_commitish' <<<"$latest_release")
date=$(jq -r '.created_at' <<<"$latest_release")
# truncate time
date=${date%T*}
@ -30,14 +25,21 @@ update-source-version yandex-music "$version" --ignore-same-hash
# set yandex-music dir
dir="pkgs/by-name/ya/yandex-music"
echo -e '{
"branch": "'"$branch"'",
"commit_hash": "'"$commit_hash"'",
"commit_message": "'"$commit_message"'",
"date": "'"$date"'",
"tag": "'"$tag"'"
}' >"$dir/info.json" || echo "Please run the script in the root of the Nixpkgs repo"
# download and save new version of 'exe' file
ym_info=$(curl --silent "$RAW/$commit_hash/utility/version_info.json" |\
jq '.ym')
curl --silent "$RAW/$commit_hash/utility/version_info.json" |\
jq . > "$dir/ym_info.json" ||\
exe_name="$(jq -r '.exe_name' <<<"$ym_info")"
exe_link="$(jq -r '.exe_link' <<<"$ym_info")"
exe_sha256="$(jq -r '.exe_sha256' <<<"$ym_info")"
exe_hash="$(nix-hash --to-sri --type sha256 "$exe_sha256")"
jq '.' > "$dir/ym_info.json" <<- EOJSON ||\
echo "Please run the script in the root of the Nixpkgs repo"
{
"version": "$version",
"exe_name": "$exe_name",
"exe_link": "$exe_link",
"exe_hash": "$exe_hash"
}
EOJSON

View File

@ -1,14 +1,6 @@
{
"ym": {
"version": "5.18.2",
"exe_name": "Yandex_Music_x64_5.18.2.exe",
"exe_link": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.18.2.exe",
"exe_sha256": "a513eb6aa4bd05bae8503f5578a8e91d778794ffe4eb3a450040903570106941"
},
"electron": {
"version": "29.4.6",
"x64": "https://github.com/electron/electron/releases/download/v29.4.6/electron-v29.4.6-linux-x64.zip",
"armv7l": "https://github.com/electron/electron/releases/download/v29.4.6/electron-v29.4.6-linux-armv7l.zip",
"arm64": "https://github.com/electron/electron/releases/download/v29.4.6/electron-v29.4.6-linux-arm64.zip"
}
"version": "5.23.2",
"exe_name": "Yandex_Music_x64_5.23.2.exe",
"exe_link": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.23.2.exe",
"exe_hash": "sha256-PhXmUGV9+9zfRZufw3FVvpPGqVLAB51lrz7KJovm+C8="
}

View File

@ -19,6 +19,7 @@
, libffi
, llvmPackages_13
, llvmPackages_15
, llvmPackages_18
, makeWrapper
, openssl
, pcre2
@ -246,6 +247,7 @@ let
passthru.buildCrystalPackage = callPackage ./build-package.nix {
crystal = finalAttrs.finalPackage;
};
passthru.llvmPackages = llvmPackages;
meta = with lib; {
inherit (binary.meta) platforms;
@ -314,5 +316,21 @@ rec {
llvmPackages = llvmPackages_15;
};
crystal = crystal_1_11;
crystal_1_12 = generic {
version = "1.12.1";
sha256 = "sha256-Q6uI9zPZ3IOGyUuWdC179GPktPGFPRbRWKtOF4YWCBw=";
binary = binaryCrystal_1_10;
llvmPackages = llvmPackages_18;
};
crystal_1_14 = generic {
version = "1.14.0";
sha256 = "sha256-ayMF5yinHVOUaZxhlmqxb/iiGJHmloeYuKcnrPmxo9Y=";
binary = binaryCrystal_1_10;
llvmPackages = llvmPackages_18;
doCheck = false; # Some compiler spec problems on x86-64_linux with the .0 release
};
crystal = crystal_1_14;
}

View File

@ -18,7 +18,7 @@
, doxygen
, python3
, lcms2
, enablePlugins ? stdenv.buildPlatform.canExecute stdenv.hostPlatform
, enablePlugins ? true
}:
let
@ -131,6 +131,9 @@ stdenv.mkDerivation rec {
GDK_PIXBUF_MODULEDIR="$out/${gdk-pixbuf.moduleDir}" \
GDK_PIXBUF_MODULE_FILE="$out/${loadersPath}" \
gdk-pixbuf-query-loaders --update-cache
''
# Cross-compiled gdk-pixbuf doesn't support thumbnailers
+ lib.optionalString (enablePlugins && stdenv.hostPlatform == stdenv.buildPlatform) ''
mkdir -p "$out/bin"
makeWrapper ${gdk-pixbuf}/bin/gdk-pixbuf-thumbnailer "$out/libexec/gdk-pixbuf-thumbnailer-jxl" \
--set GDK_PIXBUF_MODULE_FILE "$out/${loadersPath}"

View File

@ -1,17 +1,19 @@
{ lib, stdenv
, fetchurl
, autoreconfHook
, docbook_xsl
, docbook_xml_dtd_43
, gtk-doc
, lzip
, libidn2
, libunistring
, libxslt
, pkg-config
, python3
, buildPackages
, publicsuffix-list
{
lib,
stdenv,
fetchurl,
autoreconfHook,
docbook_xsl,
docbook_xml_dtd_43,
gtk-doc,
lzip,
libidn2,
libunistring,
libxslt,
pkg-config,
python3,
buildPackages,
publicsuffix-list,
}:
stdenv.mkDerivation rec {
@ -23,7 +25,11 @@ stdenv.mkDerivation rec {
hash = "sha256-mp9qjG7bplDPnqVUdc0XLdKEhzFoBOnHMgLZdXLNOi0=";
};
outputs = [ "out" "dev" ]
outputs =
[
"out"
"dev"
]
# bin/psl-make-dafsa brings a large runtime closure through python3
++ lib.optional (!stdenv.hostPlatform.isStatic) "bin";
@ -42,8 +48,10 @@ stdenv.mkDerivation rec {
libunistring
libxslt
] ++ lib.optional (
!stdenv.hostPlatform.isStatic && (stdenv.hostPlatform.isDarwin -> stdenv.buildPlatform == stdenv.hostPlatform)
) python3;
!stdenv.hostPlatform.isStatic
&& !stdenv.hostPlatform.isWindows
&& (stdenv.hostPlatform.isDarwin -> stdenv.buildPlatform == stdenv.hostPlatform)
) python3;
propagatedBuildInputs = [
publicsuffix-list

View File

@ -23,6 +23,7 @@
, protobuf_21
, pythonSupport ? true
, cudaSupport ? config.cudaSupport
, ncclSupport ? config.cudaSupport
, cudaPackages ? {}
}@inputs:
@ -160,8 +161,9 @@ effectiveStdenv.mkDerivation rec {
libcufft # cufft.h
cudnn # cudnn.h
cuda_cudart
] ++ lib.optionals (cudaSupport && ncclSupport) (with cudaPackages; [
nccl
]);
]));
nativeCheckInputs = [
gtest
@ -198,7 +200,7 @@ effectiveStdenv.mkDerivation rec {
"-Donnxruntime_ENABLE_LTO=ON"
"-Donnxruntime_USE_FULL_PROTOBUF=OFF"
(lib.cmakeBool "onnxruntime_USE_CUDA" cudaSupport)
(lib.cmakeBool "onnxruntime_USE_NCCL" cudaSupport)
(lib.cmakeBool "onnxruntime_USE_NCCL" (cudaSupport && ncclSupport))
] ++ lib.optionals pythonSupport [
"-Donnxruntime_ENABLE_PYTHON=ON"
] ++ lib.optionals cudaSupport [

View File

@ -356,7 +356,7 @@ in
luadbi-postgresql = prev.luadbi-postgresql.overrideAttrs (oa: {
buildInputs = oa.buildInputs ++ [
postgresql
(lib.getDev postgresql)
];
});

View File

@ -3,9 +3,6 @@
{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}:
let
# Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master
utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux;
python = if nodejs ? python then nodejs.python else python2;
# Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
@ -499,7 +496,7 @@ let
stdenv.mkDerivation ({
name = "${name}${if version == null then "" else "-${version}"}";
buildInputs = [ tarWrapper python nodejs ]
++ lib.optional (stdenv.hostPlatform.isLinux) utillinux
++ lib.optional (stdenv.hostPlatform.isLinux) pkgs.util-linux
++ lib.optional (stdenv.hostPlatform.isDarwin) libtool
++ buildInputs;
@ -591,7 +588,7 @@ let
name = "node-dependencies-${name}${if version == null then "" else "-${version}"}";
buildInputs = [ tarWrapper python nodejs ]
++ lib.optional (stdenv.hostPlatform.isLinux) utillinux
++ lib.optional (stdenv.hostPlatform.isLinux) pkgs.util-linux
++ lib.optional (stdenv.hostPlatform.isDarwin) libtool
++ buildInputs;
@ -662,7 +659,7 @@ let
stdenv.mkDerivation ({
name = "node-shell-${name}${if version == null then "" else "-${version}"}";
buildInputs = [ python nodejs ] ++ lib.optional (stdenv.hostPlatform.isLinux) utillinux ++ buildInputs;
buildInputs = [ python nodejs ] ++ lib.optional (stdenv.hostPlatform.isLinux) pkgs.util-linux ++ buildInputs;
buildCommand = ''
mkdir -p $out/bin
cat > $out/bin/shell <<EOF

View File

@ -15,6 +15,7 @@
pydantic,
pyyaml,
scikit-image,
scipy,
# optional dependencies
huggingface-hub,
@ -30,7 +31,7 @@
buildPythonPackage rec {
pname = "albumentations";
version = "1.4.17";
version = "1.4.18";
pyproject = true;
disabled = pythonOlder "3.8";
@ -39,9 +40,13 @@ buildPythonPackage rec {
owner = "albumentations-team";
repo = "albumentations";
rev = "refs/tags/${version}";
hash = "sha256-4JOqaSpBXSrAR3qrOeab+PvhXPcoEnblO0n9TSqW0bY=";
hash = "sha256-uAYnbglBT1mduyRnsWWjZ8axG7DzZEVcgAVeMLF48oM=";
};
patches = [
./dont-check-for-updates.patch
];
pythonRemoveDeps = [ "opencv-python" ];
build-system = [ setuptools ];
@ -54,6 +59,7 @@ buildPythonPackage rec {
pydantic
pyyaml
scikit-image
scipy
];
optional-dependencies = {

View File

@ -0,0 +1,12 @@
diff --git a/albumentations/__init__.py b/albumentations/__init__.py
index 0b3b531..7c69c65 100644
--- a/albumentations/__init__.py
+++ b/albumentations/__init__.py
@@ -7,7 +7,3 @@ from .augmentations import *
from .core.composition import *
from .core.serialization import *
from .core.transforms_interface import *
-
-# Perform the version check after all other initializations
-if os.getenv("NO_ALBUMENTATIONS_UPDATE", "").lower() not in {"true", "1"}:
- check_for_updates()

View File

@ -6,34 +6,51 @@
protobuf,
pycryptodome,
requests,
protobuf_27,
setuptools,
}:
buildPythonPackage rec {
version = "0.4.4";
format = "setuptools";
pname = "gpapi";
pyproject = true;
src = fetchPypi {
inherit version pname;
sha256 = "0ampvsv97r3hy1cakif4kmyk1ynf3scbvh4fbk02x7xrxn4kl38w";
sha256 = "sha256-HA06ie25ny7AXI7AvZgezvowfZ3ExalY8HDkk7betyo=";
};
postPatch = ''
substituteInPlace setup.py \
--replace-fail 'PROTOC_EXEC = "protoc"' 'PROTOC_EXEC = "${lib.getExe protobuf_27}"'
'';
build-system = [ setuptools ];
buildInputs = [
protobuf_27
];
dependencies = [
cryptography
protobuf
pycryptodome
requests
];
preBuild = ''
export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION="python"
'';
# package doesn't contain unit tests
# scripts in ./test require networking
doCheck = false;
pythonImportsCheck = [ "gpapi.googleplay" ];
propagatedBuildInputs = [
cryptography
protobuf
pycryptodome
requests
];
meta = with lib; {
meta = {
homepage = "https://github.com/NoMore201/googleplay-api";
license = licenses.gpl3Only;
license = lib.licenses.gpl3Only;
description = "Google Play Unofficial Python API";
maintainers = [ ];
};

View File

@ -34,12 +34,12 @@ let
in
buildPythonPackage rec {
pname = "graph-tool";
version = "2.77";
version = "2.78";
format = "other";
src = fetchurl {
url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2";
hash = "sha256-mu/6r1Uo836ZTxuIL3UdsKvuUz+H1FZY9Y3ZbEBK0LQ=";
hash = "sha256-gG9TWKRJISOowRIXI1/ROTIwrVwhxFtMOextXqN6KiU=";
};
# Remove error messages about tput during build process without adding ncurses,

View File

@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "pykcs11";
version = "1.5.16";
version = "1.5.17";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-Q9dGsGd/Q8xjS598Tastm6axqDuTHiWYJHBi+P9kHgc=";
hash = "sha256-e2Z+lZ+gtq0HULA+IIGgWcvppieJdmFD5Q+QmIoziZQ=";
};
build-system = [ setuptools ];

View File

@ -5,7 +5,6 @@
buildPythonPackage,
chalice,
channels,
click,
daphne,
django,
email-validator,
@ -40,6 +39,8 @@
starlette,
typing-extensions,
uvicorn,
typer,
graphlib-backport,
}:
buildPythonPackage rec {
@ -92,7 +93,7 @@ buildPythonPackage rec {
libcst
];
debug-server = [
click
typer
libcst
pygments
python-multipart
@ -125,10 +126,11 @@ buildPythonPackage rec {
];
chalice = [ chalice ];
cli = [
click
pygments
rich
libcst
typer
graphlib-backport
];
# starlite = [ starlite ];
# litestar = [ litestar ];

View File

@ -68,6 +68,11 @@ buildPythonPackage rec {
pytestFlagsArray = [ "tests" ];
disabledTests = [
# Flaky tests
"TwistedEventLoopTest"
];
disabledTestPaths = [
# expect call hangs
"tests/test_vterm.py"

View File

@ -6,13 +6,14 @@
fetchpatch,
pytestCheckHook,
pythonOlder,
setuptools,
six,
}:
buildPythonPackage rec {
pname = "xdis";
version = "6.1.1";
format = "setuptools";
pyproject = true;
disabled = pythonOlder "3.6";
@ -24,7 +25,6 @@ buildPythonPackage rec {
};
# Backport magics for newer newer python versions
# 6.1.1 only supports up to 3.12.4 while nixpkgs is already on 3.12.5+
patches = [
(fetchpatch {
url = "https://github.com/rocky/python-xdis/commit/fcba74a7f64c5e2879ca0779ff10f38f9229e7da.patch";
@ -34,9 +34,25 @@ buildPythonPackage rec {
url = "https://github.com/rocky/python-xdis/commit/b66976ff53a2c6e17a73fb7652ddd6c8054df8db.patch";
hash = "sha256-KO1y0nDTPmEZ+0/3Pjh+CvTdpr/p4AYZ8XdH5J+XzXo=";
})
(fetchpatch {
url = "https://github.com/rocky/python-xdis/commit/a9f50c0ba77cdbf4693388404c13a02796a4221a.patch";
hash = "sha256-gwMagKBY7d/+ohESTSl6M2IEjzABxfrddpdr58VJAk8=";
})
(fetchpatch {
url = "https://github.com/rocky/python-xdis/commit/d9e15acae76a413667912a10fbf8259711ed9c65.patch";
hash = "sha256-hpmKg+K1RiLSnmUIS8KtZRVBfvTO9bWbpsNhBFUM38o=";
})
(fetchpatch {
url = "https://github.com/rocky/python-xdis/commit/b412c878d0bc1b516bd01612d46d8830c36a14ad.patch";
hash = "sha256-W1JuIXYLO6iyjWiSnzCoXzFsedZjesq31gEPgrtjxas=";
})
];
propagatedBuildInputs = [
build-system = [
setuptools
];
dependencies = [
click
six
];

View File

@ -1,32 +0,0 @@
{ lib
, buildGoModule
, fetchFromGitHub
, go
}:
buildGoModule rec {
pname = "ineffassign";
version = "unstable-2021-09-04";
rev = "4cc7213b9bc8b868b2990c372f6fa057fa88b91c";
src = fetchFromGitHub {
owner = "gordonklaus";
repo = "ineffassign";
inherit rev;
sha256 = "sha256-XLXANN9TOmrNOixWtlqnIC27u+0TW2P3s9MyeyVUcAQ=";
};
vendorHash = "sha256-QTgWicN2m2ughtLsEBMaQWfpDbmbL0nS5qaIKF3mTJM=";
allowGoReference = true;
nativeCheckInputs = [ go ];
meta = with lib; {
description = "Detect ineffectual assignments in Go code";
mainProgram = "ineffassign";
homepage = "https://github.com/gordonklaus/ineffassign";
license = licenses.mit;
maintainers = with maintainers; [ kalbasit ];
};
}

View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "metals";
version = "1.3.5";
version = "1.4.0";
deps = stdenv.mkDerivation {
name = "${pname}-deps-${version}";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
'';
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "sha256-86/zeoOO5kSAwh7uQTV7nGUGQoIux1rlH5eUgvn3kvY=";
outputHash = "sha256-mmsCdv3zSwsaA00I5sQVy0V4fl1GytdgjVjs2r6x32Q=";
};
nativeBuildInputs = [ makeWrapper setJavaClassPath ];

View File

@ -15,21 +15,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "texlab";
version = "5.20.0";
version = "5.21.0";
src = fetchFromGitHub {
owner = "latex-lsp";
repo = "texlab";
rev = "refs/tags/v${version}";
hash = "sha256-hKQdc9p69L0t2MwCR4Fy20Nl+2qQk5JJoCaB4O43DNY=";
hash = "sha256-Lx7vENYuBXaMvGDOZxAPqivGZVaCXYrihaTnBn9eTm4=";
};
cargoHash = "sha256-A/stdJ1baV0hdDXTdLd9gi8+JO7qPgQbNiYjHkp1GPQ=";
# https://github.com/latex-lsp/texlab/pull/1237
preBuild = ''
rm .cargo/config.toml
'';
cargoHash = "sha256-6JDG9Ac43AW6HV2baZH08uxdb84hjrGXgdzZiFr2Ybk=";
outputs = [ "out" ] ++ lib.optional (!isCross) "man";
@ -46,7 +41,7 @@ rustPlatform.buildRustPackage rec {
# generate the man page
postInstall = lib.optionalString (!isCross) ''
# TexLab builds man page separately in CI:
# https://github.com/latex-lsp/texlab/blob/v5.20.0/.github/workflows/publish.yml#L110-L114
# https://github.com/latex-lsp/texlab/blob/v5.21.0/.github/workflows/publish.yml#L110-L114
help2man --no-info "$out/bin/texlab" > texlab.1
installManPage texlab.1
'';

View File

@ -44,6 +44,7 @@ python3Packages.buildPythonApplication rec {
disabledTests = [
"test_checks" # broken because new mypy release added new checks
"test_mypy_consistence" # broken by new mypy release
];
pythonImportsCheck = [

View File

@ -14,16 +14,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-dist";
version = "0.22.1";
version = "0.23.0";
src = fetchFromGitHub {
owner = "axodotdev";
repo = "cargo-dist";
rev = "v${version}";
hash = "sha256-Pq7gVZWvtWhS7HJPwKPDq3TJqwurG6fXisM5FsSMZ9k=";
hash = "sha256-R6uTuU+U9fAUx7JP2QD+mTaoSipuaOlqPiiPdXqgfhw=";
};
cargoHash = "sha256-0j3u4oQ8JxJP+lBufDiSMyvFrW70X1snpHstjaM9tDg=";
cargoHash = "sha256-Hx3xo4PVObtSk68pUIqCbploKN7AxbRD36uOl/QaVkM=";
nativeBuildInputs = [
pkg-config

View File

@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
hash = "sha256-nKcB919M9FkDloulh9IusWYPhf8vlhUmKVs6Gd6w3Bw=";
};
cargoHash = "sha256-3FMalpgKYZ4xM2fHXTFOVu5I8yS06K1bDiKg4we7jF4=";
cargoHash = "sha256-bsrpdQS0wA3T0jZTG476sSkMRngEAOjgr4wX7svyMP4=";
nativeBuildInputs = [ rustPlatform.bindgenHook ];

View File

@ -9,13 +9,13 @@
}:
buildPythonApplication rec {
pname = "mpremote";
version = "1.23.0";
version = "1.24.0";
src = fetchFromGitHub {
owner = "micropython";
repo = "micropython";
rev = "refs/tags/v${version}";
hash = "sha256-TEW9aDXodPYWlm7xxodaG/2sXOCPpDUKtYVzYZgAzf4=";
hash = "sha256-nBz4m5YxD6MV5SyyzvJcwBTttV8uJGdcCUY6HYxZ4nY=";
};
sourceRoot = "${src.name}/tools/mpremote";
format = "pyproject";

View File

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "hblock";
version = "3.4.5";
version = "3.5.0";
src = fetchFromGitHub {
owner = "hectorm";
repo = "hblock";
rev = "v${version}";
hash = "sha256-HPQ3SKaQlPEEgWjDCs6tCxi6+3pz1gIqDhHMsPT1hVg=";
hash = "sha256-XnBmKOZBHWyjNlv+L24LYns05oGTOJnNNzM0jCwZMuI=";
};
buildInputs = [ coreutils curl gnugrep gawk ];

View File

@ -4,13 +4,13 @@
let inherit (python3Packages) python pygobject3;
in stdenv.mkDerivation rec {
pname = "networkmanager_dmenu";
version = "2.4.0";
version = "2.5.0";
src = fetchFromGitHub {
owner = "firecat53";
repo = "networkmanager-dmenu";
rev = "v${version}";
sha256 = "sha256-ibZgXpHC3ueshN1BQkAaN/tW3+qulyufI3VOnxPwi7Q=";
sha256 = "sha256-aw6TwRtlb9x/JOuJqPZTZB2+srlnteEOmYiOPS1tAbM=";
};
nativeBuildInputs = [ gobject-introspection ];

View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "obfs4";
version = "0.1.0";
version = "0.4.0";
src = fetchFromGitLab {
domain = "gitlab.torproject.org";
@ -12,18 +12,20 @@ buildGoModule rec {
# will collide with lyrebird Gtk3 program.
repo = "lyrebird";
rev = "lyrebird-${version}";
hash = "sha256-2qBSmAsaR3hfxuoR5U5UAFQAepUOEUnIGoxc/GZ5LmY=";
hash = "sha256-aPALWvngC/BVQO73yUAykHvEb6T0DZcGMowXINDqhpQ=";
};
vendorHash = "sha256-O8CsvpwL9cfipl4M0BquSnG9tBrt/+i+i80OYk2mNiI=";
vendorHash = "sha256-iR3+ZMEF0SB3EoLTf2gtqTe3CQcjtDRhfwwbwGj3pXo=";
ldflags = [ "-s" "-w" ];
subPackages = [ "cmd/lyrebird" ];
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
installManPage doc/obfs4proxy.1
ln -s $out/share/man/man1/{obfs4proxy,lyrebird}.1
installManPage doc/lyrebird.1
ln -s $out/share/man/man1/{lyrebird,obfs4proxy}.1
'';
meta = with lib; {

View File

@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
# fix the plugins directory
postPatch = ''
substituteInPlace dool \
--replace \
"os.path.abspath(os.path.dirname(sys.argv[0])) + '/plugins/'" \
--replace-fail \
"os.path.dirname(os.path.abspath(__file__)) + '/plugins/'" \
"'$out/share/dool/'"
'';

View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "linuxdoc-tools";
version = "0.9.83";
version = "0.9.85";
src = fetchFromGitLab {
owner = "agmartin";
repo = "linuxdoc-tools";
rev = version;
hash = "sha256-1F3MDYJ9UH7ypgTSfYZV59PfLirlTmw6XBMEnz5Jtyk=";
hash = "sha256-8nsCfcxqVt16br6Vhk8tW3cxJMJFSZYX2g3MjO7JoT4=";
};
outputs = [ "out" "man" "doc" ];

View File

@ -533,8 +533,6 @@ with pkgs;
crackql = callPackage ../tools/security/crackql { };
crow-translate = libsForQt5.callPackage ../applications/misc/crow-translate { };
dae = callPackage ../tools/networking/dae { };
darling = callPackage ../applications/emulators/darling { };
@ -627,8 +625,6 @@ with pkgs;
fh = callPackage ../tools/nix/fh { };
figma-agent = callPackage ../applications/graphics/figma-agent { };
firefly-desktop = callPackage ../applications/misc/firefly-desktop { };
frece = callPackage ../development/tools/frece { };
@ -4190,12 +4186,6 @@ with pkgs;
burpsuite = callPackage ../tools/networking/burpsuite { };
ciano = callPackage ../applications/graphics/ciano {
inherit (pantheon) granite;
python = python3;
gtk = gtk3;
};
c3d = callPackage ../applications/graphics/c3d {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
@ -5209,6 +5199,10 @@ with pkgs;
hyprpicker = callPackage ../applications/window-managers/hyprwm/hyprpicker { };
hyprpolkitagent = callPackage ../by-name/hy/hyprpolkitagent/package.nix {
stdenv = gcc14Stdenv;
};
hyprshade = python311Packages.callPackage ../applications/window-managers/hyprwm/hyprshade { };
hyprlandPlugins = recurseIntoAttrs (callPackage ../applications/window-managers/hyprwm/hyprland-plugins { });
@ -6965,10 +6959,6 @@ with pkgs;
dockbarx = callPackage ../applications/misc/dockbarx { };
doctave = callPackage ../applications/misc/doctave {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
dog = callPackage ../tools/system/dog { };
dogdns = callPackage ../tools/networking/dogdns {
@ -8045,8 +8035,6 @@ with pkgs;
gopro = callPackage ../tools/video/gopro { };
goreleaser = callPackage ../tools/misc/goreleaser { };
goreplay = callPackage ../tools/networking/goreplay { };
gost = callPackage ../tools/networking/gost { };
@ -14424,12 +14412,15 @@ with pkgs;
crystal_1_7
crystal_1_8
crystal_1_9
crystal_1_11
crystal_1_12
crystal_1_14
crystal;
crystal2nix = callPackage ../development/compilers/crystal2nix { };
crystalline = callPackage ../development/tools/language-servers/crystalline {
llvmPackages = llvmPackages_15;
llvmPackages = crystal.llvmPackages;
};
icr = callPackage ../development/tools/icr { };
@ -16836,10 +16827,6 @@ with pkgs;
ansible-lint = callPackage ../tools/admin/ansible/lint.nix { };
antares = callPackage ../by-name/an/antares/package.nix {
electron = electron_30;
};
antlr2 = callPackage ../development/tools/parsing/antlr/2.7.7.nix { };
antlr3_4 = callPackage ../development/tools/parsing/antlr/3.4.nix { };
antlr3_5 = callPackage ../development/tools/parsing/antlr/3.5.nix { };
@ -20247,8 +20234,6 @@ with pkgs;
impy = callPackage ../development/libraries/impy { };
ineffassign = callPackage ../development/tools/ineffassign { };
ijs = callPackage ../development/libraries/ijs { };
indicator-application-gtk2 = callPackage ../development/libraries/indicator-application/gtk2.nix { };
@ -24207,8 +24192,6 @@ with pkgs;
etcd_3_4 = callPackage ../servers/etcd/3.4.nix { };
etcd_3_5 = callPackage ../servers/etcd/3.5 { };
ejabberd = callPackage ../servers/xmpp/ejabberd { };
exhaustive = callPackage ../development/tools/exhaustive { };
hyp = callPackage ../servers/http/hyp { };
@ -25629,6 +25612,7 @@ with pkgs;
};
btop = darwin.apple_sdk_11_0.callPackage ../tools/system/btop { };
btop-rocm = btop.override { rocmSupport = true; };
nmon = callPackage ../os-specific/linux/nmon { };
@ -29873,8 +29857,6 @@ with pkgs;
passky-desktop = callPackage ../applications/misc/passky-desktop { };
pat = callPackage ../applications/radio/pat { };
pinboard = with python3Packages; toPythonApplication pinboard;
pinboard-notes-backup = haskell.lib.compose.justStaticExecutables haskellPackages.pinboard-notes-backup;
@ -33902,8 +33884,6 @@ with pkgs;
btcpayserver-altcoins = callPackage ../applications/blockchains/btcpayserver { altcoinSupport = true; };
charge-lnd = callPackage ../applications/blockchains/charge-lnd { };
cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { };
dcrctl = callPackage ../applications/blockchains/dcrctl { };