Merge staging-next into staging

This commit is contained in:
github-actions[bot]
2024-03-09 18:01:41 +00:00
committed by GitHub
50 changed files with 1200 additions and 995 deletions

View File

@@ -29,6 +29,7 @@ in
incus.enable = true;
};
networking.nftables.enable = true;
};
testScript = ''

View File

@@ -67,6 +67,7 @@ import ../make-test-python.nix (
incus.enable = true;
};
networking.nftables.enable = true;
};
testScript = ''

View File

@@ -48,6 +48,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... } :
];
};
};
networking.nftables.enable = true;
};
testScript = ''

View File

@@ -12,6 +12,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... } :
incus.enable = true;
incus.socketActivation = true;
};
networking.nftables.enable = true;
};
testScript = ''

View File

@@ -10,6 +10,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: {
incus.enable = true;
incus.ui.enable = true;
};
networking.nftables.enable = true;
environment.systemPackages =
let

View File

@@ -32,6 +32,7 @@ in
incus.enable = true;
};
networking.nftables.enable = true;
};
testScript = ''

View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "JMusicBot";
version = "0.3.9";
version = "0.4.0";
src = fetchurl {
url = "https://github.com/jagrosh/MusicBot/releases/download/${version}/JMusicBot-${version}.jar";
sha256 = "sha256-2A1yo2e1MawGLMTM6jWwpQJJuKOmljxFriORv90Jqg8=";
sha256 = "sha256-JSVrzyCqAp3V5OZ+KJczhWGolPkdaHsPmiqfmhapQMs=";
};
dontUnpack = true;

View File

