Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2023-11-09 18:01:27 +00:00 committed by GitHub
commit 6a669d1ab2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
76 changed files with 6670 additions and 1670 deletions

View file

@ -209,6 +209,7 @@ In the default `installPhase` set by `buildNpmPackage`, it uses `npm pack --json
* `npmPackFlags`: Flags to pass to `npm pack`.
* `npmPruneFlags`: Flags to pass to `npm prune`. Defaults to the value of `npmInstallFlags`.
* `makeWrapperArgs`: Flags to pass to `makeWrapper`, added to executable calling the generated `.js` with `node` as an interpreter. These scripts are defined in `package.json`.
* `nodejs`: The `nodejs` package to build against, using the corresponding `npm` shipped with that version of `node`. Defaults to `pkgs.nodejs`.
#### prefetch-npm-deps {#javascript-buildNpmPackage-prefetch-npm-deps}

View file

@ -12914,6 +12914,11 @@
githubId = 66913205;
name = "Rick Sanchez";
};
nix-julia = {
name = "nix-julia";
github = "nix-julia";
githubId = 149073815;
};
nixy = {
email = "nixy@nixy.moe";
github = "nixy";
@ -13932,6 +13937,12 @@
githubId = 9267430;
name = "Philipp Mildenberger";
};
philiptaron = {
email = "philip.taron@gmail.com";
github = "philiptaron";
githubId = 43863;
name = "Philip Taron";
};
phip1611 = {
email = "phip1611@gmail.com";
github = "phip1611";

View file

@ -16,10 +16,7 @@ with lib;
};
security.sudo.keepTerminfo = mkOption {
default = config.security.sudo.package.pname != "sudo-rs";
defaultText = literalMD ''
`true` unless using `sudo-rs`
'';
default = true;
type = types.bool;
description = lib.mdDoc ''
Whether to preserve the `TERMINFO` and `TERMINFO_DIRS`

View file

@ -1,7 +1,7 @@
{
x86_64-linux = "/nix/store/3wqasl97rjiza3vd7fxjnvli2w9l30mk-nix-2.17.0";
i686-linux = "/nix/store/z360xswxfx55pmm1fng3hw748rbs0kkj-nix-2.17.0";
aarch64-linux = "/nix/store/9670sxa916xmv8n1kqs7cdvmnsrhrdjv-nix-2.17.0";
x86_64-darwin = "/nix/store/2rdbky9j8hc3mbgl6pnda4hkjllyfwnn-nix-2.17.0";
aarch64-darwin = "/nix/store/jl9qma14fb4zk9lq1k0syw2k9qm2gqjw-nix-2.17.0";
x86_64-linux = "/nix/store/azvn85cras6xv4z5j85fiy406f24r1q0-nix-2.18.1";
i686-linux = "/nix/store/9bnwy7f9h0kzdzmcnjjsjg0aak5waj40-nix-2.18.1";
aarch64-linux = "/nix/store/hh65xwqm9s040s3cgn9vzcmrxj0sf5ij-nix-2.18.1";
x86_64-darwin = "/nix/store/6zi5fqzn9n17wrk8r41rhdw4j7jqqsi3-nix-2.18.1";
aarch64-darwin = "/nix/store/0pbq6wzr2f1jgpn5212knyxpwmkjgjah-nix-2.18.1";
}

View file

@ -1531,6 +1531,10 @@ in
(map (module: "mr ${module},"))
concatLines
]);
};
security.sudo.extraConfig = optionalString config.security.pam.enableSSHAgentAuth ''
# Keep SSH_AUTH_SOCK so that pam_ssh_agent_auth.so can do its magic.
Defaults env_keep+=SSH_AUTH_SOCK
'';
};
}

View file

@ -6,6 +6,8 @@ let
cfg = config.security.sudo;
inherit (config.security.pam) enableSSHAgentAuth;
toUserString = user: if (isInt user) then "#${toString user}" else "${user}";
toGroupString = group: if (isInt group) then "%#${toString group}" else "%${group}";
@ -28,41 +30,36 @@ in
###### interface
options = {
options.security.sudo = {
security.sudo.enable = mkOption {
type = types.bool;
default = true;
description =
lib.mdDoc ''
Whether to enable the {command}`sudo` command, which
allows non-root users to execute commands as root.
'';
};
security.sudo.package = mkOption {
type = types.package;
default = pkgs.sudo;
defaultText = literalExpression "pkgs.sudo";
description = lib.mdDoc ''
Which package to use for `sudo`.
defaultOptions = mkOption {
type = with types; listOf str;
default = [ "SETENV" ];
description = mdDoc ''
Options used for the default rules, granting `root` and the
`wheel` group permission to run any command as any user.
'';
};
security.sudo.wheelNeedsPassword = mkOption {
enable = mkEnableOption (mdDoc ''
the {command}`sudo` command, which allows non-root users to execute commands as root.
'');
package = mkPackageOption pkgs "sudo" { };
wheelNeedsPassword = mkOption {
type = types.bool;
default = true;
description =
lib.mdDoc ''
Whether users of the `wheel` group must
provide a password to run commands as super user via {command}`sudo`.
'';
description = mdDoc ''
Whether users of the `wheel` group must
provide a password to run commands as super user via {command}`sudo`.
'';
};
security.sudo.execWheelOnly = mkOption {
execWheelOnly = mkOption {
type = types.bool;
default = false;
description = lib.mdDoc ''
description = mdDoc ''
Only allow members of the `wheel` group to execute sudo by
setting the executable's permissions accordingly.
This prevents users that are not members of `wheel` from
@ -70,19 +67,18 @@ in
'';
};
security.sudo.configFile = mkOption {
configFile = mkOption {
type = types.lines;
# Note: if syntax errors are detected in this file, the NixOS
# configuration will fail to build.
description =
lib.mdDoc ''
This string contains the contents of the
{file}`sudoers` file.
'';
description = mdDoc ''
This string contains the contents of the
{file}`sudoers` file.
'';
};
security.sudo.extraRules = mkOption {
description = lib.mdDoc ''
extraRules = mkOption {
description = mdDoc ''
Define specific rules to be in the {file}`sudoers` file.
More specific rules should come after more general ones in order to
yield the expected behavior. You can use mkBefore/mkAfter to ensure
@ -112,7 +108,7 @@ in
options = {
users = mkOption {
type = with types; listOf (either str int);
description = lib.mdDoc ''
description = mdDoc ''
The usernames / UIDs this rule should apply for.
'';
default = [];
@ -120,7 +116,7 @@ in
groups = mkOption {
type = with types; listOf (either str int);
description = lib.mdDoc ''
description = mdDoc ''
The groups / GIDs this rule should apply for.
'';
default = [];
@ -129,7 +125,7 @@ in
host = mkOption {
type = types.str;
default = "ALL";
description = lib.mdDoc ''
description = mdDoc ''
For what host this rule should apply.
'';
};
@ -137,7 +133,7 @@ in
runAs = mkOption {
type = with types; str;
default = "ALL:ALL";
description = lib.mdDoc ''
description = mdDoc ''
Under which user/group the specified command is allowed to run.
A user can be specified using just the username: `"foo"`.
@ -147,7 +143,7 @@ in
};
commands = mkOption {
description = lib.mdDoc ''
description = mdDoc ''
The commands for which the rule should apply.
'';
type = with types; listOf (either str (submodule {
@ -155,7 +151,7 @@ in
options = {
command = mkOption {
type = with types; str;
description = lib.mdDoc ''
description = mdDoc ''
A command being either just a path to a binary to allow any arguments,
the full command with arguments pre-set or with `""` used as the argument,
not allowing arguments to the command at all.
@ -164,7 +160,7 @@ in
options = mkOption {
type = with types; listOf (enum [ "NOPASSWD" "PASSWD" "NOEXEC" "EXEC" "SETENV" "NOSETENV" "LOG_INPUT" "NOLOG_INPUT" "LOG_OUTPUT" "NOLOG_OUTPUT" ]);
description = lib.mdDoc ''
description = mdDoc ''
Options for running the command. Refer to the [sudo manual](https://www.sudo.ws/man/1.7.10/sudoers.man.html).
'';
default = [];
@ -177,10 +173,10 @@ in
});
};
security.sudo.extraConfig = mkOption {
extraConfig = mkOption {
type = types.lines;
default = "";
description = lib.mdDoc ''
description = mdDoc ''
Extra configuration text appended to {file}`sudoers`.
'';
};
@ -195,39 +191,48 @@ in
message = "The NixOS `sudo` module does not work with `sudo-rs` yet."; }
];
# We `mkOrder 600` so that the default rule shows up first, but there is
# still enough room for a user to `mkBefore` it.
security.sudo.extraRules = mkOrder 600 [
{ groups = [ "wheel" ];
commands = [ { command = "ALL"; options = (if cfg.wheelNeedsPassword then [ "SETENV" ] else [ "NOPASSWD" "SETENV" ]); } ];
}
];
security.sudo.extraRules =
let
defaultRule = { users ? [], groups ? [], opts ? [] }: [ {
inherit users groups;
commands = [ {
command = "ALL";
options = opts ++ cfg.defaultOptions;
} ];
} ];
in mkMerge [
# This is ordered before users' `mkBefore` rules,
# so as not to introduce unexpected changes.
(mkOrder 400 (defaultRule { users = [ "root" ]; }))
security.sudo.configFile =
# This is ordered to show before (most) other rules, but
# late-enough for a user to `mkBefore` it.
(mkOrder 600 (defaultRule {
groups = [ "wheel" ];
opts = (optional (!cfg.wheelNeedsPassword) "NOPASSWD");
}))
];
security.sudo.configFile = concatStringsSep "\n" (filter (s: s != "") [
''
# Don't edit this file. Set the NixOS options security.sudo.configFile
# or security.sudo.extraRules instead.
# Keep SSH_AUTH_SOCK so that pam_ssh_agent_auth.so can do its magic.
Defaults env_keep+=SSH_AUTH_SOCK
# "root" is allowed to do anything.
root ALL=(ALL:ALL) SETENV: ALL
# extraRules
${concatStringsSep "\n" (
lists.flatten (
map (
rule: optionals (length rule.commands != 0) [
(map (user: "${toUserString user} ${rule.host}=(${rule.runAs}) ${toCommandsString rule.commands}") rule.users)
(map (group: "${toGroupString group} ${rule.host}=(${rule.runAs}) ${toCommandsString rule.commands}") rule.groups)
]
) cfg.extraRules
)
)}
''
(pipe cfg.extraRules [
(filter (rule: length rule.commands != 0))
(map (rule: [
(map (user: "${toUserString user} ${rule.host}=(${rule.runAs}) ${toCommandsString rule.commands}") rule.users)
(map (group: "${toGroupString group} ${rule.host}=(${rule.runAs}) ${toCommandsString rule.commands}") rule.groups)
]))
flatten
(concatStringsSep "\n")
])
"\n"
(optionalString (cfg.extraConfig != "") ''
# extraConfig
${cfg.extraConfig}
'';
'')
]);
security.wrappers = let
owner = "root";

View file

@ -24,7 +24,7 @@
, srcs
# provided as callPackage input to enable easier overrides through overlays
, cargoSha256 ? "sha256-po/CzUnUFh1saJuw8CVk4zeWsVAgw2iPdfq81t0zwU8="
, cargoSha256 ? "sha256-YR7d8F1LWDHY+h2ZQe52u3KWIeEMTnrbU4DO+hpIOec="
}:
mkDerivation rec {

View file

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/release-service/23.08.2/src -A '*.tar.xz' )
WGET_ARGS=( https://download.kde.org/stable/release-service/23.08.3/src -A '*.tar.xz' )

File diff suppressed because it is too large Load diff

View file

@ -11,13 +11,13 @@
perlPackages.buildPerlPackage rec {
pname = "get_iplayer";
version = "3.33";
version = "3.34";
src = fetchFromGitHub {
owner = "get-iplayer";
repo = "get_iplayer";
rev = "v${version}";
hash = "sha256-cX+ydMvpQNFfQICRVKyhnB5gZkVnOMLPbGgdFymzmeA=";
hash = "sha256-KuDNngHOoeEHJExEHoLdNO95ZUvLx8TWiAOTmRKHtmQ=";
};
nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang;
@ -33,10 +33,9 @@ perlPackages.buildPerlPackage rec {
installPhase = ''
runHook preInstall
mkdir -p $out/bin $out/share/man/man1
cp get_iplayer $out/bin
install -D get_iplayer -t $out/bin
wrapProgram $out/bin/get_iplayer --suffix PATH : ${lib.makeBinPath [ atomicparsley ffmpeg ]} --prefix PERL5LIB : $PERL5LIB
cp get_iplayer.1 $out/share/man/man1
install -D get_iplayer.1 -t $out/share/man/man1
runHook postInstall
'';

View file

@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
[[package]]
name = "aho-corasick"
version = "1.0.4"
version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a"
checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783"
dependencies = [
"memchr",
]
@ -72,9 +72,9 @@ dependencies = [
[[package]]
name = "anstyle"
version = "1.0.2"
version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea"
checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46"
[[package]]
name = "anstyle-parse"
@ -129,7 +129,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.29",
"syn 2.0.32",
]
[[package]]
@ -185,9 +185,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
[[package]]
name = "base64"
version = "0.21.3"
version = "0.21.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53"
checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2"
[[package]]
name = "bincode"
@ -248,12 +248,12 @@ dependencies = [
[[package]]
name = "bstr"
version = "1.6.0"
version = "1.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05"
checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a"
dependencies = [
"memchr",
"regex-automata 0.3.7",
"regex-automata 0.3.8",
"serde",
]
@ -265,9 +265,9 @@ checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
[[package]]
name = "bytemuck"
version = "1.13.1"
version = "1.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"
checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
[[package]]
name = "byteorder"
@ -277,9 +277,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
[[package]]
name = "bytes"
version = "1.4.0"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
dependencies = [
"serde",
]
@ -315,7 +315,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838"
dependencies = [
"serde",
"toml 0.7.6",
"toml 0.7.8",
]
[[package]]
@ -356,9 +356,9 @@ dependencies = [
[[package]]
name = "cfg-expr"
version = "0.15.4"
version = "0.15.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9"
checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3"
dependencies = [
"smallvec",
"target-lexicon",
@ -372,9 +372,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "chrono"
version = "0.4.26"
version = "0.4.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877"
dependencies = [
"android-tzdata",
"iana-time-zone",
@ -382,25 +382,24 @@ dependencies = [
"num-traits",
"serde",
"wasm-bindgen",
"winapi",
"windows-targets 0.48.5",
]
[[package]]
name = "clap"
version = "4.4.0"
version = "4.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d5f1946157a96594eb2d2c10eb7ad9a2b27518cb3000209dec700c35df9197d"
checksum = "824956d0dca8334758a5b7f7e50518d66ea319330cbceedcf76905c2f6ab30e3"
dependencies = [
"clap_builder",
"clap_derive",
"once_cell",
]
[[package]]
name = "clap_builder"
version = "4.4.0"
version = "4.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78116e32a042dd73c2901f0dc30790d20ff3447f3e3472fad359e8c3d282bcd6"
checksum = "122ec64120a49b4563ccaedcbea7818d069ed8e9aa6d829b82d8a4128936b2ab"
dependencies = [
"anstream",
"anstyle",
@ -410,23 +409,23 @@ dependencies = [
[[package]]
name = "clap_complete"
version = "4.4.0"
version = "4.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "586a385f7ef2f8b4d86bddaa0c094794e7ccbfe5ffef1f434fe928143fc783a5"
checksum = "8baeccdb91cd69189985f87f3c7e453a3a451ab5746cf3be6acc92120bd16d24"
dependencies = [
"clap",
]
[[package]]
name = "clap_derive"
version = "4.4.0"
version = "4.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a"
checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873"
dependencies = [
"heck 0.4.1",
"proc-macro2",
"quote",
"syn 2.0.29",
"syn 2.0.32",
]
[[package]]
@ -437,9 +436,9 @@ checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961"
[[package]]
name = "clap_mangen"
version = "0.2.13"
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf8e5f34d85d9e0bbe2491d100a7a7c1007bb2467b518080bfe311e8947197a9"
checksum = "b44f35c514163027542f7147797ff930523eea288e03642727348ef1a9666f6b"
dependencies = [
"clap",
"roff",
@ -639,7 +638,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
dependencies = [
"quote",
"syn 2.0.29",
"syn 2.0.32",
]
[[package]]
@ -673,7 +672,7 @@ dependencies = [
"proc-macro2",
"quote",
"strsim",
"syn 2.0.29",
"syn 2.0.32",
]
[[package]]
@ -684,7 +683,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
dependencies = [
"darling_core",
"quote",
"syn 2.0.29",
"syn 2.0.32",
]
[[package]]
@ -799,15 +798,15 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
[[package]]
name = "embed-resource"
version = "2.2.0"
version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7f1e82a60222fc67bfd50d752a9c89da5cce4c39ed39decc84a443b07bbd69a"
checksum = "fd0a2c9b742a980060d22545a7a83b573acd6b73045b9de6370c9530ce652f27"
dependencies = [
"cc",
"rustc_version",
"toml 0.7.6",
"toml 0.7.8",
"vswhom",
"winreg 0.11.0",
"winreg 0.51.0",
]
[[package]]
@ -839,9 +838,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
[[package]]
name = "errno"
version = "0.3.2"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f"
checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd"
dependencies = [
"errno-dragonfly",
"libc",
@ -1001,7 +1000,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.29",
"syn 2.0.32",
]
[[package]]
@ -1606,9 +1605,9 @@ dependencies = [
[[package]]
name = "indicatif"
version = "0.17.6"
version = "0.17.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730"
checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25"
dependencies = [
"console",
"instant",
@ -1761,9 +1760,9 @@ dependencies = [
[[package]]
name = "json-patch"
version = "1.0.0"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f54898088ccb91df1b492cc80029a6fdf1c48ca0db7c6822a8babad69c94658"
checksum = "4f7765dccf8c39c3a470fc694efe322969d791e713ca46bc7b5c506886157572"
dependencies = [
"serde",
"serde_json",
@ -1811,9 +1810,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libc"
version = "0.2.147"
version = "0.2.148"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b"
[[package]]
name = "line-wrap"
@ -1826,9 +1825,9 @@ dependencies = [
[[package]]
name = "linux-raw-sys"
version = "0.4.5"
version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"
checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128"
[[package]]
name = "lock_api"
@ -1910,9 +1909,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
[[package]]
name = "memchr"
version = "2.5.0"
version = "2.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
[[package]]
name = "memoffset"
@ -2190,9 +2189,9 @@ dependencies = [
[[package]]
name = "object"
version = "0.32.0"
version = "0.32.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe"
checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
dependencies = [
"memchr",
]
@ -2247,7 +2246,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.29",
"syn 2.0.32",
]
[[package]]
@ -2258,9 +2257,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
[[package]]
name = "openssl-sys"
version = "0.9.92"
version = "0.9.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b"
checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d"
dependencies = [
"cc",
"libc",
@ -2293,7 +2292,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]]
name = "owmods_cli"
version = "0.11.2"
version = "0.11.3"
dependencies = [
"anyhow",
"clap",
@ -2308,7 +2307,7 @@ dependencies = [
[[package]]
name = "owmods_core"
version = "0.11.2"
version = "0.11.3"
dependencies = [
"anyhow",
"directories",
@ -2334,7 +2333,7 @@ dependencies = [
[[package]]
name = "owmods_gui"
version = "0.11.2"
version = "0.11.3"
dependencies = [
"anyhow",
"log",
@ -2535,7 +2534,7 @@ version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdc0001cfea3db57a2e24bc0d818e9e20e554b5f97fabb9bc231dc240269ae06"
dependencies = [
"base64 0.21.3",
"base64 0.21.4",
"indexmap 1.9.3",
"line-wrap",
"quick-xml",
@ -2759,13 +2758,13 @@ dependencies = [
[[package]]
name = "regex"
version = "1.9.4"
version = "1.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29"
checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47"
dependencies = [
"aho-corasick",
"memchr",
"regex-automata 0.3.7",
"regex-automata 0.3.8",
"regex-syntax 0.7.5",
]
@ -2780,9 +2779,9 @@ dependencies = [
[[package]]
name = "regex-automata"
version = "0.3.7"
version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629"
checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795"
dependencies = [
"aho-corasick",
"memchr",
@ -2807,7 +2806,7 @@ version = "0.11.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1"
dependencies = [
"base64 0.21.3",
"base64 0.21.4",
"bytes",
"encoding_rs",
"futures-core",
@ -2907,9 +2906,9 @@ dependencies = [
[[package]]
name = "rustix"
version = "0.38.9"
version = "0.38.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9bfe0f2582b4931a45d1fa608f8a8722e8b3c7ac54dd6d5f3b3212791fedef49"
checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662"
dependencies = [
"bitflags 2.4.0",
"errno",
@ -2920,9 +2919,9 @@ dependencies = [
[[package]]
name = "rustls"
version = "0.21.6"
version = "0.21.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb"
checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8"
dependencies = [
"log",
"ring",
@ -2936,14 +2935,14 @@ version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
dependencies = [
"base64 0.21.3",
"base64 0.21.4",
]
[[package]]
name = "rustls-webpki"
version = "0.101.4"
version = "0.101.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d"
checksum = "45a27e3b59326c16e23d30aeb7a36a24cc0d29e71d68ff611cdfb4a01d013bed"
dependencies = [
"ring",
"untrusted",
@ -3076,14 +3075,14 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.29",
"syn 2.0.32",
]
[[package]]
name = "serde_json"
version = "1.0.105"
version = "1.0.106"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360"
checksum = "2cc66a619ed80bf7a0f6b17dd063a84b88f6dea1813737cf469aef1d081142c2"
dependencies = [
"itoa 1.0.9",
"ryu",
@ -3098,7 +3097,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.29",
"syn 2.0.32",
]
[[package]]
@ -3128,7 +3127,7 @@ version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237"
dependencies = [
"base64 0.21.3",
"base64 0.21.4",
"chrono",
"hex",
"indexmap 1.9.3",
@ -3148,7 +3147,7 @@ dependencies = [
"darling",
"proc-macro2",
"quote",
"syn 2.0.29",
"syn 2.0.32",
]
[[package]]
@ -3251,9 +3250,9 @@ dependencies = [
[[package]]
name = "socket2"
version = "0.5.3"
version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877"
checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e"
dependencies = [
"libc",
"windows-sys 0.48.0",
@ -3353,9 +3352,9 @@ dependencies = [
[[package]]
name = "syn"
version = "2.0.29"
version = "2.0.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a"
checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2"
dependencies = [
"proc-macro2",
"quote",
@ -3394,10 +3393,10 @@ version = "6.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3"
dependencies = [
"cfg-expr 0.15.4",
"cfg-expr 0.15.5",
"heck 0.4.1",
"pkg-config",
"toml 0.7.6",
"toml 0.7.8",
"version-compare 0.1.1",
]
@ -3483,7 +3482,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fbe522898e35407a8e60dc3870f7579fea2fc262a6a6072eccdd37ae1e1d91e"
dependencies = [
"anyhow",
"base64 0.21.3",
"base64 0.21.4",
"bytes",
"cocoa",
"dirs-next",
@ -3555,7 +3554,7 @@ version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54ad2d49fdeab4a08717f5b49a163bdc72efc3b1950b6758245fcde79b645e1a"
dependencies = [
"base64 0.21.3",
"base64 0.21.4",
"brotli",
"ico",
"json-patch",
@ -3696,7 +3695,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5993dc129e544393574288923d1ec447c857f3f644187f4fbf7d9a875fbfc4fb"
dependencies = [
"embed-resource",
"toml 0.7.6",
"toml 0.7.8",
]
[[package]]
@ -3731,22 +3730,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c"
[[package]]
name = "thiserror"
version = "1.0.47"
version = "1.0.48"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f"
checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.47"
version = "1.0.48"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b"
checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.29",
"syn 2.0.32",
]
[[package]]
@ -3761,9 +3760,9 @@ dependencies = [
[[package]]
name = "time"
version = "0.3.28"
version = "0.3.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48"
checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe"
dependencies = [
"deranged",
"itoa 1.0.9",
@ -3776,15 +3775,15 @@ dependencies = [
[[package]]
name = "time-core"
version = "0.1.1"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
[[package]]
name = "time-macros"
version = "0.2.14"
version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572"
checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
dependencies = [
"time-core",
]
@ -3823,7 +3822,7 @@ dependencies = [
"num_cpus",
"pin-project-lite",
"signal-hook-registry",
"socket2 0.5.3",
"socket2 0.5.4",
"tokio-macros",
"windows-sys 0.48.0",
]
@ -3836,7 +3835,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.29",
"syn 2.0.32",
]
[[package]]
@ -3908,9 +3907,9 @@ dependencies = [
[[package]]
name = "toml"
version = "0.7.6"
version = "0.7.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"
checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
dependencies = [
"serde",
"serde_spanned",
@ -3929,9 +3928,9 @@ dependencies = [
[[package]]
name = "toml_edit"
version = "0.19.14"
version = "0.19.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a"
checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
dependencies = [
"indexmap 2.0.0",
"serde",
@ -3966,7 +3965,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.29",
"syn 2.0.32",
]
[[package]]
@ -4059,9 +4058,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
[[package]]
name = "unicode-ident"
version = "1.0.11"
version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
[[package]]
name = "unicode-normalization"
@ -4092,9 +4091,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
[[package]]
name = "url"
version = "2.4.0"
version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
dependencies = [
"form_urlencoded",
"idna",
@ -4176,9 +4175,9 @@ dependencies = [
[[package]]
name = "walkdir"
version = "2.3.3"
version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
dependencies = [
"same-file",
"winapi-util",
@ -4226,7 +4225,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
"syn 2.0.29",
"syn 2.0.32",
"wasm-bindgen-shared",
]
@ -4260,7 +4259,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.29",
"syn 2.0.32",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@ -4700,16 +4699,6 @@ dependencies = [
"memchr",
]
[[package]]
name = "winreg"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76a1a57ff50e9b408431e8f97d5456f2807f8eb2a2cd79b06068fc87f8ecf189"
dependencies = [
"cfg-if",
"winapi",
]
[[package]]
name = "winreg"
version = "0.50.0"
@ -4721,10 +4710,20 @@ dependencies = [
]
[[package]]
name = "wry"
version = "0.24.3"
name = "winreg"
version = "0.51.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33748f35413c8a98d45f7a08832d848c0c5915501803d1faade5a4ebcd258cea"
checksum = "937f3df7948156640f46aacef17a70db0de5917bda9c92b0f751f3a955b588fc"
dependencies = [
"cfg-if",
"windows-sys 0.48.0",
]
[[package]]
name = "wry"
version = "0.24.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "88ef04bdad49eba2e01f06e53688c8413bd6a87b0bc14b72284465cf96e3578e"
dependencies = [
"base64 0.13.1",
"block",

View file

@ -1,5 +1,6 @@
{ lib
, stdenv
, nix-update-script
, fetchFromGitHub
, rustPlatform
, pkg-config
@ -11,13 +12,13 @@
rustPlatform.buildRustPackage rec {
pname = "owmods-cli";
version = "0.11.2";
version = "0.11.3";
src = fetchFromGitHub {
owner = "ow-mods";
repo = "ow-mod-man";
rev = "cli_v${version}";
hash = "sha256-kjHGuVYX9pKy2I+m347cEdPj6MjCDz8vz2Cnce9+z90=";
hash = "sha256-CobGF3ZQEdRRoMGL9l37alGQArIuRxiFbihQoRdnAsc=";
};
cargoLock = {
@ -53,6 +54,8 @@ rustPlatform.buildRustPackage rec {
dist/cli/completions/owmods.{bash,fish,zsh}
'';
passthru.updateScript = nix-update-script {};
meta = with lib; {
description = "CLI version of the mod manager for Outer Wilds Mod Loader";
homepage = "https://github.com/ow-mods/ow-mod-man/tree/main/owmods_cli";

View file

@ -1,38 +0,0 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl gnused nix-prefetch nix-prefetch-github jq wget
#modified version of https://github.com/NixOS/nixpkgs/blob/nixos-23.05/pkgs/servers/readarr/update.sh
set -e
dirname="$(dirname "$0")"
updateHash()
{
version=$1
url="https://github.com/ow-mods/ow-mod-man/releases/cli_v$version"
prefetchJson=$(nix-prefetch-github ow-mods ow-mod-man --rev cli_v$version)
sha256="$(echo $prefetchJson | jq -r ".sha256")"
echo "sha256=${sha256}"
sed -i "s/hash = \"[a-zA-Z0-9\/+-=]*\";/hash = \"sha256-$sha256\";/g" "$dirname/default.nix"
#downloads and replaces .lock file
wget https://raw.githubusercontent.com/ow-mods/ow-mod-man/cli_v$version/Cargo.lock -q -O $dirname/Cargo.lock
}
updateVersion()
{
sed -i "s/version = \"[0-9.]*\";/version = \"$1\";/g" "$dirname/default.nix"
}
latestTag=$(curl https://api.github.com/repos/ow-mods/ow-mod-man/releases | jq -r ".[0].tag_name")
latestVersion="$(expr $latestTag : 'gui_v\(.*\)')"
echo "latest version: ${latestVersion}"
echo "updating..."
updateVersion $latestVersion
updateHash $latestVersion
echo "updated cli"

View file

@ -1,27 +1,22 @@
{ lib, stdenv, fetchurl, asciidoc, asciidoctor, autoconf, automake, cmake,
docbook_xsl, fftw, fftwFloat, gfortran, libtool, libusb1, qtbase,
{ lib, stdenv, fetchgit, asciidoc, asciidoctor, cmake, pkg-config,
fftw, fftwFloat, gfortran, hamlib_4, libtool, libusb1, qtbase,
qtmultimedia, qtserialport, qttools, boost, texinfo, wrapQtAppsHook }:
stdenv.mkDerivation rec {
pname = "wsjtx";
version = "2.6.1";
# This is a "superbuild" tarball containing both wsjtx and a hamlib fork
src = fetchurl {
url = "https://sourceforge.net/projects/wsjt/files/wsjtx-${version}/wsjtx-${version}.tgz";
sha256 = "sha256-YNDiy0WkmmrVhbCQiCGp/yw6wlZNYQQmIP82wt3Mdl8=";
src = fetchgit {
url = "http://git.code.sf.net/p/wsjt/wsjtx";
rev = "wsjtx-${version}";
hash = "sha256-fELx3B9JqCCL5vaIHab3of5ah9qdu5lemqjUnvY5DdM=";
};
# Hamlib builds with autotools, wsjtx builds with cmake
# Omitting pkg-config because it causes issues locating the built hamlib
nativeBuildInputs = [
asciidoc asciidoctor autoconf automake cmake docbook_xsl gfortran libtool
qttools texinfo wrapQtAppsHook
asciidoc asciidoctor cmake gfortran libtool
pkg-config qttools texinfo wrapQtAppsHook
];
buildInputs = [ fftw fftwFloat libusb1 qtbase qtmultimedia qtserialport boost ];
# Remove Git dependency from superbuild since sources are included
patches = [ ./super.patch ];
buildInputs = [ fftw fftwFloat hamlib_4 libusb1 qtbase qtmultimedia qtserialport boost ];
meta = with lib; {
description = "Weak-signal digital communication modes for amateur radio";
@ -33,9 +28,8 @@ stdenv.mkDerivation rec {
contacts under extreme weak-signal conditions.
'';
homepage = "https://physics.princeton.edu/pulsar/k1jt/wsjtx.html";
# Older licenses are for the statically-linked hamlib
license = with licenses; [ gpl3Plus gpl2Plus lgpl21Plus ];
license = with licenses; [ gpl3Plus ];
platforms = platforms.linux;
maintainers = with maintainers; [ lasandell numinit ];
maintainers = with maintainers; [ lasandell numinit melling ];
};
}

View file

@ -1,12 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84fa38a..87e31bb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,6 @@ source tarball." )
#
# Find_library (USB_LIBRARY NAMES libusb.a usb)
Find_program (PATCH_EXECUTABLE patch REQUIRED)
-Find_package (Git REQUIRED)
#
# extra C flags to minimize hamlib excutable sizes

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "bedtools";
version = "2.31.0";
version = "2.31.1";
src = fetchFromGitHub {
owner = "arq5x";
repo = "bedtools2";
rev = "v${version}";
sha256 = "sha256-LBD3z0+zGbQJ67oyPRFPgbiMY9EP17vSk1EKz3DrkEc=";
sha256 = "sha256-rrk+FSv1bGL0D1lrIOsQu2AT7cw2T4lkDiCnzil5fpg=";
};
strictDeps = true;

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchNpmDeps, buildPackages, nodejs }:
{ lib, stdenv, fetchNpmDeps, buildPackages, nodejs } @ topLevelArgs:
{ name ? "${args.pname}-${args.version}"
, src ? null
@ -34,6 +34,7 @@
, npmPruneFlags ? npmInstallFlags
# Value for npm `--workspace` flag and directory in which the files to be installed are found.
, npmWorkspace ? null
, nodejs ? topLevelArgs.nodejs
, ...
} @ args:

4877
pkgs/by-name/co/cosmic-greeter/Cargo.lock generated Normal file

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,58 @@
{ lib
, stdenv
, fetchFromGitHub
, rust
, rustPlatform
, cmake
, just
, pkg-config
, libxkbcommon
, linux-pam
, wayland
}:
rustPlatform.buildRustPackage rec {
pname = "cosmic-greeter";
version = "unstable-2023-11-08";
src = fetchFromGitHub {
owner = "pop-os";
repo = pname;
rev = "a497ed8b1e67aaa9eb878d4ba225b40a71e1706c";
sha256 = "sha256-P37i0JYP21gGE7NIq9G3WVUa0vv2MdFJmo/GuRDuV8A=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"accesskit-0.11.0" = "sha256-/6KUCH1CwMHd5YEMOpAdVeAxpjl9JvrzDA4Xnbd1D9k=";
"cosmic-bg-config-0.1.0" = "sha256-fdRFndhwISmbTqmXfekFqh+Wrtdjg3vSZut4IAQUBbA=";
"cosmic-config-0.1.0" = "sha256-c2pGujYQ3WbbiHGhPo2kG8/NiydmpfFNQrlrb1nk/RY=";
"smithay-client-toolkit-0.17.0" = "sha256-vDY4cqz5CZD12twElUWVCsf4N6VO9O+Udl8Dc4arWK4=";
"softbuffer-0.2.0" = "sha256-VD2GmxC58z7Qfu/L+sfENE+T8L40mvUKKSfgLmCTmjY=";
"taffy-0.3.11" = "sha256-8gctP/nRiYxTSDrLyXi/oQbA7bE41ywgMbyotY1N8Zk=";
};
};
nativeBuildInputs = [ rustPlatform.bindgenHook cmake just pkg-config ];
buildInputs = [ libxkbcommon wayland linux-pam ];
dontUseJustBuild = true;
justFlags = [
"--set"
"prefix"
(placeholder "out")
"--set"
"bin-src"
"target/${rust.lib.toRustTargetSpecShort stdenv.hostPlatform}/release/cosmic-greeter"
];
meta = with lib; {
homepage = "https://github.com/pop-os/cosmic-greeter";
description = "Greeter for the COSMIC Desktop Environment";
license = licenses.gpl3Only;
maintainers = with maintainers; [ nyanbinary ];
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,55 @@
{ lib
, stdenv
, fetchFromGitHub
, makeBinaryWrapper
, meson
, ninja
, pkg-config
, vala
, wrapGAppsHook
, gocryptfs
, gtk3
, json-glib
, libgee
}:
stdenv.mkDerivation (finalAttrs: {
pname = "cryptor";
version = "1.0.3";
src = fetchFromGitHub {
owner = "moson-mo";
repo = "cryptor";
rev = "v${finalAttrs.version}";
hash = "sha256-bgOOueOKSc6dLyxGU+ds9XYWM5mO+qCKC4dkCu2B1sQ=";
};
nativeBuildInputs = [
makeBinaryWrapper
meson
ninja
pkg-config
vala
wrapGAppsHook
];
buildInputs = [
gtk3
json-glib
libgee
];
postInstall = ''
wrapProgram $out/bin/cryptor \
--prefix PATH : "${lib.makeBinPath [ gocryptfs ]}"
'';
meta = {
description = "Simple gocryptfs GUI";
homepage = "https://github.com/moson-mo/cryptor";
license = lib.licenses.bsd3;
mainProgram = "cryptor";
maintainers = with lib.maintainers; [ fgaz ];
platforms = lib.platforms.all;
};
})

View file

@ -17,16 +17,16 @@
rustPlatform.buildRustPackage rec {
pname = "eza";
version = "0.15.2";
version = "0.15.3";
src = fetchFromGitHub {
owner = "eza-community";
repo = "eza";
rev = "v${version}";
hash = "sha256-bEuzA67bBueHgKTpj+CsX7fZMc9RMV4cc7KOVqJfT7M=";
hash = "sha256-V0PuiF8N5ubNO4/EmGFx6qL0k1ziTVVKe+0rpMTMVlg=";
};
cargoHash = "sha256-JL31KVZrKPNlJzB3tyLheXZ3qVcm0HtAVuccehGkM0c=";
cargoHash = "sha256-kO4WxTDVmLlQpYuFbohih+4Hct2AmnO802Veuw2Wj2g=";
nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ];
buildInputs = [ zlib ]

View file

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "fortune-kind";
version = "0.1.7";
version = "0.1.8";
src = fetchFromGitHub {
owner = "cafkafk";
repo = "fortune-kind";
rev = "v${version}";
hash = "sha256-txFboO7TdmwFm8BPP2onDJs1LSp4fXTwciIyAnC4Q04=";
hash = "sha256-8xXRIp6fNYo0Eylzz+i+YccEJZjqiT0TxguZheIblns=";
};
cargoHash = "sha256-3HxkKE2cQK91dBTtrsNG9VDk0efo1Ci5VfaG3UjvLNU=";
cargoHash = "sha256-v1LmZRuknWFAwwuw4U7Y7jnhBi8UkglY0sege9nSKes=";
nativeBuildInputs = [ makeBinaryWrapper installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];

View file

@ -0,0 +1,37 @@
{ lib
, buildNpmPackage
, fetchFromGitHub
, fetchpatch
}:
buildNpmPackage rec {
pname = "mathjax-node-cli";
version = "1.0.1";
src = fetchFromGitHub {
owner = "mathjax";
repo = "mathjax-node-cli";
rev = version;
hash = "sha256-jFSn/Ftm1iNOAmMadHYfy2jm0H/+hP2XCyyNbJqfhkY=";
};
patches = [
# https://github.com/mathjax/mathjax-node-cli/pull/20
(fetchpatch {
name = "add-package-lock.patch";
url = "https://github.com/mathjax/mathjax-node-cli/commit/ac304d896d840dc5004045f012abab40648d20fd.patch";
hash = "sha256-kIfxF5II/PHtzBhhMbO2RcEuZQCNFrLeAnL536WBXq8=";
})
];
npmDepsHash = "sha256-gGTRr8CN6aP/T/jUqt4E53DYVaz7ykaoG519+3sPdXo=";
dontNpmBuild = true;
meta = {
description = "CLI tools for mathjax-node";
homepage = "https://github.com/mathjax/mathjax-node-cli";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ colinsane ];
};
}

View file

@ -0,0 +1,28 @@
{ lib
, stdenv
, fetchFromGitHub
, rustPlatform
}:
rustPlatform.buildRustPackage rec {
pname = "qrtool";
version = "0.8.4";
src = fetchFromGitHub {
owner = "sorairolake";
repo = "qrtool";
rev = "v${version}";
sha256 = "sha256-FoWUGhNfVILpYxmsnSzRIM1+R9/xFxCF7W1sdiHaAiA=";
};
cargoSha256 = "sha256-mtejnHCkN2krgFAneyyBpvbv5PZO3GigM2DJqrbHim4=";
meta = with lib; {
maintainers = with maintainers; [ philiptaron ];
description = "An utility for encoding or decoding QR code";
license = licenses.asl20;
homepage = "https://sorairolake.github.io/qrtool/book/index.html";
changelog = "https://sorairolake.github.io/qrtool/book/changelog.html";
mainProgram = "qrtool";
};
}

View file

@ -1,29 +1,41 @@
{ lib, fetchzip, stdenvNoCC, fetchFromGitLab, xcursorgen, imagemagick6, inkscape }:
{ lib, stdenvNoCC, fetchFromGitLab, imagemagick, inkscape, xcursorgen }:
stdenvNoCC.mkDerivation rec {
pname = "hackneyed";
version = "0.8.2";
version = "0.9.1";
src = fetchFromGitLab {
owner = "Enthymeme";
repo = "hackneyed-x11-cursors";
rev = version;
sha256 = "sha256-Wtrw/EzxCj4cAyfdBp0OJE4+c6FouW7+b6nFTLxdXNY=";
hash = "sha256-+7QtHgBuhJtQejiHeZ+QoedJo24LqSY51XRVLv9Ho2g=";
};
buildInputs = [ imagemagick6 inkscape xcursorgen ];
nativeBuildInputs = [ imagemagick inkscape xcursorgen ];
postPatch = ''
patchShebangs *.sh
substituteInPlace make-png.sh \
--replace /usr/bin/inkscape ${inkscape}/bin/inkscape
'';
enableParallelBuilding = true;
makeFlags = [ "PREFIX=$(out)" ];
makeFlags = [
"INKSCAPE=inkscape"
"INSTALL=install"
"PREFIX=$(out)"
"VERBOSE=1"
"XCURSORGEN=xcursorgen"
];
buildFlags = [ "theme" "theme.left" ];
# The Makefile declares a dependency on the value of $(INKSCAPE) for some reason;
# it's unnecessary for building though.
prePatch = ''
substituteInPlace GNUmakefile \
--replace 'inkscape-version: $(INKSCAPE)' 'inkscape-version:'
'';
meta = with lib; {
homepage = "https://gitlab.com/Enthymeme/hackneyed-x11-cursors";
description = "A scalable cursor theme that resembles Windows 3.x/NT 3.x cursors";

View file

@ -84,7 +84,8 @@ let
runHook postInstall
'';
postInstall = ''
# Release will generate a binary which will cause a read null byte failure, see #261354
postInstall = lib.optionalString (releaseType == "escript") ''
for dir in $out/rel/*/erts-*; do
echo "ERTS found in $dir - removing references to erlang to reduce closure size"
for f in $dir/bin/{erl,start}; do

View file

@ -266,11 +266,13 @@ in let
targetLlvmLibraries.compiler-rt
];
extraBuildCommands = mkExtraBuildCommands cc;
nixSupport.cc-cflags = [
"-rtlib=compiler-rt"
"-B${targetLlvmLibraries.compiler-rt}/lib"
"-nostdlib++"
];
nixSupport.cc-cflags =
[
"-rtlib=compiler-rt"
"-B${targetLlvmLibraries.compiler-rt}/lib"
"-nostdlib++"
]
++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
};
clangNoLibc = wrapCCWith rec {
@ -281,10 +283,12 @@ in let
targetLlvmLibraries.compiler-rt
];
extraBuildCommands = mkExtraBuildCommands cc;
nixSupport.cc-cflags = [
"-rtlib=compiler-rt"
"-B${targetLlvmLibraries.compiler-rt}/lib"
];
nixSupport.cc-cflags =
[
"-rtlib=compiler-rt"
"-B${targetLlvmLibraries.compiler-rt}/lib"
]
++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
};
clangNoCompilerRt = wrapCCWith rec {
@ -293,16 +297,22 @@ in let
bintools = bintoolsNoLibc';
extraPackages = [ ];
extraBuildCommands = mkExtraBuildCommands0 cc;
nixSupport.cc-cflags = [ "-nostartfiles" ];
nixSupport.cc-cflags =
[
"-nostartfiles"
]
++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
};
clangNoCompilerRtWithLibc = wrapCCWith rec {
clangNoCompilerRtWithLibc = wrapCCWith (rec {
cc = tools.clang-unwrapped;
libcxx = null;
bintools = bintools';
extraPackages = [ ];
extraBuildCommands = mkExtraBuildCommands0 cc;
};
} // lib.optionalAttrs stdenv.targetPlatform.isWasm {
nixSupport.cc-cflags = [ "-fno-exceptions" ];
});
});

View file

@ -271,11 +271,13 @@ in let
targetLlvmLibraries.compiler-rt
];
extraBuildCommands = mkExtraBuildCommands cc;
nixSupport.cc-cflags = [
"-rtlib=compiler-rt"
"-B${targetLlvmLibraries.compiler-rt}/lib"
"-nostdlib++"
];
nixSupport.cc-cflags =
[
"-rtlib=compiler-rt"
"-B${targetLlvmLibraries.compiler-rt}/lib"
"-nostdlib++"
]
++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
};
clangNoLibc = wrapCCWith rec {
@ -286,10 +288,12 @@ in let
targetLlvmLibraries.compiler-rt
];
extraBuildCommands = mkExtraBuildCommands cc;
nixSupport.cc-cflags = [
"-rtlib=compiler-rt"
"-B${targetLlvmLibraries.compiler-rt}/lib"
];
nixSupport.cc-cflags =
[
"-rtlib=compiler-rt"
"-B${targetLlvmLibraries.compiler-rt}/lib"
]
++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
};
clangNoCompilerRt = wrapCCWith rec {
@ -298,16 +302,22 @@ in let
bintools = bintoolsNoLibc';
extraPackages = [ ];
extraBuildCommands = mkExtraBuildCommands0 cc;
nixSupport.cc-cflags = [ "-nostartfiles" ];
nixSupport.cc-cflags =
[
"-nostartfiles"
]
++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
};
clangNoCompilerRtWithLibc = wrapCCWith rec {
clangNoCompilerRtWithLibc = wrapCCWith (rec {
cc = tools.clang-unwrapped;
libcxx = null;
bintools = bintools';
extraPackages = [ ];
extraBuildCommands = mkExtraBuildCommands0 cc;
};
} // lib.optionalAttrs stdenv.targetPlatform.isWasm {
nixSupport.cc-cflags = [ "-fno-exceptions" ];
});
# Has to be in tools despite mostly being a library,
# because we use a native helper executable from a

View file

@ -0,0 +1,5 @@
_bb_tasks() {
COMPREPLY=( $(compgen -W "$(bb tasks |tail -n +3 |cut -f1 -d ' ')" -- ${COMP_WORDS[COMP_CWORD]}) );
}
# autocomplete filenames as well
complete -f -F _bb_tasks bb

View file

@ -0,0 +1,9 @@
function __bb_complete_tasks
if not test "$__bb_tasks"
set -g __bb_tasks (bb tasks |tail -n +3 |cut -f1 -d ' ')
end
printf "%s\n" $__bb_tasks
end
complete -c bb -a "(__bb_complete_tasks)" -d 'tasks'

View file

@ -0,0 +1,6 @@
_bb_tasks() {
local matches=(`bb tasks |tail -n +3 |cut -f1 -d ' '`)
compadd -a matches
_files # autocomplete filenames as well
}
compdef _bb_tasks bb

View file

@ -4,23 +4,24 @@
, removeReferencesTo
, fetchurl
, writeScript
, installShellFiles
}:
let
babashka-unwrapped = buildGraalvmNativeImage rec {
pname = "babashka-unwrapped";
version = "1.3.185";
version = "1.3.186";
src = fetchurl {
url = "https://github.com/babashka/babashka/releases/download/v${version}/babashka-${version}-standalone.jar";
sha256 = "sha256-nTW7LpvWoF8hBWtpWOc8VtVvx3v1ISJGvxnnYIvprQk=";
sha256 = "sha256-T7inTJHSnUySituU0fcgZ0xWjIY3yb8BlSakqym67ew=";
};
graalvmDrv = graalvmCEPackages.graalvm-ce;
executable = "bb";
nativeBuildInputs = [ removeReferencesTo ];
nativeBuildInputs = [ removeReferencesTo installShellFiles ];
extraNativeImageBuildArgs = [
"-H:+ReportExceptionStackTraces"
@ -42,6 +43,9 @@ let
# graalvm-ce anyway.
postInstall = ''
remove-references-to -t ${graalvmDrv} $out/bin/${executable}
installShellCompletion --cmd bb --bash ${./completions/bb.bash}
installShellCompletion --cmd bb --zsh ${./completions/bb.zsh}
installShellCompletion --cmd bb --fish ${./completions/bb.fish}
'';
passthru.updateScript = writeScript "update-babashka" ''

View file

@ -3,6 +3,7 @@
, babashka-unwrapped
, callPackage
, makeWrapper
, installShellFiles
, rlwrap
, clojureToolsBabashka ? callPackage ./clojure-tools.nix { }
, jdkBabashka ? clojureToolsBabashka.jdk
@ -23,7 +24,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
dontUnpack = true;
dontBuild = true;
nativeBuildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper installShellFiles ];
installPhase =
let unwrapped-bin = "${babashka-unwrapped}/bin/bb"; in
@ -37,6 +38,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
--set-default DEPS_CLJ_TOOLS_DIR $out/clojure_tools \
--set-default JAVA_HOME ${jdkBabashka}
installShellCompletion --cmd bb --bash ${babashka-unwrapped}/share/bash-completion/completions/bb.bash
installShellCompletion --cmd bb --zsh ${babashka-unwrapped}/share/fish/vendor_completions.d/bb.fish
installShellCompletion --cmd bb --fish ${babashka-unwrapped}/share/zsh/site-functions/_bb
'' +
lib.optionalString withRlwrap ''
substituteInPlace $out/bin/bb \

View file

@ -1,6 +1,6 @@
/* hunspell dictionaries */
{ lib, stdenv, fetchurl, fetchzip, fetchFromGitHub, unzip, coreutils, bash, which, zip, ispell, perl, hunspell }:
{ lib, stdenv, fetchurl, fetchzip, fetchFromGitHub, unzip, coreutils, bash, which, zip, ispell, perl, python3, hunspell }:
let
@ -934,4 +934,37 @@ rec {
readmeFile = "README_pt_PT.txt";
license = with lib.licenses; [ gpl2 lgpl21 mpl11 ];
};
/* PERSIAN */
fa_IR = fa-ir;
fa-ir = mkDict {
pname = "hunspell-dict-fa-ir";
version = "experimental-2022-09-04";
dictFileName = "fa-IR";
readmeFile = "README.md";
src = fetchFromGitHub {
owner = "b00f";
repo = "lilak";
rev = "1a80a8e5c9377ac424d29ef20be894e250bc9765";
hash = "sha256-xonnrclzgFEHdQ9g8ijm0bo9r5a5Y0va52NoJR5d8mo=";
};
nativeBuildInputs = [ python3 ];
buildPhase = ''
runHook preBuild
mkdir build
(cd src && python3 lilak.py)
mv build/* ./
# remove timestamp from file
sed -i 's/^\(## *File Version[^,]*\),.*/\1/' fa-IR.aff
runHook postBuild
'';
meta = with lib; {
description = "Hunspell dictionary for Persian (Iran)";
homepage = "https://github.com/b00f/lilak";
license = licenses.asl20;
maintainers = with maintainers; [ nix-julia ];
platforms = platforms.all;
};
};
}

View file

@ -12,13 +12,13 @@ assert (!blas.isILP64) && (!lapack.isILP64);
stdenv.mkDerivation rec {
pname = "ipopt";
version = "3.14.12";
version = "3.14.13";
src = fetchFromGitHub {
owner = "coin-or";
repo = "Ipopt";
rev = "releases/${version}";
sha256 = "sha256-cyV3tgmZz5AExxxdGJ12r+PPXn7v2AEhxb9icBxolS8=";
sha256 = "sha256-51isH1hlzgbD0JVtGp3NuaGY5l2CeS1S7oVeRYG+vWI=";
};
CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ];

View file

@ -1,40 +1,47 @@
{ config
, cudaPackages
{ backendStdenv
, config
, cuda_cccl
, cuda_cudart
, cuda_nvcc
, cudaVersion
, fetchFromGitHub
, gitUpdater
, lib
, mpiSupport ? false
, mpi
, stdenv
, mpiSupport ? false
, nccl
, which
}:
cudaPackages.backendStdenv.mkDerivation (finalAttrs: {
backendStdenv.mkDerivation (finalAttrs: {
pname = "nccl-tests";
version = "2.13.6";
version = "2.13.8";
src = fetchFromGitHub {
owner = "NVIDIA";
repo = finalAttrs.pname;
rev = "v${finalAttrs.version}";
hash = "sha256-3gSBQ0g6mnQ/MFXGflE+BqqrIUoiBgp8+fWRQOvLVkw=";
hash = "sha256-dxLoflsTHDBnZRTzoXdm30OyKpLlRa73b784YWALBHg=";
};
strictDeps = true;
nativeBuildInputs = [
cudaPackages.cuda_nvcc
cuda_nvcc
which
];
buildInputs = [
cudaPackages.cuda_cudart
cudaPackages.nccl
cuda_cudart
nccl
] ++ lib.optionals (lib.versionAtLeast cudaVersion "12.0") [
cuda_cccl.dev # <nv/target>
] ++ lib.optional mpiSupport mpi;
makeFlags = [
"CUDA_HOME=${cudaPackages.cuda_nvcc}"
"NCCL_HOME=${cudaPackages.nccl}"
"CUDA_HOME=${cuda_nvcc}"
"NCCL_HOME=${nccl}"
] ++ lib.optionals mpiSupport [
"MPI=1"
];
@ -46,12 +53,17 @@ cudaPackages.backendStdenv.mkDerivation (finalAttrs: {
cp -r build/* $out/bin/
'';
passthru.updateScript = gitUpdater {
inherit (finalAttrs) pname version;
rev-prefix = "v";
};
meta = with lib; {
description = "Tests to check both the performance and the correctness of NVIDIA NCCL operations";
homepage = "https://github.com/NVIDIA/nccl-tests";
platforms = [ "x86_64-linux" ];
platforms = platforms.linux;
license = licenses.bsd3;
broken = !config.cudaSupport || (mpiSupport && mpi == null);
maintainers = with maintainers; [ jmillerpdt ];
maintainers = with maintainers; [ jmillerpdt ] ++ teams.cuda.members;
};
})

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "sofia-sip";
version = "1.13.16";
version = "1.13.17";
src = fetchFromGitHub {
owner = "freeswitch";
repo = pname;
rev = "v${version}";
sha256 = "sha256-mYJhA/ylJDr45IL9CxEZ2WJA/DIRj8RDCwkznsi1KcI=";
sha256 = "sha256-7QmK2UxEO5lC0KBDWB3bwKTy0Nc7WrdTLjoQYzezoaY=";
};
buildInputs = [ glib openssl ] ++ lib.optional stdenv.isDarwin SystemConfiguration;

View file

@ -99,6 +99,7 @@ mapAliases {
manta = pkgs.node-manta; # Added 2023-05-06
markdownlint-cli = pkgs.markdownlint-cli; # added 2023-07-29
inherit (pkgs) markdownlint-cli2; # added 2023-08-22
inherit (pkgs) mathjax-node-cli; # added 2023-11-02
mdctl-cli = self."@medable/mdctl-cli"; # added 2023-08-21
inherit (pkgs) mermaid-cli; # added 2023-10-01
musescore-downloader = pkgs.dl-librescore; # added 2023-08-19

View file

@ -166,7 +166,6 @@
, "markdown-link-check"
, "mastodon-bot"
, "mathjax"
, "mathjax-node-cli"
, "meat"
, "mocha"
, "multi-file-swagger"

View file

@ -86763,212 +86763,6 @@ in
bypassCache = true;
reconstructLock = true;
};
mathjax-node-cli = nodeEnv.buildNodePackage {
name = "mathjax-node-cli";
packageName = "mathjax-node-cli";
version = "1.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/mathjax-node-cli/-/mathjax-node-cli-1.0.1.tgz";
sha512 = "p1OB9zalQZkKYumfx+8mSX59MysF2Ox2H88gHSUQpdjpuMISwIPfw0MQmsvcS00hntSX05uEDa3uzo+1SgSk5w==";
};
dependencies = [
sources."abab-2.0.6"
sources."acorn-5.7.4"
(sources."acorn-globals-4.3.4" // {
dependencies = [
sources."acorn-6.4.2"
];
})
sources."acorn-walk-6.2.0"
sources."ajv-6.12.6"
sources."ansi-regex-3.0.1"
sources."ansi-styles-4.3.0"
sources."array-equal-1.0.0"
sources."asn1-0.2.6"
sources."assert-plus-1.0.0"
sources."async-limiter-1.0.1"
sources."asynckit-0.4.0"
sources."aws-sign2-0.7.0"
sources."aws4-1.12.0"
sources."bcrypt-pbkdf-1.0.2"
sources."browser-process-hrtime-1.0.0"
sources."camelcase-5.3.1"
sources."caseless-0.12.0"
sources."cliui-4.1.0"
sources."code-point-at-1.1.0"
sources."color-convert-2.0.1"
sources."color-name-1.1.4"
sources."combined-stream-1.0.8"
sources."commander-11.1.0"
sources."core-util-is-1.0.2"
sources."cross-spawn-6.0.5"
sources."cssom-0.3.8"
sources."cssstyle-1.4.0"
sources."dashdash-1.14.1"
(sources."data-urls-1.1.0" // {
dependencies = [
sources."whatwg-url-7.1.0"
];
})
sources."decamelize-1.2.0"
sources."deep-is-0.1.4"
sources."delayed-stream-1.0.0"
sources."domexception-1.0.1"
sources."ecc-jsbn-0.1.2"
sources."emoji-regex-8.0.0"
sources."end-of-stream-1.4.4"
sources."escalade-3.1.1"
sources."escodegen-1.14.3"
sources."esprima-4.0.1"
sources."estraverse-4.3.0"
sources."esutils-2.0.3"
sources."execa-1.0.0"
sources."extend-3.0.2"
sources."extsprintf-1.3.0"
sources."fast-deep-equal-3.1.3"
sources."fast-json-stable-stringify-2.1.0"
sources."fast-levenshtein-2.0.6"
sources."find-up-3.0.0"
sources."forever-agent-0.6.1"
sources."form-data-2.3.3"
sources."get-caller-file-1.0.3"
sources."get-stream-4.1.0"
sources."getpass-0.1.7"
sources."har-schema-2.0.0"
sources."har-validator-5.1.5"
sources."html-encoding-sniffer-1.0.2"
sources."http-signature-1.2.0"
sources."iconv-lite-0.4.24"
sources."invert-kv-2.0.0"
sources."is-fullwidth-code-point-2.0.0"
sources."is-stream-1.1.0"
sources."is-typedarray-1.0.0"
sources."isexe-2.0.0"
sources."isstream-0.1.2"
sources."jsbn-0.1.1"
sources."jsdom-11.12.0"
sources."json-schema-0.4.0"
sources."json-schema-traverse-0.4.1"
sources."json-stringify-safe-5.0.1"
sources."jsprim-1.4.2"
sources."lcid-2.0.0"
sources."left-pad-1.3.0"
sources."levn-0.3.0"
sources."locate-path-3.0.0"
sources."lodash-4.17.21"
sources."lodash.sortby-4.7.0"
sources."map-age-cleaner-0.1.3"
sources."mathjax-2.7.9"
sources."mathjax-node-2.1.1"
(sources."mathjax-node-sre-3.0.3" // {
dependencies = [
sources."yargs-12.0.5"
];
})
sources."mem-4.3.0"
sources."mime-db-1.52.0"
sources."mime-types-2.1.35"
sources."mimic-fn-2.1.0"
sources."nice-try-1.0.5"
sources."npm-run-path-2.0.2"
sources."number-is-nan-1.0.1"
sources."nwsapi-2.2.7"
sources."oauth-sign-0.9.0"
sources."once-1.4.0"
sources."optionator-0.8.3"
sources."os-locale-3.1.0"
sources."p-defer-1.0.0"
sources."p-finally-1.0.0"
sources."p-is-promise-2.1.0"
sources."p-limit-2.3.0"
sources."p-locate-3.0.0"
sources."p-try-2.2.0"
sources."parse5-4.0.0"
sources."path-exists-3.0.0"
sources."path-key-2.0.1"
sources."performance-now-2.1.0"
sources."pn-1.1.0"
sources."prelude-ls-1.1.2"
sources."psl-1.9.0"
sources."pump-3.0.0"
sources."punycode-2.3.1"
sources."qs-6.5.3"
sources."request-2.88.2"
sources."request-promise-core-1.1.4"
sources."request-promise-native-1.0.9"
sources."require-directory-2.1.1"
sources."require-main-filename-1.0.1"
sources."safe-buffer-5.2.1"
sources."safer-buffer-2.1.2"
sources."sax-1.3.0"
sources."semver-5.7.2"
sources."set-blocking-2.0.0"
sources."shebang-command-1.2.0"
sources."shebang-regex-1.0.0"
sources."signal-exit-3.0.7"
sources."source-map-0.6.1"
sources."speech-rule-engine-2.4.0"
sources."sshpk-1.18.0"
sources."stealthy-require-1.1.1"
sources."string-width-2.1.1"
sources."strip-ansi-4.0.0"
sources."strip-eof-1.0.0"
sources."symbol-tree-3.2.4"
sources."tough-cookie-2.5.0"
sources."tr46-1.0.1"
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
sources."type-check-0.3.2"
sources."uri-js-4.4.1"
sources."uuid-3.4.0"
sources."verror-1.10.0"
sources."w3c-hr-time-1.0.2"
sources."webidl-conversions-4.0.2"
sources."whatwg-encoding-1.0.5"
sources."whatwg-mimetype-2.3.0"
sources."whatwg-url-6.5.0"
sources."which-1.3.1"
sources."which-module-2.0.1"
sources."wicked-good-xpath-1.3.0"
sources."word-wrap-1.2.5"
(sources."wrap-ansi-2.1.0" // {
dependencies = [
sources."ansi-regex-2.1.1"
sources."is-fullwidth-code-point-1.0.0"
sources."string-width-1.0.2"
sources."strip-ansi-3.0.1"
];
})
sources."wrappy-1.0.2"
sources."ws-5.2.3"
sources."xml-name-validator-3.0.0"
sources."xmldom-sre-0.1.31"
sources."y18n-4.0.3"
(sources."yargs-17.7.2" // {
dependencies = [
sources."ansi-regex-5.0.1"
sources."cliui-8.0.1"
sources."get-caller-file-2.0.5"
sources."is-fullwidth-code-point-3.0.0"
sources."string-width-4.2.3"
sources."strip-ansi-6.0.1"
sources."wrap-ansi-7.0.0"
sources."y18n-5.0.8"
sources."yargs-parser-21.1.1"
];
})
sources."yargs-parser-11.1.1"
];
buildInputs = globalBuildInputs;
meta = {
description = "CLI tools for calling mathjax-node";
homepage = "https://github.com/mathjax/mathjax-node-cli#readme";
license = "Apache-2.0";
};
production = true;
bypassCache = true;
reconstructLock = true;
};
meat = nodeEnv.buildNodePackage {
name = "meat";
packageName = "meat";

View file

@ -23,7 +23,7 @@
buildPythonPackage rec {
pname = "awkward";
version = "2.4.9";
version = "2.4.10";
pyproject = true;
disabled = pythonOlder "3.8";
@ -32,7 +32,7 @@ buildPythonPackage rec {
owner = "scikit-hep";
repo = "awkward";
rev = "refs/tags/v${version}";
hash = "sha256-8MllMKf/xp5SdtF9P1Sa6Ytml4nQ5OX7vs7ITU8mCRU=";
hash = "sha256-D+bgKI6olK3smgnRdACvd0gYMWvS6ao6f7nQh3YExXw=";
};
nativeBuildInputs = [

View file

@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchpatch
, einops
, emoji
, flax
@ -16,16 +17,20 @@
buildPythonPackage rec {
pname = "dalle-mini";
version = "0.1.5";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-k4XILjNNz0FPcAzwPEeqe5Lj24S2Y139uc9o/1IUS1c=";
};
format = "setuptools";
buildInputs = [
jaxlib
# Fix incompatibility with the latest JAX versions
# See https://github.com/borisdayma/dalle-mini/pull/338
patches = [
(fetchpatch {
url = "https://github.com/borisdayma/dalle-mini/pull/338/commits/22ffccf03f3e207731a481e3e42bdb564ceebb69.patch";
hash = "sha256-LIOyfeq/oVYukG+1rfy5PjjsJcjADCjn18x/hVmLkPY=";
})
];
propagatedBuildInputs = [
@ -34,6 +39,7 @@ buildPythonPackage rec {
flax
ftfy
jax
jaxlib
pillow
transformers
unidecode
@ -49,7 +55,5 @@ buildPythonPackage rec {
homepage = "https://github.com/borisdayma/dalle-mini";
license = licenses.asl20;
maintainers = with maintainers; [ r-burns ];
# incompatible with recent versions of JAX
broken = true;
};
}

View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "losant-rest";
version = "1.19.1";
version = "1.19.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "Losant";
repo = "losant-rest-python";
rev = "v${version}";
hash = "sha256-xCC0AEiHrulxNdBf59ap9oKh/mF1u9IzZsPYFJeHNR0=";
hash = "sha256-JaXADzNxRqumjx6FZxJj6ioMVdUMR6S1FQQ6QcP8S5Q=";
};
propagatedBuildInputs = [

View file

@ -5,7 +5,6 @@
, buildPythonPackage
, dacite
, fetchFromGitHub
, orjson
, pytest-asyncio
, pytest-error-for-skips
, pytestCheckHook
@ -14,7 +13,7 @@
buildPythonPackage rec {
pname = "nettigo-air-monitor";
version = "2.2.0";
version = "2.2.1";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -23,14 +22,13 @@ buildPythonPackage rec {
owner = "bieniu";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-K8EiDb6B18No9RNbw2a7U+FJQaXrrcFf0hgt40r6Igo=";
hash = "sha256-24O9Yl0+boxDtyPW4tBTsk2iDGGXf8ofkDHu8B+GxhE=";
};
propagatedBuildInputs = [
aiohttp
aqipy-atmotech
dacite
orjson
];
nativeCheckInputs = [

View file

@ -15,6 +15,11 @@ buildPythonPackage rec {
url = "https://github.com/sods/paramz/pull/38/commits/a5a0be15b12c5864b438d870b519ad17cc72cd12.patch";
hash = "sha256-vj/amEXL9QJ7VdqJmyhv/lj8n+yuiZEARQBYWw6lgBA=";
})
(fetchpatch {
name = "_raveled_index_for.patch";
url = "https://github.com/sods/paramz/pull/40/commits/dd68a81cfd28edb48354c6a9b493ef711f00fb5b.patch";
hash = "sha256-nbnW3lYJDT1WXko3Y28YyELhO0QIAA1Tx0CJ57T1Nq0=";
})
];
propagatedBuildInputs = [ numpy scipy six decorator ];

View file

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "pdfplumber";
version = "0.10.2";
version = "0.10.3";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "jsvine";
repo = "pdfplumber";
rev = "refs/tags/v${version}";
hash = "sha256-nuHHEVOYm2/PkXIs9Ze5y5xyJMLkxqp3q3u4gV8Ks80=";
hash = "sha256-fd/4I6jjc0Wz2+XHGXAGg0Am3Dmw9R2ZX7nymIj/UnA=";
};
postPatch = ''

View file

@ -15,12 +15,12 @@
buildPythonPackage rec {
pname = "pep517";
version = "0.13.0";
version = "0.13.1";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-rmmSfFwXK+Gt2SA3JtS4TPPrrR7c1fcfzcdG5m6Cn1k=";
hash = "sha256-Gy+i/9OTi7S+/+XWFGy8sr2plqWk2p8xq//Ysk4Hsxc=";
};
nativeBuildInputs = [

View file

@ -22,11 +22,11 @@
# integrating with ipython-sql
buildPythonPackage rec {
pname = "pgcli";
version = "4.0.0";
version = "4.0.1";
src = fetchPypi {
inherit pname version;
hash = "sha256-C/X427yQR+BkbQFqQhMoomDEbP8hCJCLEbtVyWR17o0=";
hash = "sha256-8v7qIJnOGtXoqdXZOw7a9g3GHpeyG3XpHZcjk5zlO9I=";
};
propagatedBuildInputs = [

View file

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "publicsuffixlist";
version = "0.10.0.20231105";
version = "0.10.0.20231109";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-+/r2gVtA0j+aY827B0wZCOlogil7921V94/bay8/dVg=";
hash = "sha256-cr2rEoGVJ8BeXLfyPq4Auxu7OEOlVnKxlSMUREmji2E=";
};
nativeBuildInputs = [

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pyezviz";
version = "0.2.2.2";
version = "0.2.2.3";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "baqs";
repo = "pyEzviz";
rev = "refs/tags/${version}";
hash = "sha256-YQlPv8YfPbYfpg+4VrLWHOWYJoecuAr3K7JBiogiI/g=";
hash = "sha256-HZLWpoo0luAqqwLA3t7cDh0yVP6znrzMoUg7cuexd28=";
};
propagatedBuildInputs = [

View file

@ -7,7 +7,7 @@
}:
buildPythonPackage rec {
pname = "tika-client";
version = "0.4.0";
version = "0.5.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "stumpylog";
repo = "tika-client";
rev = "refs/tags/${version}";
hash = "sha256-yp9Wxc5RUZYhv2RxQwImZGqqoQmtZEkfEmj40ilxhQM=";
hash = "sha256-fFibRF3SoDOje6M9YmZI0dwYVn/cvgXqmClvqvNy5f8=";
};
propagatedBuildInputs = [
@ -36,7 +36,7 @@ buildPythonPackage rec {
description = "A modern Python REST client for Apache Tika server";
homepage = "https://github.com/stumpylog/tika-client";
changelog = "https://github.com/stumpylog/tika-client/blob/${version}/CHANGELOG.md";
license = licenses.gpl3;
license = licenses.mpl20;
maintainers = with maintainers; [ e1mo ];
};
}

View file

@ -46,7 +46,10 @@
let
inherit (lib) attrsets lists strings trivial;
inherit (cudaPackages) cudaFlags cudnn nccl;
inherit (cudaPackages) cudaFlags cudnn;
# Some packages are not available on all platforms
nccl = cudaPackages.nccl or null;
setBool = v: if v then "1" else "0";
@ -176,6 +179,13 @@ in buildPythonPackage rec {
'message(FATAL_ERROR "Found NCCL header version and library version' \
'message(WARNING "Found NCCL header version and library version'
''
# TODO(@connorbaker): Remove this patch after 2.1.0 lands.
+ lib.optionalString cudaSupport ''
substituteInPlace torch/utils/cpp_extension.py \
--replace \
"'8.6', '8.9'" \
"'8.6', '8.7', '8.9'"
''
# error: no member named 'aligned_alloc' in the global namespace; did you mean simply 'aligned_alloc'
# This lib overrided aligned_alloc hence the error message. Tltr: his function is linkable but not in header.
+ lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0") ''
@ -251,6 +261,7 @@ in buildPythonPackage rec {
PYTORCH_BUILD_VERSION = version;
PYTORCH_BUILD_NUMBER = 0;
USE_NCCL = setBool (nccl != null);
USE_SYSTEM_NCCL = setBool useSystemNccl; # don't build pytorch's third_party NCCL
USE_STATIC_NCCL = setBool useSystemNccl;
@ -318,6 +329,8 @@ in buildPythonPackage rec {
libcusolver.lib
libcusparse.dev
libcusparse.lib
] ++ lists.optionals (nccl != null) [
# Some platforms do not support NCCL (i.e., Jetson)
nccl.dev # Provides nccl.h AND a static copy of NCCL!
] ++ lists.optionals (strings.versionOlder cudaVersion "11.8") [
cuda_nvprof.dev # <cuda_profiler_api.h>

View file

@ -8,17 +8,22 @@ lib.makeScope pkgs.newScope (self:
buildPackage = callPackage ./build-skaware-package.nix { };
cleanPackaging = callPackage ./clean-packaging.nix { };
# execline
execline = callPackage ./execline { };
execline-man-pages = callPackage ./execline-man-pages { };
# servers & tools
mdevd = callPackage ./mdevd { };
nsss = callPackage ./nsss { };
sdnotify-wrapper = callPackage ./sdnotify-wrapper { };
tipidee = callPackage ./tipidee { };
utmps = callPackage ./utmps { };
# libs
skalibs = callPackage ./skalibs { };
skalibs_2_10 = callPackage ./skalibs/2_10.nix { };
sdnotify-wrapper = callPackage ./sdnotify-wrapper { };
# s6 tooling
s6 = callPackage ./s6 { };
s6-dns = callPackage ./s6-dns { };
s6-linux-init = callPackage ./s6-linux-init { };

View file

@ -0,0 +1,40 @@
{ skawarePackages }:
with skawarePackages;
buildPackage {
pname = "tipidee";
version = "0.0.1.0";
sha256 = "sha256-rKi9IX9CcRhY4n44i2vDom9MIeuGxRAHF7u0C3nNvFU=";
description = "A HTTP 1.1 webserver, serving static files and CGI/NPH";
outputs = [ "bin" "lib" "out" "dev" "doc" ];
configureFlags = [
"--libdir=\${lib}/lib"
"--libexecdir=\${lib}/libexec"
"--dynlibdir=\${lib}/lib"
"--bindir=\${bin}/bin"
"--includedir=\${dev}/include"
"--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps"
"--with-include=${skalibs.dev}/include"
"--with-lib=${skalibs.lib}/lib"
"--with-dynlib=${skalibs.lib}/lib"
# we set sysconfdir to /etc here to allow tipidee-config
# to look in the global paths for its configs.
# This is not encouraged, but a valid use-case.
"--sysconfdir=/etc"
];
postInstall = ''
# remove all tipidee executables from build directory
rm $(find -type f -mindepth 1 -maxdepth 1 -executable)
rm libtipidee.*
mv doc $doc/share/doc/tipidee/html
mv examples $doc/share/doc/tipidee/examples
'';
}

View file

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "bundletool";
version = "1.15.5";
version = "1.15.6";
src = fetchurl {
url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar";
sha256 = "sha256-DrrIh2ThayFUqnUGGHkX0WmVkzitnVEOMXS8yWydD0A=";
sha256 = "sha256-OK6KELzazvB+zOghEYjFySs3a+lto4/z7h8s9IlbLLg=";
};
dontUnpack = true;

View file

@ -43,8 +43,12 @@ in stdenv.mkDerivation rec {
];
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp $src/* $out/bin
runHook postInstall
'';
meta = with lib; {

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "golangci-lint";
version = "1.55.1";
version = "1.55.2";
src = fetchFromGitHub {
owner = "golangci";
repo = "golangci-lint";
rev = "v${version}";
hash = "sha256-r4tPFHvxXMgyGc5KTz0fM5nZ20OVSPQ6kKnTkeaefPI=";
hash = "sha256-DO71wfDmCuziEcsme1g1uNIl3MswA+EkQcYzOYHbG+I=";
};
vendorHash = "sha256-NfSO3JUrFJi1lwxhy+eubNNKuhgLTfDt2KLAnmOjdoA=";
vendorHash = "sha256-0+jImfMdVocOczGWeO03YXUg5yKYTu3WeJaokSlcYFM=";
subPackages = [ "cmd/golangci-lint" ];

View file

@ -12,7 +12,7 @@
}:
stdenvNoCC.mkDerivation rec {
version = "1.0.10";
version = "1.0.11";
pname = "bun";
src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec {
sources = {
"aarch64-darwin" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip";
hash = "sha256-xwKNDTlghNkq36wMAKSa+reROqGwMm4dZ/Hfos1zuP4=";
hash = "sha256-yZp/AFlOVRtZ60865utrtVv0zlerwFMhpqBh26WnfL8=";
};
"aarch64-linux" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip";
hash = "sha256-gaquYp4q22IJHV7Fx5GxZWVFvJzU30HOmL32lkxJeQ8=";
hash = "sha256-/9MKD2iRogrOIiKlCCPUX5KoDD0rM7K8+jVLx9xxs5s=";
};
"x86_64-darwin" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip";
hash = "sha256-DPVnTzdGprjZ16kme3Y6xBognjWHt+0N/zk0J3dm8jY=";
hash = "sha256-9wE3GL+EGvPHtVgfMx09Jn+WU/VoUf5x/QrrdlhePa8=";
};
"x86_64-linux" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip";
hash = "sha256-Er7QiWBhENTa9xhCIVqECCzexWejBwBC59u3CJKQiwc=";
hash = "sha256-pT9+GchNC3vmeFgTF0GzzyLzWBrCQcR/DFRVK2CnHCw=";
};
};
updateScript = writeShellScript "update-bun" ''

View file

@ -1,69 +1,63 @@
{ pkgs, lib, stdenv, makeDesktopItem, fetchurl, unzip, makeWrapper, xorg, jre, }:
{ lib
, fetchFromGitHub
, makeDesktopItem
, makeWrapper
, maven
, jre
, xorg
, gitUpdater
}:
stdenv.mkDerivation rec {
maven.buildMavenPackage rec {
pname = "runelite";
version = "2.5.0";
version = "2.6.9";
jar = fetchurl {
url = "https://github.com/runelite/launcher/releases/download/${version}/RuneLite.jar";
hash = "sha512-uEvlxXtnq7pgt8H5/hYIMu/kl32/dNojcHrPW6n2/RD/nzywreDw4kZ3G1kx0gGBY71x0RIEseEbm4BM+fhJlQ==";
src = fetchFromGitHub {
owner = "runelite";
repo = "launcher";
rev = version;
hash = "sha256-wU97uiotKZfui0ir7rmO1WLN3G6lTMxqF6vTyrlax1Q=";
};
icon = fetchurl {
url = "https://github.com/runelite/launcher/raw/${version}/appimage/runelite.png";
hash = "sha512-Yh8mpc6z9xd6ePe3f1f+KzrpE9r3fsdtQ0pfAvOhK/0hrCo/17eQA6v73yFXZcPQogVwm9CmJlrx4CkfzB25RQ==";
};
# The `.so` files provided by these two jars aren't detected by RuneLite for some reason, so we have to provide them manually
jogl = fetchurl {
url = "https://repo.runelite.net/net/runelite/jogl/jogl-all/2.4.0-rc-20200429/jogl-all-2.4.0-rc-20200429-natives-linux-amd64.jar";
hash = "sha512-OmJIbk5pKtvf1n1I5UHu6iaOKNrPgmaJTPhqC8yMjaRh/Hso1vV/+Eu+zKu7d5UiVggVUzJxqDKatmEnqFrzbg==";
};
gluegen = fetchurl {
url = "https://repo.runelite.net/net/runelite/gluegen/gluegen-rt/2.4.0-rc-20220318/gluegen-rt-2.4.0-rc-20220318-natives-linux-amd64.jar";
hash = "sha512-kF+RdDzYEhBuZOJ6ZwMhaEVcjYLxiwR8tYAm08FXDML45iP4HBEfmqHOLJpIakK06aQFj99/296vx810eDFX5A==";
};
dontUnpack = true;
mvnHash = "sha256-iGnoAZcJvaVoACi9ozG/f+A8tjvDuwn22bMRyuUU5Jg=";
desktop = makeDesktopItem {
name = "RuneLite";
type = "Application";
exec = "runelite";
icon = icon;
icon = "runelite";
comment = "Open source Old School RuneScape client";
desktopName = "RuneLite";
genericName = "Oldschool Runescape";
categories = [ "Game" ];
};
nativeBuildInputs = [ makeWrapper unzip ];
# tests require internet :(
mvnParameters = "-Dmaven.test.skip";
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/share/runelite
mkdir -p $out/share/applications
mkdir -p $out/natives
mkdir -p $out/share/icons
unzip ${jogl} 'natives/*' -d $out
unzip ${gluegen} 'natives/*' -d $out
cp target/RuneLite.jar $out/share
cp appimage/runelite.png $out/share/icons
ln -s ${jar} $out/share/runelite/RuneLite.jar
ln -s ${desktop}/share/applications/RuneLite.desktop $out/share/applications/RuneLite.desktop
# RuneLite looks for `.so` files in $PWD/natives, so ensure that we set the PWD to the right place
makeWrapper ${jre}/bin/java $out/bin/runelite \
--chdir "$out" \
--prefix LD_LIBRARY_PATH : "${xorg.libXxf86vm}/lib" \
--add-flags "-jar $out/share/runelite/RuneLite.jar"
--add-flags "-jar $out/share/RuneLite.jar"
'';
meta = with lib; {
passthru.updateScript = gitUpdater { };
meta = {
description = "Open source Old School RuneScape client";
homepage = "https://runelite.net/";
sourceProvenance = with sourceTypes; [
sourceProvenance = with lib.sourceTypes; [
binaryBytecode
binaryNativeCode
];
license = licenses.bsd2;
maintainers = with maintainers; [ kmeakin ];
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [ kmeakin moody ];
platforms = [ "x86_64-linux" ];
mainProgram = "runelite";
};
}

View file

@ -6,11 +6,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "aldente";
version = "1.22.2";
version = "1.22.3";
src = fetchurl {
url = "https://github.com/davidwernhart/aldente-charge-limiter/releases/download/${finalAttrs.version}/AlDente.dmg";
hash = "sha256-bREI0RS4xvEccyw3yed5aD8oG5wmD5hyG82qW2tqlEA=";
hash = "sha256-pSqBDDumCbORLQ+B3skSqKmgG2KybR5Zb4ojiNQcAaM=";
};
dontBuild = true;

View file

@ -6,14 +6,14 @@ let
# NOTE: When updating these, please also take a look at the changes done to
# kernel config in the xanmod version commit
ltsVariant = {
version = "6.1.61";
hash = "sha256-15dAzCcFUekBlkBfcHWiZ3gourimLp6GlUKeWAddDqo=";
version = "6.1.62";
hash = "sha256-fo5OQ/MZ+QVdCmLzX0OgFUBedfqrkqp+Ev081RVdtWw=";
variant = "lts";
};
mainVariant = {
version = "6.5.10";
hash = "sha256-t99LKAmNApcjFVna3ChNZp4O6ag9t2kQVrg8yRsTANg=";
version = "6.5.11";
hash = "sha256-1bb5LG6JvqX5eNSe2Xyu86HxaqkUVkKUf1H3T7bFkGE=";
variant = "main";
};
@ -36,9 +36,9 @@ let
# WineSync driver for fast kernel-backed Wine
WINESYNC = module;
# Preemptive Full Tickless Kernel at 500Hz
HZ = freeform "500";
HZ_500 = yes;
# Preemptive Full Tickless Kernel at 250Hz
HZ = freeform "250";
HZ_250 = yes;
HZ_1000 = no;
};

View file

@ -11,13 +11,15 @@ final: prev: let
"11.4" = "082dkk5y34wyvjgj2p5j1d00rk8xaxb9z0mhvz16bd469r1bw2qk";
"11.5" = "sha256-AKRZbke0K59lakhTi8dX2cR2aBuWPZkiQxyKaZTvHrI=";
"11.6" = "sha256-AsLNmAplfuQbXg9zt09tXAuFJ524EtTYsQuUlV1tPkE=";
"11.7" = throw "The tag 11.7 of cuda-samples does not exist";
# The tag 11.7 of cuda-samples does not exist
"11.8" = "sha256-7+1P8+wqTKUGbCUBXGMDO9PkxYr2+PLDx9W2hXtXbuc=";
"12.0" = "sha256-Lj2kbdVFrJo5xPYPMiE4BS7Z8gpU5JLKXVJhZABUe/g=";
}.${prev.cudaVersion};
"12.1" = "sha256-xE0luOMq46zVsIEWwK4xjLs7NorcTIi9gbfZPVjIlqo=";
"12.2" = "sha256-pOy0qfDjA/Nr0T9PNKKefK/63gQnJV2MQsN2g3S2yng=";
};
in {
in prev.lib.attrsets.optionalAttrs (builtins.hasAttr prev.cudaVersion sha256) {
cuda-samples = final.callPackage ./generic.nix {
inherit sha256;
sha256 = sha256.${prev.cudaVersion};
};
}

View file

@ -1,31 +1,46 @@
{ lib
, cudaPackages
{ autoAddOpenGLRunpathHook
, backendStdenv
, cmake
, cudatoolkit
, cudaVersion
, fetchFromGitHub
, fetchpatch
, addOpenGLRunpath
, cudatoolkit
, freeimage
, glfw3
, lib
, pkg-config
, sha256
, glfw3
, freeimage
}:
cudaPackages.backendStdenv.mkDerivation rec {
backendStdenv.mkDerivation (finalAttrs: {
pname = "cuda-samples";
version = lib.versions.majorMinor cudatoolkit.version;
version = cudaVersion;
src = fetchFromGitHub {
owner = "NVIDIA";
repo = pname;
rev = "v${version}";
repo = finalAttrs.pname;
rev = "v${finalAttrs.version}";
inherit sha256;
};
nativeBuildInputs = [ pkg-config addOpenGLRunpath glfw3 freeimage ];
nativeBuildInputs = [
pkg-config
autoAddOpenGLRunpathHook
glfw3
freeimage
]
# CMake has to run as a native, build-time dependency for libNVVM samples.
++ lib.lists.optionals (lib.strings.versionAtLeast finalAttrs.version "12.2") [
cmake
];
# CMake is not the primary build tool -- that's still make.
# As such, we disable CMake's build system.
dontUseCmakeConfigure = true;
buildInputs = [ cudatoolkit ];
# See https://github.com/NVIDIA/cuda-samples/issues/75.
patches = lib.optionals (version == "11.3") [
patches = lib.optionals (finalAttrs.version == "11.3") [
(fetchpatch {
url = "https://github.com/NVIDIA/cuda-samples/commit/5c3ec60faeb7a3c4ad9372c99114d7bb922fda8d.patch";
sha256 = "sha256-0XxdmNK9MPpHwv8+qECJTvXGlFxc+fIbta4ynYprfpU=";
@ -41,21 +56,15 @@ cudaPackages.backendStdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
install -Dm755 -t $out/bin bin/${cudaPackages.backendStdenv.hostPlatform.parsed.cpu.name}/${cudaPackages.backendStdenv.hostPlatform.parsed.kernel.name}/release/*
install -Dm755 -t $out/bin bin/${backendStdenv.hostPlatform.parsed.cpu.name}/${backendStdenv.hostPlatform.parsed.kernel.name}/release/*
runHook postInstall
'';
postFixup = ''
for exe in $out/bin/*; do
addOpenGLRunpath $exe
done
'';
meta = {
description = "Samples for CUDA Developers which demonstrates features in CUDA Toolkit";
# CUDA itself is proprietary, but these sample apps are not.
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ obsidian-systems-maintenance ];
maintainers = with lib.maintainers; [ obsidian-systems-maintenance ] ++ lib.teams.cuda.members;
};
}
})

View file

@ -6,15 +6,15 @@
}:
buildGoModule rec {
pname = "aws-sso-cli";
version = "1.14.0";
version = "1.14.2";
src = fetchFromGitHub {
owner = "synfinatic";
repo = pname;
rev = "v${version}";
hash = "sha256-4LgTAoPly551vzZ8StF01+zpBGAO7fpcyq3IrSrDhlg=";
hash = "sha256-KtSmDBr2JRxyBUJ5UWMmnfN87oO1/TiCrtuxA2b9Ph0=";
};
vendorHash = "sha256-YZ9/eqKZ0PDHZL6f3J7Obfq34Xk3swU/gGwzWJ2QsKs=";
vendorHash = "sha256-B7t1syBJjwaTM4Tgj/OhhmHJRAhJ/Ewg+g55AKpdj4c=";
nativeBuildInputs = [ makeWrapper ];
@ -28,6 +28,11 @@ buildGoModule rec {
--suffix PATH : ${lib.makeBinPath [ xdg-utils ]}
'';
checkFlags = [
# requires network access
"-skip=TestAWSConsoleUrl|TestAWSFederatedUrl"
];
meta = with lib; {
homepage = "https://github.com/synfinatic/aws-sso-cli";
description = "AWS SSO CLI is a secure replacement for using the aws configure sso wizard";

View file

@ -54,6 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Utility for RAR archives";
homepage = "https://www.rarlab.com/";
license = licenses.unfreeRedistributable;
mainProgram = "unrar";
maintainers = with maintainers; [ ehmry wegank ];
platforms = platforms.all;
};

View file

@ -29,13 +29,13 @@ with rec {
stdenv.mkDerivation rec {
pname = "astc-encoder";
version = "4.5.0";
version = "4.6.0";
src = fetchFromGitHub {
owner = "ARM-software";
repo = "astc-encoder";
rev = version;
sha256 = "sha256-pNoBOp//xa5F6/T1cwtdHsAWLZeIHgxZ7UKaB60fg4M=";
sha256 = "sha256-COZO4LTrM/kZp85uNGwB9eaF27Xf7NVg4hcshaCJBwI=";
};
nativeBuildInputs = [ cmake ];

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "fsql";
version = "0.5.1";
version = "0.5.2";
src = fetchFromGitHub {
owner = "kshvmdn";
repo = "fsql";
rev = "v${version}";
sha256 = "sha256-6KqlpFBaAWrlEjkFQhOEic569+eoYVAsnhMrg8AEPV4=";
sha256 = "sha256-U6TPszqsZvoz+9GIB0wNYMRJqIDLOp/BZO3/k8FC0Gs=";
};
vendorHash = "sha256-xuD7/gTssf1Iu1VuIRysjtUjve16gozOq0Wz4w6mIB8=";
vendorHash = "sha256-+laTnx6Xkrv3QQel5opqYQSuFmo54UMI2A653xbBWzQ=";
ldflags = [ "-s" "-w" ];

View file

@ -9,13 +9,13 @@
}:
buildGoModule rec {
pname = "goreleaser";
version = "1.22.0";
version = "1.22.1";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
hash = "sha256-82DaGmXS+qbPN3dg1Zk/WHGOymJEuhOzQl+MsPmi5tw=";
hash = "sha256-Okuiicq1CAVrE3YPe/aF/HZbf23p6ulz//BRGX77cnw=";
};
vendorHash = "sha256-+ac4q820gETsNRVpW2u0MXU6HfoztLdsWK2HYqJ4mqo=";

View file

@ -5,19 +5,19 @@
rustPlatform.buildRustPackage rec {
pname = "wasm-tools";
version = "1.0.48";
version = "1.0.51";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = pname;
rev = "${pname}-${version}";
hash = "sha256-7LAmU5Ay8Zf8wdKAj7am6cGmWtD5L+lUyxeiv1yv/A4=";
hash = "sha256-SeUwd9S2WMGbNqj9NzZZKW1tQWc0cbe+uZmHc1PWKR8=";
fetchSubmodules = true;
};
# Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
auditable = false;
cargoHash = "sha256-QWWz5c+D2UH+CWGJTaTEuAqHVIW4hu1cM7LWKO7K98Q=";
cargoHash = "sha256-G7pIy8KuDEEVVhH0WzY93eDhH2oTT9sP5CqTgfxYB0c=";
cargoBuildFlags = [ "--package" "wasm-tools" ];
cargoTestFlags = [ "--all" ];

View file

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "openfortivpn";
version = "1.20.5";
version = "1.21.0";
src = fetchFromGitHub {
owner = "adrienverge";
repo = pname;
rev = "v${version}";
hash = "sha256-jbgxhCQWDw1ZUOAeLhOG+b6JYgvpr5TnNDIO/4k+e7k=";
hash = "sha256-7Yf22EpOTEGGqPoNGnHFyn5A4n7aYFXoSE1G6zyzT3M=";
};
# we cannot write the config file to /etc and as we don't need the file, so drop it

View file

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, curl }:
stdenv.mkDerivation rec {
version = "2.8.3";
version = "2.8.5";
pname = "clib";
src = fetchFromGitHub {
rev = version;
owner = "clibs";
repo = "clib";
sha256 = "sha256-Ld6u+F25SOyYr+JWXVmn5G8grQ39eN8EY7j77WNycEE=";
sha256 = "sha256-znvqxZWkQndxE6s36c77whUPc1UokrofTApFSIKFOtM=";
};
makeFlags = [ "PREFIX=$(out)" ];

View file

@ -203,7 +203,7 @@ in lib.makeExtensible (self: ({
else
nix;
stable = self.nix_2_17;
stable = self.nix_2_18;
unstable = self.nix_2_18;
} // lib.optionalAttrs config.allowAliases {

View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2023-11-03";
version = "2023-11-08";
src = fetchFromGitLab {
owner = "exploit-database";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-Ent0FQI2ZCmgQA98bZxGjKW12fj/0yicZ/UFUgfT0yw=";
hash = "sha256-6GGDWI2NOWoPg5DyOjrsnmNzViBBUz9ZY5pO3BFoCOU=";
};
nativeBuildInputs = [

View file

@ -9,13 +9,13 @@
rustPlatform.buildRustPackage rec {
pname = "feroxbuster";
version = "2.10.0";
version = "2.10.1";
src = fetchFromGitHub {
owner = "epi052";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-u2c+s5kCAYOKwl5eb1zY7xdl4pD6eAjiyRj6JFkA07M=";
hash = "sha256-AFh/IeB88NYPsyUqzaN92GoDbAgl+HG87cIy+Ni06Q8=";
};
# disable linker overrides on aarch64-linux
@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
rm .cargo/config
'';
cargoHash = "sha256-rPFj53KQkucz1/yAr6U2nk6gTdxcBxyRHVqGeawBYZU=";
cargoHash = "sha256-Fu3qw3qRK3TZlzK1WcmI/GQ5TM1j+gbGoedwp18SolY=";
OPENSSL_NO_VENDOR = true;

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "notation";
version = "1.0.0";
version = "1.0.1";
src = fetchFromGitHub {
owner = "notaryproject";
repo = pname;
rev = "v${version}";
hash = "sha256-mj+LCO6Q4kKfYewPl0R9axZB9O4Yy+GkLlUIDe6yhlI=";
hash = "sha256-KcB5l6TRZhciXO04mz5iORR4//cAhrh+o4Kdq7LA4A4=";
};
vendorHash = "sha256-wQTRgOSOq0LeiSwF5eowaW4R2xCx+kEb0WQ+upsxdAA=";
vendorHash = "sha256-r58ZV63KIHKxh5HDeQRfd0OF0s7xpC4sXvsYLhm8AIE=";
# This is a Go sub-module and cannot be built directly (e2e tests).
excludedPackages = [ "./test" ];

View file

@ -16647,7 +16647,7 @@ with pkgs;
else if platform.isFreeBSD then 12
else if platform.isAndroid then 12
else if platform.isLinux then 16
else if platform.isWasm then 12
else if platform.isWasm then 16
else 14;
# We take the "max of the mins". Why? Since those are lower bounds of the
# supported version set, this is like intersecting those sets and then
@ -25020,6 +25020,7 @@ with pkgs;
sdnotify-wrapper
skalibs
skalibs_2_10
tipidee
utmps;
kgt = callPackage ../development/tools/kgt {