Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
bc7a5b525c
@ -622,6 +622,20 @@ rec {
|
||||
dontRecurseIntoAttrs =
|
||||
attrs: attrs // { recurseForDerivations = false; };
|
||||
|
||||
/* `unionOfDisjoint x y` is equal to `x // y // z` where the
|
||||
attrnames in `z` are the intersection of the attrnames in `x` and
|
||||
`y`, and all values `assert` with an error message. This
|
||||
operator is commutative, unlike (//). */
|
||||
unionOfDisjoint = x: y:
|
||||
let
|
||||
intersection = builtins.intersectAttrs x y;
|
||||
collisions = lib.concatStringsSep " " (builtins.attrNames intersection);
|
||||
mask = builtins.mapAttrs (name: value: builtins.throw
|
||||
"unionOfDisjoint: collision on ${name}; complete list: ${collisions}")
|
||||
intersection;
|
||||
in
|
||||
(x // y) // mask;
|
||||
|
||||
/*** deprecated stuff ***/
|
||||
|
||||
zipWithNames = zipAttrsWithNames;
|
||||
|
||||
@ -3,8 +3,10 @@
|
||||
stdenv.mkDerivation {
|
||||
name = "nix-generate-from-cpan-3";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
buildInputs = with perlPackages; [
|
||||
makeWrapper perl GetoptLongDescriptive CPANPLUS Readonly LogLog4perl
|
||||
perl GetoptLongDescriptive CPANPLUS Readonly LogLog4perl
|
||||
];
|
||||
|
||||
phases = [ "installPhase" ];
|
||||
|
||||
@ -102,7 +102,7 @@ in {
|
||||
each user that tries to use the sound system. The server runs
|
||||
with user privileges. If true, one system-wide PulseAudio
|
||||
server is launched on boot, running as the user "pulse", and
|
||||
only users in the "audio" group will have access to the server.
|
||||
only users in the "pulse-access" group will have access to the server.
|
||||
Please read the PulseAudio documentation for more details.
|
||||
|
||||
Don't enable this option unless you know what you are doing.
|
||||
@ -310,6 +310,7 @@ in {
|
||||
};
|
||||
|
||||
users.groups.pulse.gid = gid;
|
||||
users.groups.pulse-access = {};
|
||||
|
||||
systemd.services.pulseaudio = {
|
||||
description = "PulseAudio System-Wide Server";
|
||||
|
||||
@ -23,8 +23,10 @@ in
|
||||
runCommand "uvcdynctrl-udev-rules-${version}"
|
||||
{
|
||||
inherit dataPath;
|
||||
buildInputs = [
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
buildInputs = [
|
||||
libwebcam
|
||||
];
|
||||
dontPatchELF = true;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# This module defines the software packages included in the "minimal"
|
||||
# installation CD. It might be useful elsewhere.
|
||||
|
||||
{ lib, pkgs, ... }:
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
# Include some utilities that are useful for installing or repairing
|
||||
@ -51,7 +51,9 @@
|
||||
];
|
||||
|
||||
# Include support for various filesystems.
|
||||
boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "zfs" "ntfs" "cifs" ];
|
||||
boot.supportedFilesystems =
|
||||
[ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ] ++
|
||||
lib.optional (lib.meta.availableOn pkgs.stdenv.hostPlatform config.boot.zfs.package) "zfs";
|
||||
|
||||
# Configure host id for ZFS to work
|
||||
networking.hostId = lib.mkDefault "8425e349";
|
||||
|
||||
@ -14,7 +14,7 @@ let
|
||||
pyEnv = pkgs.python.withPackages(ps: [ ps.mininet-python ]);
|
||||
|
||||
mnexecWrapped = pkgs.runCommand "mnexec-wrapper"
|
||||
{ buildInputs = [ pkgs.makeWrapper pkgs.pythonPackages.wrapPython ]; }
|
||||
{ nativeBuildInputs = [ pkgs.makeWrapper pkgs.pythonPackages.wrapPython ]; }
|
||||
''
|
||||
makeWrapper ${pkgs.mininet}/bin/mnexec \
|
||||
$out/bin/mnexec \
|
||||
|
||||
@ -14,6 +14,7 @@ let
|
||||
''
|
||||
#! ${pkgs.runtimeShell} -e
|
||||
export DISPLAY="$(systemctl --user show-environment | ${pkgs.gnused}/bin/sed 's/^DISPLAY=\(.*\)/\1/; t; d')"
|
||||
export WAYLAND_DISPLAY="$(systemctl --user show-environment | ${pkgs.gnused}/bin/sed 's/^WAYLAND_DISPLAY=\(.*\)/\1/; t; d')"
|
||||
exec ${askPassword} "$@"
|
||||
'';
|
||||
|
||||
|
||||
@ -14,7 +14,7 @@ let
|
||||
name = "mopidy-with-extensions-${mopidy.version}";
|
||||
paths = closePropagation cfg.extensionPackages;
|
||||
pathsToLink = [ "/${mopidyPackages.python.sitePackages}" ];
|
||||
buildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
postBuild = ''
|
||||
makeWrapper ${mopidy}/bin/mopidy $out/bin/mopidy \
|
||||
--prefix PYTHONPATH : $out/${mopidyPackages.python.sitePackages}
|
||||
|
||||
@ -116,7 +116,7 @@ let
|
||||
original, name, set ? {}
|
||||
}:
|
||||
pkgs.runCommand "${name}-wrapper" {
|
||||
buildInputs = [ pkgs.makeWrapper ];
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
} (with lib; ''
|
||||
makeWrapper "${original}" "$out/bin/${name}" \
|
||||
${concatStringsSep " \\\n " (mapAttrsToList (name: value: ''--set ${name} "${value}"'') set)}
|
||||
|
||||
@ -200,46 +200,65 @@ in
|
||||
|
||||
${lines}
|
||||
'';
|
||||
currentConfigPath = "$STATE_DIRECTORY/.nixos-current-config.json";
|
||||
runnerRegistrationConfig = getAttrs [ "name" "tokenFile" "url" "runnerGroup" "extraLabels" "ephemeral" ] cfg;
|
||||
newConfigPath = builtins.toFile "${svcName}-config.json" (builtins.toJSON runnerRegistrationConfig);
|
||||
newConfigTokenFilename = ".new-token";
|
||||
currentConfigPath = "$STATE_DIRECTORY/.nixos-current-config.json";
|
||||
newConfigTokenPath= "$STATE_DIRECTORY/.new-token";
|
||||
currentConfigTokenPath = "$STATE_DIRECTORY/${currentConfigTokenFilename}";
|
||||
|
||||
runnerCredFiles = [
|
||||
".credentials"
|
||||
".credentials_rsaparams"
|
||||
".runner"
|
||||
];
|
||||
unconfigureRunner = writeScript "unconfigure" ''
|
||||
differs=
|
||||
|
||||
if [[ "$(ls -A "$STATE_DIRECTORY")" ]]; then
|
||||
# State directory is not empty
|
||||
# Set `differs = 1` if current and new runner config differ or if `currentConfigPath` does not exist
|
||||
${pkgs.diffutils}/bin/diff -q '${newConfigPath}' "${currentConfigPath}" >/dev/null 2>&1 || differs=1
|
||||
# Also trigger a registration if the token content changed
|
||||
${pkgs.diffutils}/bin/diff -q \
|
||||
"$STATE_DIRECTORY"/${currentConfigTokenFilename} \
|
||||
${escapeShellArg cfg.tokenFile} \
|
||||
>/dev/null 2>&1 || differs=1
|
||||
# If .credentials does not exist, assume a previous run de-registered the runner on stop (ephemeral mode)
|
||||
[[ ! -f "$STATE_DIRECTORY/.credentials" ]] && differs=1
|
||||
fi
|
||||
|
||||
if [[ -n "$differs" ]]; then
|
||||
echo "Config has changed, removing old runner state."
|
||||
# In ephemeral mode, the runner deletes the `.credentials` file after de-registering it with GitHub
|
||||
[[ -f "$STATE_DIRECTORY/.credentials" ]] && echo "The old runner will still appear in the GitHub Actions UI." \
|
||||
"You have to remove it manually."
|
||||
find "$STATE_DIRECTORY/" -mindepth 1 -delete
|
||||
|
||||
copy_tokens() {
|
||||
# Copy the configured token file to the state dir and allow the service user to read the file
|
||||
install --mode=666 ${escapeShellArg cfg.tokenFile} "$STATE_DIRECTORY/${newConfigTokenFilename}"
|
||||
install --mode=666 ${escapeShellArg cfg.tokenFile} "${newConfigTokenPath}"
|
||||
# Also copy current file to allow for a diff on the next start
|
||||
install --mode=600 ${escapeShellArg cfg.tokenFile} "$STATE_DIRECTORY/${currentConfigTokenFilename}"
|
||||
install --mode=600 ${escapeShellArg cfg.tokenFile} "${currentConfigTokenPath}"
|
||||
}
|
||||
|
||||
clean_state() {
|
||||
find "$STATE_DIRECTORY/" -mindepth 1 -delete
|
||||
copy_tokens
|
||||
}
|
||||
|
||||
diff_config() {
|
||||
changed=0
|
||||
|
||||
# Check for module config changes
|
||||
[[ -f "${currentConfigPath}" ]] \
|
||||
&& ${pkgs.diffutils}/bin/diff -q '${newConfigPath}' "${currentConfigPath}" >/dev/null 2>&1 \
|
||||
|| changed=1
|
||||
|
||||
# Also check the content of the token file
|
||||
[[ -f "${currentConfigTokenPath}" ]] \
|
||||
&& ${pkgs.diffutils}/bin/diff -q "${currentConfigTokenPath}" ${escapeShellArg cfg.tokenFile} >/dev/null 2>&1 \
|
||||
|| changed=1
|
||||
|
||||
# If the config has changed, remove old state and copy tokens
|
||||
if [[ "$changed" -eq 1 ]]; then
|
||||
echo "Config has changed, removing old runner state."
|
||||
echo "The old runner will still appear in the GitHub Actions UI." \
|
||||
"You have to remove it manually."
|
||||
clean_state
|
||||
fi
|
||||
}
|
||||
|
||||
if [[ "${optionalString cfg.ephemeral "1"}" ]]; then
|
||||
# In ephemeral mode, we always want to start with a clean state
|
||||
clean_state
|
||||
elif [[ "$(ls -A "$STATE_DIRECTORY")" ]]; then
|
||||
# There are state files from a previous run; diff them to decide if we need a new registration
|
||||
diff_config
|
||||
else
|
||||
# The state directory is entirely empty which indicates a first start
|
||||
copy_tokens
|
||||
fi
|
||||
'';
|
||||
configureRunner = writeScript "configure" ''
|
||||
if [[ -e "$STATE_DIRECTORY/${newConfigTokenFilename}" ]]; then
|
||||
if [[ -e "${newConfigTokenPath}" ]]; then
|
||||
echo "Configuring GitHub Actions Runner"
|
||||
|
||||
args=(
|
||||
@ -256,7 +275,7 @@ in
|
||||
|
||||
# If the token file contains a PAT (i.e., it starts with "ghp_"), we have to use the --pat option,
|
||||
# if it is not a PAT, we assume it contains a registration token and use the --token option
|
||||
token=$(<"$STATE_DIRECTORY/${newConfigTokenFilename}")
|
||||
token=$(<"${newConfigTokenPath}")
|
||||
if [[ "$token" =~ ^ghp_* ]]; then
|
||||
args+=(--pat "$token")
|
||||
else
|
||||
@ -271,7 +290,7 @@ in
|
||||
rm -rf "$STATE_DIRECTORY/_diag/"
|
||||
|
||||
# Cleanup token from config
|
||||
rm "$STATE_DIRECTORY/${newConfigTokenFilename}"
|
||||
rm "${newConfigTokenPath}"
|
||||
|
||||
# Symlink to new config
|
||||
ln -s '${newConfigPath}' "${currentConfigPath}"
|
||||
@ -305,8 +324,8 @@ in
|
||||
WorkingDirectory = runtimeDir;
|
||||
|
||||
InaccessiblePaths = [
|
||||
# Token file path given in the configuration
|
||||
cfg.tokenFile
|
||||
# Token file path given in the configuration, if visible to the service
|
||||
"-${cfg.tokenFile}"
|
||||
# Token file in the state directory
|
||||
"${stateDir}/${currentConfigTokenFilename}"
|
||||
];
|
||||
|
||||
@ -42,7 +42,7 @@ let
|
||||
makeWrapperArgs = concatStringsSep " " (mapAttrsToList (key: value: "--set \"${key}\" \"${value}\"") hydraEnv);
|
||||
in pkgs.buildEnv rec {
|
||||
name = "hydra-env";
|
||||
buildInputs = [ pkgs.makeWrapper ];
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
paths = [ cfg.package ];
|
||||
|
||||
postBuild = ''
|
||||
|
||||
@ -50,7 +50,7 @@ let
|
||||
# to install it because it would create a cyclic dependency between
|
||||
# the outputs. We also need to enable the remote,
|
||||
# which should not be done by default.
|
||||
mkIf cfg.enableTestRemote (enableRemote cfg.package.installedTests "fwupd-tests")
|
||||
if cfg.enableTestRemote then (enableRemote cfg.package.installedTests "fwupd-tests") else {}
|
||||
);
|
||||
|
||||
in {
|
||||
|
||||
@ -162,7 +162,7 @@ in
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
(runCommand "etebase-server" {
|
||||
buildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
} ''
|
||||
makeWrapper ${pythonEnv}/bin/etebase-server \
|
||||
$out/bin/etebase-server \
|
||||
|
||||
@ -205,7 +205,7 @@ let
|
||||
|
||||
gitlab-rake = pkgs.stdenv.mkDerivation {
|
||||
name = "gitlab-rake";
|
||||
buildInputs = [ pkgs.makeWrapper ];
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
dontBuild = true;
|
||||
dontUnpack = true;
|
||||
installPhase = ''
|
||||
@ -220,7 +220,7 @@ let
|
||||
|
||||
gitlab-rails = pkgs.stdenv.mkDerivation {
|
||||
name = "gitlab-rails";
|
||||
buildInputs = [ pkgs.makeWrapper ];
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
dontBuild = true;
|
||||
dontUnpack = true;
|
||||
installPhase = ''
|
||||
|
||||
@ -101,6 +101,14 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
description = mkOption {
|
||||
type = types.str;
|
||||
default = "Gitolite user";
|
||||
description = lib.mdDoc ''
|
||||
Gitolite user account's description.
|
||||
'';
|
||||
};
|
||||
|
||||
group = mkOption {
|
||||
type = types.str;
|
||||
default = "gitolite";
|
||||
@ -145,7 +153,7 @@ in
|
||||
'';
|
||||
|
||||
users.users.${cfg.user} = {
|
||||
description = "Gitolite user";
|
||||
description = cfg.description;
|
||||
home = cfg.dataDir;
|
||||
uid = config.ids.uids.gitolite;
|
||||
group = cfg.group;
|
||||
|
||||
@ -18,7 +18,7 @@ let
|
||||
|
||||
knot-cli-wrappers = pkgs.stdenv.mkDerivation {
|
||||
name = "knot-cli-wrappers";
|
||||
buildInputs = [ pkgs.makeWrapper ];
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
buildCommand = ''
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${cfg.package}/bin/knotc "$out/bin/knotc" \
|
||||
|
||||
@ -82,7 +82,7 @@ with lib;
|
||||
ppp-pptpd-wrapped = pkgs.stdenv.mkDerivation {
|
||||
name = "ppp-pptpd-wrapped";
|
||||
phases = [ "installPhase" ];
|
||||
buildInputs = with pkgs; [ makeWrapper ];
|
||||
nativeBuildInputs = with pkgs; [ makeWrapper ];
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${pkgs.ppp}/bin/pppd $out/bin/pppd \
|
||||
|
||||
@ -410,7 +410,7 @@ in
|
||||
environment.systemPackages = let
|
||||
cli-wrappers = pkgs.stdenv.mkDerivation {
|
||||
name = "tinc-cli-wrappers";
|
||||
buildInputs = [ pkgs.makeWrapper ];
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
buildCommand = ''
|
||||
mkdir -p $out/bin
|
||||
${concatStringsSep "\n" (mapAttrsToList (network: data:
|
||||
|
||||
@ -84,7 +84,7 @@ with lib;
|
||||
xl2tpd-ppp-wrapped = pkgs.stdenv.mkDerivation {
|
||||
name = "xl2tpd-ppp-wrapped";
|
||||
phases = [ "installPhase" ];
|
||||
buildInputs = with pkgs; [ makeWrapper ];
|
||||
nativeBuildInputs = with pkgs; [ makeWrapper ];
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
|
||||
|
||||
@ -35,7 +35,7 @@ let
|
||||
};
|
||||
|
||||
mediawikiScripts = pkgs.runCommand "mediawiki-scripts" {
|
||||
buildInputs = [ pkgs.makeWrapper ];
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
preferLocalBuild = true;
|
||||
} ''
|
||||
mkdir -p $out/bin
|
||||
|
||||
@ -17,7 +17,7 @@ let
|
||||
|
||||
patches = [ ./azure-agent-entropy.patch ];
|
||||
|
||||
buildInputs = [ makeWrapper python pythonPackages.wrapPython ];
|
||||
nativeBuildInputs = [ makeWrapper python pythonPackages.wrapPython ];
|
||||
runtimeDeps = [ findutils gnugrep gawk coreutils openssl openssh
|
||||
nettools # for hostname
|
||||
procps # for pidof
|
||||
|
||||
@ -104,16 +104,18 @@ in
|
||||
group = "vboxusers";
|
||||
setuid = true;
|
||||
};
|
||||
executables = [
|
||||
"VBoxHeadless"
|
||||
"VBoxNetAdpCtl"
|
||||
"VBoxNetDHCP"
|
||||
"VBoxNetNAT"
|
||||
"VBoxVolInfo"
|
||||
] ++ (lib.optionals (!cfg.headless) [
|
||||
"VBoxSDL"
|
||||
"VirtualBoxVM"
|
||||
]);
|
||||
in mkIf cfg.enableHardening
|
||||
(builtins.listToAttrs (map (x: { name = x; value = mkSuid x; }) [
|
||||
"VBoxHeadless"
|
||||
"VBoxNetAdpCtl"
|
||||
"VBoxNetDHCP"
|
||||
"VBoxNetNAT"
|
||||
"VBoxSDL"
|
||||
"VBoxVolInfo"
|
||||
"VirtualBoxVM"
|
||||
]));
|
||||
(builtins.listToAttrs (map (x: { name = x; value = mkSuid x; }) executables));
|
||||
|
||||
users.groups.vboxusers.gid = config.ids.gids.vboxusers;
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
createTrivialProject = pkgs.stdenv.mkDerivation {
|
||||
name = "create-trivial-project";
|
||||
dontUnpack = true;
|
||||
buildInputs = [ pkgs.makeWrapper ];
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
installPhase = "install -m755 -D ${./create-trivial-project.sh} $out/bin/create-trivial-project.sh";
|
||||
postFixup = ''
|
||||
wrapProgram "$out/bin/create-trivial-project.sh" --prefix PATH ":" ${pkgs.lib.makeBinPath [ pkgs.curl ]} --set EXPR_PATH ${trivialJob}
|
||||
|
||||
@ -18,7 +18,7 @@ let
|
||||
${master.ip} api.${domain}
|
||||
${concatMapStringsSep "\n" (machineName: "${machines.${machineName}.ip} ${machineName}.${domain}") (attrNames machines)}
|
||||
'';
|
||||
wrapKubectl = with pkgs; runCommand "wrap-kubectl" { buildInputs = [ makeWrapper ]; } ''
|
||||
wrapKubectl = with pkgs; runCommand "wrap-kubectl" { nativeBuildInputs = [ makeWrapper ]; } ''
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${pkgs.kubernetes}/bin/kubectl $out/bin/kubectl --set KUBECONFIG "/etc/kubernetes/cluster-admin.kubeconfig"
|
||||
'';
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
let
|
||||
mkTest = { systemWide ? false }:
|
||||
mkTest = { systemWide ? false , fullVersion ? false }:
|
||||
import ./make-test-python.nix ({ pkgs, lib, ... }:
|
||||
let
|
||||
testFile = pkgs.fetchurl {
|
||||
url =
|
||||
"https://file-examples-com.github.io/uploads/2017/11/file_example_MP3_700KB.mp3";
|
||||
"https://file-examples.com/storage/fe5947fd2362fc197a3c2df/2017/11/file_example_MP3_700KB.mp3";
|
||||
hash = "sha256-+iggJW8s0/LfA/okfXsB550/55Q0Sq3OoIzuBrzOPJQ=";
|
||||
};
|
||||
|
||||
@ -22,7 +22,7 @@ let
|
||||
testPlay32 = { inherit (pkgs.pkgsi686Linux) sox alsa-utils; };
|
||||
};
|
||||
in {
|
||||
name = "pulseaudio${lib.optionalString systemWide "-systemWide"}";
|
||||
name = "pulseaudio${lib.optionalString fullVersion "Full"}${lib.optionalString systemWide "-systemWide"}";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ synthetica ] ++ pkgs.pulseaudio.meta.maintainers;
|
||||
};
|
||||
@ -35,12 +35,14 @@ let
|
||||
enable = true;
|
||||
support32Bit = true;
|
||||
inherit systemWide;
|
||||
} // lib.optionalAttrs fullVersion {
|
||||
package = pkgs.pulseaudioFull;
|
||||
};
|
||||
|
||||
environment.systemPackages = [ testers.testPlay pkgs.pavucontrol ]
|
||||
++ lib.optional pkgs.stdenv.isx86_64 testers.testPlay32;
|
||||
} // lib.optionalAttrs systemWide {
|
||||
users.users.alice.extraGroups = [ "audio" ];
|
||||
users.users.alice.extraGroups = [ "pulse-access" ];
|
||||
systemd.services.pulseaudio.wantedBy = [ "multi-user.target" ];
|
||||
};
|
||||
|
||||
@ -58,14 +60,21 @@ let
|
||||
''}
|
||||
machine.screenshot("testPlay")
|
||||
|
||||
${lib.optionalString (!systemWide) ''
|
||||
machine.send_chars("pacmd info && touch /tmp/pacmd_success\n")
|
||||
machine.wait_for_file("/tmp/pacmd_success")
|
||||
''}
|
||||
|
||||
# Pavucontrol only loads when Pulseaudio is running. If it isn't, the
|
||||
# text "Playback" (one of the tabs) will never show.
|
||||
# text "Dummy Output" (sound device name) will never show.
|
||||
machine.send_chars("pavucontrol\n")
|
||||
machine.wait_for_text("Playback")
|
||||
machine.wait_for_text("Dummy Output")
|
||||
machine.screenshot("Pavucontrol")
|
||||
'';
|
||||
});
|
||||
in builtins.mapAttrs (key: val: mkTest val) {
|
||||
user = { systemWide = false; };
|
||||
system = { systemWide = true; };
|
||||
user = { systemWide = false; fullVersion = false; };
|
||||
system = { systemWide = true; fullVersion = false; };
|
||||
userFull = { systemWide = false; fullVersion = true; };
|
||||
systemFull = { systemWide = true; fullVersion = true; };
|
||||
}
|
||||
|
||||
@ -28,8 +28,12 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = lib.optionals gtkGUI [ pkg-config ];
|
||||
|
||||
buildInputs = [ gettext ncurses ]
|
||||
++ lib.optionals gtkGUI [ pkg-config gtk2 ];
|
||||
++ lib.optionals gtkGUI [ gtk2 ];
|
||||
|
||||
configureFlags = lib.optionals (!gtkGUI) ["--without-gtk"];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Audio mixer for X and the console";
|
||||
|
||||
@ -12,9 +12,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
cairo expat fftwSinglePrec fluidsynth glib gtk2 libjack2 ladspaH
|
||||
libglade lv2 pkg-config
|
||||
libglade lv2
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -2,11 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flac";
|
||||
version = "1.3.4";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://downloads.xiph.org/releases/flac/${pname}-${version}.tar.xz";
|
||||
sha256 = "0dz7am8kbc97a6afml1h4yp085274prg8j7csryds8m3fmz61w4g";
|
||||
# Official checksum is published at https://github.com/xiph/flac/releases/tag/${version}
|
||||
sha256 = "91303c3e5dfde52c3e94e75976c0ab3ee14ced278ab8f60033a3a12db9209ae6";
|
||||
};
|
||||
|
||||
buildInputs = [ libogg ];
|
||||
@ -20,5 +21,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Library and tools for encoding and decoding the FLAC lossless audio file format";
|
||||
platforms = platforms.all;
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ruuda ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [ pkg-config fftwFloat alsa-lib zlib wavpack wxGTK31 udev ]
|
||||
buildInputs = [ fftwFloat alsa-lib zlib wavpack wxGTK31 udev ]
|
||||
++ lib.optional jackaudioSupport libjack2;
|
||||
|
||||
cmakeFlags = lib.optional (!jackaudioSupport) [
|
||||
|
||||
@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0vp25b970r1hv5ndzs4di63rgwnl31jfaj3jz5dka276kx34q4al";
|
||||
};
|
||||
|
||||
buildInputs = [ pkg-config libltc libsndfile jack2 ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libltc libsndfile jack2 ];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
|
||||
@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patches = [ ./buf_rect.patch ./fix_build_with_gcc-5.patch];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs =
|
||||
[ pkg-config SDL SDL_image libjack2
|
||||
[ SDL SDL_image libjack2
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-1KiWMTVTTf1/iR4AzJ1Oe0mOrWN5edsZN0tQMidgnRA=";
|
||||
};
|
||||
|
||||
buildInputs = [ lv2 pkg-config ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ lv2 ];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
|
||||
@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl libogg ];
|
||||
propagatedBuildInputs = [ libopus ];
|
||||
outputs = [ "out" "dev" ];
|
||||
patches = [ ./include-multistream.patch ]
|
||||
# fixes problem with openssl 1.1 dependency
|
||||
# see https://github.com/xiph/opusfile/issues/13
|
||||
|
||||
@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
boost
|
||||
@ -33,7 +34,6 @@ stdenv.mkDerivation rec {
|
||||
glibmm
|
||||
gtkmm2
|
||||
libjack2
|
||||
pkg-config
|
||||
python3
|
||||
wafHook
|
||||
];
|
||||
|
||||
@ -1,4 +1,17 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchCrate, rustPlatform, installShellFiles, pkg-config, openssl, python3, libxcb, AppKit, Security }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchCrate
|
||||
, fetchpatch
|
||||
, rustPlatform
|
||||
, installShellFiles
|
||||
, pkg-config
|
||||
, openssl
|
||||
, python3
|
||||
, libxcb
|
||||
, AppKit
|
||||
, Security
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "spotify-tui";
|
||||
@ -8,14 +21,30 @@ rustPlatform.buildRustPackage rec {
|
||||
owner = "Rigellute";
|
||||
repo = "spotify-tui";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-L5gg6tjQuYoAC89XfKE38KCFONwSAwfNoFEUPH4jNAI=";
|
||||
hash = "sha256-L5gg6tjQuYoAC89XfKE38KCFONwSAwfNoFEUPH4jNAI=";
|
||||
};
|
||||
|
||||
# Use patched rspotify
|
||||
cargoPatches = [
|
||||
# Use patched rspotify
|
||||
./Cargo.lock.patch
|
||||
|
||||
# Needed so that the patch below it applies.
|
||||
(fetchpatch {
|
||||
name = "update-dirs.patch";
|
||||
url = "https://github.com/Rigellute/spotify-tui/commit/3881defc1ed0bcf79df1aef4836b857f64be657c.patch";
|
||||
hash = "sha256-OGqiYLFojMwR3RgKbddXxPDiAdzPySnscVVsVmTT7t4=";
|
||||
})
|
||||
|
||||
# https://github.com/Rigellute/spotify-tui/pull/990
|
||||
(fetchpatch {
|
||||
name = "update-socket2-for-rust-1.64.patch";
|
||||
url = "https://github.com/Rigellute/spotify-tui/commit/14df9419cf72da13f3b55654686a95647ea9dfea.patch";
|
||||
hash = "sha256-craY6UwmHDdxih3nZBdPkNJtQ6wvVgf09Ovqdxi0JZo=";
|
||||
})
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Use patched rspotify
|
||||
./Cargo.toml.patch
|
||||
];
|
||||
|
||||
@ -44,7 +73,7 @@ rustPlatform.buildRustPackage rec {
|
||||
ln -s ${rspotify} ./rspotify-${rspotify.version}
|
||||
'';
|
||||
|
||||
cargoSha256 = "sha256-S8zuVYcyYvrwggIvlpxNydhoN9kx6xLBwYJSHcbEK40=";
|
||||
cargoHash = "sha256-aZJ6Q/rvqrv+wvQw2eKFPnSROhI5vXPvr5pu1hwtZKA=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config python3 ];
|
||||
buildInputs = [ ]
|
||||
|
||||
@ -9,8 +9,9 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1e4e72d8e0dd62a80b8dd90699f5ca64c9b0cb37a5c9325c184166a9654f0a92";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ flac lame zlib libjpeg libvorbis libtheora libxml2 lzo
|
||||
libdvdread pkg-config x264 libmpeg2 xvidcore ];
|
||||
libdvdread x264 libmpeg2 xvidcore ];
|
||||
configureFlags = [
|
||||
"--disable-ffmpeg" "--disable-libavcodec" "--disable-libavformat"
|
||||
"--enable-lzo" "--enable-ogg" "--enable-vorbis" "--enable-theora" "--enable-libxml2"
|
||||
|
||||
@ -10,9 +10,9 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "00nwv2pqjbmxqdc6xdm0cljq6z05lv4y6bibmhz1kih9lm0lklnk";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoconf automake ];
|
||||
nativeBuildInputs = [ autoconf automake pkg-config ];
|
||||
buildInputs = [ alsa-lib dssi gtk2 libjack2 ladspaH
|
||||
ladspaPlugins liblo pkg-config ];
|
||||
ladspaPlugins liblo ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
|
||||
@ -7,12 +7,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "eclair";
|
||||
version = "0.6.2";
|
||||
revision = "6817d6f";
|
||||
version = "0.7.0-patch-disconnect";
|
||||
revision = "cad88bf";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/ACINQ/eclair/releases/download/v${version}/eclair-node-${version}-${revision}-bin.zip";
|
||||
sha256 = "038r9mblm2r8mkxnv65k29r7xj22dff5gmvzv9xiy5zf9i45mmk8";
|
||||
hash = "sha256-agOxflCXfoeSeGliB/PAMMyCdqYYajciHMfLrSiZx1Q=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ jq openjdk11 ];
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "lnd";
|
||||
version = "0.15.1-beta";
|
||||
version = "0.15.2-beta";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lightningnetwork";
|
||||
repo = "lnd";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-E1RxFy7eRCTnzTg2B0llRt+r41K6V4VQH7Edh1As4cY=";
|
||||
sha256 = "sha256-C7BZ6awY2v5Uvvh12YEosoEQyJoetWzH/1wIQSVjtEk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-e72HIsS1fftJEOvjr1RQMo3+gjlBxXPHq2olGWfurJk=";
|
||||
vendorSha256 = "sha256-rCdcPkgrFcDfLfF8wipFws7YTKEgotuVqVIJYLMOxbs=";
|
||||
|
||||
subPackages = [ "cmd/lncli" "cmd/lnd" ];
|
||||
|
||||
|
||||
@ -40,7 +40,7 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec {
|
||||
postPatch = ''
|
||||
# Have to do this here instead of in preConfigure because
|
||||
# cargoDepsCopy gets unset after postPatch.
|
||||
configureFlagsArray+=("RUST_VENDORED_SOURCES=$NIX_BUILD_TOP/$cargoDepsCopy")
|
||||
configureFlagsArray+=("RUST_VENDORED_SOURCES=$cargoDepsCopy")
|
||||
'';
|
||||
|
||||
CXXFLAGS = [
|
||||
|
||||
@ -38,13 +38,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cudatext";
|
||||
version = "1.172.0";
|
||||
version = "1.172.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alexey-T";
|
||||
repo = "CudaText";
|
||||
rev = version;
|
||||
hash = "sha256-AYIgYLrOVutsv0cHUd/TwNAyLbog6xjcepV9/3fTshc=";
|
||||
hash = "sha256-bet0hLplxTjizYhRKDqafsps1kULW8jves1faEeLAKE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -16,8 +16,8 @@
|
||||
},
|
||||
"ATSynEdit": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.10.01",
|
||||
"hash": "sha256-cfjpPTOc8KjhaD1wVY3Tb/lQwEeT3Rq22lJ1MKdTNF0="
|
||||
"rev": "2022.10.09",
|
||||
"hash": "sha256-FUqkKcX0UbknvhntIo782ZGIteEE1SvPsfXo4yv6310="
|
||||
},
|
||||
"ATSynEdit_Cmp": {
|
||||
"owner": "Alexey-T",
|
||||
|
||||
@ -14,11 +14,11 @@
|
||||
|
||||
let
|
||||
platform_major = "4";
|
||||
platform_minor = "24";
|
||||
platform_minor = "25";
|
||||
year = "2022";
|
||||
month = "06"; #release month
|
||||
buildmonth = "06"; #sometimes differs from release month
|
||||
timestamp = "${year}${buildmonth}070700";
|
||||
month = "09"; #release month
|
||||
buildmonth = "08"; #sometimes differs from release month
|
||||
timestamp = "${year}${buildmonth}311800";
|
||||
gtk = gtk3;
|
||||
in rec {
|
||||
|
||||
@ -38,7 +38,7 @@ in rec {
|
||||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||
hash = "sha512-mqoeP6BwmTWGy6qp/+BSfjTaMfAEKtlyqHwn1GrihRCXQyDNeVWRkBNa7JTCUs+yve2rokgisZNVSwpgAqqHYQ==";
|
||||
hash = "sha512-1sUQ/jDOQMqnKLKY6oh28STvS5pbH89+2zs+H77euiJOsBgB+yEkEntnhI39O67qmOK/EkQ3y3NkQcumbax56A==";
|
||||
};
|
||||
};
|
||||
|
||||
@ -50,7 +50,7 @@ in rec {
|
||||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||
hash = "sha512-RbvqIUnJ00/qvqsw1s5mcZ2SQhhT2y+S9J9xOB+t8bK+1SOhUOFvU/HcDAmHBl88L1qBCF0ckAKd7jETYPeXnw==";
|
||||
hash = "sha512-Qb2BmfXtmVeTLIZZav91hayPkwSGYMAG3fod3BmyJdo1DPas6VC+MzBwklAjpC1wqLTzKCAKzVZtdtPYC9QCqw==";
|
||||
};
|
||||
};
|
||||
|
||||
@ -62,7 +62,7 @@ in rec {
|
||||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
|
||||
hash = "sha512-PPgFti6UUSkIDEUBGY4tDVfnaFXxTUIRIvfMOVXVxIr+ciGK2dOHpQ7K9hcYnWqoIulxa/fV+TXQI3hzcIRVAA==";
|
||||
hash = "sha512-RW+5H82AcH/U9XUzIlUCU5heN9qQAlMl3rmxsKnTYxVWdIjSN461Nf71F6jPhL/Q+VCAMesguOEF0AqyhnH0nw==";
|
||||
};
|
||||
};
|
||||
|
||||
@ -88,7 +88,7 @@ in rec {
|
||||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
|
||||
hash = "sha512-IVSdZI4QnMtj7HdWAXATeJSQt950qNkiSL7n/+f9bPioCA2NtNbDUlBBxnownMKnr+C+iJH2phzPabT9Ar6plA==";
|
||||
hash = "sha512-1wjKNBl6A2XENRVZNtDelPSMAYtc4wRXdQ4CJX/1YcFUPEzbPsX7plO2uJXmDpZcjw3wkQNxqy4bmZF6YnXy/Q==";
|
||||
};
|
||||
};
|
||||
|
||||
@ -100,7 +100,7 @@ in rec {
|
||||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||
hash = "sha512-ace+zpz5tjLA89gHLyBrjldKU7+kb85uJX4y4IQdVkrskrA+uCv0z9lzB/qbgrH51ZFN2xz04z1nFLJd09WacA==";
|
||||
hash = "sha512-UejE0pzgwBYpmNbdGEegMM5iEOMYP+VvebU17YQeJUzh/qYr0B6sfXwJ+cdTCavKCNGLMMDenJMYk9V/6DSZHw==";
|
||||
};
|
||||
};
|
||||
|
||||
@ -112,7 +112,7 @@ in rec {
|
||||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||
hash = "sha512-Xo1dk8+BLUoUVrnMm9XC+IBzoS9bKde2waRaYxjCRBOykUiZ4npGgquh3bEbsk1GZ3cKlwuxLxr9Y9+RGw3UTA==";
|
||||
hash = "sha512-9E0Zwv64qRwVdPouhmIYT6SkbTkd3zLnfkHduHy2VXvmqW7xaOfmplvxpr+V1RDpnfDfw4RouU+WQdhFqBqcWg==";
|
||||
};
|
||||
};
|
||||
|
||||
@ -124,7 +124,7 @@ in rec {
|
||||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||
hash = "sha512-rkjLwexI352G8CYkaF/1dl26wF58IuPMan76gR/3Fx/CMywtv25Tueu8NWZGkHd6Zwdpv/h25D8fu9tbM2NExg==";
|
||||
hash = "sha512-V7GmvqQVZnTkkhKmuGyMiZlFlRpFbXM7r6w9yS0FxBOHNHIzkX4pJ6sgn+ww1lvwsdPqBFYtbWUiuKo73eTKzg==";
|
||||
};
|
||||
};
|
||||
|
||||
@ -136,7 +136,7 @@ in rec {
|
||||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||
hash = "sha256-8FaVTzjvtT17pYUYfKJgVd55nd2ngrsLY+7AJnXu/BI=";
|
||||
hash = "sha256-8qQWwUiNemJLTAncZwO14fBfr7kTmmXPSeqBLfV8wTw=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0b0az2wvqgvam7w0ns1j8xp2llslm1rx6h7zcsy06a7j0yp257cm";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ intltool gtk2 ];
|
||||
nativeBuildInputs = [ pkg-config intltool ];
|
||||
buildInputs = [ gtk2 ];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
|
||||
@ -27,6 +27,7 @@
|
||||
, ApplicationServices
|
||||
, AppKit
|
||||
, Carbon
|
||||
, removeReferencesTo
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "neovide";
|
||||
@ -80,6 +81,7 @@ rustPlatform.buildRustPackage rec {
|
||||
python2 # skia-bindings
|
||||
python3 # rust-xcb
|
||||
llvmPackages.clang # skia
|
||||
removeReferencesTo
|
||||
] ++ lib.optionals stdenv.isDarwin [ xcbuild ];
|
||||
|
||||
# All tests passes but at the end cargo prints for unknown reason:
|
||||
@ -115,6 +117,10 @@ rustPlatform.buildRustPackage rec {
|
||||
xorg.libXi
|
||||
] ++ lib.optionals enableWayland [ wayland ]);
|
||||
in ''
|
||||
# library skia embeds the path to its sources
|
||||
remove-references-to -t "$SKIA_SOURCE_DIR" \
|
||||
$out/bin/neovide
|
||||
|
||||
wrapProgram $out/bin/neovide \
|
||||
--prefix LD_LIBRARY_PATH : ${libPath}
|
||||
'';
|
||||
@ -128,6 +134,8 @@ rustPlatform.buildRustPackage rec {
|
||||
install -m444 -Dt $out/share/applications assets/neovide.desktop
|
||||
'';
|
||||
|
||||
disallowedReferences = [ SKIA_SOURCE_DIR ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "This is a simple graphical user interface for Neovim.";
|
||||
homepage = "https://github.com/Kethku/neovide";
|
||||
|
||||
@ -3,41 +3,37 @@
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, which
|
||||
, zip
|
||||
, libicns
|
||||
, capstone
|
||||
, jansson
|
||||
, libunistring
|
||||
, lua5_3
|
||||
, wxGTK31
|
||||
, lua53Packages
|
||||
, perlPackages
|
||||
, Carbon
|
||||
, Cocoa
|
||||
, IOKit
|
||||
, libicns
|
||||
, wxmac
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rehex";
|
||||
version = "0.4.1";
|
||||
version = "0.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "solemnwarning";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-NuWWaYABQDaS9wkwmXkBJWHzLFJbUUCiePNQNo4yZrk=";
|
||||
hash = "sha256-VBHNrOVIz7UM9tY1V7Ykwt4Cv0fY++8gXc2og4sLDk8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# See https://github.com/solemnwarning/rehex/pull/148
|
||||
substituteInPlace Makefile.osx \
|
||||
--replace '$(filter-out %@2x.png,$(wildcard $(ICONSET)/*.png))' 'res/icon{16,32,128,256,512}.png'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config which ]
|
||||
nativeBuildInputs = [ pkg-config which zip ]
|
||||
++ lib.optionals stdenv.isDarwin [ libicns ];
|
||||
|
||||
buildInputs = [ capstone jansson libunistring lua5_3 ]
|
||||
++ lib.optionals (!stdenv.isDarwin) [ wxGTK31 ]
|
||||
++ lib.optionals stdenv.isDarwin [ Carbon Cocoa IOKit wxmac ];
|
||||
buildInputs = [ capstone jansson libunistring wxGTK31 ]
|
||||
++ (with lua53Packages; [ lua busted ])
|
||||
++ (with perlPackages; [ perl TemplateToolkit ])
|
||||
++ lib.optionals stdenv.isDarwin [ Carbon Cocoa IOKit ];
|
||||
|
||||
makeFlags = [ "prefix=${placeholder "out"}" ]
|
||||
++ lib.optionals stdenv.isDarwin [ "-f Makefile.osx" ];
|
||||
@ -53,7 +49,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/solemnwarning/rehex";
|
||||
changelog = "https://github.com/solemnwarning/rehex/raw/${version}/CHANGES.txt";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ markus1189 ];
|
||||
maintainers = with maintainers; [ markus1189 wegank ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -161,12 +161,12 @@ final: prev:
|
||||
|
||||
LeaderF = buildVimPluginFrom2Nix {
|
||||
pname = "LeaderF";
|
||||
version = "2022-09-15";
|
||||
version = "2022-10-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Yggdroot";
|
||||
repo = "LeaderF";
|
||||
rev = "f090cb40eacdce71c406e466d02e3b41c03312c8";
|
||||
sha256 = "0ma65874dffpj7sc3skczlxf7gmq1v2lqi5qwqv0hgx6idqdkf1c";
|
||||
rev = "b7bf04eaeae846168efd86ef0136394a2d128b72";
|
||||
sha256 = "00krndb2crrcvcp8vb60wqz75pjj3121335mykaqhhq0jhc67xw2";
|
||||
};
|
||||
meta.homepage = "https://github.com/Yggdroot/LeaderF/";
|
||||
};
|
||||
@ -341,12 +341,12 @@ final: prev:
|
||||
|
||||
SpaceVim = buildVimPluginFrom2Nix {
|
||||
pname = "SpaceVim";
|
||||
version = "2022-10-08";
|
||||
version = "2022-10-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "SpaceVim";
|
||||
repo = "SpaceVim";
|
||||
rev = "cd193b852d51dc70200fbf8f7d92f174735ee657";
|
||||
sha256 = "0syimr7v6a87fq9zvxkh8xc38102y04jm8z0g53inayamp64vz2p";
|
||||
rev = "3bacbcd4ef84d24602799555465fed6d71fdd9b2";
|
||||
sha256 = "1mhq6gz0maab2vvrajdcq689nr93sniw5iz75spr8vq9za9aazx0";
|
||||
};
|
||||
meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
|
||||
};
|
||||
@ -942,12 +942,12 @@ final: prev:
|
||||
|
||||
bullets-vim = buildVimPluginFrom2Nix {
|
||||
pname = "bullets.vim";
|
||||
version = "2022-10-08";
|
||||
version = "2022-10-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dkarter";
|
||||
repo = "bullets.vim";
|
||||
rev = "bb2b9f3cae530fcc9e70055243cbbdda4daa497e";
|
||||
sha256 = "1k9ynbkiag6b42zaqk7vyq2l376g5p7j8hn5xmjnmxzra1s68yx4";
|
||||
rev = "746f92ae05cdcc988857d8e76418326f07af9494";
|
||||
sha256 = "0zdfri31h1iv3jjw2yqkqqfd07cdk7ymyrl5n03khwh192dawd5r";
|
||||
};
|
||||
meta.homepage = "https://github.com/dkarter/bullets.vim/";
|
||||
};
|
||||
@ -990,12 +990,12 @@ final: prev:
|
||||
|
||||
ccc-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "ccc.nvim";
|
||||
version = "2022-10-07";
|
||||
version = "2022-10-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "uga-rosa";
|
||||
repo = "ccc.nvim";
|
||||
rev = "666a406659fadd22a9c2b0fb1fed432f4529e7f1";
|
||||
sha256 = "1cdkws7k3b55ahbhfhnqv4f47jm20n6cfgrr5yrfmplqvl2az70h";
|
||||
rev = "e74e0ebf3fac929c81fb9d918228ef03afc8d470";
|
||||
sha256 = "1abpkiry3ffmwj51yldiaw3ix1scr6jjx714am1d4wz7kbl4228g";
|
||||
};
|
||||
meta.homepage = "https://github.com/uga-rosa/ccc.nvim/";
|
||||
};
|
||||
@ -1506,12 +1506,12 @@ final: prev:
|
||||
|
||||
cmp-spell = buildVimPluginFrom2Nix {
|
||||
pname = "cmp-spell";
|
||||
version = "2022-10-03";
|
||||
version = "2022-10-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "f3fora";
|
||||
repo = "cmp-spell";
|
||||
rev = "5c32dd5c23ec31e88ed28c74231eec0c55dc8307";
|
||||
sha256 = "1w0658jgn5v1018by1912dpnxa6y25pv929awaimgzd3wlsfm89p";
|
||||
rev = "60584cb75e5e8bba5a0c9e4c3ab0791e0698bffa";
|
||||
sha256 = "1lzv8wbq1w45pbig7lcgyj46nmz4gkag7b37j72p04bixr7wgabv";
|
||||
};
|
||||
meta.homepage = "https://github.com/f3fora/cmp-spell/";
|
||||
};
|
||||
@ -1806,12 +1806,12 @@ final: prev:
|
||||
|
||||
comment-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "comment.nvim";
|
||||
version = "2022-10-08";
|
||||
version = "2022-10-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "numtostr";
|
||||
repo = "comment.nvim";
|
||||
rev = "d30f2b059c0c03fcfab3842684212bac525a3d0b";
|
||||
sha256 = "0n0ybjzwfdh7dk8wk3mf77hf0v7zxakv26a9z608srdia2xa3ndr";
|
||||
rev = "250bbc5a04b6e80ff1c212e89a80e976cda9e433";
|
||||
sha256 = "18x9a1fmial78f28mkaqsajzazjj9zd4yq44fghw1ynaa36gjmwh";
|
||||
};
|
||||
meta.homepage = "https://github.com/numtostr/comment.nvim/";
|
||||
};
|
||||
@ -1878,12 +1878,12 @@ final: prev:
|
||||
|
||||
compiler-explorer-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "compiler-explorer.nvim";
|
||||
version = "2022-10-07";
|
||||
version = "2022-10-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "krady21";
|
||||
repo = "compiler-explorer.nvim";
|
||||
rev = "b611606f62b4ae0de10cc9a5565ce32f629a868a";
|
||||
sha256 = "102ic12byilviz65nnk3crwnrfsw1dqwvvfhj6gfix7ybg76vkx6";
|
||||
rev = "b565df009e92aad6ca8b338562b2f375fb1fea96";
|
||||
sha256 = "0855y7vhhfzv3ppmg5834k593jg4b2qlkpg45fsf4xkks3g2s168";
|
||||
};
|
||||
meta.homepage = "https://github.com/krady21/compiler-explorer.nvim/";
|
||||
};
|
||||
@ -2010,24 +2010,24 @@ final: prev:
|
||||
|
||||
coq-artifacts = buildVimPluginFrom2Nix {
|
||||
pname = "coq.artifacts";
|
||||
version = "2022-10-09";
|
||||
version = "2022-10-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "coq.artifacts";
|
||||
rev = "39a174683e28b7b96a4b6521d1d3d2ef3a571ce2";
|
||||
sha256 = "0wk5jgsn0k2zp4kg6rj4pagnnbmq4rbk566d01svfw6vphv4d9fc";
|
||||
rev = "e7ce839707e349fa5d8ea494dae2490fa849a4c3";
|
||||
sha256 = "0g10avvx8i7pgfipq2wbylk98r1xz3g1sqr4kldxkv2g48842c1v";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/coq.artifacts/";
|
||||
};
|
||||
|
||||
coq-thirdparty = buildVimPluginFrom2Nix {
|
||||
pname = "coq.thirdparty";
|
||||
version = "2022-10-09";
|
||||
version = "2022-10-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "coq.thirdparty";
|
||||
rev = "46dc68b8193873ce44f2f572f1f2ecb3f5cdb9a9";
|
||||
sha256 = "14z16aw60ns90yf8g5z8rcb757byrvq1c8yaw0qb6bcvvgzgpwbm";
|
||||
rev = "9f0744543875c3bee9c124248d259d059ccdad21";
|
||||
sha256 = "0ykh3xl37x07z9ci63rvxqp1p3sw42macl0jxskbpk338rdvw9yi";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/";
|
||||
};
|
||||
@ -2046,12 +2046,12 @@ final: prev:
|
||||
|
||||
coq_nvim = buildVimPluginFrom2Nix {
|
||||
pname = "coq_nvim";
|
||||
version = "2022-10-09";
|
||||
version = "2022-10-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "coq_nvim";
|
||||
rev = "27fb487f108d8159793f0eeb6aa1e5ee0d4da9aa";
|
||||
sha256 = "1wzwgi6czri6cnq7qws5pw97k2c81q72masn7cd7lv7dva6bzz3p";
|
||||
rev = "cbe678af3d43772781781fa485137ea3c46ce323";
|
||||
sha256 = "1dc6903m9qs3s9jpc676lg6970w8vb635w6mc4w72zcln8xgih56";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
|
||||
};
|
||||
@ -3215,12 +3215,12 @@ final: prev:
|
||||
|
||||
gitsigns-nvim = buildNeovimPluginFrom2Nix {
|
||||
pname = "gitsigns.nvim";
|
||||
version = "2022-10-07";
|
||||
version = "2022-10-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lewis6991";
|
||||
repo = "gitsigns.nvim";
|
||||
rev = "9787c94178b4062f30d2f06b6d52984217196647";
|
||||
sha256 = "1w96nqwmc9y3k6wyrnbr8br1h6lwxcvyykv22320lbxipl6i8rhw";
|
||||
rev = "9d18976c10413e52d76d41a771f042704786ce2e";
|
||||
sha256 = "1fzmg74i9q6xal0k1s1ikgbc37s0q1z79af5vhlfll5f2c5dkpsk";
|
||||
};
|
||||
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
|
||||
};
|
||||
@ -3407,11 +3407,11 @@ final: prev:
|
||||
|
||||
hare-vim = buildVimPluginFrom2Nix {
|
||||
pname = "hare.vim";
|
||||
version = "2022-08-27";
|
||||
version = "2022-10-10";
|
||||
src = fetchgit {
|
||||
url = "https://git.sr.ht/~sircmpwn/hare.vim";
|
||||
rev = "0bdef854f8531747438f7764cf7553ba16e56fb8";
|
||||
sha256 = "15ajgvhwl63h5268kp56m741bglaq3zgcf0bv61sasrh4v97xmgz";
|
||||
rev = "267fb4dac4e8cd4df1d9b57fa587ce718f5fc256";
|
||||
sha256 = "1spl17vd8w5k5xgqvmr80fi5samzhxfcqnkmzpqjk2sf5z88k80k";
|
||||
};
|
||||
meta.homepage = "https://git.sr.ht/~sircmpwn/hare.vim";
|
||||
};
|
||||
@ -3490,12 +3490,12 @@ final: prev:
|
||||
|
||||
hologram-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "hologram.nvim";
|
||||
version = "2022-09-03";
|
||||
version = "2022-10-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "edluffy";
|
||||
repo = "hologram.nvim";
|
||||
rev = "338969044a5d6f9f56f728c8efeeced7408d580a";
|
||||
sha256 = "0q493i7fsws9q2wrmddbvxwr968qkkz8nlgm0nynb13m5qxpdzvh";
|
||||
rev = "f5194f71ec1578d91b2e3119ff08e574e2eab542";
|
||||
sha256 = "0khmi21mvmif7qd8cak9x1z4h68d34rwhfvcvnqxxh0mjzvskppv";
|
||||
};
|
||||
meta.homepage = "https://github.com/edluffy/hologram.nvim/";
|
||||
};
|
||||
@ -3514,12 +3514,12 @@ final: prev:
|
||||
|
||||
hop-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "hop.nvim";
|
||||
version = "2022-07-31";
|
||||
version = "2022-10-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "phaazon";
|
||||
repo = "hop.nvim";
|
||||
rev = "2a1b686aad85a3c241f8cd8fd42eb09c7de5ed79";
|
||||
sha256 = "1f8p8cxi74kgqs20knx7yq1bd7m30va1dqpsy5dqdzsazr50fymc";
|
||||
rev = "6591b3656b75ff313cc38dc662a7ee8f75f1c165";
|
||||
sha256 = "1y6jvl8q8j46zy1c18xi0hfdbma2cq7g3k0ymw05qghvvjyv65bq";
|
||||
};
|
||||
meta.homepage = "https://github.com/phaazon/hop.nvim/";
|
||||
};
|
||||
@ -3536,6 +3536,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/rktjmp/hotpot.nvim/";
|
||||
};
|
||||
|
||||
hydra-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "hydra.nvim";
|
||||
version = "2022-10-02";
|
||||
src = fetchFromGitHub {
|
||||
owner = "anuvyklack";
|
||||
repo = "hydra.nvim";
|
||||
rev = "fa41a971765d4cce9c39185289f5a10894f66dbd";
|
||||
sha256 = "198bkw3y3253wjamvxxkdjr54nv1bkin148v554b47yv5w156zz1";
|
||||
};
|
||||
meta.homepage = "https://github.com/anuvyklack/hydra.nvim/";
|
||||
};
|
||||
|
||||
i3config-vim = buildVimPluginFrom2Nix {
|
||||
pname = "i3config.vim";
|
||||
version = "2021-06-23";
|
||||
@ -3935,36 +3947,36 @@ final: prev:
|
||||
|
||||
leap-ast-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "leap-ast.nvim";
|
||||
version = "2022-08-02";
|
||||
version = "2022-10-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggandor";
|
||||
repo = "leap-ast.nvim";
|
||||
rev = "38d05c808fc8cecb4c380912649d87c7abfa9e95";
|
||||
sha256 = "0d52ndk9r8g6mp09rjryz9hp7mdyfqqcjf94j0f83qdkdmv3i9gp";
|
||||
rev = "1a21b70505ebb868a1e196c0d63797e1426b53a5";
|
||||
sha256 = "1jb8rydp4h3b71vfn9hq4ni1fs6ds0kk92vlal4jl9gzs38cx5p9";
|
||||
};
|
||||
meta.homepage = "https://github.com/ggandor/leap-ast.nvim/";
|
||||
};
|
||||
|
||||
leap-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "leap.nvim";
|
||||
version = "2022-10-01";
|
||||
version = "2022-10-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggandor";
|
||||
repo = "leap.nvim";
|
||||
rev = "5a09c30bf676d1392ff00eb9a41e0a1fc9b60a1b";
|
||||
sha256 = "078q9dr4a2j6c6v7l4n1ly2j94d3q4fbinpmi4qma9zmrpg9nsn6";
|
||||
rev = "517f142dea3d62c956fd00ab78385b83b14932a9";
|
||||
sha256 = "09j9frsxqxbzvk2fpyfz1ian9q5gzm1zj13kq64fwldzxamjsjji";
|
||||
};
|
||||
meta.homepage = "https://github.com/ggandor/leap.nvim/";
|
||||
};
|
||||
|
||||
legendary-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "legendary.nvim";
|
||||
version = "2022-10-07";
|
||||
version = "2022-10-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mrjones2014";
|
||||
repo = "legendary.nvim";
|
||||
rev = "4ecafc2993b31e74bb8cecb93a90f2414f008be2";
|
||||
sha256 = "0d0qg2hs83jf26hjca7bwjxgv59zrnw4w8gm54p0fr8gaqcvr514";
|
||||
rev = "9d8e43e25174033a1066f12b7d656d93c7527db7";
|
||||
sha256 = "17drk65qrxnmnywg8p3251581hfy01drzj669v92brn1varp1a6d";
|
||||
};
|
||||
meta.homepage = "https://github.com/mrjones2014/legendary.nvim/";
|
||||
};
|
||||
@ -4211,12 +4223,12 @@ final: prev:
|
||||
|
||||
live-command-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "live-command.nvim";
|
||||
version = "2022-10-06";
|
||||
version = "2022-10-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "smjonas";
|
||||
repo = "live-command.nvim";
|
||||
rev = "76abef7bcf40afd8db381c8d95a0f3143aa28e68";
|
||||
sha256 = "0swz1pvzl5fr57y7vzxzb9gqfmw5d3zh0751hgj7jqdy4hn00a6z";
|
||||
rev = "b3639c1bc78dbd396b47ef1dcf624dabc01238be";
|
||||
sha256 = "0bkffrsha1mhsnd0w45js5d0kx097k21lyg7bwj4a40icgkgyfpk";
|
||||
};
|
||||
meta.homepage = "https://github.com/smjonas/live-command.nvim/";
|
||||
};
|
||||
@ -4366,12 +4378,12 @@ final: prev:
|
||||
|
||||
lua-dev-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lua-dev.nvim";
|
||||
version = "2022-10-09";
|
||||
version = "2022-10-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "folke";
|
||||
repo = "lua-dev.nvim";
|
||||
rev = "a37b9ba11a4d1ed97284b416526e6251d23d58e1";
|
||||
sha256 = "1ida1a97ddz5ps4yhxpvm9in20q8jy345a0b8kc7h4h3v0pqmdkd";
|
||||
rev = "092306391310e0cd3b8785588c50d03a9c98d473";
|
||||
sha256 = "0hg6mq5h6a63vnvpxjjyfx1czjj14gpjdc0cn18hnch9krr5mz1i";
|
||||
};
|
||||
meta.homepage = "https://github.com/folke/lua-dev.nvim/";
|
||||
};
|
||||
@ -4402,12 +4414,12 @@ final: prev:
|
||||
|
||||
luasnip = buildVimPluginFrom2Nix {
|
||||
pname = "luasnip";
|
||||
version = "2022-10-08";
|
||||
version = "2022-10-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "l3mon4d3";
|
||||
repo = "luasnip";
|
||||
rev = "aa7acef98392f35288590f2fcf984b19e0d5bc29";
|
||||
sha256 = "1xs5h97q3fg4avsab9csf8nwmxadc9pvhv31khq86637kximgzz1";
|
||||
rev = "08511f9a8dc3ef01c31a245429bfaef993e2f1f6";
|
||||
sha256 = "04100gf6rgl3d7vxsxvf0xgn0y2ypyjh22qznx18hm0c7mdsl1qz";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
|
||||
@ -4511,12 +4523,12 @@ final: prev:
|
||||
|
||||
mini-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "mini.nvim";
|
||||
version = "2022-10-02";
|
||||
version = "2022-10-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "echasnovski";
|
||||
repo = "mini.nvim";
|
||||
rev = "3f2c7a2aee528309fb42091b723285fb7630a0c2";
|
||||
sha256 = "18049zbm2gxm6gjif6radwy09x84ix1y30657q294n7scsh25mg5";
|
||||
rev = "9f7bdfd90d5bdb466fd297f691db6c58316c3bb7";
|
||||
sha256 = "11yn7jwy8vy6rzmavh420x3dn7y9lzb0dn5nkrky2rr38s6wyd5h";
|
||||
};
|
||||
meta.homepage = "https://github.com/echasnovski/mini.nvim/";
|
||||
};
|
||||
@ -4943,12 +4955,12 @@ final: prev:
|
||||
|
||||
neorg = buildVimPluginFrom2Nix {
|
||||
pname = "neorg";
|
||||
version = "2022-10-08";
|
||||
version = "2022-10-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-neorg";
|
||||
repo = "neorg";
|
||||
rev = "7e56721877cb8219a6b982710d98eb675738f499";
|
||||
sha256 = "1n875jcbrqvc3gyswld3np9r7axns7v0pmd4cf0lcx64pkb3wrn2";
|
||||
rev = "9a9891a3247b2c15b752efca749f1175b9013235";
|
||||
sha256 = "01iibvgf5lf23zivd94dfcjiz2b0rmqcz7yddfqf8drq1pi3bxjw";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-neorg/neorg/";
|
||||
};
|
||||
@ -5171,12 +5183,12 @@ final: prev:
|
||||
|
||||
noice-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "noice.nvim";
|
||||
version = "2022-10-08";
|
||||
version = "2022-10-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "folke";
|
||||
repo = "noice.nvim";
|
||||
rev = "b479e237c3af7b72e26e032f790a73a9aae91897";
|
||||
sha256 = "1hv0gqs088ga60clp4dszjqsf67g6ppggmwi9h4pkyr9yni6himh";
|
||||
rev = "87f908da660c321439a0dd98a8e51cd85227f57b";
|
||||
sha256 = "0byzbwhclppby3ryqis29d6wpdgshk7qi9sp1pp8kkfjv2fg3xb3";
|
||||
};
|
||||
meta.homepage = "https://github.com/folke/noice.nvim/";
|
||||
};
|
||||
@ -5243,12 +5255,12 @@ final: prev:
|
||||
|
||||
null-ls-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "null-ls.nvim";
|
||||
version = "2022-10-08";
|
||||
version = "2022-10-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jose-elias-alvarez";
|
||||
repo = "null-ls.nvim";
|
||||
rev = "3d76bb2968310f7e18a20711ac89c5e7b07e8c93";
|
||||
sha256 = "145dqk8423b8wnkzrv7ajvymxpsvpr2bj3malywmlyb6zkzkc8q4";
|
||||
rev = "ce85d7738b5a29c910a970fed3299bada855fb3d";
|
||||
sha256 = "0gnz4w8yj2d8qzx63dfyvr18sxhid3876gdaf33p0j3x138d45p1";
|
||||
};
|
||||
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
|
||||
};
|
||||
@ -5363,12 +5375,12 @@ final: prev:
|
||||
|
||||
nvim-cmp = buildNeovimPluginFrom2Nix {
|
||||
pname = "nvim-cmp";
|
||||
version = "2022-10-07";
|
||||
version = "2022-10-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrsh7th";
|
||||
repo = "nvim-cmp";
|
||||
rev = "0e436ee23abc6c3fe5f3600145d2a413703e7272";
|
||||
sha256 = "02w95zqbl3nx0vnl2fhlhlkil3jzy6yi2731xmy01qjl54vgqgdj";
|
||||
rev = "0ad2450ff617a3568cc3f5e46f13635ef5185e6c";
|
||||
sha256 = "1fgl908sv4pzqg6z4i584d86qqkf91igd0pkhggwf951x0ss4m02";
|
||||
};
|
||||
meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
|
||||
};
|
||||
@ -5459,12 +5471,12 @@ final: prev:
|
||||
|
||||
nvim-dap = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-dap";
|
||||
version = "2022-10-08";
|
||||
version = "2022-10-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mfussenegger";
|
||||
repo = "nvim-dap";
|
||||
rev = "684f57f9d6aed53dfa349986a1038b10b759e18b";
|
||||
sha256 = "1w1ka48zhv0qgx6s03q5c9clm3y7x572q0k6qvgqlj22fcqcqph1";
|
||||
rev = "6b12294a57001d994022df8acbe2ef7327d30587";
|
||||
sha256 = "16v6cy2za9v48jrm4mipfnxv5ry0h60k85342xrzxwanhnkagi5v";
|
||||
};
|
||||
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
|
||||
};
|
||||
@ -5579,12 +5591,12 @@ final: prev:
|
||||
|
||||
nvim-hlslens = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-hlslens";
|
||||
version = "2022-09-30";
|
||||
version = "2022-10-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kevinhwang91";
|
||||
repo = "nvim-hlslens";
|
||||
rev = "5e6ea33cfdf8be57bb33146f1927b7723d3ddff6";
|
||||
sha256 = "0zhjsg627avq3755a9q28hy8g6iahrn17cwavx47q69j3hp0cl7q";
|
||||
rev = "8b67dd488cc4633dc3580b44bf0b30d002a2ba29";
|
||||
sha256 = "1wwk0sxd3j4fpndill5hbdq1rwmjfv8x8hmajvsxdnpc8skvyzxa";
|
||||
};
|
||||
meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/";
|
||||
};
|
||||
@ -5687,12 +5699,12 @@ final: prev:
|
||||
|
||||
nvim-lspconfig = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-lspconfig";
|
||||
version = "2022-10-07";
|
||||
version = "2022-10-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovim";
|
||||
repo = "nvim-lspconfig";
|
||||
rev = "9d4b8d393aad0e6e9227e2d67629aa99e56b994a";
|
||||
sha256 = "0yajlbas8ghm75d2qsngl6c72w1kk05rhpzfmsrp3yzm57jpx73v";
|
||||
rev = "0a8064eda0c7a4475c4a8ceb39199e975308797b";
|
||||
sha256 = "163ppl8fdybx2bkaimbxxidn6vgqgz6dz6qs45ng9f9ys1wxg5nr";
|
||||
};
|
||||
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
|
||||
};
|
||||
@ -5771,12 +5783,12 @@ final: prev:
|
||||
|
||||
nvim-notify = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-notify";
|
||||
version = "2022-10-08";
|
||||
version = "2022-10-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rcarriga";
|
||||
repo = "nvim-notify";
|
||||
rev = "74eb04da1945cb4411bb7b1a4373d61b4f4c135b";
|
||||
sha256 = "05rszmk0x5xbhlprfky2kn3dm2gvbiphqcb7yj65sng4423z4g40";
|
||||
rev = "56f65a9474e9ce294a89eb325fccf4391646bfd4";
|
||||
sha256 = "1dr3yv8b3zv50yls8xwf6k75xk7l8y78cbbs7zvjmwri31sw5w4f";
|
||||
};
|
||||
meta.homepage = "https://github.com/rcarriga/nvim-notify/";
|
||||
};
|
||||
@ -5883,20 +5895,20 @@ final: prev:
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-tree";
|
||||
repo = "nvim-tree.lua";
|
||||
rev = "0db49773037a399996db81bb2ba0ac5301d8bf1d";
|
||||
sha256 = "1d19hb819zxbl1vzn3d50gyhp97z818hh5q9fdgav33kkkhycc4f";
|
||||
rev = "875d38e52cc4367bad10e648a906a6bd73b3691c";
|
||||
sha256 = "02mqgphmmpvnwqaivy4yjgvwrhf23s1jb8z8qldgfxypf5lfpgvl";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
|
||||
};
|
||||
|
||||
nvim-treesitter = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-treesitter";
|
||||
version = "2022-10-08";
|
||||
version = "2022-10-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-treesitter";
|
||||
repo = "nvim-treesitter";
|
||||
rev = "b273a06728305c1e7bd0179977ca48049aeff5e6";
|
||||
sha256 = "107yb35kq5c8fg2h9mr0v1wjskym9ai1wmfdr5j72gcv0zc174xj";
|
||||
rev = "7ddc2b54db9b92846292e081a337dce2ed4f66a1";
|
||||
sha256 = "195qckaq6xiixh1m2h306c43mf09nfk5p840k2amdbg0i2wi44na";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
|
||||
};
|
||||
@ -6071,12 +6083,12 @@ final: prev:
|
||||
|
||||
octo-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "octo.nvim";
|
||||
version = "2022-09-14";
|
||||
version = "2022-10-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pwntester";
|
||||
repo = "octo.nvim";
|
||||
rev = "e634cd1b120af1d7f642081185782a24b49dc11f";
|
||||
sha256 = "1zlqyhxr8ibgahz3s3gwbw0ybkczgd96a18d5lfcg5i9axi6iaqp";
|
||||
rev = "d91f88be51fa7cde8b5d6f529c057338aad18383";
|
||||
sha256 = "0d4340gjbsvbdvymw0a7kpqwvzrn946nnsaav9i0z6rallrk583n";
|
||||
};
|
||||
meta.homepage = "https://github.com/pwntester/octo.nvim/";
|
||||
};
|
||||
@ -6131,12 +6143,12 @@ final: prev:
|
||||
|
||||
onedarkpro-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "onedarkpro.nvim";
|
||||
version = "2022-10-08";
|
||||
version = "2022-10-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "olimorris";
|
||||
repo = "onedarkpro.nvim";
|
||||
rev = "18d2362f28ba577824e68e0a12d2338f67da0e06";
|
||||
sha256 = "1qan2g1a0kmbbzwd4hs9msv5bx47m0pa02jhl7ha03g0j2qbxbcx";
|
||||
rev = "81f50f9ab0f4b556b4bd10c8c8cdf8a76ab01213";
|
||||
sha256 = "179nq72hlcb4g5dgm8psl3il075km80ijz5kz5yzb43kllkaadls";
|
||||
};
|
||||
meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
|
||||
};
|
||||
@ -7227,12 +7239,12 @@ final: prev:
|
||||
|
||||
surround-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "surround.nvim";
|
||||
version = "2022-02-22";
|
||||
version = "2022-10-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ur4ltz";
|
||||
repo = "surround.nvim";
|
||||
rev = "633068182cf894480341b992445f0f0d2883721d";
|
||||
sha256 = "0mqg4vki23rs0rj6zyfkd1ki9wndjifp0lmnnw99x3i1qc0ba47i";
|
||||
rev = "36c253d6470910692491b13382f54c9bab2811e1";
|
||||
sha256 = "0bjv399gw0gkpfqclmv65viwi34il5zn5kx9zplnkq5r0734l3nw";
|
||||
};
|
||||
meta.homepage = "https://github.com/ur4ltz/surround.nvim/";
|
||||
};
|
||||
@ -7481,12 +7493,12 @@ final: prev:
|
||||
|
||||
telescope-coc-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "telescope-coc.nvim";
|
||||
version = "2022-10-06";
|
||||
version = "2022-10-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "fannheyward";
|
||||
repo = "telescope-coc.nvim";
|
||||
rev = "ecf56935b05c7da4150e6d046f07b920628aab53";
|
||||
sha256 = "16jl04zbsmhry1ybpcl9czs2lzlni6dzpaf163y9ff080cs5f3si";
|
||||
rev = "da487dfd41266a0b5507a310da684ef3a3bfdb68";
|
||||
sha256 = "1lnang3qn861z0p657aa8r7w6d1v6qn86gdwg7di11dgc5vljfh4";
|
||||
};
|
||||
meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/";
|
||||
};
|
||||
@ -7602,12 +7614,12 @@ final: prev:
|
||||
|
||||
telescope-project-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "telescope-project.nvim";
|
||||
version = "2022-10-02";
|
||||
version = "2022-10-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-telescope";
|
||||
repo = "telescope-project.nvim";
|
||||
rev = "a0dec67decbc85cf1af2002807c8a963f72c1d13";
|
||||
sha256 = "0gz7rxzn7phq45ss1bhb5g35z1kq97r7yapvrnb1yi0259jwbxsa";
|
||||
rev = "ff4d3cea905383a67d1a47b9dd210c4907d858c2";
|
||||
sha256 = "16byj7gcyxpn837x096a074vpj67drbd5ndcfpkvp1xyam9604b4";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/";
|
||||
};
|
||||
@ -7686,12 +7698,12 @@ final: prev:
|
||||
|
||||
telescope-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "telescope.nvim";
|
||||
version = "2022-10-08";
|
||||
version = "2022-10-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-telescope";
|
||||
repo = "telescope.nvim";
|
||||
rev = "5fadc247c56e739d9c5c30a484fd291bb87bd378";
|
||||
sha256 = "1bdzdsxx9l0aq2hk81diawpa56m7yh33wvb6kb0s4c7i2c6kbi3m";
|
||||
rev = "f174a0367b4fc7cb17710d867e25ea792311c418";
|
||||
sha256 = "1hra6vrr25xan0xwjc76m14ml6hwrm7nx2wapl44zx3m29hwfasx";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
|
||||
};
|
||||
@ -7891,12 +7903,12 @@ final: prev:
|
||||
|
||||
tokyonight-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "tokyonight.nvim";
|
||||
version = "2022-10-05";
|
||||
version = "2022-10-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "folke";
|
||||
repo = "tokyonight.nvim";
|
||||
rev = "fd9105c9487996aa2269992b72a6fea7504688e4";
|
||||
sha256 = "1aawphnlac7aaizn4im4v7lx87gnp1avishghvk3fglfsm95r3fz";
|
||||
rev = "23c0038166800d373f3ec41e56768212aa3aaa2f";
|
||||
sha256 = "1zz54cq4ls4kb74pjxpy1afzckw5m3q92r1gr83l36i7yn5w0h61";
|
||||
};
|
||||
meta.homepage = "https://github.com/folke/tokyonight.nvim/";
|
||||
};
|
||||
@ -9691,12 +9703,12 @@ final: prev:
|
||||
|
||||
vim-gist = buildVimPluginFrom2Nix {
|
||||
pname = "vim-gist";
|
||||
version = "2021-11-04";
|
||||
version = "2022-10-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattn";
|
||||
repo = "vim-gist";
|
||||
rev = "34e0f0aad5cc21cb3087a5d92ae1aa108019ecda";
|
||||
sha256 = "1dlsml47nh2mdllahh2nicnpqxk271p62cp3xsjd4dbbr0lallds";
|
||||
rev = "5bfbb5450d9eff248f6c074de0b7800392439304";
|
||||
sha256 = "00yvl59jbblkif4967kdg6b0mr0hd7rnr5mkxnb4n74akj9pwcf0";
|
||||
};
|
||||
meta.homepage = "https://github.com/mattn/vim-gist/";
|
||||
};
|
||||
@ -10521,12 +10533,12 @@ final: prev:
|
||||
|
||||
vim-lsp = buildVimPluginFrom2Nix {
|
||||
pname = "vim-lsp";
|
||||
version = "2022-09-27";
|
||||
version = "2022-10-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "prabirshrestha";
|
||||
repo = "vim-lsp";
|
||||
rev = "8fdaf4f78c94c6abba06a907520a5de157c5803b";
|
||||
sha256 = "0cm3vf84hvvi13v4239j3m24p6dzclv7y4061wyh6sdf7cdx6dqq";
|
||||
rev = "23728ad8c5becd2641ac7fb7e995b36295d2544e";
|
||||
sha256 = "026blks2bljynrw1xg8wmxz1ikr0f819ih0635bxwp8ah9dkfqzc";
|
||||
};
|
||||
meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
|
||||
};
|
||||
@ -11410,12 +11422,12 @@ final: prev:
|
||||
|
||||
vim-qml = buildVimPluginFrom2Nix {
|
||||
pname = "vim-qml";
|
||||
version = "2020-11-03";
|
||||
version = "2022-10-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "peterhoeg";
|
||||
repo = "vim-qml";
|
||||
rev = "50d2e737094c146195171b7d52e522384f15afe8";
|
||||
sha256 = "1iz2l51c15ijkpzyk5qwmd8y0yy2z8f1jwxcwk16h63g4nmfm1zr";
|
||||
rev = "92cd291bc3d59126ef771dfaad5f2506636104c7";
|
||||
sha256 = "1pabhpsikss4cr439yikwl7lnq5bahzs22xmv9icp3fz921c67bh";
|
||||
};
|
||||
meta.homepage = "https://github.com/peterhoeg/vim-qml/";
|
||||
};
|
||||
@ -11830,12 +11842,12 @@ final: prev:
|
||||
|
||||
vim-snippets = buildVimPluginFrom2Nix {
|
||||
pname = "vim-snippets";
|
||||
version = "2022-10-07";
|
||||
version = "2022-10-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "honza";
|
||||
repo = "vim-snippets";
|
||||
rev = "250fd916757a545e7dfa29a62afa1e7ea16e2460";
|
||||
sha256 = "1iimz25g4vyg9fnjsrbc1b6rkga99y9b3wn0qnyf9d1hms643k3a";
|
||||
rev = "9a7f3968c92c6589d3a12aa5448e8374c8d68a42";
|
||||
sha256 = "15bqw0l78s8v2l44j4h64lvs7456h5l0dy46kxas095jrjg9aqnw";
|
||||
};
|
||||
meta.homepage = "https://github.com/honza/vim-snippets/";
|
||||
};
|
||||
@ -11866,12 +11878,12 @@ final: prev:
|
||||
|
||||
vim-speeddating = buildVimPluginFrom2Nix {
|
||||
pname = "vim-speeddating";
|
||||
version = "2021-04-29";
|
||||
version = "2022-10-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tpope";
|
||||
repo = "vim-speeddating";
|
||||
rev = "95da3d72efc91a5131acf388eafa4b1ad6512a9b";
|
||||
sha256 = "1al53c1x2bnnf0nnn7319jxq7bphaxdcnb5i7qa86m337jb2wqrp";
|
||||
rev = "5a36fd29df63ea3f65562bd2bb837be48a5ec90b";
|
||||
sha256 = "0zwhynknkcf9zpsl7ddsrihh351fy9k75ylfrzzl222i88g17d14";
|
||||
};
|
||||
meta.homepage = "https://github.com/tpope/vim-speeddating/";
|
||||
};
|
||||
@ -12251,12 +12263,12 @@ final: prev:
|
||||
|
||||
vim-tpipeline = buildVimPluginFrom2Nix {
|
||||
pname = "vim-tpipeline";
|
||||
version = "2022-10-06";
|
||||
version = "2022-10-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vimpostor";
|
||||
repo = "vim-tpipeline";
|
||||
rev = "c345f17e8ff7c3158a60d7a4285fc29972fa0c80";
|
||||
sha256 = "1mi6x2k1dpyrw9fsrbq48rfyj4bsgcazy8jw7nnkhicmhp73mzqs";
|
||||
rev = "58daf4b1927c4c4fa5377f7527a2d13d06a044f7";
|
||||
sha256 = "1k91q2i7pv1yx1mdcwhagwvpi294zbwngvd63xv1wfkwkyi32jcj";
|
||||
};
|
||||
meta.homepage = "https://github.com/vimpostor/vim-tpipeline/";
|
||||
};
|
||||
@ -12743,12 +12755,12 @@ final: prev:
|
||||
|
||||
vimspector = buildVimPluginFrom2Nix {
|
||||
pname = "vimspector";
|
||||
version = "2022-09-27";
|
||||
version = "2022-10-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "puremourning";
|
||||
repo = "vimspector";
|
||||
rev = "c95ad4c8fb54adb75ceb0397ef6ace1c4eec3790";
|
||||
sha256 = "1mxgw6zx529lmi98z4072zc0ri9idf2ysaxmfby3wycl2z73b7k8";
|
||||
rev = "90c8b7de334ee778c99eaafee41105808e363f81";
|
||||
sha256 = "0hgasj2sr5kh4c70rwgzn2cfpw8vc61m82jjhis15a6bdl2jqw4a";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/puremourning/vimspector/";
|
||||
@ -13093,12 +13105,12 @@ final: prev:
|
||||
|
||||
catppuccin-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "catppuccin-nvim";
|
||||
version = "2022-10-08";
|
||||
version = "2022-10-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "catppuccin";
|
||||
repo = "nvim";
|
||||
rev = "e9b313b4dcaa35a8092c91fbff5984df39406173";
|
||||
sha256 = "08g2qlqjrg0svj53h91ay95fraa15v8myvx3yjvggi1f6y4vgwcf";
|
||||
rev = "9991ede2bc5714abfdca7eaf5b20be429502ffe4";
|
||||
sha256 = "10w5q3v91swm538rczncvpzmph01rvpzvwv3zi5la6hbkz5qab8y";
|
||||
};
|
||||
meta.homepage = "https://github.com/catppuccin/nvim/";
|
||||
};
|
||||
@ -13117,12 +13129,12 @@ final: prev:
|
||||
|
||||
chad = buildVimPluginFrom2Nix {
|
||||
pname = "chad";
|
||||
version = "2022-10-09";
|
||||
version = "2022-10-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "chadtree";
|
||||
rev = "06d13155ac420b410b2b48e36d62069035c00323";
|
||||
sha256 = "0mn54z0w6sjxh3fb0igkmcbms102mi52js3fj3kjx5b56iy1k87r";
|
||||
rev = "caab879af5f52cdfc673ebd2aff2fb099cf538e1";
|
||||
sha256 = "0rb89dlil2lv8cf7x2vsqfvh0ba7mr5rfwyzx8ln7h8bj56hnx5i";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/chadtree/";
|
||||
};
|
||||
|
||||
@ -296,6 +296,7 @@ https://github.com/edluffy/hologram.nvim/,,
|
||||
https://github.com/urbit/hoon.vim/,,
|
||||
https://github.com/phaazon/hop.nvim/,,
|
||||
https://github.com/rktjmp/hotpot.nvim/,,
|
||||
https://github.com/anuvyklack/hydra.nvim/,HEAD,
|
||||
https://github.com/mboughaba/i3config.vim/,,
|
||||
https://github.com/cocopon/iceberg.vim/,,
|
||||
https://github.com/idris-hackers/idris-vim/,,
|
||||
|
||||
@ -225,8 +225,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-apollo";
|
||||
publisher = "apollographql";
|
||||
version = "1.19.9";
|
||||
sha256 = "sha256-iJpzNKcuQrfq4Z0LXuadt6OKXelBbDQg/vuc7NJ2I5o=";
|
||||
version = "1.19.11";
|
||||
sha256 = "sha256-EixefDuJiw/p5yAR/UQLK1a1RXJLXlTmOlD34qpAN+U=";
|
||||
};
|
||||
meta = with lib; {
|
||||
changelog = "https://marketplace.visualstudio.com/items/apollographql.vscode-apollo/changelog";
|
||||
@ -673,8 +673,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-eslint";
|
||||
publisher = "dbaeumer";
|
||||
version = "2.2.2";
|
||||
sha256 = "sha256-llalyQXl+k/ugZq+Ti9mApHRqAGu6QyoMP51GtZnRJ4=";
|
||||
version = "2.2.6";
|
||||
sha256 = "sha256-1yZeyLrXuubhKzobWcd00F/CdU824uJDTkB6qlHkJlQ=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
@ -698,8 +698,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-markdownlint";
|
||||
publisher = "DavidAnson";
|
||||
version = "0.47.0";
|
||||
sha256 = "sha256-KtDJo8rhQXkZtJz93E+J7eNiAIcLk4e5qKDLoR3DoGw=";
|
||||
version = "0.48.1";
|
||||
sha256 = "sha256-3TpZGvas+pfabHayaA6Yd9nOO2MbfXbCvCiTcbja9Vo=";
|
||||
};
|
||||
meta = with lib; {
|
||||
changelog = "https://marketplace.visualstudio.com/items/DavidAnson.vscode-markdownlint/changelog";
|
||||
@ -934,8 +934,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "prettier-vscode";
|
||||
publisher = "esbenp";
|
||||
version = "9.8.0";
|
||||
sha256 = "sha256-+8lEuQD73w+urAv2Tw0b+q6oQ66+gLgMPe3Luln9cuY=";
|
||||
version = "9.9.0";
|
||||
sha256 = "sha256-Yr7M4HyRNcsBf8YglQLvyZjblMhtkpMP+f9SH8oUav0=";
|
||||
};
|
||||
meta = with lib; {
|
||||
changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog";
|
||||
@ -1881,8 +1881,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "color-highlight";
|
||||
publisher = "naumovs";
|
||||
version = "2.5.0";
|
||||
sha256 = "sha256-dYMDV84LEGXUjt/fbsSy3BVM5SsBHcPaDDll8KjPIWY=";
|
||||
version = "2.6.0";
|
||||
sha256 = "sha256-TcPQOAHCYeFHPdR85GIXsy3fx70p8cLdO2UNO0krUOs=";
|
||||
};
|
||||
meta = with lib; {
|
||||
changelog = "https://marketplace.visualstudio.com/items/naumovs.color-highlight/changelog";
|
||||
@ -2345,8 +2345,8 @@ let
|
||||
mktplcRef = {
|
||||
publisher = "stkb";
|
||||
name = "rewrap";
|
||||
version = "1.16.1";
|
||||
sha256 = "sha256-OTPNbwoQmKd73g8IwLKMIbe6c7E2jKNkzwuBU/f8dmY=";
|
||||
version = "1.16.3";
|
||||
sha256 = "sha256-WHeLTN992ltEZw2W7B3sJrHfAFsOGMq3llV4C0hXLNA=";
|
||||
};
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/stkb/Rewrap/blob/master/CHANGELOG.md";
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, vscode-utils, callPackage }:
|
||||
let
|
||||
version = "1.6.0";
|
||||
version = "1.8.1";
|
||||
rescript-editor-analysis = callPackage ./rescript-editor-analysis.nix { inherit version; };
|
||||
arch =
|
||||
if stdenv.isLinux then "linux"
|
||||
@ -13,7 +13,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
|
||||
name = "rescript-vscode";
|
||||
publisher = "chenglou92";
|
||||
inherit version;
|
||||
sha256 = "sha256-/Nv+uyTkJQVaPKIDRr1P/Z5vsituXpP48/sDn3FUEeA=";
|
||||
sha256 = "sha256-XZG0PRzc3wyAVq9tQeGDlaUZg5YAgkPxJ3NsrdUHoOk=";
|
||||
};
|
||||
postPatch = ''
|
||||
rm -r ${analysisDir}
|
||||
|
||||
@ -8,7 +8,7 @@ stdenv.mkDerivation {
|
||||
owner = "rescript-lang";
|
||||
repo = "rescript-vscode";
|
||||
rev = version;
|
||||
sha256 = "sha256-O5kZCnhtMcevPTs5UxhIXx124WQf1VvF2WMVHjMEQZc=";
|
||||
sha256 = "sha256-a8otK0BxZbl0nOp4QWQRkjb5fM85JA4nVkLuKAz71xU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ocaml dune_3 ];
|
||||
|
||||
@ -45,7 +45,8 @@ let
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
}).nodeDependencies.override (old: {
|
||||
inherit src version;
|
||||
buildInputs = [pkg-config libsecret];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [libsecret];
|
||||
dontNpmInstall = true;
|
||||
}));
|
||||
|
||||
|
||||
@ -124,7 +124,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
configurePhase = ''
|
||||
export GIT_VERSION=${builtins.substring 0 7 src.rev}
|
||||
buildFlags="$buildFlags ''${enableParallelBuilding:+-j$NIX_BUILD_CORES -l$NIX_BUILD_CORES}"
|
||||
buildFlags="$buildFlags ''${enableParallelBuilding:+-j$NIX_BUILD_CORES"
|
||||
'' + optionalString enableX11 ''
|
||||
cd x11
|
||||
substituteInPlace Makefile.am \
|
||||
|
||||
@ -9,10 +9,10 @@
|
||||
|
||||
let
|
||||
# Keep these separate so the update script can regex them
|
||||
rpcs3GitVersion = "14141-d686b48f6";
|
||||
rpcs3Version = "0.0.24-14141-d686b48f6";
|
||||
rpcs3Revision = "d686b48f6549c736661e14d1e0990b043c32e3c2";
|
||||
rpcs3Sha256 = "1jzpb189isy9kc6l5cy1nfx0wq5cri753sh32b1xq259lkqihdp5";
|
||||
rpcs3GitVersion = "14241-92b08a4fa";
|
||||
rpcs3Version = "0.0.24-14241-92b08a4fa";
|
||||
rpcs3Revision = "92b08a4fafb1e36ccc23ac7e2a9b10e91a9b6df7";
|
||||
rpcs3Sha256 = "01h9m4cdywdfhiv5kjd7cv53spv3g2ixk3dvji14vi28zac8jcxb";
|
||||
|
||||
ittapi = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
|
||||
@ -45,9 +45,9 @@ stdenv.mkDerivation rec {
|
||||
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share")
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [ pkg-config intltool ];
|
||||
buildInputs = [
|
||||
gtk3 udev desktop-file-utils shared-mime-info intltool
|
||||
gtk3 udev desktop-file-utils shared-mime-info
|
||||
wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks2
|
||||
] ++ (if ifuseSupport then [ ifuse ] else []);
|
||||
# Introduced because ifuse doesn't build due to CVEs in libplist
|
||||
|
||||
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1v1v0vcbnm30kpyd3rj8f56yh7lfnwy7nbs9785wi229b29fiqx1";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ fox gettext xlibsWrapper gcc intltool file libpng ];
|
||||
nativeBuildInputs = [ pkg-config intltool ];
|
||||
buildInputs = [ fox gettext xlibsWrapper gcc file libpng ];
|
||||
|
||||
preConfigure = ''
|
||||
sed -i s,/usr/share/xfe,$out/share/xfe, src/xfedefs.h
|
||||
|
||||
@ -21,6 +21,7 @@
|
||||
, virtualpg
|
||||
, wxGTK
|
||||
, wxmac
|
||||
, xz
|
||||
, zstd
|
||||
, Carbon
|
||||
, Cocoa
|
||||
@ -56,6 +57,7 @@ stdenv.mkDerivation rec {
|
||||
proj
|
||||
sqlite
|
||||
virtualpg
|
||||
xz
|
||||
zstd
|
||||
] ++ lib.optional stdenv.isLinux wxGTK
|
||||
++ lib.optionals stdenv.isDarwin [ Carbon Cocoa IOKit wxmac ];
|
||||
|
||||
@ -16,9 +16,9 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [ pkg-config intltool ];
|
||||
|
||||
buildInputs = [ intltool gtk2 ];
|
||||
buildInputs = [ gtk2 ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple and fast image viewer for X";
|
||||
|
||||
@ -114,7 +114,6 @@ stdenv.mkDerivation {
|
||||
gtk3
|
||||
gtkmm3
|
||||
imagemagick
|
||||
intltool
|
||||
libjack2
|
||||
libsigcxx
|
||||
libxmlxx
|
||||
|
||||
@ -12,9 +12,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
nativeBuildInputs = [ intltool ];
|
||||
buildInputs = [
|
||||
aalib gsl libpng libX11 xorgproto libXext
|
||||
libXt zlib gettext intltool perl
|
||||
libXt zlib gettext perl
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "albert";
|
||||
version = "0.17.3";
|
||||
version = "0.17.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "albertlauncher";
|
||||
repo = "albert";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-UIG6yLkIcdf5IszhNPwkBcSfZe4/CyI5shK/QPOmpPE=";
|
||||
sha256 = "sha256-nbnywrsKvFG8AkayjnylOKSnn7rRWgNv5zE9DDeOmLw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -11,13 +11,13 @@ assert x11Support -> xorg != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bemenu";
|
||||
version = "0.6.11";
|
||||
version = "0.6.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Cloudef";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-M8ezaXu62GYzP8xt5ke1I1IIdUcyTk6vtVbJszU7/6g=";
|
||||
sha256 = "sha256-u8DQn1WIQjt1Be3WMAUNr/4qQm4vLGaj5RY49sQVpFI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config pcre ];
|
||||
|
||||
@ -23,16 +23,16 @@
|
||||
inherit maven; # use overridden maven version (see dbeaver's entry in all-packages.nix)
|
||||
}) rec {
|
||||
pname = "dbeaver";
|
||||
version = "22.2.0"; # When updating also update mvnSha256
|
||||
version = "22.2.2"; # When updating also update mvnSha256
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dbeaver";
|
||||
repo = "dbeaver";
|
||||
rev = version;
|
||||
sha256 = "sha256-T2S5qoOqjqJGf7M4h+IFO+bBER3aNcbxC7CY1fJFqpg=";
|
||||
sha256 = "sha256-TUdtrhQ1JzqZx+QNauNA1P/+WDSSeOGIgGX3SdS0JTI=";
|
||||
};
|
||||
|
||||
mvnSha256 = "HdIhENml6W4U+gM7ODxXinbex5o1X4YhWGTct5rpL5c=";
|
||||
mvnSha256 = "uu7UNRIuAx2GOh4+YxxoGRcV5QO8C72q32e0ynJdgFo=";
|
||||
mvnParameters = "-P desktop,all-platforms";
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,12 +1,5 @@
|
||||
{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, cairo, poppler, wxGTK ? null, wxmac ? null, darwin ? null }:
|
||||
{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, cairo, poppler, wxGTK, Cocoa }:
|
||||
|
||||
let
|
||||
wxInputs =
|
||||
if stdenv.isDarwin then
|
||||
[ wxmac darwin.apple_sdk.frameworks.Cocoa ]
|
||||
else
|
||||
[ wxGTK ];
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "diff-pdf";
|
||||
version = "0.5";
|
||||
@ -19,7 +12,8 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoconf automake pkg-config ];
|
||||
buildInputs = [ cairo poppler ] ++ wxInputs;
|
||||
buildInputs = [ cairo poppler wxGTK ]
|
||||
++ lib.optionals stdenv.isDarwin [ Cocoa ];
|
||||
|
||||
preConfigure = "./bootstrap";
|
||||
|
||||
|
||||
@ -1,32 +1,29 @@
|
||||
{ lib, rustPlatform, fetchFromGitHub, jq }:
|
||||
{ lib, rustPlatform, fetchFromGitHub, installShellFiles }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "genact";
|
||||
version = "1.2.0";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "svenstaro";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-POOXawhxrPT2UgbSZE3r0br7cqJ0ao7MpycrPYa/oCc=";
|
||||
sha256 = "sha256-MB/i1jCxoGE8cPF+NE8aS7kF7ZsGb4+OyLcPcGp1hwI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-wpCzWJglX3FnNySnBRJjFWST5FIG5wAO7u+D4VIevtU=";
|
||||
cargoSha256 = "sha256-OBGJIR3REeMxHQu3ovEKSZZ8QNlhl/5jvWbR5OdsRTQ=";
|
||||
|
||||
depsExtraArgs = {
|
||||
nativeBuildInputs = [ jq ];
|
||||
postBuild = ''
|
||||
pushd $name/humansize
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
[ -d feature-tests ] && rm -r feature-tests
|
||||
postInstall = ''
|
||||
$out/bin/genact --print-manpage > genact.1
|
||||
installManPage genact.1
|
||||
|
||||
jq '.files |= with_entries(select(.key | startswith("feature-tests") | not))' \
|
||||
-c .cargo-checksum.json > .cargo-checksum.json.new
|
||||
mv .cargo-checksum.json{.new,}
|
||||
|
||||
popd
|
||||
'';
|
||||
};
|
||||
installShellCompletion --cmd genact \
|
||||
--bash <($out/bin/genact --print-completions bash) \
|
||||
--fish <($out/bin/genact --print-completions fish) \
|
||||
--zsh <($out/bin/genact --print-completions zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A nonsense activity generator";
|
||||
|
||||
@ -13,11 +13,11 @@ stdenv.mkDerivation rec {
|
||||
"--enable-SIGCHLD-fallback"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
Xaw3d
|
||||
ghostscriptX
|
||||
perl
|
||||
pkg-config
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
libiconv
|
||||
];
|
||||
|
||||
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ intltool gtk3 texinfo ];
|
||||
nativeBuildInputs = [ pkg-config intltool ];
|
||||
buildInputs = [ gtk3 texinfo ];
|
||||
|
||||
meta = {
|
||||
description = "A GTK enabled dropin replacement for xmessage";
|
||||
|
||||
@ -8,10 +8,15 @@ rustPlatform.buildRustPackage rec {
|
||||
owner = "mdzk-rs";
|
||||
repo = "mdzk";
|
||||
rev = version;
|
||||
sha256 = "sha256-V//tVcIzhCh03VjwMC+R2ynaOFm+dp6qxa0oqBfvGUs=";
|
||||
hash = "sha256-V//tVcIzhCh03VjwMC+R2ynaOFm+dp6qxa0oqBfvGUs=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-2lPckUhnyfHaVWXzZXKliolDZiPtNl9UBZIKs6tUaNQ=";
|
||||
cargoPatches = [
|
||||
# Remove when new version of mdzk is released.
|
||||
./update-mdbook-for-rust-1.64.patch
|
||||
];
|
||||
|
||||
cargoHash = "sha256-5zGUBvmf68tCk5jGrNn+ukgYbiKzrlmZvWrYgoJf2zk=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
|
||||
|
||||
|
||||
246
pkgs/applications/misc/mdzk/update-mdbook-for-rust-1.64.patch
Normal file
246
pkgs/applications/misc/mdzk/update-mdbook-for-rust-1.64.patch
Normal file
@ -0,0 +1,246 @@
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index ae63793..4068e02 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -162,12 +162,46 @@ dependencies = [
|
||||
"ansi_term",
|
||||
"atty",
|
||||
"bitflags",
|
||||
- "strsim",
|
||||
- "textwrap",
|
||||
+ "strsim 0.8.0",
|
||||
+ "textwrap 0.11.0",
|
||||
"unicode-width",
|
||||
"vec_map",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "clap"
|
||||
+version = "3.2.2"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "8e538f9ee5aa3b3963f09a997035f883677966ed50fce0292611927ce6f6d8c6"
|
||||
+dependencies = [
|
||||
+ "atty",
|
||||
+ "bitflags",
|
||||
+ "clap_lex",
|
||||
+ "indexmap",
|
||||
+ "lazy_static",
|
||||
+ "strsim 0.10.0",
|
||||
+ "termcolor",
|
||||
+ "textwrap 0.15.1",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "clap_complete"
|
||||
+version = "3.2.5"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "3f7a2e0a962c45ce25afce14220bc24f9dade0a1787f185cecf96bfba7847cd8"
|
||||
+dependencies = [
|
||||
+ "clap 3.2.2",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "clap_lex"
|
||||
+version = "0.2.4"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
|
||||
+dependencies = [
|
||||
+ "os_str_bytes",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "cpufeatures"
|
||||
version = "0.2.1"
|
||||
@@ -222,9 +256,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "env_logger"
|
||||
-version = "0.7.1"
|
||||
+version = "0.9.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
|
||||
+checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272"
|
||||
dependencies = [
|
||||
"atty",
|
||||
"humantime",
|
||||
@@ -385,15 +419,6 @@ dependencies = [
|
||||
"version_check",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "getopts"
|
||||
-version = "0.2.21"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
|
||||
-dependencies = [
|
||||
- "unicode-width",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.1.16"
|
||||
@@ -471,7 +496,7 @@ dependencies = [
|
||||
"log",
|
||||
"pest",
|
||||
"pest_derive",
|
||||
- "quick-error 2.0.1",
|
||||
+ "quick-error",
|
||||
"serde",
|
||||
"serde_json",
|
||||
]
|
||||
@@ -575,12 +600,9 @@ checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440"
|
||||
|
||||
[[package]]
|
||||
name = "humantime"
|
||||
-version = "1.3.0"
|
||||
+version = "2.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
|
||||
-dependencies = [
|
||||
- "quick-error 1.2.3",
|
||||
-]
|
||||
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
|
||||
|
||||
[[package]]
|
||||
name = "hyper"
|
||||
@@ -822,13 +844,14 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
|
||||
|
||||
[[package]]
|
||||
name = "mdbook"
|
||||
-version = "0.4.15"
|
||||
+version = "0.4.21"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "241f10687eb3b4e0634b3b4e423f97c5f1efbd69dc9522e24a8b94583eeec3c6"
|
||||
+checksum = "23f3e133c6d515528745ffd3b9f0c7d975ae039f0b6abb099f2168daa2afb4f9"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"chrono",
|
||||
- "clap",
|
||||
+ "clap 3.2.2",
|
||||
+ "clap_complete",
|
||||
"env_logger",
|
||||
"handlebars",
|
||||
"lazy_static",
|
||||
@@ -838,7 +861,6 @@ dependencies = [
|
||||
"pulldown-cmark",
|
||||
"regex",
|
||||
"serde",
|
||||
- "serde_derive",
|
||||
"serde_json",
|
||||
"shlex",
|
||||
"tempfile",
|
||||
@@ -1062,6 +1084,12 @@ dependencies = [
|
||||
"winapi 0.3.9",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "os_str_bytes"
|
||||
+version = "6.3.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff"
|
||||
+
|
||||
[[package]]
|
||||
name = "parking_lot"
|
||||
version = "0.11.2"
|
||||
@@ -1258,17 +1286,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "34f197a544b0c9ab3ae46c359a7ec9cbbb5c7bf97054266fecb7ead794a181d6"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
- "getopts",
|
||||
"memchr",
|
||||
"unicase",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "quick-error"
|
||||
-version = "1.2.3"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
|
||||
-
|
||||
[[package]]
|
||||
name = "quick-error"
|
||||
version = "2.0.1"
|
||||
@@ -1386,9 +1407,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "regex"
|
||||
-version = "1.5.4"
|
||||
+version = "1.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
|
||||
+checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
@@ -1403,9 +1424,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
|
||||
|
||||
[[package]]
|
||||
name = "regex-syntax"
|
||||
-version = "0.6.25"
|
||||
+version = "0.6.27"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
|
||||
+checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
|
||||
|
||||
[[package]]
|
||||
name = "remove_dir_all"
|
||||
@@ -1577,13 +1598,19 @@ version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
|
||||
|
||||
+[[package]]
|
||||
+name = "strsim"
|
||||
+version = "0.10.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
|
||||
+
|
||||
[[package]]
|
||||
name = "structopt"
|
||||
version = "0.3.26"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10"
|
||||
dependencies = [
|
||||
- "clap",
|
||||
+ "clap 2.33.3",
|
||||
"lazy_static",
|
||||
"structopt-derive",
|
||||
]
|
||||
@@ -1673,6 +1700,12 @@ dependencies = [
|
||||
"unicode-width",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "textwrap"
|
||||
+version = "0.15.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16"
|
||||
+
|
||||
[[package]]
|
||||
name = "thiserror"
|
||||
version = "1.0.30"
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index dfeeb45..8b1e4e5 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -38,7 +38,7 @@ handlebars = "4.2.1"
|
||||
ignore = "0.4.18"
|
||||
lazy_static = "1.4.0"
|
||||
lazy-regex = "2.2.2"
|
||||
-mdbook = { version = "0.4.15", default-features = false }
|
||||
+mdbook = { version = "0.4.21", default-features = false }
|
||||
notify = "4.0.17"
|
||||
pest = "2.1.3"
|
||||
pest_derive = "2.1.0"
|
||||
diff --git a/src/renderer/mdzk_renderer.rs b/src/renderer/mdzk_renderer.rs
|
||||
index 55b2423..f8480ca 100644
|
||||
--- a/src/renderer/mdzk_renderer.rs
|
||||
+++ b/src/renderer/mdzk_renderer.rs
|
||||
@@ -92,7 +92,7 @@ impl Renderer for HtmlMdzk {
|
||||
"description",
|
||||
json!(ctx.config.book.description.clone().unwrap_or_default()),
|
||||
);
|
||||
- if let Some(ref livereload) = html_config.livereload_url {
|
||||
+ if let Some(ref livereload) = html_config.live_reload_endpoint {
|
||||
data.insert("livereload", json!(livereload));
|
||||
}
|
||||
data.insert("fold_enable", json!(html_config.fold.enable));
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, mkDerivation, fetchFromGitHub, pkg-config
|
||||
, qmake, qttools, kirigami2, qtquickcontrols2, qtlocation
|
||||
, libosmscout, valhalla, libpostal, osrm-backend, protobuf
|
||||
, libmicrohttpd_0_9_70, sqlite, marisa, kyotocabinet, boost
|
||||
, libmicrohttpd, sqlite, marisa, kyotocabinet, boost
|
||||
}:
|
||||
|
||||
let
|
||||
@ -27,7 +27,7 @@ mkDerivation rec {
|
||||
nativeBuildInputs = [ qmake pkg-config qttools ];
|
||||
buildInputs = [
|
||||
kirigami2 qtquickcontrols2 qtlocation
|
||||
valhalla libosmscout osrm-backend libmicrohttpd_0_9_70
|
||||
valhalla libosmscout osrm-backend libmicrohttpd
|
||||
libpostal sqlite marisa kyotocabinet boost protobuf date
|
||||
];
|
||||
|
||||
|
||||
81
pkgs/applications/misc/parsec/bin.nix
Normal file
81
pkgs/applications/misc/parsec/bin.nix
Normal file
@ -0,0 +1,81 @@
|
||||
{ stdenvNoCC, stdenv
|
||||
, lib
|
||||
, dpkg, autoPatchelfHook, makeWrapper
|
||||
, fetchurl
|
||||
, alsa-lib, openssl, udev
|
||||
, libglvnd
|
||||
, libX11, libXcursor, libXi, libXrandr
|
||||
, libpulseaudio
|
||||
, libva
|
||||
, ffmpeg
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "parsec-bin";
|
||||
version = "150_28";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://web.archive.org/web/20220622215230id_/https://builds.parsecgaming.com/package/parsec-linux.deb";
|
||||
sha256 = "1hfdzjd8qiksv336m4s4ban004vhv00cv2j461gc6zrp37s0fwhc";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
|
||||
dpkg-deb -x $src .
|
||||
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ dpkg autoPatchelfHook makeWrapper ];
|
||||
|
||||
buildInputs = [
|
||||
stdenv.cc.cc # libstdc++
|
||||
libglvnd
|
||||
libX11
|
||||
];
|
||||
|
||||
runtimeDependenciesPath = lib.makeLibraryPath [
|
||||
stdenv.cc.cc
|
||||
libglvnd
|
||||
openssl
|
||||
udev
|
||||
alsa-lib
|
||||
libpulseaudio
|
||||
libva
|
||||
ffmpeg
|
||||
libX11
|
||||
libXcursor
|
||||
libXi
|
||||
libXrandr
|
||||
];
|
||||
|
||||
prepareParsec = ''
|
||||
if [[ ! -e "$HOME/.parsec/appdata.json" ]]; then
|
||||
mkdir -p "$HOME/.parsec"
|
||||
cp --no-preserve=mode,ownership,timestamps ${placeholder "out"}/share/parsec/skel/* "$HOME/.parsec/"
|
||||
fi
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir $out
|
||||
mv usr/* $out
|
||||
|
||||
wrapProgram $out/bin/parsecd \
|
||||
--prefix LD_LIBRARY_PATH : "$runtimeDependenciesPath" \
|
||||
--run "$prepareParsec"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://parsecgaming.com/";
|
||||
description = "Remote streaming service client";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ arcnmx ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "parsecd";
|
||||
};
|
||||
}
|
||||
@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0fbwd149wny67rfhczz4cbh713a1qnswjiz7b6c2bxfcwh51f9rc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config automake autoconf ];
|
||||
buildInputs = [ gtk2 libXft intltool libtool ];
|
||||
nativeBuildInputs = [ pkg-config automake autoconf intltool ];
|
||||
buildInputs = [ gtk2 libXft libtool ];
|
||||
|
||||
preConfigure = ''
|
||||
./autogen.sh
|
||||
|
||||
@ -20,11 +20,10 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0nd44r8rbxifx4x4m24z5aji1c6k1fhw8cmf5s43wd5qys0bcdad";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [ pkg-config intltool ];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
intltool
|
||||
udev
|
||||
];
|
||||
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "wtf";
|
||||
version = "0.41.0";
|
||||
version = "0.42.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wtfutil";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Y8Vdh6sMMX8pS4zIuOfcejfsOB5z5mXEpRskJXQgU1Y=";
|
||||
sha256 = "sha256-6dSKambBAi1JHVyhq9xBUx5X6QmjsZCV8lENB55Wzto=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-UE7BYal8ycU7mM1TLJMhoNxQKZjtsO9rJ+YXmLiOSk0=";
|
||||
vendorSha256 = "sha256-Qe+u0u/NBXpEDvfKAF50Uxu5rh8BLa7N0wJ4bEuKOps=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, stdenvGcc6, lib
|
||||
, fetchFromGitHub, cmake, libmicrohttpd_0_9_70, openssl
|
||||
{ stdenv, lib, fetchpatch
|
||||
, fetchFromGitHub, cmake, libmicrohttpd, openssl
|
||||
, opencl-headers, ocl-icd, hwloc
|
||||
, devDonationLevel ? "0.0"
|
||||
, openclSupport ? true
|
||||
@ -18,11 +18,18 @@ stdenv.mkDerivation rec {
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-O3";
|
||||
|
||||
patches = [ (fetchpatch {
|
||||
name = "fix-libmicrohttpd-0-9-71.patch";
|
||||
url = "https://github.com/fireice-uk/xmr-stak/compare/06e08780eab54dbc025ce3f38c948e4eef2726a0...8adb208987f5881946992ab9cd9a45e4e2a4b870.patch";
|
||||
excludes = [ "CMakeLists.txt.user" ];
|
||||
hash = "sha256-Yv0U5EO1P5eikn1fKvUXEwemoUIjjeTjpP9p5J8pbC0=";
|
||||
}) ];
|
||||
|
||||
cmakeFlags = [ "-DCUDA_ENABLE=OFF" ]
|
||||
++ lib.optional (!openclSupport) "-DOpenCL_ENABLE=OFF";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ libmicrohttpd_0_9_70 openssl hwloc ]
|
||||
buildInputs = [ libmicrohttpd openssl hwloc ]
|
||||
++ lib.optionals openclSupport [ opencl-headers ocl-icd ];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -11,9 +11,9 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1qpmlwn0bcw1q73ag0l0fdnlzmwawfvsy4g9y5b0vyrc58lcp5d3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ];
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook intltool ];
|
||||
|
||||
buildInputs = [ glib intltool gtk3 gtksourceview ];
|
||||
buildInputs = [ glib gtk3 gtksourceview ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A sticky note application for jotting down things to remember";
|
||||
|
||||
@ -23,14 +23,14 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0hl1i38z9xnbgfjkaz04vv1n8xbgfg88g5z8fyzyb2hxv2z37anf";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ imake gccmakedep ];
|
||||
nativeBuildInputs = [ imake gccmakedep pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
libX11
|
||||
libXt
|
||||
libXext
|
||||
libXpm
|
||||
] ++ lib.optionals svgSupport [ librsvg glib gdk-pixbuf pkg-config ];
|
||||
] ++ lib.optionals svgSupport [ librsvg glib gdk-pixbuf ];
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
|
||||
@ -325,7 +325,7 @@ let
|
||||
|
||||
buildPhase = let
|
||||
buildCommand = target: ''
|
||||
ninja -C "${buildPath}" -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES "${target}"
|
||||
ninja -C "${buildPath}" -j$NIX_BUILD_CORES "${target}"
|
||||
(
|
||||
source chrome/installer/linux/common/installer.include
|
||||
PACKAGE=$packageName
|
||||
|
||||
@ -45,9 +45,9 @@
|
||||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "106.0.5249.91",
|
||||
"sha256": "16jlwzlfqdhhyajsxxrdfcqmh76ds8g1w4xd5mz3bdbd81mljh2p",
|
||||
"sha256bin64": "1cfhsar79f319417cx4blcg5hk7b7ix45r7vhrbbwla18p0jij5y",
|
||||
"version": "106.0.5249.103",
|
||||
"sha256": "0k2f3hc6mdmwzw9zzwcv6pnpibdz47a3xxkhfcvdki5gbag6cpr2",
|
||||
"sha256bin64": "0bg6d9fv3ha7iql17nj8h22klbs3ls2nlvabczhh067mh3fpzf5x",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-08-11",
|
||||
@ -56,8 +56,8 @@
|
||||
"sha256": "13zks2z65kg7fzzsysq4mswd4bhhy3h7ycdrpxfilcvixx2n2gac"
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "106.0.5249.91-1",
|
||||
"sha256": "1cih72ay2gr9xjwwa8iw0wmpmfs4xm4200c4z04v7vi9sxadxnrd"
|
||||
"rev": "106.0.5249.103-1",
|
||||
"sha256": "00acfq9hsdjqqlxddr9lr45l4372mpqxj717qpf78z8iyrccjm23"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, xlibsWrapper, bzip2, zlib
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, libX11, bzip2, zlib
|
||||
, brotli, zstd, xz, openssl, autoreconfHook, gettext, pkg-config, libev
|
||||
, gpm, libidn, tre, expat
|
||||
, # Incompatible licenses, LGPLv3 - GPLv2
|
||||
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
ncurses xlibsWrapper bzip2 zlib brotli zstd xz
|
||||
ncurses libX11 bzip2 zlib brotli zstd xz
|
||||
openssl libidn tre expat libev
|
||||
]
|
||||
++ lib.optional stdenv.isLinux gpm
|
||||
|
||||
@ -25,6 +25,7 @@
|
||||
, gtk-doc
|
||||
, docbook-xsl-nons
|
||||
, docbook_xml_dtd_43
|
||||
, docutils
|
||||
, gobject-introspection
|
||||
, gst_all_1
|
||||
, sofia_sip
|
||||
@ -32,15 +33,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "calls";
|
||||
version = "42.0";
|
||||
version = "43.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-ASKK9PB5FAD10CR5O+L2WgMjCzmIalithHL8jV0USiM=";
|
||||
hash = "sha256-fvG9N6HuuO8BMH8MJRquMSe1oEPNmX/pzsJX5yzs1CY=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "devdoc" ];
|
||||
@ -56,6 +57,7 @@ stdenv.mkDerivation rec {
|
||||
gtk-doc
|
||||
docbook-xsl-nons
|
||||
docbook_xml_dtd_43
|
||||
docutils
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@ -104,7 +106,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "A phone dialer and call handler";
|
||||
longDescription = "GNOME Calls is a phone dialer and call handler. Setting NixOS option `programs.calls.enable = true` is recommended.";
|
||||
homepage = "https://source.puri.sm/Librem5/calls";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/calls";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ craigem lheckemann tomfitzhenry ];
|
||||
platforms = platforms.linux;
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "clusterctl";
|
||||
version = "1.2.2";
|
||||
version = "1.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = "cluster-api";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-U9U1r74E4ryc8zUb1EogfBT57kfsd89i7DWO05tnQw4=";
|
||||
sha256 = "sha256-QVzhRaNLFhH+5x+/X/Nc3bW/09txurhVd0yDU9LYhAo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-jM5qU/KaBf+CzKKOuVXjawn/QqwrCjXKaQFFomEPndg=";
|
||||
vendorSha256 = "sha256-jPIrUW4el8sAO+4j20qMYVXqvov6Ac0cENd7gOrYj+U=";
|
||||
|
||||
subPackages = [ "cmd/clusterctl" ];
|
||||
|
||||
|
||||
@ -64,11 +64,6 @@ let
|
||||
|
||||
html=$(mktemp -d)
|
||||
sphinx-build -b html -d $doc_cache doc/ $out/share/nixops/doc
|
||||
|
||||
# Override buggy nixpkgs function
|
||||
pythonOutputDistPhase() {
|
||||
echo "no-op output dist phase"
|
||||
}
|
||||
'';
|
||||
|
||||
};
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "talosctl";
|
||||
version = "1.2.3";
|
||||
version = "1.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "siderolabs";
|
||||
repo = "talos";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BCbbQQUk3iJJQhjkwlSAVz/SbVPvZGhGHwXSPgCPBHg=";
|
||||
sha256 = "sha256-nAT9tn/YfivM25xBL3POgdAF87MB/J2HQfcFOeCEj2o=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-jUVPJ1mq9pMJGwS/0nBv9hsXotiqUksbKChjegF7KRk=";
|
||||
vendorSha256 = "sha256-b9F7P6WRdJywRNQdFY+SJqYxic2W/HrIEYhvCLo3Lok=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
||||
@ -2,22 +2,22 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tanka";
|
||||
version = "0.22.1";
|
||||
version = "0.23.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MMQv3/Ft6/FUueGEXGqYWAYy4zc2R6LASbh2x7eJNdQ=";
|
||||
sha256 = "sha256-exPFlcbku51Bs/YISRyjl8iwLYRVS9ltRQPpd/QpnWk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-QwtcWzJbusa8BxtG5xmGUgqG0qCMSpkzbmes/x3lnWc=";
|
||||
vendorSha256 = "sha256-eo4B2p5Yo1r5jro49mSetp9AFYhcTXbyy7wGuaFwbb0=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
subPackages = [ "cmd/tk" ];
|
||||
|
||||
ldflags = [ "-s" "-w" "-extldflags '-static'" "-X github.com/grafana/tanka/pkg/tanka.CURRENT_VERSION=v${version}" ];
|
||||
ldflags = [ "-s" "-w" "-extldflags '-static'" "-X github.com/grafana/tanka/pkg/tanka.CurrentVersion=v${version}" ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -11,13 +11,14 @@
|
||||
"version": "2.5.2"
|
||||
},
|
||||
"acme": {
|
||||
"hash": "sha256-nafJJ2Gr2jA09mjh8hozdDgl67h+10D35KtqjTUPgBE=",
|
||||
"hash": "sha256-H+1/Au/jCxNxrV+kk6tylUF85taZcs44uWed1QH1aRo=",
|
||||
"owner": "vancluever",
|
||||
"provider-source-address": "registry.terraform.io/vancluever/acme",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-acme",
|
||||
"rev": "v2.10.0",
|
||||
"vendorHash": "sha256-lNI0u8DCBl4mGVecRfAqieCooyJlqK+Z4eixPFFyBuU=",
|
||||
"version": "2.10.0"
|
||||
"rev": "v2.11.1",
|
||||
"vendorHash": "sha256-QGZKoxiSiT78gk2vc8uE6k1LAi/S1o5W9TZN7T/1XfA=",
|
||||
"version": "2.11.1"
|
||||
},
|
||||
"age": {
|
||||
"hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=",
|
||||
@ -403,14 +404,14 @@
|
||||
},
|
||||
"fortios": {
|
||||
"deleteVendor": true,
|
||||
"hash": "sha256-jXaEGWt/O0Cv15ksFax571f6aoDhVpNZSbvbOFj6TZ4=",
|
||||
"hash": "sha256-nvK5mbQdCB6lmdyhJbMS15eOER8eIAYv26mc1FCifXs=",
|
||||
"owner": "fortinetdev",
|
||||
"provider-source-address": "registry.terraform.io/fortinetdev/fortios",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-fortios",
|
||||
"rev": "v1.15.0",
|
||||
"vendorHash": "sha256-QsUJ9BqoCtMC9PpGzwlKvBn+BDlcjUR2rU9zx8FvLCk=",
|
||||
"version": "1.15.0"
|
||||
"rev": "v1.16.0",
|
||||
"vendorHash": "sha256-ZgVA2+2tu17dnAc51Aw3k6v8k7QosNTmFjFhmeknxa8=",
|
||||
"version": "1.16.0"
|
||||
},
|
||||
"gandi": {
|
||||
"hash": "sha256-uXZcYiNsBf5XsMjOjjQeNtGwLhTgYES1E9t63fBEI6Q=",
|
||||
@ -623,13 +624,13 @@
|
||||
"version": "3.10.0"
|
||||
},
|
||||
"ksyun": {
|
||||
"hash": "sha256-y7F6eCyiYVtiBaHCaZyUUPAE9GkKo/m/OY98EeBd8DU=",
|
||||
"hash": "sha256-sfvmDByxAQbbdPHb9l5tIT5dyu8eA3r63i5FZJYEYTI=",
|
||||
"owner": "kingsoftcloud",
|
||||
"provider-source-address": "registry.terraform.io/kingsoftcloud/ksyun",
|
||||
"repo": "terraform-provider-ksyun",
|
||||
"rev": "v1.3.54",
|
||||
"rev": "v1.3.55",
|
||||
"vendorHash": "sha256-miHKAz+ONXtuC1DNukcyZbbaYReY69dz9Zk6cJdORdQ=",
|
||||
"version": "1.3.54"
|
||||
"version": "1.3.55"
|
||||
},
|
||||
"kubectl": {
|
||||
"hash": "sha256-UkUwWi7Z9cSMyZakD6JxMl+qdczAYfZQgwroCUjFIUM=",
|
||||
@ -659,13 +660,13 @@
|
||||
"version": "2.9.3"
|
||||
},
|
||||
"libvirt": {
|
||||
"hash": "sha256-PmaGBKAaOInLId6r6D29YOedqEA1EreVvI1oRtegPfQ=",
|
||||
"hash": "sha256-j5EcxmkCyHwbXzvJ9lfQBRBYa3SbrKc3kbt1KZTm0gY=",
|
||||
"owner": "dmacvicar",
|
||||
"provider-source-address": "registry.terraform.io/dmacvicar/libvirt",
|
||||
"repo": "terraform-provider-libvirt",
|
||||
"rev": "v0.6.14",
|
||||
"vendorHash": "sha256-yrz6o2iEAVtc8+dn+KNAGaGy5TtfFMrL4I9sff7SAM8=",
|
||||
"version": "0.6.14"
|
||||
"rev": "v0.7.0",
|
||||
"vendorHash": "sha256-4jAJf2FC83NdH4t1l7EA26yQ0pqteWmTIyrZDJdi7fg=",
|
||||
"version": "0.7.0"
|
||||
},
|
||||
"linode": {
|
||||
"hash": "sha256-gysdJOGUmhwFoRpR0Yp2p/Vjb69k+fDzcWatOgA+/AQ=",
|
||||
|
||||
@ -5,13 +5,13 @@ buildGoModule rec {
|
||||
/* Do not use "dev" as a version. If you do, Tilt will consider itself
|
||||
running in development environment and try to serve assets from the
|
||||
source tree, which is not there once build completes. */
|
||||
version = "0.30.8";
|
||||
version = "0.30.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tilt-dev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dVaLeooTEiKYWp9CmEcSFOunLyJecB8jR9LIKRO8b9g=";
|
||||
sha256 = "sha256-vZthFaIsgpZ2aap9kRSH//AHHnOpekPIkwpz9Tt0lI4=";
|
||||
};
|
||||
vendorSha256 = null;
|
||||
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "flexget";
|
||||
version = "3.3.32";
|
||||
version = "3.3.33";
|
||||
|
||||
# Fetch from GitHub in order to use `requirements.in`
|
||||
src = fetchFromGitHub {
|
||||
owner = "flexget";
|
||||
repo = "flexget";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-AeEVsgJtg9QVSstliKNbwogbXKpVhL3VnnsnEqg27wc=";
|
||||
hash = "sha256-dJdRGqHBPbdGrxqhOmQJSZmR+YacQCDKgu03WtrGqVA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0xrc7crchflfrk4x5dq5zx22zkmgcrbkww5r1pvkc3cyyr18cc6h";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ pkg-config luajit openssl libpcap pcre libdnet daq zlib flex bison libtirpc ];
|
||||
nativeBuildInputs = [ makeWrapper pkg-config ];
|
||||
buildInputs = [ luajit openssl libpcap pcre libdnet daq zlib flex bison libtirpc ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ];
|
||||
|
||||
|
||||
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "GNOME";
|
||||
repo = "fractal";
|
||||
rev = version;
|
||||
sha256 = "DSNVd9YvI7Dd3s3+M0+wE594tmL1yPNMnD1W9wLhSuw=";
|
||||
hash = "sha256-To6lr2I+JVrxvuK++2gLWntFGnEBm+B6KTRuOvjASek=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -40,14 +40,17 @@ stdenv.mkDerivation rec {
|
||||
# fractal-gtk/res/meson.build:5:0: ERROR: Function does not take positional arguments.
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/fractal/-/commit/6fa1a23596d65d94aa889efe725174e6cd2903f0.patch";
|
||||
sha256 = "3OzU9XL2V1VNOkvL1j677K3HNoBqPMQudQDmiDxYfAc=";
|
||||
hash = "sha256-3OzU9XL2V1VNOkvL1j677K3HNoBqPMQudQDmiDxYfAc=";
|
||||
})
|
||||
|
||||
# This is in fractal v4.4.1b1+ so can be removed when fractal is updated.
|
||||
./update-socket2-for-rust-1.64.diff
|
||||
];
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
inherit src patches;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-xim5sOzeXJjRXbTOg2Gk/LHU0LioiyMK5nSr1LwMPjc=";
|
||||
hash = "sha256-d99zSaxp22YyLP3Wckgcm7wlz7nFrLJDHq2xPJmZFf0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -0,0 +1,195 @@
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index c0b5e5e2..3009f183 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -1,5 +1,7 @@
|
||||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
+version = 3
|
||||
+
|
||||
[[package]]
|
||||
name = "addr2line"
|
||||
version = "0.13.0"
|
||||
@@ -169,7 +171,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "46254cf2fdcdf1badb5934448c1bcbe046a56537b3987d96c51a7afc5d03f293"
|
||||
dependencies = [
|
||||
"addr2line",
|
||||
- "cfg-if",
|
||||
+ "cfg-if 0.1.10",
|
||||
"libc",
|
||||
"miniz_oxide",
|
||||
"object",
|
||||
@@ -326,6 +328,12 @@ version = "0.1.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
|
||||
|
||||
+[[package]]
|
||||
+name = "cfg-if"
|
||||
+version = "1.0.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
+
|
||||
[[package]]
|
||||
name = "chrono"
|
||||
version = "0.4.13"
|
||||
@@ -407,7 +415,7 @@ version = "1.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
|
||||
dependencies = [
|
||||
- "cfg-if",
|
||||
+ "cfg-if 0.1.10",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -417,7 +425,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
|
||||
dependencies = [
|
||||
"autocfg 1.0.0",
|
||||
- "cfg-if",
|
||||
+ "cfg-if 0.1.10",
|
||||
"lazy_static",
|
||||
]
|
||||
|
||||
@@ -455,7 +463,7 @@ version = "2.0.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "551a778172a450d7fc12e629ca3b0428d00f6afa9a43da1b630d54604e97371c"
|
||||
dependencies = [
|
||||
- "cfg-if",
|
||||
+ "cfg-if 0.1.10",
|
||||
"dirs-sys",
|
||||
]
|
||||
|
||||
@@ -465,7 +473,7 @@ version = "2.0.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3"
|
||||
dependencies = [
|
||||
- "cfg-if",
|
||||
+ "cfg-if 0.1.10",
|
||||
"dirs-sys",
|
||||
]
|
||||
|
||||
@@ -506,7 +514,7 @@ version = "0.8.23"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e8ac63f94732332f44fe654443c46f6375d1939684c17b0afb6cb56b0456e171"
|
||||
dependencies = [
|
||||
- "cfg-if",
|
||||
+ "cfg-if 0.1.10",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -549,7 +557,7 @@ version = "1.0.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "68c90b0fc46cf89d227cc78b40e494ff81287a92dd07631e5af0d06fe3cf885e"
|
||||
dependencies = [
|
||||
- "cfg-if",
|
||||
+ "cfg-if 0.1.10",
|
||||
"crc32fast",
|
||||
"libc",
|
||||
"miniz_oxide",
|
||||
@@ -842,7 +850,7 @@ version = "0.1.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
|
||||
dependencies = [
|
||||
- "cfg-if",
|
||||
+ "cfg-if 0.1.10",
|
||||
"libc",
|
||||
"wasi",
|
||||
]
|
||||
@@ -979,7 +987,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ce8664a114cd6ec16bece783d5eee59496919915b1f6884400ba4a953274a163"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
- "cfg-if",
|
||||
+ "cfg-if 0.1.10",
|
||||
"futures-channel",
|
||||
"futures-core",
|
||||
"futures-util",
|
||||
@@ -1543,7 +1551,7 @@ version = "0.4.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
|
||||
dependencies = [
|
||||
- "cfg-if",
|
||||
+ "cfg-if 0.1.10",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1648,7 +1656,7 @@ version = "0.6.22"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430"
|
||||
dependencies = [
|
||||
- "cfg-if",
|
||||
+ "cfg-if 0.1.10",
|
||||
"fuchsia-zircon",
|
||||
"fuchsia-zircon-sys",
|
||||
"iovec",
|
||||
@@ -1703,7 +1711,7 @@ version = "0.2.34"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2ba7c918ac76704fb42afcbbb43891e72731f3dcca3bef2a19786297baf14af7"
|
||||
dependencies = [
|
||||
- "cfg-if",
|
||||
+ "cfg-if 0.1.10",
|
||||
"libc",
|
||||
"winapi 0.3.9",
|
||||
]
|
||||
@@ -1826,7 +1834,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
- "cfg-if",
|
||||
+ "cfg-if 0.1.10",
|
||||
"foreign-types",
|
||||
"lazy_static",
|
||||
"libc",
|
||||
@@ -2523,13 +2531,12 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
|
||||
|
||||
[[package]]
|
||||
name = "socket2"
|
||||
-version = "0.3.12"
|
||||
+version = "0.3.19"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918"
|
||||
+checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
|
||||
dependencies = [
|
||||
- "cfg-if",
|
||||
+ "cfg-if 1.0.0",
|
||||
"libc",
|
||||
- "redox_syscall",
|
||||
"winapi 0.3.9",
|
||||
]
|
||||
|
||||
@@ -2678,7 +2685,7 @@ version = "3.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
|
||||
dependencies = [
|
||||
- "cfg-if",
|
||||
+ "cfg-if 0.1.10",
|
||||
"libc",
|
||||
"rand 0.7.3",
|
||||
"redox_syscall",
|
||||
@@ -2818,7 +2825,7 @@ version = "0.1.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f0aae59226cf195d8e74d4b34beae1859257efb4e5fed3f147d2dc2c7d372178"
|
||||
dependencies = [
|
||||
- "cfg-if",
|
||||
+ "cfg-if 0.1.10",
|
||||
"log",
|
||||
"tracing-core",
|
||||
]
|
||||
@@ -2998,7 +3005,7 @@ version = "0.2.67"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f0563a9a4b071746dd5aedbc3a28c6fe9be4586fb3fbadb67c400d4f53c6b16c"
|
||||
dependencies = [
|
||||
- "cfg-if",
|
||||
+ "cfg-if 0.1.10",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"wasm-bindgen-macro",
|
||||
@@ -3025,7 +3032,7 @@ version = "0.4.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "95f8d235a77f880bcef268d379810ea6c0af2eacfa90b1ad5af731776e0c4699"
|
||||
dependencies = [
|
||||
- "cfg-if",
|
||||
+ "cfg-if 0.1.10",
|
||||
"js-sys",
|
||||
"wasm-bindgen",
|
||||
"web-sys",
|
||||
@ -33,7 +33,7 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "linphone-desktop";
|
||||
version = "4.4.9";
|
||||
version = "4.4.10";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.linphone.org";
|
||||
@ -41,7 +41,7 @@ mkDerivation rec {
|
||||
group = "BC";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-xvKkFMZ7rUyEjnQK7rBkrzO8fhfHjpQ1DHQBUlizZ+o=";
|
||||
sha256 = "sha256-V3vycO0kV6RTFZWi6uiCFSNfLq/09dBfyLk/5zw3kRA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr";
|
||||
|
||||
buildInputs = [ libotr pidgin intltool ];
|
||||
nativeBuildInputs = [ intltool ];
|
||||
buildInputs = [ libotr pidgin ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://otr.cypherpunks.ca/";
|
||||
|
||||
@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-CdA/aUu+CmCRbVBKpJGydicqFQa/rEsLWS3MBKlH2/M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [ glib intltool libappindicator-gtk2 libtool pidgin ];
|
||||
nativeBuildInputs = [ autoreconfHook intltool ];
|
||||
buildInputs = [ glib libappindicator-gtk2 libtool pidgin ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An AppIndicator and KStatusNotifierItem Plugin for Pidgin";
|
||||
|
||||
@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0g5hmy7fwgjq59j52h9yps28jsjjrfkd4r18gyx6hfd3g3kzbg1b";
|
||||
};
|
||||
|
||||
buildInputs = [ pidgin intltool python2 ];
|
||||
nativeBuildInputs = [ intltool ];
|
||||
buildInputs = [ pidgin python2 ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://bitbucket.org/rekkanoryo/purple-plugin-pack";
|
||||
|
||||
@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
meta = with lib; {
|
||||
broken = true; # unmaintained and not compatible with current Tox API.
|
||||
homepage = "https://github.com/jin-eld/tox-prpl";
|
||||
description = "Tox plugin for Pidgin / libpurple";
|
||||
license = licenses.gpl3;
|
||||
|
||||
@ -16,7 +16,7 @@ let unwrapped = stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-RUsbkovGvLsYM1OvMPv95VlfIkWjQjoaRubJei3yKBA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper intltool ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0";
|
||||
|
||||
@ -27,7 +27,7 @@ let unwrapped = stdenv.mkDerivation rec {
|
||||
gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
|
||||
libxml2 nss nspr
|
||||
libXScrnSaver python-with-dbus
|
||||
avahi dbus dbus-glib intltool libidn
|
||||
avahi dbus dbus-glib libidn
|
||||
libICE libXext libSM cyrus_sasl
|
||||
libgnt ncurses # optional: build finch - the console UI
|
||||
]
|
||||
|
||||
@ -1,27 +1,18 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, libsodium, ncurses, curl
|
||||
{ lib, stdenv, fetchFromGitHub, libsodium, ncurses, curl
|
||||
, libtoxcore, openal, libvpx, freealut, libconfig, pkg-config, libopus
|
||||
, qrencode, gdk-pixbuf, libnotify }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "toxic";
|
||||
version = "0.11.1";
|
||||
version = "0.11.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Tox";
|
||||
repo = "toxic";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5jLXXI+IMrYa7ZtdMjJrah1zB5TJ3GdHfvcMd1TYE4E=";
|
||||
sha256 = "sha256-BabRY9iu5ccEXo5POrWkWaIWAeQU4MVlMK8I+Iju6aQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pending for upstream inclusion fix for ncurses-6.3 compatibility.
|
||||
(fetchpatch {
|
||||
name = "ncurses-6.3.patch";
|
||||
url = "https://github.com/JFreegman/toxic/commit/41e93adbdbd56db065166af5a6676a7996e9e451.patch";
|
||||
sha256 = "sha256-LYEseB5FmXFNifa1RZUxhkXeWlkEEMm3ASD55IoUPa0=";
|
||||
})
|
||||
];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)"];
|
||||
installFlags = [ "PREFIX=$(out)"];
|
||||
|
||||
@ -32,10 +23,10 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
nativeBuildInputs = [ pkg-config libconfig ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = with lib; src.meta // {
|
||||
description = "Reference CLI for Tox";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ ehmry ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,20 +1,25 @@
|
||||
{ stdenv, fetchurl, lib
|
||||
, ncurses, openssl, aspell, gnutls, gettext
|
||||
, zlib, curl, pkg-config, libgcrypt
|
||||
, cmake, makeWrapper, libobjc, libresolv, libiconv
|
||||
, cmake, libobjc, libresolv, libiconv
|
||||
, asciidoctor # manpages
|
||||
, enableTests ? !stdenv.isDarwin, cpputest
|
||||
, guileSupport ? true, guile
|
||||
, luaSupport ? true, lua5
|
||||
, perlSupport ? true, perl
|
||||
, pythonSupport ? true, python3Packages
|
||||
, rubySupport ? true, ruby
|
||||
, tclSupport ? true, tcl
|
||||
, phpSupport ? !stdenv.isDarwin, php, systemd, libxml2, pcre2, libargon2
|
||||
, extraBuildInputs ? []
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (python3Packages) python;
|
||||
php-embed = php.override {
|
||||
embedSupport = true;
|
||||
apxs2Support = false;
|
||||
};
|
||||
plugins = [
|
||||
{ name = "perl"; enabled = perlSupport; cmakeFlag = "ENABLE_PERL"; buildInputs = [ perl ]; }
|
||||
{ name = "tcl"; enabled = tclSupport; cmakeFlag = "ENABLE_TCL"; buildInputs = [ tcl ]; }
|
||||
@ -22,35 +27,37 @@ let
|
||||
{ name = "guile"; enabled = guileSupport; cmakeFlag = "ENABLE_GUILE"; buildInputs = [ guile ]; }
|
||||
{ name = "lua"; enabled = luaSupport; cmakeFlag = "ENABLE_LUA"; buildInputs = [ lua5 ]; }
|
||||
{ name = "python"; enabled = pythonSupport; cmakeFlag = "ENABLE_PYTHON3"; buildInputs = [ python ]; }
|
||||
{ name = "php"; enabled = phpSupport; cmakeFlag = "ENABLE_PHP"; buildInputs = [
|
||||
php-embed.unwrapped.dev libxml2 pcre2 libargon2
|
||||
] ++ lib.optional stdenv.isLinux systemd; }
|
||||
];
|
||||
enabledPlugins = builtins.filter (p: p.enabled) plugins;
|
||||
|
||||
in
|
||||
assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.6";
|
||||
version = "3.7";
|
||||
pname = "weechat";
|
||||
|
||||
hardeningEnable = [ "pie" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://weechat.org/files/src/weechat-${version}.tar.bz2";
|
||||
sha256 = "sha256-GkYN/Y4LQQr7GdSDu0ucXXM9wWPAqKD1txJXkOhJMDc=";
|
||||
hash = "sha256-n5kvC//h85c4IvkrCVTz+F0DcCC5rdRkvj8W3fUPXI8=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;
|
||||
|
||||
cmakeFlags = with lib; [
|
||||
"-DENABLE_MAN=ON"
|
||||
"-DENABLE_DOC=OFF" # TODO: Documentation fails to build, was deactivated to push through security update
|
||||
"-DENABLE_JAVASCRIPT=OFF" # Requires v8 <= 3.24.3, https://github.com/weechat/weechat/issues/360
|
||||
"-DENABLE_PHP=OFF"
|
||||
"-DENABLE_DOC=OFF" # TODO(@ncfavier): Documentation fails to build, was deactivated to push through security update
|
||||
"-DENABLE_TESTS=${if enableTests then "ON" else "OFF"}"
|
||||
]
|
||||
++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib"]
|
||||
++ map (p: "-D${p.cmakeFlag}=" + (if p.enabled then "ON" else "OFF")) plugins
|
||||
;
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config makeWrapper asciidoctor ];
|
||||
nativeBuildInputs = [ cmake pkg-config asciidoctor ] ++ lib.optional enableTests cpputest;
|
||||
buildInputs = with lib; [
|
||||
ncurses openssl aspell gnutls gettext zlib curl
|
||||
libgcrypt ]
|
||||
@ -85,7 +92,7 @@ let
|
||||
on https://nixos.org/nixpkgs/manual/#sec-weechat .
|
||||
'';
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ lovek323 ];
|
||||
maintainers = with lib.maintainers; [ ncfavier ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -7,7 +7,11 @@ weechat:
|
||||
let
|
||||
wrapper = {
|
||||
installManPages ? true
|
||||
, configure ? { availablePlugins, ... }: { plugins = builtins.attrValues availablePlugins; }
|
||||
, configure ? { availablePlugins, ... }: {
|
||||
# Do not include PHP by default, because it bloats the closure, doesn't
|
||||
# build on Darwin, and there are no official PHP scripts.
|
||||
plugins = builtins.attrValues (builtins.removeAttrs availablePlugins [ "php" ]);
|
||||
}
|
||||
}:
|
||||
|
||||
let
|
||||
@ -21,6 +25,7 @@ let
|
||||
'';
|
||||
withPackages = pkgsFun: (python // {
|
||||
extraEnv = ''
|
||||
${python.extraEnv}
|
||||
export PYTHONHOME="${python3Packages.python.withPackages pkgsFun}"
|
||||
'';
|
||||
});
|
||||
@ -40,6 +45,7 @@ let
|
||||
ruby = simplePlugin "ruby";
|
||||
guile = simplePlugin "guile";
|
||||
lua = simplePlugin "lua";
|
||||
php = simplePlugin "php";
|
||||
};
|
||||
|
||||
config = configure { inherit availablePlugins; };
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user