@@ -22,11 +22,11 @@ let
in
stdenv.mkDerivation rec {
pname = "clightning";
version = "24.02";
version = "24.02.1";
src = fetchurl {
url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
sha256 = "sha256-hud6NU2apAJNf2epNk+3nwTUmRy5DfNOYiGp402H4ik=";
sha256 = "sha256-cz4rQUEaWILZMxmIP4V15pWf4zow5PDeWJzn5FEaUSs=";
};
# when building on darwin we need dawin.cctools to provide the correct libtool

View File

@@ -69,9 +69,9 @@ in rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the hash for staging as well.
version = "9.3";
version = "9.4";
url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz";
hash = "sha256-FIsuNBR9H6FIQVY3xyPJn0N26SyE6QzB0OAK1O07F5M=";
hash = "sha256-xV/5lXYSVJuMfffN3HnXoA0ZFX0Fs3EUi/CNTd92jsY=";
inherit (stable) patches;
## see http://wiki.winehq.org/Gecko
@@ -117,7 +117,7 @@ in rec {
staging = fetchFromGitLab rec {
# https://gitlab.winehq.org/wine/wine-staging
inherit (unstable) version;
hash = "sha256-1k7HHcsosce5MX86IMiFrfjg0li4DuP0utjyal1Iwkc=";
hash = "sha256-wij0CeAL6V8dH4nRS+UVKZMBJlSNgzr9tG1860WSbrU=";
domain = "gitlab.winehq.org";
owner = "wine";
repo = "wine-staging";

View File

@@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
[[package]]
name = "ahash"
version = "0.8.10"
version = "0.8.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b79b82693f705137f8fb9b37871d99e4f9a7df12b917eed79c3d3954830a60b"
checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
dependencies = [
"cfg-if",
"once_cell",
@@ -46,14 +46,13 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
[[package]]
name = "alsa"
version = "0.7.1"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2562ad8dcf0f789f65c6fdaad8a8a9708ed6b488e649da28c01656ad66b8b47"
checksum = "37fe60779335388a88c01ac6c3be40304d1e349de3ada3b15f7808bb90fa9dce"
dependencies = [
"alsa-sys",
"bitflags 1.3.2",
"bitflags 2.4.2",
"libc",
"nix",
]
[[package]]
@@ -526,9 +525,9 @@ dependencies = [
[[package]]
name = "bumpalo"
version = "3.15.3"
version = "3.15.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b"
checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa"
[[package]]
name = "bytemuck"
@@ -580,10 +579,11 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
[[package]]
name = "cc"
version = "1.0.88"
version = "1.0.90"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc"
checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
dependencies = [
"jobserver",
"libc",
]
@@ -620,9 +620,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "chrono"
version = "0.4.34"
version = "0.4.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b"
checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a"
dependencies = [
"android-tzdata",
"iana-time-zone",
@@ -645,9 +645,9 @@ dependencies = [
[[package]]
name = "clap"
version = "4.5.1"
version = "4.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da"
checksum = "b230ab84b0ffdf890d5a10abdbc8b83ae1c4918275daea1ab8801f71536b2651"
dependencies = [
"clap_builder",
"clap_derive",
@@ -655,9 +655,9 @@ dependencies = [
[[package]]
name = "clap_builder"
version = "4.5.1"
version = "4.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb"
checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
dependencies = [
"anstream",
"anstyle",
@@ -774,23 +774,21 @@ dependencies = [
[[package]]
name = "cpal"
version = "0.15.2"
version = "0.15.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d959d90e938c5493000514b446987c07aed46c668faaa7d34d6c7a67b1a578c"
checksum = "873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779"
dependencies = [
"alsa",
"core-foundation-sys",
"coreaudio-rs",
"dasp_sample",
"jni 0.19.0",
"jni",
"js-sys",
"libc",
"mach2",
"ndk",
"ndk-context",
"oboe",
"once_cell",
"parking_lot",
"wasm-bindgen",
"wasm-bindgen-futures",
"web-sys",
@@ -871,9 +869,9 @@ dependencies = [
[[package]]
name = "cxx"
version = "1.0.118"
version = "1.0.119"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2673ca5ae28334544ec2a6b18ebe666c42a2650abfb48abbd532ed409a44be2b"
checksum = "635179be18797d7e10edb9cd06c859580237750c7351f39ed9b298bfc17544ad"
dependencies = [
"cc",
"cxxbridge-flags",
@@ -883,9 +881,9 @@ dependencies = [
[[package]]
name = "cxx-gen"
version = "0.7.118"
version = "0.7.119"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a94f02b4e45d7d00ecabff7635833f71c786576067b3d4158c8bef65d0a8e38b"
checksum = "5797d553b95704a6a49394acfdb93e2332b8aaa146713a1e8ebe362e86d9fa68"
dependencies = [
"codespan-reporting",
"proc-macro2",
@@ -895,15 +893,15 @@ dependencies = [
[[package]]
name = "cxxbridge-flags"
version = "1.0.118"
version = "1.0.119"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "886acf875df67811c11cd015506b3392b9e1820b1627af1a6f4e93ccdfc74d11"
checksum = "a87ff7342ffaa54b7c61618e0ce2bbcf827eba6d55b923b83d82551acbbecfe5"
[[package]]
name = "cxxbridge-macro"
version = "1.0.118"
version = "1.0.119"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d151cc139c3080e07f448f93a1284577ab2283d2a44acd902c6fba9ec20b6de"
checksum = "70b5b86cf65fa0626d85720619d80b288013477a91a0389fa8bc716bf4903ad1"
dependencies = [
"proc-macro2",
"quote",
@@ -1469,9 +1467,9 @@ dependencies = [
[[package]]
name = "gdk4"
version = "0.8.0"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6771942f85a2beaa220c64739395e4401b9fab4a52aba9b503fa1e6ed4d4d806"
checksum = "9100b25604183f2fd97f55ef087fae96ab4934d7215118a35303e422688e6e4b"
dependencies = [
"cairo-rs",
"gdk-pixbuf",
@@ -1484,9 +1482,9 @@ dependencies = [
[[package]]
name = "gdk4-sys"
version = "0.8.0"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1eb95854fab65072023a7814434f003db571d6e45c287c0b0c540c1c78bdf6ae"
checksum = "d0b76874c40bb8d1c7d03a7231e23ac75fa577a456cd53af32ec17ec8f121626"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
@@ -1653,7 +1651,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f5897ca27a83e4cdc7b4666850bade0a2e73e17689aabafcc9acddad9d823b8"
dependencies = [
"heck",
"proc-macro-crate 3.1.0",
"proc-macro-crate",
"proc-macro2",
"quote",
"syn 2.0.52",
@@ -1711,9 +1709,9 @@ dependencies = [
[[package]]
name = "gsk4"
version = "0.8.0"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e8ce8dee0fd87a11002214b1204ff18c9272fbd530408f0884a0f9b25dc31de"
checksum = "c65036fc8f99579e8cb37b12487969b707ab23ec8ab953682ff347cbd15d396e"
dependencies = [
"cairo-rs",
"gdk4",
@@ -1726,9 +1724,9 @@ dependencies = [
[[package]]
name = "gsk4-sys"
version = "0.8.0"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2660a652da5b662d43924df19ba40d73f015ed427329ef51d2b1360a4e0dc0e4"
checksum = "bd24c814379f9c3199dc53e52253ee8d0f657eae389ab282c330505289d24738"
dependencies = [
"cairo-sys-rs",
"gdk4-sys",
@@ -1742,9 +1740,9 @@ dependencies = [
[[package]]
name = "gtk4"
version = "0.8.0"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d26ffa3ec6316ccaa1df62d3e7f5bae1637c0acbb43f250fabef38319f73c64"
checksum = "aa82753b8c26277e4af1446c70e35b19aad4fb794a7b143859e7eeb9a4025d83"
dependencies = [
"cairo-rs",
"field-offset",
@@ -1763,12 +1761,12 @@ dependencies = [
[[package]]
name = "gtk4-macros"
version = "0.8.0"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c8b86439e9896f6f3f47c3d8077c5c8205174078760afdabd9098a8e9e937d97"
checksum = "40300bf071d2fcd4c94eacc09e84ec6fe73129d2ceb635cf7e55b026b5443567"
dependencies = [
"anyhow",
"proc-macro-crate 3.1.0",
"proc-macro-crate",
"proc-macro-error",
"proc-macro2",
"quote",
@@ -1777,9 +1775,9 @@ dependencies = [
[[package]]
name = "gtk4-sys"
version = "0.8.0"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2abc0a6d356d59a3806021829ce6ed3e70bba3509b41a535fedcb09fae13fbc0"
checksum = "0db1b104138f087ccdc81d2c332de5dd049b89de3d384437cc1093b17cd2da18"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
@@ -1886,7 +1884,7 @@ dependencies = [
"iana-time-zone-haiku",
"js-sys",
"wasm-bindgen",
"windows-core",
"windows-core 0.52.0",
]
[[package]]
@@ -2113,30 +2111,18 @@ checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
[[package]]
name = "jni"
version = "0.19.0"
version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec"
dependencies = [
"cesu8",
"combine",
"jni-sys",
"log",
"thiserror",
"walkdir",
]
[[package]]
name = "jni"
version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c"
checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
dependencies = [
"cesu8",
"cfg-if",
"combine",
"jni-sys",
"log",
"thiserror",
"walkdir",
"windows-sys 0.45.0",
]
[[package]]
@@ -2145,6 +2131,15 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
[[package]]
name = "jobserver"
version = "0.1.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6"
dependencies = [
"libc",
]
[[package]]
name = "jpeg-decoder"
version = "0.3.1"
@@ -2156,9 +2151,9 @@ dependencies = [
[[package]]
name = "js-sys"
version = "0.3.68"
version = "0.3.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee"
checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
dependencies = [
"wasm-bindgen",
]
@@ -2266,12 +2261,12 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
[[package]]
name = "libloading"
version = "0.8.1"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161"
checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
dependencies = [
"cfg-if",
"windows-sys 0.48.0",
"windows-targets 0.52.4",
]
[[package]]
@@ -2497,9 +2492,9 @@ dependencies = [
[[package]]
name = "mio"
version = "0.8.10"
version = "0.8.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
dependencies = [
"libc",
"log",
@@ -2546,15 +2541,15 @@ dependencies = [
[[package]]
name = "ndk"
version = "0.7.0"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0"
checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7"
dependencies = [
"bitflags 1.3.2",
"bitflags 2.4.2",
"jni-sys",
"log",
"ndk-sys",
"num_enum",
"raw-window-handle",
"thiserror",
]
@@ -2566,9 +2561,9 @@ checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
[[package]]
name = "ndk-sys"
version = "0.4.1+23.1.7779620"
version = "0.5.0+25.2.9519653"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3"
checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691"
dependencies = [
"jni-sys",
]
@@ -2579,17 +2574,6 @@ version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
[[package]]
name = "nix"
version = "0.24.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
dependencies = [
"bitflags 1.3.2",
"cfg-if",
"libc",
]
[[package]]
name = "no-std-compat"
version = "0.4.1"
@@ -2659,17 +2643,6 @@ dependencies = [
"serde",
]
[[package]]
name = "num-derive"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.109",
]
[[package]]
name = "num-derive"
version = "0.4.2"
@@ -2723,23 +2696,23 @@ dependencies = [
[[package]]
name = "num_enum"
version = "0.5.11"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845"
dependencies = [
"num_enum_derive",
]
[[package]]
name = "num_enum_derive"
version = "0.5.11"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b"
dependencies = [
"proc-macro-crate 1.3.1",
"proc-macro-crate",
"proc-macro2",
"quote",
"syn 1.0.109",
"syn 2.0.52",
]
[[package]]
@@ -2797,23 +2770,23 @@ dependencies = [
[[package]]
name = "oboe"
version = "0.5.0"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8868cc237ee02e2d9618539a23a8d228b9bb3fc2e7a5b11eed3831de77c395d0"
checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb"
dependencies = [
"jni 0.20.0",
"jni",
"ndk",
"ndk-context",
"num-derive 0.3.3",
"num-derive",
"num-traits",
"oboe-sys",
]
[[package]]
name = "oboe-sys"
version = "0.5.0"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f44155e7fb718d3cfddcf70690b2b51ac4412f347cd9e4fbe511abe9cd7b5f2"
checksum = "6c8bb09a4a2b1d668170cfe0a7d5bc103f8999fb316c98099b6a9939c9f2e79d"
dependencies = [
"cc",
]
@@ -2826,9 +2799,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
[[package]]
name = "open"
version = "5.1.0"
version = "5.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f2588edf622de56e7a1fed57bf203344f63c03f3d43472ba0434a92373c8f27"
checksum = "449f0ff855d85ddbf1edd5b646d65249ead3f5e422aaa86b7d2d0b049b103e32"
dependencies = [
"is-wsl",
"libc",
@@ -2961,7 +2934,7 @@ dependencies = [
"downcast-rs",
"either",
"nalgebra",
"num-derive 0.4.2",
"num-derive",
"num-traits",
"rustc-hash",
"serde",
@@ -3248,16 +3221,6 @@ dependencies = [
"syn 2.0.52",
]
[[package]]
name = "proc-macro-crate"
version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
dependencies = [
"once_cell",
"toml_edit 0.19.15",
]
[[package]]
name = "proc-macro-crate"
version = "3.1.0"
@@ -3367,12 +3330,6 @@ dependencies = [
"rand_core",
]
[[package]]
name = "raw-window-handle"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
[[package]]
name = "rawpointer"
version = "0.2.1"
@@ -3422,7 +3379,7 @@ checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
dependencies = [
"aho-corasick",
"memchr",
"regex-automata 0.4.5",
"regex-automata 0.4.6",
"regex-syntax 0.8.2",
]
@@ -3437,9 +3394,9 @@ dependencies = [
[[package]]
name = "regex-automata"
version = "0.4.5"
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
dependencies = [
"aho-corasick",
"memchr",
@@ -3469,7 +3426,7 @@ dependencies = [
[[package]]
name = "rnote"
version = "0.10.0"
version = "0.10.1"
dependencies = [
"anyhow",
"async-fs",
@@ -3487,7 +3444,7 @@ dependencies = [
"libadwaita",
"nalgebra",
"notify-debouncer-full",
"num-derive 0.4.2",
"num-derive",
"num-traits",
"numeric-sort",
"once_cell",
@@ -3519,7 +3476,7 @@ dependencies = [
[[package]]
name = "rnote-cli"
version = "0.10.0"
version = "0.10.1"
dependencies = [
"anyhow",
"atty",
@@ -3538,7 +3495,7 @@ dependencies = [
[[package]]
name = "rnote-compose"
version = "0.10.0"
version = "0.10.1"
dependencies = [
"anyhow",
"approx",
@@ -3547,7 +3504,7 @@ dependencies = [
"ink-stroke-modeler-rs",
"kurbo 0.10.4",
"nalgebra",
"num-derive 0.4.2",
"num-derive",
"num-traits",
"once_cell",
"palette",
@@ -3567,7 +3524,7 @@ dependencies = [
[[package]]
name = "rnote-engine"
version = "0.10.0"
version = "0.10.1"
dependencies = [
"anyhow",
"approx",
@@ -3587,7 +3544,7 @@ dependencies = [
"kurbo 0.10.4",
"librsvg",
"nalgebra",
"num-derive 0.4.2",
"num-derive",
"num-traits",
"once_cell",
"parry2d-f64",
@@ -4674,9 +4631,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]]
name = "walkdir"
version = "2.4.0"
version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
dependencies = [
"same-file",
"winapi-util",
@@ -4690,9 +4647,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
version = "0.2.91"
version = "0.2.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f"
checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
dependencies = [
"cfg-if",
"wasm-bindgen-macro",
@@ -4700,9 +4657,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
version = "0.2.91"
version = "0.2.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b"
checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
dependencies = [
"bumpalo",
"log",
@@ -4715,9 +4672,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-futures"
version = "0.4.41"
version = "0.4.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97"
checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
dependencies = [
"cfg-if",
"js-sys",
@@ -4727,9 +4684,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
version = "0.2.91"
version = "0.2.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed"
checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -4737,9 +4694,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
version = "0.2.91"
version = "0.2.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66"
checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
dependencies = [
"proc-macro2",
"quote",
@@ -4750,15 +4707,15 @@ dependencies = [
[[package]]
name = "wasm-bindgen-shared"
version = "0.2.91"
version = "0.2.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838"
checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
[[package]]
name = "web-sys"
version = "0.3.68"
version = "0.3.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446"
checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -4825,11 +4782,12 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "windows"
version = "0.46.0"
version = "0.54.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25"
checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49"
dependencies = [
"windows-targets 0.42.2",
"windows-core 0.54.0",
"windows-targets 0.52.4",
]
[[package]]
@@ -4841,6 +4799,34 @@ dependencies = [
"windows-targets 0.52.4",
]
[[package]]
name = "windows-core"
version = "0.54.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65"
dependencies = [
"windows-result",
"windows-targets 0.52.4",
]
[[package]]
name = "windows-result"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd19df78e5168dfb0aedc343d1d1b8d422ab2db6756d2dc3fef75035402a3f64"
dependencies = [
"windows-targets 0.52.4",
]
[[package]]
name = "windows-sys"
version = "0.45.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
dependencies = [
"windows-targets 0.42.2",
]
[[package]]
name = "windows-sys"
version = "0.48.0"

View File

@@ -27,13 +27,13 @@
stdenv.mkDerivation rec {
pname = "rnote";
version = "0.10.0";
version = "0.10.1";
src = fetchFromGitHub {
owner = "flxzt";
repo = "rnote";
rev = "v${version}";
hash = "sha256-PMg83eWcC21yNiRYdTS6/j9gerTctnDPHXIM4PWktrU=";
hash = "sha256-J9M1d6C40EpqcSU5vYVfsCruhECkPJOdhzG2IX1tTQ0=";
};
cargoDeps = rustPlatform.importCargoLock {

View File

@@ -18,7 +18,7 @@
stdenv.mkDerivation rec {
pname = "girara";
version = "0.4.2";
version = "0.4.3";
outputs = [ "out" "dev" ];
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
owner = "pwmt";
repo = "girara";
rev = version;
hash = "sha256-/9pj6gB46sKIilImDGdJ8H7UHip/z5ckZWZnJLw/0YU=";
hash = "sha256-/bJXdLXksTxUFC3w7zuBZY6Zh7tJxUJVbS87ENDQbDE=";
};
nativeBuildInputs = [

View File

@@ -15,12 +15,12 @@ let
in
stdenv.mkDerivation rec {
pname = "mkgmap";
version = "4917";
version = "4918";
src = fetchsvn {
url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk";
rev = version;
sha256 = "sha256-7VCEbsvcT7iaJ3MZz4CthJEE9FSJCowAO7PJ9UqmzPA=";
sha256 = "sha256-oQ/2KY6xA/kwAroHiPqcIJlcPsTTeStUu8WN/95ZUTw=";
};
patches = [

View File

@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, meson, ninja, wrapGAppsHook, pkg-config
{ lib, stdenv, fetchFromGitLab, meson, ninja, wrapGAppsHook, pkg-config, gitUpdater
, appstream-glib, json-glib, desktop-file-utils, python3
, gtk, girara, gettext, libxml2, check
, sqlite, glib, texlive, libintl, libseccomp
@@ -8,11 +8,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "zathura";
version = "0.5.4";
version = "0.5.5";
src = fetchurl {
url = "https://pwmt.org/projects/zathura/download/zathura-${finalAttrs.version}.tar.xz";
sha256 = "0ckgamf98sydq543arp865jg1afwzhpzcsbhv6zrch2dm5x7y0x3";
src = fetchFromGitLab {
domain = "git.pwmt.org";
owner = "pwmt";
repo = "zathura";
rev = finalAttrs.version;
hash = "sha256-mHEYqgBB55p8nykFtvYtP5bWexp/IqFbeLs7gZmXCeE=";
};
outputs = [ "bin" "man" "dev" "out" ];
@@ -20,7 +23,6 @@ stdenv.mkDerivation (finalAttrs: {
# Flag list:
# https://github.com/pwmt/zathura/blob/master/meson_options.txt
mesonFlags = [
"-Dsqlite=enabled"
"-Dmanpages=enabled"
"-Dconvert-icon=enabled"
"-Dsynctex=enabled"
@@ -43,6 +45,8 @@ stdenv.mkDerivation (finalAttrs: {
doCheck = !stdenv.isDarwin;
passthru.updateScript = gitUpdater { };
meta = with lib; {
homepage = "https://git.pwmt.org/pwmt/zathura";
description = "A core component for zathura PDF viewer";

View File

@@ -1,7 +1,7 @@
{ lib
, buildNpmPackage
, copyDesktopItems
, electron_26
, electron_28
, buildGoModule
, esbuild
, fetchFromGitHub
@@ -36,16 +36,16 @@ let
in
buildNpmPackage rec {
pname = "deltachat-desktop";
version = "1.42.2";
version = "1.44.0";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-desktop";
rev = "v${version}";
hash = "sha256-c8eK6YpxCP+Ga/VcqbbOUYuL1h4xspjglCZ1wiEAags=";
hash = "sha256-EHMKk5V77b+wTf72K9FUclrUzmAm51l4uv3vhOrCloA=";
};
npmDepsHash = "sha256-7xMSsKESK9BqQrMvxceEhsETwDFue0/viCNULtzzwGo=";
npmDepsHash = "sha256-nuhOrgHXKK01EirWYmGF17V+aYhZipwmhnAuNqwSQ/c=";
postPatch = ''
test \
@@ -103,7 +103,7 @@ buildNpmPackage rec {
$out/lib/node_modules/deltachat-desktop/html-dist/fonts
done
makeWrapper ${electron_26}/bin/electron $out/bin/deltachat \
makeWrapper ${lib.getExe electron_28} $out/bin/deltachat \
--set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher${stdenv.hostPlatform.extensions.sharedLibrary} \
--add-flags $out/lib/node_modules/deltachat-desktop

View File

@@ -1,53 +0,0 @@
{ lib, fetchFromGitHub
, buildPythonApplication, buildPythonPackage
, pygobject3, pytest-runner, requests, responses, pytest, python-olm
, canonicaljson, olm
}:
let
mainsrc = fetchFromGitHub {
owner = "saadnpq";
repo = "matrixcli";
rev = "61ebde173ca2f77185c261c2b7f6db297ca89863";
sha256 = "sha256-eH/8b8IyfXqUo7odSECYF+84pXTsP+5S7pFR3oWXknU=";
fetchSubmodules = true;
};
sdk = buildPythonPackage rec {
name = "${pname}-${version}";
pname = "matrix-python-sdk-matrixcli";
version = "0.0.2019-08-15";
src = "${mainsrc}/matrix-python-sdk/";
propagatedBuildInputs = [
requests responses olm python-olm canonicaljson
pytest-runner pytest
];
doCheck = false;
doInstallCheck = false;
meta = {
license = lib.licenses.asl20;
description = "Fork of Matrix Python SDK";
platforms = lib.platforms.linux;
};
};
in
buildPythonApplication rec {
pname = "matrixcli";
version = "0.0.2019-08-15";
src = mainsrc;
propagatedBuildInputs = [pygobject3 sdk];
meta = {
description = "CLI client for Matrix";
license = lib.licenses.gpl3;
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux;
homepage = "https://github.com/saadnpq/matrixcli";
};
}

View File

@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "hyprshade";
version = "3.1.0";
version = "3.2.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "loqusion";
repo = "hyprshade";
rev = "refs/tags/${version}";
hash = "sha256-bH+QXvZ+Yaogcp/MYJopiAUvM/imNrSo+cotTzzdlV8=";
hash = "sha256-bNgXnN4F9kzbi1vTuBqn8H7A8QMznr7QA65eNLumkAA=";
};
nativeBuildInputs = [

View File

@@ -52,6 +52,7 @@ for package in *; do
fi
used_source="$(jq -r '.source' "$version"/.nupkg.metadata)"
found=false
if [[ -d "$used_source" ]]; then
continue
@@ -80,7 +81,7 @@ for package in *; do
fi
done
if ! ${found-false}; then
if [[ $found = false ]]; then
echo "couldn't find $package $version" >&2
exit 1
fi

View File

@@ -22,5 +22,11 @@ lxd.ui.overrideAttrs(prev: rec {
echo "applying patch $p"
git apply -p1 "$p"
done
sed -i "s/LXD/Incus/g" src/*/*.ts* src/*/*/*.ts* src/*/*/*/*.ts*
sed -i "s/devlxd/guestapi/g" src/*/*.ts* src/*/*/*.ts* src/*/*/*/*.ts*
sed -i "s/dev\/lxd/dev\/incus/g" src/*/*.ts* src/*/*/*.ts* src/*/*/*/*.ts*
sed -i "s/lxd_/incus_/g" src/*/*.ts* src/*/*/*.ts* src/*/*/*/*.ts*
sed -i "s/\"lxd\"/\"incus\"/g" src/*/*.ts* src/*/*/*.ts* src/*/*/*/*.ts*
'';
})

View File

@@ -22,19 +22,19 @@
stdenv.mkDerivation rec {
pname = "kooha";
version = "2.2.3";
version = "2.2.4";
src = fetchFromGitHub {
owner = "SeaDve";
repo = "Kooha";
rev = "v${version}";
hash = "sha256-vLgBuP0DncBIb05R3484WozS+Nl+S7YBJUYek2CkJkQ=";
hash = "sha256-D/+tsIfcXrlwwL6vSLRsiAp7wMVtIgzjNNd2uk+9bco=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-NPh603/5yZDUdTegAzFvjRn5tuzyrcNzbbKQr6NxXso=";
hash = "sha256-iDyhK2k2RB7CvtW+91isVzIFOl2/Loh+Bvneu4TGfn0=";
};
nativeBuildInputs = [

View File

@@ -17,7 +17,7 @@
let
pname = "spotube";
version = "3.4.1";
version = "3.5.0";
meta = {
description = "An open source, cross-platform Spotify client compatible across multiple platforms";
@@ -46,7 +46,7 @@ let
src = fetchArtifact {
filename = "Spotube-macos-universal.dmg";
hash = "sha256-VobLCxsmE5kGIlDDa3v5xIHkw2x2YV14fgHHcDb+bLo=";
hash = "sha256-omXhiH/hVxFef03GqmpYf65SfdLjLyeMyuAWuvSpYiI=";
};
sourceRoot = ".";
@@ -67,7 +67,7 @@ let
src = fetchArtifact {
filename = "Spotube-linux-x86_64.deb";
hash = "sha256-NEGhzNz0E8jK2NPmigzoPAvYcU7zN9YHikuXHpzWfx0=";
hash = "sha256-Rea4GvxdkUfZF8lCBzI9UrD9Iz9D5vq9oxYBn5bahZE=";
};
nativeBuildInputs = [

View File

@@ -14,9 +14,9 @@
}:
stdenv.mkDerivation (self: {
pname = "srm-cuarzo";
version = "0.5.3-1";
version = "0.5.4-1";
rev = "v${self.version}";
hash = "sha256-KRp+rTpiUbOmUPE9vASwTF+c8TDveFnAEqptcGO5luc=";
hash = "sha256-nmYMhX3XtyIyv6Kxi7s+ahkOHfnuLcjpwSU58HcPNeU=";
src = fetchFromGitHub {
inherit (self) rev hash;

View File

@@ -0,0 +1,18 @@
--- a/main.js
+++ b/main.js
@@ -13,6 +13,15 @@
const fs = require("fs");
const path = require("path");
autoUpdater.autoDownload = false;
+
+// Set the config directory to XDG_CONFIG_HOME/ytdownloader
+const xdgConfigHome = process.env.XDG_CONFIG_HOME;
+let configDir = app.getPath('home') + "/.config/ytdownloader";
+if (xdgConfigHome) {
+ configDir = xdgConfigHome + "/ytdownloader";
+}
+app.setPath ('userData', configDir);
+
/**@type {BrowserWindow} */
let win = null;
let secondaryWindow = null;

View File

@@ -25,19 +25,23 @@ buildNpmPackage rec {
buildInputs = [ ffmpeg yt-dlp ];
desktopItem = makeDesktopItem {
name = "YTDownloader";
name = "ytDownloader";
exec = "ytdownloader %U";
icon = "ytdownloader";
desktopName = "YT Downloader";
desktopName = "ytDownloader";
comment = "A modern GUI video and audio downloader";
categories = [ "Utility" ];
startupWMClass = "YTDownloader";
startupWMClass = "ytDownloader";
};
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
dontNpmBuild = true;
# Patch config dir to ~/.config/ytdownloader
# Otherwise it stores config in ~/.config/Electron
patches = [ ./config-dir.patch ];
# Replace hardcoded ffmpeg and ytdlp paths
# Also stop it from downloading ytdlp
postPatch = ''

View File

@@ -6,13 +6,13 @@
stdenvNoCC.mkDerivation (self: {
name = "alacritty-theme";
version = "unstable-2024-02-28";
version = "unstable-2024-03-06";
src = fetchFromGitHub {
owner = "alacritty";
repo = "alacritty-theme";
rev = "4aefb7c079721474078b28bbf9f582b592749ca6";
hash = "sha256-+35S6eQkxLBuS/fDKD5bglQDIuz2xeEc5KSaK6k7IjI=";
rev = "cb786242b6f5e00a57e2f541e7bf1115f3950650";
hash = "sha256-fZJ0F4zJy6HOwWtZGm5yN4WfeFNJnW/UJhoQSZ0Bpxk=";
};
dontConfigure = true;

View File

@@ -23,13 +23,13 @@ in
stdenvNoCC.mkDerivation rec {
pname = "where-is-my-sddm-theme";
version = "1.6.0";
version = "1.6.1";
src = fetchFromGitHub {
owner = "stepanzubkov";
repo = pname;
rev = "v${version}";
hash = "sha256-EK0bB2dRXNtDKFiyf+nMoDq9XK2f3PFwoNbQDZamB3Y=";
hash = "sha256-H0CVTnznODJ27m5C7gT68RVcXFXS2mi0daI6vCi5KmQ=";
};
propagatedUserEnvPkgs = [ qtgraphicaleffects ];

View File

@@ -36,11 +36,11 @@ release_platform_attr () {
platform_sources () {
local release_files="$1"
local platforms=( \
"x86_64-linux linux-x64" \
"aarch64-linux linux-arm64" \
"x86_64-darwin osx-x64" \
"aarch64-darwin osx-arm64" \
local platforms=(
"x86_64-linux linux-x64"
"aarch64-linux linux-arm64"
"x86_64-darwin osx-x64"
"aarch64-darwin osx-arm64"
)
echo "srcs = {"
@@ -85,7 +85,7 @@ version_older () {
cur_version=$1
max_version=$2
result=$(nix-instantiate -I ../../../../. \
--eval -E "(import <nixpkgs> {}).lib.versionOlder \"$cur_version\" \"$max_version\"")
--eval -E "(import ../../../../. {}).lib.versionOlder \"$cur_version\" \"$max_version\"")
if [[ "$result" == "true" ]]; then
return 0
else
@@ -117,31 +117,31 @@ aspnetcore_packages () {
# Due to this, make sure to check if new SDK versions introduce any new packages.
# This should not happend in minor or bugfix updates, but probably happens
# with every new major .NET release.
local pkgs=( \
"Microsoft.AspNetCore.App.Runtime.linux-arm" \
"Microsoft.AspNetCore.App.Runtime.linux-arm64" \
"Microsoft.AspNetCore.App.Runtime.linux-musl-arm64" \
"Microsoft.AspNetCore.App.Runtime.linux-musl-x64" \
"Microsoft.AspNetCore.App.Runtime.linux-x64" \
"Microsoft.AspNetCore.App.Runtime.osx-x64" \
"Microsoft.AspNetCore.App.Runtime.win-arm64" \
"Microsoft.AspNetCore.App.Runtime.win-x64" \
"Microsoft.AspNetCore.App.Runtime.win-x86" \
local pkgs=(
"Microsoft.AspNetCore.App.Runtime.linux-arm"
"Microsoft.AspNetCore.App.Runtime.linux-arm64"
"Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"
"Microsoft.AspNetCore.App.Runtime.linux-musl-x64"
"Microsoft.AspNetCore.App.Runtime.linux-x64"
"Microsoft.AspNetCore.App.Runtime.osx-x64"
"Microsoft.AspNetCore.App.Runtime.win-arm64"
"Microsoft.AspNetCore.App.Runtime.win-x64"
"Microsoft.AspNetCore.App.Runtime.win-x86"
)
# These packages are currently broken on .NET 8
if version_older "$version" "8"; then
pkgs+=( \
"Microsoft.AspNetCore.App.Runtime.win-arm" \
pkgs+=(
"Microsoft.AspNetCore.App.Runtime.win-arm"
)
fi
# Packages that only apply to .NET 6 and up
if ! version_older "$version" "6"; then
pkgs+=( \
"Microsoft.AspNetCore.App.Ref" \
"Microsoft.AspNetCore.App.Runtime.linux-musl-arm" \
"Microsoft.AspNetCore.App.Runtime.osx-arm64" \
pkgs+=(
"Microsoft.AspNetCore.App.Ref"
"Microsoft.AspNetCore.App.Runtime.linux-musl-arm"
"Microsoft.AspNetCore.App.Runtime.osx-arm64"
)
fi
@@ -173,93 +173,93 @@ sdk_packages () {
# Due to this, make sure to check if new SDK versions introduce any new packages.
# This should not happend in minor or bugfix updates, but probably happens
# with every new major .NET release.
local pkgs=( \
"Microsoft.NETCore.App.Host.linux-arm" \
"Microsoft.NETCore.App.Host.linux-arm64" \
"Microsoft.NETCore.App.Host.linux-musl-arm64" \
"Microsoft.NETCore.App.Host.linux-musl-x64" \
"Microsoft.NETCore.App.Host.linux-x64" \
"Microsoft.NETCore.App.Host.osx-x64" \
"Microsoft.NETCore.App.Host.win-arm64" \
"Microsoft.NETCore.App.Host.win-x64" \
"Microsoft.NETCore.App.Host.win-x86" \
"Microsoft.NETCore.App.Runtime.linux-arm" \
"Microsoft.NETCore.App.Runtime.linux-arm64" \
"Microsoft.NETCore.App.Runtime.linux-musl-arm64" \
"Microsoft.NETCore.App.Runtime.linux-musl-x64" \
"Microsoft.NETCore.App.Runtime.linux-x64" \
"Microsoft.NETCore.App.Runtime.osx-x64" \
"Microsoft.NETCore.App.Runtime.win-arm64" \
"Microsoft.NETCore.App.Runtime.win-x64" \
"Microsoft.NETCore.App.Runtime.win-x86" \
"Microsoft.NETCore.DotNetAppHost" \
"Microsoft.NETCore.DotNetHost" \
"Microsoft.NETCore.DotNetHostPolicy" \
"Microsoft.NETCore.DotNetHostResolver" \
"runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost" \
"runtime.linux-arm64.Microsoft.NETCore.DotNetHost" \
"runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy" \
"runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver" \
"runtime.linux-arm.Microsoft.NETCore.DotNetAppHost" \
"runtime.linux-arm.Microsoft.NETCore.DotNetHost" \
"runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy" \
"runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver" \
"runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost" \
"runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost" \
"runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy" \
"runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver" \
"runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost" \
"runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost" \
"runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy" \
"runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver" \
"runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" \
"runtime.linux-x64.Microsoft.NETCore.DotNetHost" \
"runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" \
"runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" \
"runtime.osx-x64.Microsoft.NETCore.DotNetAppHost" \
"runtime.osx-x64.Microsoft.NETCore.DotNetHost" \
"runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy" \
"runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" \
"runtime.win-arm64.Microsoft.NETCore.DotNetAppHost" \
"runtime.win-arm64.Microsoft.NETCore.DotNetHost" \
"runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy" \
"runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" \
"runtime.win-x64.Microsoft.NETCore.DotNetAppHost" \
"runtime.win-x64.Microsoft.NETCore.DotNetHost" \
"runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy" \
"runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" \
"runtime.win-x86.Microsoft.NETCore.DotNetAppHost" \
"runtime.win-x86.Microsoft.NETCore.DotNetHost" \
"runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy" \
"runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" \
"Microsoft.NETCore.App.Host.linux-musl-arm" \
"Microsoft.NETCore.App.Host.osx-arm64" \
"Microsoft.NETCore.App.Runtime.linux-musl-arm" \
"Microsoft.NETCore.App.Runtime.osx-arm64" \
"Microsoft.NETCore.App.Ref" \
"Microsoft.NETCore.App.Runtime.Mono.linux-arm" \
"Microsoft.NETCore.App.Runtime.Mono.linux-arm64" \
"Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64" \
"Microsoft.NETCore.App.Runtime.Mono.linux-x64" \
"Microsoft.NETCore.App.Runtime.Mono.osx-arm64" \
"Microsoft.NETCore.App.Runtime.Mono.osx-x64" \
"Microsoft.NETCore.App.Runtime.Mono.win-x64" \
"Microsoft.NETCore.App.Runtime.Mono.win-x86" \
"runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost" \
"runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost" \
"runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy" \
"runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver" \
"runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost" \
"runtime.osx-arm64.Microsoft.NETCore.DotNetHost" \
"runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy" \
"runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver" \
"Microsoft.NETCore.App.Crossgen2.linux-musl-arm" \
"Microsoft.NETCore.App.Crossgen2.linux-musl-arm64" \
"Microsoft.NETCore.App.Crossgen2.linux-musl-x64" \
"Microsoft.NETCore.App.Crossgen2.linux-arm" \
"Microsoft.NETCore.App.Crossgen2.linux-arm64" \
"Microsoft.NETCore.App.Crossgen2.linux-x64" \
"Microsoft.NETCore.App.Crossgen2.osx-x64" \
local pkgs=(
"Microsoft.NETCore.App.Host.linux-arm"
"Microsoft.NETCore.App.Host.linux-arm64"
"Microsoft.NETCore.App.Host.linux-musl-arm64"
"Microsoft.NETCore.App.Host.linux-musl-x64"
"Microsoft.NETCore.App.Host.linux-x64"
"Microsoft.NETCore.App.Host.osx-x64"
"Microsoft.NETCore.App.Host.win-arm64"
"Microsoft.NETCore.App.Host.win-x64"
"Microsoft.NETCore.App.Host.win-x86"
"Microsoft.NETCore.App.Runtime.linux-arm"
"Microsoft.NETCore.App.Runtime.linux-arm64"
"Microsoft.NETCore.App.Runtime.linux-musl-arm64"
"Microsoft.NETCore.App.Runtime.linux-musl-x64"
"Microsoft.NETCore.App.Runtime.linux-x64"
"Microsoft.NETCore.App.Runtime.osx-x64"
"Microsoft.NETCore.App.Runtime.win-arm64"
"Microsoft.NETCore.App.Runtime.win-x64"
"Microsoft.NETCore.App.Runtime.win-x86"
"Microsoft.NETCore.DotNetAppHost"
"Microsoft.NETCore.DotNetHost"
"Microsoft.NETCore.DotNetHostPolicy"
"Microsoft.NETCore.DotNetHostResolver"
"runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"
"runtime.linux-arm64.Microsoft.NETCore.DotNetHost"
"runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"
"runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"
"runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"
"runtime.linux-arm.Microsoft.NETCore.DotNetHost"
"runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"
"runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"
"runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"
"runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"
"runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"
"runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"
"runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"
"runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"
"runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"
"runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"
"runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"
"runtime.linux-x64.Microsoft.NETCore.DotNetHost"
"runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"
"runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"
"runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"
"runtime.osx-x64.Microsoft.NETCore.DotNetHost"
"runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"
"runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"
"runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"
"runtime.win-arm64.Microsoft.NETCore.DotNetHost"
"runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"
"runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"
"runtime.win-x64.Microsoft.NETCore.DotNetAppHost"
"runtime.win-x64.Microsoft.NETCore.DotNetHost"
"runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"
"runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"
"runtime.win-x86.Microsoft.NETCore.DotNetAppHost"
"runtime.win-x86.Microsoft.NETCore.DotNetHost"
"runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"
"runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"
"Microsoft.NETCore.App.Host.linux-musl-arm"
"Microsoft.NETCore.App.Host.osx-arm64"
"Microsoft.NETCore.App.Runtime.linux-musl-arm"
"Microsoft.NETCore.App.Runtime.osx-arm64"
"Microsoft.NETCore.App.Ref"
"Microsoft.NETCore.App.Runtime.Mono.linux-arm"
"Microsoft.NETCore.App.Runtime.Mono.linux-arm64"
"Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"
"Microsoft.NETCore.App.Runtime.Mono.linux-x64"
"Microsoft.NETCore.App.Runtime.Mono.osx-arm64"
"Microsoft.NETCore.App.Runtime.Mono.osx-x64"
"Microsoft.NETCore.App.Runtime.Mono.win-x64"
"Microsoft.NETCore.App.Runtime.Mono.win-x86"
"runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"
"runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"
"runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"
"runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"
"runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"
"runtime.osx-arm64.Microsoft.NETCore.DotNetHost"
"runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"
"runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"
"Microsoft.NETCore.App.Crossgen2.linux-musl-arm"
"Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"
"Microsoft.NETCore.App.Crossgen2.linux-musl-x64"
"Microsoft.NETCore.App.Crossgen2.linux-arm"
"Microsoft.NETCore.App.Crossgen2.linux-arm64"
"Microsoft.NETCore.App.Crossgen2.linux-x64"
"Microsoft.NETCore.App.Crossgen2.osx-x64"
"Microsoft.NETCore.App.Crossgen2.osx-arm64"
)
@@ -274,27 +274,27 @@ sdk_packages () {
# These packages were removed on .NET 8
if version_older "$version" "8"; then
pkgs+=( \
"Microsoft.NETCore.App.Host.win-arm" \
"Microsoft.NETCore.App.Runtime.win-arm" \
"runtime.win-arm.Microsoft.NETCore.DotNetAppHost" \
"runtime.win-arm.Microsoft.NETCore.DotNetHost" \
"runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy" \
"runtime.win-arm.Microsoft.NETCore.DotNetHostResolver" \
"Microsoft.NETCore.App.Composite" \
pkgs+=(
"Microsoft.NETCore.App.Host.win-arm"
"Microsoft.NETCore.App.Runtime.win-arm"
"runtime.win-arm.Microsoft.NETCore.DotNetAppHost"
"runtime.win-arm.Microsoft.NETCore.DotNetHost"
"runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"
"runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"
"Microsoft.NETCore.App.Composite"
)
fi
# Packages that only apply to .NET 7 and up
if ! version_older "$version" "7"; then
pkgs+=( \
"runtime.linux-arm64.Microsoft.DotNet.ILCompiler" \
"runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler" \
"runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler" \
"runtime.linux-x64.Microsoft.DotNet.ILCompiler" \
"runtime.osx-x64.Microsoft.DotNet.ILCompiler" \
"runtime.win-arm64.Microsoft.DotNet.ILCompiler" \
"runtime.win-x64.Microsoft.DotNet.ILCompiler" \
pkgs+=(
"runtime.linux-arm64.Microsoft.DotNet.ILCompiler"
"runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"
"runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"
"runtime.linux-x64.Microsoft.DotNet.ILCompiler"
"runtime.osx-x64.Microsoft.DotNet.ILCompiler"
"runtime.win-arm64.Microsoft.DotNet.ILCompiler"
"runtime.win-x64.Microsoft.DotNet.ILCompiler"
)
fi
@@ -368,6 +368,13 @@ Examples:
channel_version=$(jq -r '."channel-version"' <<< "$content")
support_phase=$(jq -r '."support-phase"' <<< "$content")
aspnetcore_sources="$(platform_sources "$aspnetcore_files")"
runtime_sources="$(platform_sources "$runtime_files")"
sdk_sources="$(platform_sources "$sdk_files")"
aspnetcore_packages="$(aspnetcore_packages "${aspnetcore_version}")"
sdk_packages="$(sdk_packages "${runtime_version}")"
result=$(mktemp)
trap "rm -f $result" TERM INT EXIT
@@ -377,20 +384,20 @@ Examples:
{
aspnetcore_$major_minor_underscore = buildAspNetCore {
version = \"${aspnetcore_version}\";
$(platform_sources "$aspnetcore_files")
$aspnetcore_sources
};
runtime_$major_minor_underscore = buildNetRuntime {
version = \"${runtime_version}\";
$(platform_sources "$runtime_files")
$runtime_sources
};
sdk_$major_minor_underscore = buildNetSdk {
version = \"${sdk_version}\";
$(platform_sources "$sdk_files")
$sdk_sources
packages = { fetchNuGet }: [
$(aspnetcore_packages "${aspnetcore_version}")
$(sdk_packages "${runtime_version}")
$aspnetcore_packages
$sdk_packages
];
};
}" > "${result}"

File diff suppressed because it is too large Load Diff

View File

@@ -23,22 +23,20 @@ let
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"email-0.0.21" = "sha256-u4CsK/JqFgq5z3iJGxxGtb7QbSkOAqmOvrmagsqfXIU=";
"email-0.0.20" = "sha256-rV4Uzqt2Qdrfi5Ti1r+Si1c2iW1kKyWLwOgLkQ5JGGw=";
"encoded-words-0.2.0" = "sha256-KK9st0hLFh4dsrnLd6D8lC6pRFFs8W+WpZSGMGJcosk=";
"imap-proto-0.16.3" = "sha256-okIHA8MQ1K/tcKHZYGh83zom1ULGHZ/KGxgcwiE1+sE=";
"iroh-0.4.2" = "sha256-VXNMmj+AvlY/W2JRWMICoNOqpFEahsUDxypHRg185Ao=";
"lettre-0.9.2" = "sha256-+hU1cFacyyeC9UGVBpS14BWlJjHy90i/3ynMkKAzclk=";
};
};
in stdenv.mkDerivation rec {
pname = "libdeltachat";
version = "1.131.9";
version = "1.136.1";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-core-rust";
rev = "v${version}";
hash = "sha256-xZai5RsrfT6bYzMpNdKncmDzBzcAcEtZZmh7f+3g5Hs=";
hash = "sha256-+mwOTm9SWgZjGI0TFHMmLgQJQSXyYMqteqQiubGhFkU=";
};
patches = [

View File

@@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchPypi
, isPy3k
, pythonOlder
, gitpython
, pbr
@@ -12,14 +11,14 @@
buildPythonPackage rec {
pname = "bandit";
version = "1.7.7";
format = "setuptools";
version = "1.7.8";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-UnkGvsYIjLSZquMbyWKGS053Vp6dUp7lHfOpO0uKsoo=";
hash = "sha256-Nt5Q9yCFarJKJNuqX+4sZgUO2XwUd+ChFZ3qsXdeq2s=";
};
nativeBuildInputs = [

View File

@@ -13,8 +13,8 @@
buildPythonPackage rec {
pname = "bthome-ble";
version = "3.6.0";
format = "pyproject";
version = "3.7.0";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = "bthome-ble";
rev = "refs/tags/v${version}";
hash = "sha256-CgPmBZGciK5WsDc46B+v7FmDRwRjxt7VasZg+3xSLN0=";
hash = "sha256-ALLeJdEYCFtGZb7dO7xW8Mv331kmQpl0e/CUt9erjHc=";
};
nativeBuildInputs = [

View File

@@ -4,13 +4,11 @@
, pkg-config
, pkgconfig
, setuptools-scm
, wheel
, libdeltachat
, cffi
, imap-tools
, requests
, pluggy
, setuptools
, pytestCheckHook
}:
@@ -20,15 +18,13 @@ buildPythonPackage rec {
sourceRoot = "${src.name}/python";
disabled = pythonOlder "3.7";
format = "pyproject";
pyproject = true;
nativeBuildInputs = [
cffi
pkg-config
pkgconfig
setuptools
setuptools-scm
wheel
];
buildInputs = [

View File

@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "jwcrypto";
version = "1.5.5";
version = "1.5.6";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-WefV5FidGwcXDzaOIMMusyoCORGAapcjsfQ6DYswKNY=";
hash = "sha256-dxqHdioMCBrmFmlYqVT4CEiCCyqwZpN9yLg3nWWxsDk=";
};
nativeBuildInputs = [

View File

@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "piccolo-theme";
version = "0.19.0";
version = "0.20.0";
format = "setuptools";
src = fetchPypi {
pname = "piccolo_theme";
inherit version;
hash = "sha256-pGMOc/GSh3q2HW1mfW+XFgpOyiXd3cdh56cvXatseuc=";
hash = "sha256-/I6Q///oZ1OlSQEOwQ4KtUuj73ra6poyDhfhiF5nJrE=";
};
propagatedBuildInputs = [

View File

@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "pyngrok";
version = "7.1.4";
version = "7.1.5";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-MlTT2a4VvazWP+EPLb1W3KZIf284OM4mI6LA8ToBtVY=";
hash = "sha256-9oS/iBuAWQ3COlnhgeN0e7CFj6VNbkfpPe35tO0BSpo=";
};
nativeBuildInputs = [

View File

@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "trimesh";
version = "4.1.7";
version = "4.1.8";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-bO7fIrk+ScSvz1iwLMdPN+fK9T5VhIEitxdZRnLBSxA=";
hash = "sha256-oG0UejqUe+8OcgSZF/Ln/QC70GifiHHkkI5EelPF+0A=";
};
nativeBuildInputs = [ setuptools ];

View File

@@ -5,13 +5,13 @@
buildPythonPackage rec {
pname = "types-pillow";
version = "10.2.0.20240206";
version = "10.2.0.20240213";
format = "setuptools";
src = fetchPypi {
inherit version;
pname = "types-Pillow";
hash = "sha256-8N5RB/+DYv/bvVPsiWICrJBearIq54S0a82tFg6hQ7k=";
hash = "sha256-SAC2G/fqva4vGxet4NCAcJ7TPp8moukA5HDotW6+I4c=";
};
# Modules doesn't have tests

View File

@@ -3,22 +3,27 @@
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "unidecode";
version = "1.3.6";
format = "setuptools";
version = "1.3.8";
pyproject = true;
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "avian2";
repo = pname;
rev = "${pname}-${version}";
hash = "sha256-75E2OlrGIxvwR9MeZEB4bDLdFd1SdprCVcBIJCPS3hM=";
repo = "unidecode";
rev = "refs/tags/${pname}-${version}";
hash = "sha256-OoJSY+dNNISyVwKuRboMH7Je8nYFKxus2c4v3VsmyRE=";
};
nativeBuildInputs = [
setuptools
];
nativeCheckInputs = [
pytestCheckHook
];

View File

@@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "checkov";
version = "3.2.32";
version = "3.2.33";
pyproject = true;
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = "checkov";
rev = "refs/tags/${version}";
hash = "sha256-brebisU7YhbLHEojJUu5Ei0F6hMHg1lsYjppBAXewYQ=";
hash = "sha256-OI5c1L4wWM9C+wKJCY+VIoIyxoNVAdlZoeu3zbWSNPY=";
};
patches = [

View File

@@ -8,16 +8,16 @@
buildNpmPackage rec {
pname = "firebase-tools";
version = "13.4.0";
version = "13.4.1";
src = fetchFromGitHub {
owner = "firebase";
repo = "firebase-tools";
rev = "v${version}";
hash = "sha256-15u6upX9xPSlXhRrCxqmAuzjkfnpkXk8vwt1pI7c7Tk=";
hash = "sha256-XznQP9kcool3dgydMk1tq68ms+/TKVgKj8EvhdFr8LE=";
};
npmDepsHash = "sha256-on4NKTGpdEb9l0JoybbssUN6z63Yg5AT8sHeGRGUEDA=";
npmDepsHash = "sha256-mDjSWIg/mtB1nl0Znu4MQO8Rr0EYfRbArx650DnqZd8=";
postPatch = ''
ln -s npm-shrinkwrap.json package-lock.json

View File

@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "operator-sdk";
version = "1.34.0";
version = "1.34.1";
src = fetchFromGitHub {
owner = "operator-framework";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-7Kkx1XMWoi1P3UA2HlCsqVxr2d5jjs9JxMUvHWs1nlk=";
hash = "sha256-3S7jR76b9MZpqn4Hj9yhjfravBk1PiESJEbG5XR4tnI=";
};
vendorHash = "sha256-YspUrnSS6d8Ta8dmUjx9A5D/V5Bqm08DQJrRBaIGyQg=";

View File

@@ -1,18 +1,18 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, docbook2x, libarchive, libcap_ng, lzo, zstd, docbook_xml_dtd_45 }:
{ lib, stdenv, fetchFromGitHub, autoreconfHook, docbook2x, libarchive, libcap_ng, lzo, pkg-config, zstd, docbook_xml_dtd_45 }:
stdenv.mkDerivation rec {
pname = "icecream";
version = "2020-04-15";
version = "1.4";
src = fetchFromGitHub {
owner = "icecc";
repo = pname;
rev = "c370c4d701d05e1872d44d1c1642a774a7f25807";
sha256 = "0ld2ihd39irlk4wshpbw7inmgyl3x0gbkgsy10izcm1wwfc0x2ac";
rev = version;
sha256 = "sha256-nBdUbWNmTxKpkgFM3qbooNQISItt5eNKtnnzpBGVbd4=";
};
enableParallelBuilding = true;
nativeBuildInputs = [ autoreconfHook docbook2x ];
nativeBuildInputs = [ autoreconfHook docbook2x pkg-config ];
buildInputs = [ libarchive libcap_ng lzo zstd docbook_xml_dtd_45 ];
meta = with lib; {

View File

@@ -5,13 +5,13 @@
}:
stdenv.mkDerivation rec {
pname = "zsh-abbr";
version = "5.3.0";
version = "5.4.1";
src = fetchFromGitHub {
owner = "olets";
repo = "zsh-abbr";
rev = "v${version}";
hash = "sha256-TdTjIt8SmwxXJqfaaCyBnBRzMm1Ux1nELGTkpY2Lmrc=";
hash = "sha256-gEBGMVR1lMVKNPVuPjtdPkgOXI1MWO0EAtk7JRmS0Ok=";
};
strictDeps = true;

View File

@@ -54,11 +54,11 @@ assert lib.assertMsg
stdenv.mkDerivation (finalAttrs: {
pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}";
version = "3.3.3";
version = "3.3.4";
src = fetchzip {
url = "https://gmic.eu/files/source/gmic_${finalAttrs.version}.tar.gz";
hash = "sha256-LkWQ3fSHJSaXztX+soGZ+pl3MnXNgw6tV09356bAfYY=";
hash = "sha256-/Hh5yzH//i01kyeoqETokvsKUOcY2iZsiYJBEmgw1rU=";
};
nativeBuildInputs = [

View File

@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "aichat";
version = "0.13.0";
version = "0.14.0";
src = fetchFromGitHub {
owner = "sigoden";
repo = "aichat";
rev = "v${version}";
hash = "sha256-1m0Sf8qC5kGOfXkxQVri+kL3sZfOFKH3TcpNhuOFPVQ=";
hash = "sha256-0VNFqfl1La6jSUE7IsS/pYIQGaNrAgSgiGUjo65pUR4=";
};
cargoHash = "sha256-/oEyI6m5j3u89NeEwM4+z1exZfu0FMSf14scAiax3CE=";
cargoHash = "sha256-zrX4e9Z8FgZvvNyyiw29Dr/0KO1uL20/+DUASyPjxjE=";
nativeBuildInputs = [
pkg-config

View File

@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "bash_unit";
version = "2.2.0";
version = "2.3.1";
src = fetchFromGitHub {
owner = "pgrange";
repo = pname;
rev = "v${version}";
sha256 = "sha256-sYs7b6I1VhO2TLLhMFuaV9AtLoavcoKvCRYfVNGAg20=";
sha256 = "sha256-kd5h12yjzvR/RBE/IjVXNSyjcf+rz6B2eoO8w2jiaps=";
};
patchPhase = ''

View File

@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, inih, bash-completion }:
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, inih, bash-completion, darwin }:
stdenv.mkDerivation rec {
pname = "tio";
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
strictDeps = true;
buildInputs = [ inih ];
buildInputs = [ inih ]
++ lib.optionals (stdenv.hostPlatform.isDarwin) [ darwin.apple_sdk.frameworks.IOKit ];
nativeBuildInputs = [ meson ninja pkg-config bash-completion ];

View File

@@ -18,11 +18,11 @@ let
in
stdenv.mkDerivation rec {
pname = "ugs";
version = "2.1.5";
version = "2.1.6";
src = fetchzip {
url = "https://github.com/winder/Universal-G-Code-Sender/releases/download/v${version}/UniversalGcodeSender.zip";
hash = "sha256-StXEtDJ3UjTWgiQQ8HQtPcUENQPosdHis1eo81Jf96M=";
hash = "sha256-6L/4s/QmlTnYnhwLgPf7z8UVkBUYXi3Wb3doa5JCViE=";
};
dontUnpack = true;

View File

@@ -694,6 +694,7 @@ mapAliases ({
markdown-pp = throw "markdown-pp was removed from nixpkgs, because the upstream archived it on 2021-09-02"; # Added 2023-07-22
markmind = throw "markmind has been removed from nixpkgs, because it depended on an old version of electron"; # Added 2023-09-12
matrique = spectral; # Added 2020-01-27
matrixcli = throw "'matrixcli' has been removed due to being unmaintained and broken functionality. Recommend 'matrix-commander' as an alternative"; # Added 2024-03-09
matrix-recorder = throw "matrix-recorder has been removed due to being unmaintained"; # Added 2023-05-21
maui-nota = libsForQt5.mauiPackages.nota; # added 2022-05-17
mbox = throw "'mbox' has been removed, as it was broken and unmaintained"; # Added 2023-12-21

View File

@@ -7297,7 +7297,7 @@ with pkgs;
builtins.mapAttrs (_: pin-to-gcc12-if-gcc13)
(darwin.apple_sdk_11_0.callPackage ../tools/networking/curl-impersonate { });
curl-impersonate-ff = pin-to-gcc12-if-gcc13 curl-impersonate.curl-impersonate-ff;
curl-impersonate-chrom = pin-to-gcc12-if-gcc13 curl-impersonate.curl-impersonate-chrome;
curl-impersonate-chrome = pin-to-gcc12-if-gcc13 curl-impersonate.curl-impersonate-chrome;
curlie = callPackage ../tools/networking/curlie { };
@@ -26037,11 +26037,11 @@ with pkgs;
engelsystem = callPackage ../servers/web-apps/engelsystem { php = php81; };
envoy = pin-to-gcc12-if-gcc13 (callPackage ../servers/http/envoy {
envoy = callPackage ../servers/http/envoy {
go = go_1_20;
jdk = openjdk11_headless;
gn = gn1924;
});
};
ergochat = callPackage ../servers/irc/ergochat { };
@@ -32721,8 +32721,6 @@ with pkgs;
kondo = callPackage ../applications/misc/kondo { };
kooha = callPackage ../applications/video/kooha { };
kotatogram-desktop = libsForQt5.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop {
inherit (darwin.apple_sdk_11_0.frameworks) Cocoa CoreFoundation CoreServices CoreText CoreGraphics
CoreMedia OpenGL AudioUnit ApplicationServices Foundation AGL Security SystemConfiguration
@@ -33198,12 +33196,6 @@ with pkgs;
matchbox = callPackage ../applications/window-managers/matchbox { };
matrixcli = callPackage ../applications/networking/instant-messengers/matrixcli {
inherit (python3Packages) buildPythonApplication buildPythonPackage
pygobject3 pytest-runner requests responses pytest python-olm
canonicaljson;
};
matrix-commander = python3Packages.callPackage ../applications/networking/instant-messengers/matrix-commander { };
matrix-dl = callPackage ../applications/networking/instant-messengers/matrix-dl { };