Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
10c9ad1b8c
@ -200,7 +200,7 @@ sub pciCheck {
|
||||
}
|
||||
|
||||
# In case this is a virtio scsi device, we need to explicitly make this available.
|
||||
if ($vendor eq "0x1af4" && $device eq "0x1004") {
|
||||
if ($vendor eq "0x1af4" && ($device eq "0x1004" || $device eq "0x1048") ) {
|
||||
push @initrdAvailableKernelModules, "virtio_scsi";
|
||||
}
|
||||
|
||||
|
||||
@ -78,6 +78,13 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
bantime = mkOption {
|
||||
default = null;
|
||||
type = types.nullOr types.str;
|
||||
example = "10m";
|
||||
description = lib.mdDoc "Number of seconds that a host is banned.";
|
||||
};
|
||||
|
||||
maxretry = mkOption {
|
||||
default = 3;
|
||||
type = types.ints.unsigned;
|
||||
@ -320,6 +327,9 @@ in
|
||||
''}
|
||||
# Miscellaneous options
|
||||
ignoreip = 127.0.0.1/8 ${optionalString config.networking.enableIPv6 "::1"} ${concatStringsSep " " cfg.ignoreIP}
|
||||
${optionalString (cfg.bantime != null) ''
|
||||
bantime = ${cfg.bantime}
|
||||
''}
|
||||
maxretry = ${toString cfg.maxretry}
|
||||
backend = systemd
|
||||
# Actions
|
||||
|
||||
@ -33,8 +33,8 @@ in
|
||||
description = "Multipass orchestrates virtual Ubuntu instances.";
|
||||
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
wants = [ "network.target" ];
|
||||
after = [ "network.target" ];
|
||||
wants = [ "network-online.target" ];
|
||||
after = [ "network-online.target" ];
|
||||
|
||||
environment = {
|
||||
"XDG_DATA_HOME" = "/var/lib/multipass/data";
|
||||
|
||||
@ -6,6 +6,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
||||
maintainers = [ mvnetbiz ];
|
||||
};
|
||||
nodes.machine = { pkgs, ... }: {
|
||||
security.polkit.enable = true;
|
||||
services.power-profiles-daemon.enable = true;
|
||||
environment.systemPackages = [ pkgs.glib ];
|
||||
};
|
||||
|
||||
@ -19,11 +19,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crow-translate";
|
||||
version = "2.10.3";
|
||||
version = "2.10.4";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}-source.tar.gz";
|
||||
hash = "sha256-K6mYzR4EIBHd0w/6Dpx4ldX4iDFszmfSLT6jNTfJlDQ=";
|
||||
hash = "sha256-M2vAH1YAvNOhDsz+BWxvteR8YX89FHtbUcQZr1uVoCs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -221,12 +221,13 @@ buildStdenv.mkDerivation ({
|
||||
"profilingPhase"
|
||||
];
|
||||
|
||||
patches = lib.optionals (lib.versionOlder version "102.6.0") [
|
||||
patches = lib.optionals (lib.versionAtLeast version "112.0" && lib.versionOlder version "113.0") [
|
||||
(fetchpatch {
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1773259
|
||||
name = "rust-cbindgen-0.24.2-compat.patch";
|
||||
url = "https://raw.githubusercontent.com/canonical/firefox-snap/5622734942524846fb0eb7108918c8cd8557fde3/patches/fix-ftbfs-newer-cbindgen.patch";
|
||||
hash = "sha256-+wNZhkDB3HSknPRD4N6cQXY7zMT/DzNXx29jQH0Gb1o=";
|
||||
# Crash when desktop scaling does not divide window scale on Wayland
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1803016
|
||||
name = "mozbz1803016.patch";
|
||||
url = "https://hg.mozilla.org/mozilla-central/raw-rev/1068e0955cfb";
|
||||
hash = "sha256-iPqmofsmgvlFNm+mqVPbdgMKmP68ANuzYu+PzfCpoNA=";
|
||||
})
|
||||
]
|
||||
++ lib.optional (lib.versionOlder version "111") ./env_var_for_system_dir-ff86.patch
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
{ darwin, fetchFromGitHub, rustPlatform, lib, stdenv }:
|
||||
|
||||
with rustPlatform;
|
||||
|
||||
buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "click";
|
||||
version = "0.4.2";
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "glooctl";
|
||||
version = "1.13.11";
|
||||
version = "1.13.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "solo-io";
|
||||
repo = "gloo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-K3tk55YPgBSF0YrxSw8zypnzgwEiyEPAAbiGyuKId9o=";
|
||||
hash = "sha256-JGmt07aXcxbPH772oWTD7YPvLLuxZGy8rdXEN1EgCNc=";
|
||||
};
|
||||
|
||||
subPackages = [ "projects/gloo/cli/cmd" ];
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl }:
|
||||
|
||||
with rustPlatform;
|
||||
|
||||
buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cfdyndns";
|
||||
version = "0.0.3";
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@ -189,12 +189,12 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "async-imap"
|
||||
version = "0.6.0"
|
||||
source = "git+https://github.com/async-email/async-imap?branch=master#90270474a5a494669e7c63c13471d189afdc98ae"
|
||||
version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d11e163a705d0c809dfc886eee95df5117c758539c940c0fe9aa3aa4da5388ce"
|
||||
dependencies = [
|
||||
"async-channel",
|
||||
"async-native-tls 0.4.0",
|
||||
"base64 0.13.1",
|
||||
"base64 0.21.0",
|
||||
"byte-pool",
|
||||
"chrono",
|
||||
"futures",
|
||||
@ -218,18 +218,6 @@ dependencies = [
|
||||
"event-listener",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "async-native-tls"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d57d4cec3c647232e1094dc013546c0b33ce785d8aeb251e1f20dfaf8a9a13fe"
|
||||
dependencies = [
|
||||
"native-tls",
|
||||
"thiserror",
|
||||
"tokio",
|
||||
"url",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "async-native-tls"
|
||||
version = "0.5.0"
|
||||
@ -494,9 +482,9 @@ checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
|
||||
|
||||
[[package]]
|
||||
name = "byte-pool"
|
||||
version = "0.2.3"
|
||||
version = "0.2.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f8c7230ddbb427b1094d477d821a99f3f54d36333178eeb806e279bcdcecf0ca"
|
||||
checksum = "c2f1b21189f50b5625efa6227cf45e9d4cfdc2e73582df2b879e9689e78a7158"
|
||||
dependencies = [
|
||||
"crossbeam-queue",
|
||||
"stable_deref_trait",
|
||||
@ -836,9 +824,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-channel"
|
||||
version = "0.5.7"
|
||||
version = "0.5.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c"
|
||||
checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"crossbeam-utils",
|
||||
@ -1061,13 +1049,13 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "deltachat"
|
||||
version = "1.112.6"
|
||||
version = "1.112.7"
|
||||
dependencies = [
|
||||
"ansi_term",
|
||||
"anyhow",
|
||||
"async-channel",
|
||||
"async-imap",
|
||||
"async-native-tls 0.5.0",
|
||||
"async-native-tls",
|
||||
"async-smtp",
|
||||
"async_zip",
|
||||
"backtrace",
|
||||
@ -1135,7 +1123,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "deltachat-jsonrpc"
|
||||
version = "1.112.6"
|
||||
version = "1.112.7"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-channel",
|
||||
@ -1158,7 +1146,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "deltachat-repl"
|
||||
version = "1.112.6"
|
||||
version = "1.112.7"
|
||||
dependencies = [
|
||||
"ansi_term",
|
||||
"anyhow",
|
||||
@ -1173,7 +1161,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "deltachat-rpc-server"
|
||||
version = "1.112.6"
|
||||
version = "1.112.7"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"deltachat",
|
||||
@ -1197,7 +1185,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "deltachat_ffi"
|
||||
version = "1.112.6"
|
||||
version = "1.112.7"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"deltachat",
|
||||
|
||||
@ -21,17 +21,16 @@
|
||||
|
||||
let
|
||||
libdeltachat' = libdeltachat.overrideAttrs (old: rec {
|
||||
version = "1.112.6";
|
||||
version = "1.112.7";
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-core-rust";
|
||||
rev = version;
|
||||
hash = "sha256-xadf6N5x3zdefwsKUFaVs71HmLMpJoUq5LL7IENsvC0=";
|
||||
hash = "sha256-zBstNj8IZ8ScwZxzvTxDPwe8R0n2z/EuvjbR+bJepJk=";
|
||||
};
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"async-imap-0.6.0" = "sha256-q6ZDm+4i+EtiMgkW/8LQ/TkDO/sj0p7KJhpYE76zAjo=";
|
||||
"email-0.0.21" = "sha256-Ys47MiEwVZenRNfenT579Rb17ABQ4QizVFTWUq3+bAY=";
|
||||
"encoded-words-0.2.0" = "sha256-KK9st0hLFh4dsrnLd6D8lC6pRFFs8W+WpZSGMGJcosk=";
|
||||
"lettre-0.9.2" = "sha256-+hU1cFacyyeC9UGVBpS14BWlJjHy90i/3ynMkKAzclk=";
|
||||
@ -53,16 +52,16 @@ let
|
||||
};
|
||||
in buildNpmPackage rec {
|
||||
pname = "deltachat-desktop";
|
||||
version = "1.36.2";
|
||||
version = "1.36.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-desktop";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0f3i+ZmORq1IDdzsIJo7e4lCnC3K1B5SY9pjpGM8+ro=";
|
||||
hash = "sha256-OmAWABZLTNU8EzXl2Rp/Y4DJcaqXuMt14ReaJbHx/u8=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-9gfqVFGmouGd+E78/GDKyanHEvA37OZSR1zBEpVOYF0=";
|
||||
npmDepsHash = "sha256-u2hYIhXGMnjAp5T2h4THcTL5Om4Zg8aTO3NpSiphAXc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
||||
@ -15,16 +15,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sniffnet";
|
||||
version = "1.1.3";
|
||||
version = "1.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gyulyvgc";
|
||||
repo = "sniffnet";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-sJUc14MXaCS4OHtwdCuwI1b7NAlOnaGsXBNUYCEXJqQ=";
|
||||
hash = "sha256-8G6cfp5/eXjwyNBk2SvE2XmUt7Y42E76IjDU5QHUK7s=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-neRVpJmI4TgzvIQqKNqBr61O7rR8246PcxG50IIKE/M=";
|
||||
cargoHash = "sha256-KN7jlB6PzRGpHBk5UvqPLhxRG7QAzOXLmEuFYNhdZJU=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "streamlit";
|
||||
version = "1.18.1";
|
||||
version = "1.21.0";
|
||||
format = "wheel"; # source currently requires pipenv
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version format;
|
||||
hash = "sha256-lO2QfM/G+4M55f8JCZBwk10SkMp4gXb68KncHm90k7g=";
|
||||
hash = "sha256-BYYlmJUqkSbhZlLKpbyI7u6nsnc68lLi2szxyEzqrvQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -191,7 +191,7 @@ stdenv.mkDerivation rec {
|
||||
"-Dpythia6=OFF"
|
||||
"-Dpythia8=OFF"
|
||||
"-Drfio=OFF"
|
||||
"-Droot7=OFF"
|
||||
"-Droot7=ON"
|
||||
"-Dsqlite=OFF"
|
||||
"-Dssl=ON"
|
||||
"-Dtmva=ON"
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ghq";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "x-motemen";
|
||||
repo = "ghq";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dUW5eZODHkhhzC21uA9jFnwb9Q+9/t7o0K/nGbsZH84=";
|
||||
sha256 = "sha256-ggTx5Kz9cRqOqxxzERv4altf7m1GlreGgOiYCnHyJks=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Q3sIXt8srGI1ZFUdQ+x6I6Tc07HqyH0Hyu4kBe64uRs=";
|
||||
vendorHash = "sha256-6ZDvU3RQ/1M4DZMFOaQsEuodldB8k+2thXNhvZlVQEg=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
|
||||
fionera
|
||||
sternenseemann
|
||||
];
|
||||
license = licenses.mit;
|
||||
license = with licenses; [ mit zlib ];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
||||
|
||||
40
pkgs/development/libraries/libdeltachat/Cargo.lock
generated
40
pkgs/development/libraries/libdeltachat/Cargo.lock
generated
@ -189,12 +189,12 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "async-imap"
|
||||
version = "0.6.0"
|
||||
source = "git+https://github.com/async-email/async-imap?branch=master#90270474a5a494669e7c63c13471d189afdc98ae"
|
||||
version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d11e163a705d0c809dfc886eee95df5117c758539c940c0fe9aa3aa4da5388ce"
|
||||
dependencies = [
|
||||
"async-channel",
|
||||
"async-native-tls 0.4.0",
|
||||
"base64 0.13.1",
|
||||
"base64 0.21.0",
|
||||
"byte-pool",
|
||||
"chrono",
|
||||
"futures",
|
||||
@ -218,18 +218,6 @@ dependencies = [
|
||||
"event-listener",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "async-native-tls"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d57d4cec3c647232e1094dc013546c0b33ce785d8aeb251e1f20dfaf8a9a13fe"
|
||||
dependencies = [
|
||||
"native-tls",
|
||||
"thiserror",
|
||||
"tokio",
|
||||
"url",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "async-native-tls"
|
||||
version = "0.5.0"
|
||||
@ -494,9 +482,9 @@ checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
|
||||
|
||||
[[package]]
|
||||
name = "byte-pool"
|
||||
version = "0.2.3"
|
||||
version = "0.2.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f8c7230ddbb427b1094d477d821a99f3f54d36333178eeb806e279bcdcecf0ca"
|
||||
checksum = "c2f1b21189f50b5625efa6227cf45e9d4cfdc2e73582df2b879e9689e78a7158"
|
||||
dependencies = [
|
||||
"crossbeam-queue",
|
||||
"stable_deref_trait",
|
||||
@ -836,9 +824,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-channel"
|
||||
version = "0.5.7"
|
||||
version = "0.5.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c"
|
||||
checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"crossbeam-utils",
|
||||
@ -1061,13 +1049,13 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "deltachat"
|
||||
version = "1.112.6"
|
||||
version = "1.112.7"
|
||||
dependencies = [
|
||||
"ansi_term",
|
||||
"anyhow",
|
||||
"async-channel",
|
||||
"async-imap",
|
||||
"async-native-tls 0.5.0",
|
||||
"async-native-tls",
|
||||
"async-smtp",
|
||||
"async_zip",
|
||||
"backtrace",
|
||||
@ -1135,7 +1123,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "deltachat-jsonrpc"
|
||||
version = "1.112.6"
|
||||
version = "1.112.7"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-channel",
|
||||
@ -1158,7 +1146,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "deltachat-repl"
|
||||
version = "1.112.6"
|
||||
version = "1.112.7"
|
||||
dependencies = [
|
||||
"ansi_term",
|
||||
"anyhow",
|
||||
@ -1173,7 +1161,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "deltachat-rpc-server"
|
||||
version = "1.112.6"
|
||||
version = "1.112.7"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"deltachat",
|
||||
@ -1197,7 +1185,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "deltachat_ffi"
|
||||
version = "1.112.6"
|
||||
version = "1.112.7"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"deltachat",
|
||||
|
||||
@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdeltachat";
|
||||
version = "1.112.6";
|
||||
version = "1.112.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-core-rust";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xadf6N5x3zdefwsKUFaVs71HmLMpJoUq5LL7IENsvC0=";
|
||||
hash = "sha256-zBstNj8IZ8ScwZxzvTxDPwe8R0n2z/EuvjbR+bJepJk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -34,7 +34,6 @@ stdenv.mkDerivation rec {
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"async-imap-0.6.0" = "sha256-q6ZDm+4i+EtiMgkW/8LQ/TkDO/sj0p7KJhpYE76zAjo=";
|
||||
"email-0.0.21" = "sha256-Ys47MiEwVZenRNfenT579Rb17ABQ4QizVFTWUq3+bAY=";
|
||||
"encoded-words-0.2.0" = "sha256-KK9st0hLFh4dsrnLd6D8lC6pRFFs8W+WpZSGMGJcosk=";
|
||||
"lettre-0.9.2" = "sha256-+hU1cFacyyeC9UGVBpS14BWlJjHy90i/3ynMkKAzclk=";
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "live555";
|
||||
version = "2023.01.19";
|
||||
version = "2023.03.30";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
"https://download.videolan.org/contrib/live555/live.${version}.tar.gz"
|
||||
"mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz"
|
||||
];
|
||||
sha256 = "sha256-p8ZJE/f3AHxf3CnqgR48p4HyYicbPkKv3UvBBB2G+pk=";
|
||||
sha256 = "sha256-v/1Nh8dicdWeNxFp7bakhEaKB4ysKtRFnyLKqNmJ2tQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optional stdenv.isDarwin darwin.cctools;
|
||||
|
||||
@ -16,11 +16,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hepmc3";
|
||||
version = "3.2.5";
|
||||
version = "3.2.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://hepmc.web.cern.ch/hepmc/releases/HepMC3-${version}.tar.gz";
|
||||
sha256 = "sha256-zQ91yA91VJxZzCqCns52Acd96Xyypat1eQysjh1YUDI=";
|
||||
sha256 = "sha256-JI87WzbddzhEy+c9UfYIkUWDNLmGsll1TFnb9Lvx1SU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
{ lib, fetchFromGitHub, rustPlatform }:
|
||||
|
||||
with rustPlatform;
|
||||
|
||||
buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage rec {
|
||||
version = "0.4.1";
|
||||
pname = "loc";
|
||||
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
let
|
||||
pname = "psalm";
|
||||
version = "5.4.0";
|
||||
version = "5.9.0";
|
||||
in
|
||||
mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar";
|
||||
sha256 = "sha256-d5jf68s+LppUDwERQaqr+ry8L+Zmob8VwetYkQ+vIUg=";
|
||||
sha256 = "sha256-56vLT/t+3f5ZyH1pFmgy4vtSMQcDYLQZIF/iIkwd2vM=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@ -2,9 +2,7 @@
|
||||
, darwin
|
||||
}:
|
||||
|
||||
with rustPlatform;
|
||||
|
||||
buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "chit";
|
||||
version = "0.1.15";
|
||||
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
{ fetchFromGitHub, rustPlatform, lib }:
|
||||
|
||||
with rustPlatform;
|
||||
|
||||
buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "clog-cli";
|
||||
version = "0.9.3";
|
||||
|
||||
|
||||
@ -2,21 +2,22 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fx";
|
||||
version = "24.0.0";
|
||||
version = "24.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "antonmedv";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Sg+mluDOGpkEUl+3BoItuPnMqs8F6o+D5xIqF0w0EIU=";
|
||||
hash = "sha256-X6wuCAiQa1coHMz96aAXKGZFnius1vHJpk+EhbXqoMA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-4hx1AZQQ4xHBTzBK0OmrTUGMK4Rfu36cmopVV4SOjCQ=";
|
||||
vendorHash = "sha256-J19MhLvjxcxvcub888UFKI0iIf7OG3dmP5v40ElHCU4=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Terminal JSON viewer";
|
||||
homepage = "https://github.com/antonmedv/fx";
|
||||
changelog = "https://github.com/antonmedv/fx/releases/tag/${src.rev}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-minimock";
|
||||
version = "3.1.2";
|
||||
version = "3.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gojuno";
|
||||
repo = "minimock";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-r1P9uLIxdDDI+slWO/K3nKf5gmsCEVfephrR+ZCXhBE=";
|
||||
sha256 = "sha256-6n5FOHTfsLYqnhlDO3etMnrypeOElmwdvoFQb3aSBts=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "motion";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fatih";
|
||||
repo = "motion";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bD6Mm9/LOzguoK/xMpVEeT7G8j1shCsMv14wFostlW4=";
|
||||
sha256 = "sha256-7vkMhjO4JUAf0sUcKiMjqJ5GzLb//QoHd7Cagerx4/s=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib, fetchFromGitHub, fetchurl, rustPlatform, runCommand } :
|
||||
with rustPlatform;
|
||||
|
||||
buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "pax-rs";
|
||||
version = "0.4.0";
|
||||
|
||||
|
||||
@ -165,7 +165,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cargo-release"
|
||||
version = "0.24.9"
|
||||
version = "0.24.10"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"assert_fs",
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, libgit2_1_5
|
||||
, openssl
|
||||
, stdenv
|
||||
, curl
|
||||
@ -11,13 +12,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-release";
|
||||
version = "0.24.9";
|
||||
version = "0.24.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crate-ci";
|
||||
repo = "cargo-release";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-J71TfOG9gagp2YbsEq2z8fCwBTMJmkYhY5Gl4lB+cDI=";
|
||||
hash = "sha256-3kOis5C0XOdp0CCCSZ8PoGtePqW7ozwzSTA9TGe7kAg=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
@ -32,6 +33,7 @@ rustPlatform.buildRustPackage rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libgit2_1_5
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
curl
|
||||
@ -42,7 +44,8 @@ rustPlatform.buildRustPackage rec {
|
||||
git
|
||||
];
|
||||
|
||||
OPENSSL_NO_VENDOR = true;
|
||||
# disable vendored-libgit2 and vendored-openssl
|
||||
buildNoDefaultFeatures = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = ''Cargo subcommand "release": everything about releasing a rust crate'';
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
{
|
||||
"version": "4.4.265",
|
||||
"version": "4.4.282",
|
||||
"platforms": {
|
||||
"x86_64-linux": {
|
||||
"name": "x86_64-unknown-linux-musl",
|
||||
"hash": "sha256-HyRUlOSH/GmvBlOEtdIdv5cyHaw92OqWrYqaEI63NDE="
|
||||
"hash": "sha256-ddf30gAKYztw6RD5fPK/eb7AoYp/SiN9hDDEuUT3LZE="
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"name": "aarch64-apple-darwin",
|
||||
"hash": "sha256-ZcM7JnrPCWvhvpb7vbrLvqY9RmWjMaaAd7Wvx6Eveto="
|
||||
"hash": "sha256-fZyovA6Oq/jGF1OAzm/6nfldaVtZyor9IJGQtVmCVLM="
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"name": "x86_64-apple-darwin",
|
||||
"hash": "sha256-eiZv5eidDynNOb5P6IUAVI3X8xub9U0GgWFkFq6mY74="
|
||||
"hash": "sha256-4oVDbUtl+zkaL9kDCdfAvCCDlJRZG8ho0LufKx7nTkg="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -12,15 +12,15 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "deno";
|
||||
version = "1.32.4";
|
||||
version = "1.32.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "denoland";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-yTTvfhOeU8zBwC+btscSlQygwEwjFlpvQQtiYunPCTI=";
|
||||
hash = "sha256-H2qa83To6kG4rvpCwjxmsgPnuUHj6chK4UUultY4/OU=";
|
||||
};
|
||||
cargoHash = "sha256-GgOqo0q9sQyoYWUZkuBW6kxWXzpI3/+0YgRPhVD0GhM=";
|
||||
cargoHash = "sha256-FgqpHn5WMoLjUQfiow7BuyvCu7ypuO4wWm/B4kr40MI=";
|
||||
|
||||
postPatch = ''
|
||||
# upstream uses lld on aarch64-darwin for faster builds
|
||||
|
||||
@ -7,21 +7,21 @@
|
||||
|
||||
let
|
||||
pname = "osu-lazer-bin";
|
||||
version = "2023.403.1";
|
||||
version = "2023.419.0";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
osu-lazer-bin-src = {
|
||||
aarch64-darwin = {
|
||||
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip";
|
||||
sha256 = "sha256-M0ByF2bEK4tWLSP04gjQTAyOyXfP2cB/w90otkwIfFs=";
|
||||
sha256 = "sha256-KItS8OykIjinSgm/CtF3YUMUQE9OfZ6aZ6DLBpyyDQE=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip";
|
||||
sha256 = "sha256-lsGtdGm9UGzgz/OCwnev4XGUwHdzMTlBIgWH7qDKt+w=";
|
||||
sha256 = "sha256-O4MlcawL6wlj6HilSH8wm0GJWN8DqWjNw51YJGu2NMs=";
|
||||
};
|
||||
x86_64-linux = {
|
||||
url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
|
||||
sha256 = "sha256-xHz9CYpI02m54xJOkO8Kd7KIxvAELqCDOZnw05EsSYw=";
|
||||
sha256 = "sha256-v+p+IOaHhb/wgqmeSO78rqLQLPGtCOEZBj+I3oZH9N0=";
|
||||
};
|
||||
}.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported.");
|
||||
|
||||
|
||||
@ -17,13 +17,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "osu-lazer";
|
||||
version = "2023.403.1";
|
||||
version = "2023.419.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ppy";
|
||||
repo = "osu";
|
||||
rev = version;
|
||||
sha256 = "sha256-IFy8QkuDgfXfKXthPS5khpehbS4eQEBI66YJUO/22O0=";
|
||||
sha256 = "sha256-BTrEE2+0EgYUAiAhanq3H38hlEMJLXVo47dc1+9VARQ=";
|
||||
};
|
||||
|
||||
projectFile = "osu.Desktop/osu.Desktop.csproj";
|
||||
|
||||
10
pkgs/games/osu-lazer/deps.nix
generated
10
pkgs/games/osu-lazer/deps.nix
generated
@ -130,15 +130,15 @@
|
||||
(fetchNuGet { pname = "ppy.ManagedBass"; version = "2022.1216.0"; sha256 = "19nnj1hq2v21mrplnivjr9c4y3wg4hhfnc062sjgzkmiv1cchvf8"; })
|
||||
(fetchNuGet { pname = "ppy.ManagedBass.Fx"; version = "2022.1216.0"; sha256 = "1vw573mkligpx9qiqasw1683cqaa1kgnxhlnbdcj9c4320b1pwjm"; })
|
||||
(fetchNuGet { pname = "ppy.ManagedBass.Mix"; version = "2022.1216.0"; sha256 = "185bpvgbnd8y20r7vxb1an4pd1aal9b7b5wvmv3knz0qg8j0chd9"; })
|
||||
(fetchNuGet { pname = "ppy.osu.Framework"; version = "2023.403.0"; sha256 = "1jwa6zm8sk3nicflna43ab2p91yapsnqw2baxpbm829qzvrw7yfz"; })
|
||||
(fetchNuGet { pname = "ppy.osu.Framework"; version = "2023.418.0"; sha256 = "0bxvza7kq3vba64800r6wr0cq31y0dhbwzkqh89cq42v7hqrpa0f"; })
|
||||
(fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2022.525.0"; sha256 = "1zsqj3xng06bb46vg79xx35n2dsh3crqg951r1ga2gxqzgzy4nk0"; })
|
||||
(fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2022.1222.1"; sha256 = "1pwwsp4rfzl6166mhrn5lsnyazpckhfh1m6ggf9d1lw2wb58vxfr"; })
|
||||
(fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2023.402.0"; sha256 = "1yi48dnsi8lg0i5hhmk9yqjzhwsjrch6gm8jdr5rxkfxwbkk6i7s"; })
|
||||
(fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2023.417.0"; sha256 = "015dk8rhj2m9842wmdv76bhp81xmqlh2jxlqj934lskvwv24kl66"; })
|
||||
(fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.211"; sha256 = "0j4a9n39pqm0cgdcps47p5n2mqph3h94r7hmf0bs59imif4jxvjy"; })
|
||||
(fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.652-alpha"; sha256 = "104amh94xlnp13qfjkwwvi74qanx52k52dd7h7j2anaa0g350rrh"; })
|
||||
(fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.2-g0ec05acb9b"; sha256 = "16gq7x3kp1rg9qpjfp5hxdmkgyhpkk1m62sfmcrpckk9xz46jlc3"; })
|
||||
(fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.2-g0ec05acb9b"; sha256 = "0frfsgbiml8178f70szdhngc4yk22f7akf65yww9c8ri850wcd79"; })
|
||||
(fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.2-g0ec05acb9b"; sha256 = "0mxcbdlhzmzm8m22ssliwqpqgvk1lfzqayn8nrb8gi7h37jvk165"; })
|
||||
(fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.3-gf1f8dc0432"; sha256 = "01xnb43gkbrn3wnb79k9k5cg2xhq4vf94i7c648003i0pdvm0rbz"; })
|
||||
(fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.3-gf1f8dc0432"; sha256 = "0w15rfshjrkblk91gl7mqdvbfrqi19bpgx60zm42znx5r4ryjix8"; })
|
||||
(fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.3-gf1f8dc0432"; sha256 = "1mr7mcpjb4fz3lbxi1qv9vwjsbm8sgh20gb8xbvpjkzj9hk5xbp3"; })
|
||||
(fetchNuGet { pname = "ppy.Veldrid.SPIRV"; version = "1.0.15-gc5e8498253"; sha256 = "16rs7633v27mcvq4c1np7mp6y9hg3l1f15i9rh61gyx75x2rs5pm"; })
|
||||
(fetchNuGet { pname = "Realm"; version = "10.20.0"; sha256 = "0gy0l2r7726wb6i599n55dn9035h0g7k0binfiy2dy9bjwz60jqk"; })
|
||||
(fetchNuGet { pname = "Realm.Fody"; version = "10.20.0"; sha256 = "0rwcbbzr41iww3k59rjgy5xy7bna1x906h5blbllpywgpc2l5afw"; })
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rectangle";
|
||||
version = "0.59";
|
||||
version = "0.67";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/rxhanson/Rectangle/releases/download/v${version}/Rectangle${version}.dmg";
|
||||
sha256 = "sha256-6K4HJ4qWjf/BsoxmSWyO/Km3BZujCnMJ2/xCMkH3TaI=";
|
||||
hash = "sha256-tvxGDfpHu86tZt7M055ehEG/lDdmdPmZwrDc2F/yUjk=";
|
||||
};
|
||||
|
||||
sourceRoot = "Rectangle.app";
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
, stdenv
|
||||
}:
|
||||
let
|
||||
version = "2.0-1244";
|
||||
version = "2.0-1259";
|
||||
urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "0" ] version;
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
@ -24,7 +24,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2";
|
||||
hash = "sha256-godyvkeClBc6AW3WWNYRX+2gqhGWf/Y7xJdX6RfYDn0=";
|
||||
hash = "sha256-nd0dDiiUmwhuVivB78EXdj6LrK0ufdSrVYH/0Y++img=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
{ fetchFromGitHub, rustPlatform, lib }:
|
||||
|
||||
with rustPlatform;
|
||||
|
||||
buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tarssh";
|
||||
version = "0.7.0";
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "carapace";
|
||||
version = "0.24.1";
|
||||
version = "0.24.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rsteube";
|
||||
repo = "${pname}-bin";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-eJD+7J5R+Oomj4QbOj5QHB30F0jpWmnkbl6bhVOEgDU=";
|
||||
sha256 = "sha256-UEvmaUr/3Fq92HSfBPxSpfuo5mp5zMSYGZu2HLZvUq0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-UMRAyUcGxPsW4Q7o5KtXMmdcuY+DEGhbm4jPBVLOLGQ=";
|
||||
vendorHash = "sha256-4Q8yBDds2EIxt5Caxoq8hk4X6ADwVe04P3Jt3L+Qf0M=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib, stdenv
|
||||
, substituteAll
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, autoreconfHook
|
||||
, gettext
|
||||
, makeWrapper
|
||||
@ -56,13 +57,13 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ibus";
|
||||
version = "1.5.27";
|
||||
version = "1.5.28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ibus";
|
||||
repo = "ibus";
|
||||
rev = version;
|
||||
sha256 = "sha256-DwX7SYRb18C0Lz2ySPS3yV99Q1xQezs0Ls2P7Rbtk5Q=";
|
||||
sha256 = "sha256-zjV+QkhVkrHFs9Vt1FpbvmS4nRHxwKaKU3mQkSgyLaQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -72,6 +73,12 @@ stdenv.mkDerivation rec {
|
||||
pythonSitePackages = python3.sitePackages;
|
||||
})
|
||||
./build-without-dbus-launch.patch
|
||||
# unicode and emoji input are broken before 1.5.29
|
||||
# https://github.com/NixOS/nixpkgs/issues/226526
|
||||
(fetchpatch {
|
||||
url = "https://github.com/ibus/ibus/commit/7c8abbe89403c2fcb08e3fda42049a97187e53ab.patch";
|
||||
hash = "sha256-59HzAdLq8ahrF7K+tFGLjTodwIiTkJGEkFe8quqIkhU=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" "installedTests" ];
|
||||
@ -98,6 +105,12 @@ stdenv.mkDerivation rec {
|
||||
"--with-ucd-dir=${unicode-character-database}/share/unicode"
|
||||
];
|
||||
|
||||
# missing make dependency
|
||||
# https://github.com/NixOS/nixpkgs/pull/218120#issuecomment-1514027173
|
||||
preBuild = ''
|
||||
make -C src ibusenumtypes.h
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
"test_execsdir=${placeholder "installedTests"}/libexec/installed-tests/ibus"
|
||||
"test_sourcesdir=${placeholder "installedTests"}/share/installed-tests/ibus"
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, curl
|
||||
, jansson
|
||||
, perl
|
||||
@ -17,7 +19,15 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0f44i0z8rid20c2hiyp92xq0q0mjj537r05sa6vdbc0nl0a5q40i";
|
||||
};
|
||||
|
||||
patchPhase = if stdenv.cc.isClang then "${perl}/bin/perl ./nomacro.pl" else null;
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-build-on-aarch64.patch";
|
||||
url = "https://github.com/pooler/cpuminer/commit/5f02105940edb61144c09a7eb960bba04a10d5b7.patch";
|
||||
hash = "sha256-lGAcwDcXgcJBFhasSEdQIEIY7pp6x/PEXHBsVwAOqhc=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = if stdenv.cc.isClang then "${perl}/bin/perl ./nomacro.pl" else null;
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [ curl jansson ];
|
||||
@ -30,7 +40,5 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ pSub ];
|
||||
# never built on aarch64-darwin since first introduction in nixpkgs
|
||||
broken = stdenv.isDarwin && stdenv.isAarch64;
|
||||
};
|
||||
}
|
||||
|
||||
@ -13,9 +13,7 @@ in
|
||||
|
||||
assert (x11Support && usesX11) -> xclip != null || xsel != null;
|
||||
|
||||
with rustPlatform;
|
||||
|
||||
buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ffsend";
|
||||
version = "0.2.76";
|
||||
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "halp";
|
||||
version = "0.1.5";
|
||||
version = "0.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "orhun";
|
||||
repo = "halp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Iowo3IBYnLCLnILIBithJejqDkzszCEgufcOcv2pVHI=";
|
||||
hash = "sha256-VGfZwXB2MM8dfjc89LjHBalNFTvp6B6KI0lPOlkHDOQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-YWMcY8tc/XAm7tMxGD+TyowTisDlcdVI/GXMDR7m/kQ=";
|
||||
cargoHash = "sha256-beYDb8+UKPLkkzey95Da8Ft2NwH2JZZsBLNvoW8FJN4=";
|
||||
|
||||
patches = [
|
||||
# patch tests to point to the correct target directory
|
||||
|
||||
@ -2,21 +2,22 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "peep";
|
||||
version = "0.1.4-post.2021-08-17";
|
||||
version = "0.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ryochack";
|
||||
repo = "peep";
|
||||
rev = "0eceafe16ff1f9c6d6784cca75b6f612c38901c4";
|
||||
sha256 = "sha256-HtyT9kFS7derPhiBzICHIz3AvYVcYpUj1OW+t5RivRs=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6Y7ZI0kIPE7uMMOkXgm75JMEec090xZPBJFJr9DaswA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-sHsmHCMuHc56Mkqk2NUtZgC0RGyqhPvW1fKHkEAhqYk=";
|
||||
cargoHash = "sha256-CDWa03H8vWfhx2dwZU5rAV3fSwAGqCIPcvl+lTG4npE=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "The CLI text viewer tool that works like less command on small pane within the terminal window";
|
||||
license = licenses.mit;
|
||||
homepage = "https://github.com/ryochack/peep";
|
||||
maintainers = with maintainers; [ ];
|
||||
changelog = "https://github.com/ryochack/peep/releases/tag/${src.rev}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "drill";
|
||||
version = "0.8.2";
|
||||
version = "0.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcsonline";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-x+ljh96RkmZQBPxUcXwcYQhRQAxMB8YOAsdg3aiht+U=";
|
||||
sha256 = "sha256-4y5gpkQB0U6Yq92O6DDD5eq/i/36l/VfeyiE//pcZOk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-GPa3gfqY3fiBI75+hLlqnR1+vUUWCxkracOdR6SsJFk=";
|
||||
cargoHash = "sha256-96eUCg0mzgUFLOKxpwRfzj1jH2Z+aDohBTztvRVWln0=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [
|
||||
pkg-config
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "unstable-2022-11-15";
|
||||
version = "unstable-2023-03-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jtojnar";
|
||||
repo = "nixpkgs-hammering";
|
||||
rev = "1b038ef38fececb39b65a4cdfa7273ed9d9359b4";
|
||||
hash = "sha256-5wZGGTahP1Tlu+WAgGx8Q9YnnHtyhfScl9j6X3W+Toc=";
|
||||
rev = "243b81c687aac33d6716957c0cd2235c81631044";
|
||||
hash = "sha256-a57Ux6W2EvJBEHL6Op9Pz6Tvw/LRRk7uCMRvneXggEo=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
@ -28,7 +28,7 @@ let
|
||||
pname = "nixpkgs-hammering-rust-checks";
|
||||
inherit version src meta;
|
||||
sourceRoot = "${src.name}/rust-checks";
|
||||
cargoHash = "sha256-YiC9mts6h15ZGdLKKmCVNNdTWDPtbDF0J5pwtjc6YKM=";
|
||||
cargoHash = "sha256-MFYMP6eQS0wJbHmTRKaKajSborzaW6dEfshtAZcP+xs=";
|
||||
};
|
||||
in
|
||||
|
||||
|
||||
@ -17,8 +17,7 @@
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
with rustPlatform;
|
||||
buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage rec {
|
||||
version = "0.6.4";
|
||||
pname = "ripasso-cursive";
|
||||
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "automatic-timezoned";
|
||||
version = "1.0.81";
|
||||
version = "1.0.82";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxbrunet";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-i+l+nYfGUXzpbqINWsX2U/CHQ7sMvZyvrLakItyLE6I=";
|
||||
sha256 = "sha256-ONpOGu2xzCJMQiuqeRfjPiOvuXfnaaah7OvAtHa7F4s=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-wRzi/efAfC6PGJFATB4EQjyTRkxsn5wBiY2DJom4npY=";
|
||||
cargoHash = "sha256-lzhrze7VbI0jCJTLCjc+rZu4xlEYnZ76V9pSeigaCn8=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Automatically update system timezone based on location";
|
||||
|
||||
Loading…
Reference in New Issue
Block a user