Merge master into haskell-updates

This commit is contained in:
github-actions[bot] 2021-08-26 00:06:00 +00:00 committed by GitHub
commit faa97c56dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
132 changed files with 1614 additions and 846 deletions

View file

@ -1602,3 +1602,33 @@ The following rules are desired to be respected:
If necessary, `pname` has to be given a different value within `fetchPypi`. If necessary, `pname` has to be given a different value within `fetchPypi`.
* Attribute names in `python-packages.nix` should be sorted alphanumerically to * Attribute names in `python-packages.nix` should be sorted alphanumerically to
avoid merge conflicts and ease locating attributes. avoid merge conflicts and ease locating attributes.
## Package set maintenance
The whole Python package set has a lot of packages that do not see regular
updates, because they either are a very fragile component in the Python
ecosystem, like for example the `hypothesis` package, or packages that have
no maintainer, so maintenance falls back to the package set maintainers.
### Updating packages in bulk
There is a tool to update alot of python libraries in bulk, it exists at
`maintainers/scripts/update-python-libraries` with this repository.
It can quickly update minor or major versions for all packages selected
and create update commits, and supports the `fetchPypi`, `fetchurl` and
`fetchFromGitHub` fetchers. When updating lots of packages that are
hosted on GitHub, exporting a `GITHUB_API_TOKEN` is highly recommended.
Updating packages in bulk leads to lots of breakages, which is why a
stabilization period on the `python-unstable` branch is required.
Once the branch is sufficiently stable it should normally be merged
into the `staging` branch.
An exemplary call to update all python libraries between minor versions
would be:
```ShellSession
$ maintainers/scripts/update-python-libraries --target minor --commit --use-pkgs-prefix pkgs/development/python-modules/**/default.nix
```

View file

@ -863,6 +863,15 @@ Superuser created successfully.
release instead of 1.0.x release instead of 1.0.x
</para> </para>
</listitem> </listitem>
<listitem>
<para>
If <literal>exfat</literal> is included in
<literal>boot.supportedFilesystems</literal> and when using
kernel 5.7 or later, the <literal>exfatprogs</literal>
user-space utilities are used instead of
<literal>exfat</literal>.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>
<section xml:id="sec-release-21.11-notable-changes"> <section xml:id="sec-release-21.11-notable-changes">
@ -1049,6 +1058,13 @@ Superuser created successfully.
sign OCSP responses and server certificates. sign OCSP responses and server certificates.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
<literal>lib.formats.yaml</literal>s
<literal>generate</literal> will not generate JSON anymore,
but instead use more of the YAML-specific syntax.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>
</section> </section>

View file

@ -250,6 +250,9 @@ To be able to access the web UI this port needs to be opened in the firewall.
- The `nomad` package now defaults to a 1.1.x release instead of 1.0.x - The `nomad` package now defaults to a 1.1.x release instead of 1.0.x
- If `exfat` is included in `boot.supportedFilesystems` and when using kernel 5.7
or later, the `exfatprogs` user-space utilities are used instead of `exfat`.
## Other Notable Changes {#sec-release-21.11-notable-changes} ## Other Notable Changes {#sec-release-21.11-notable-changes}
- The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets. - The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets.
@ -299,3 +302,5 @@ To be able to access the web UI this port needs to be opened in the firewall.
- Zfs: `latestCompatibleLinuxPackages` is now exported on the zfs package. One can use `boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;` to always track the latest compatible kernel with a given version of zfs. - Zfs: `latestCompatibleLinuxPackages` is now exported on the zfs package. One can use `boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;` to always track the latest compatible kernel with a given version of zfs.
- Nginx will use the value of `sslTrustedCertificate` if provided for a virtual host, even if `enableACME` is set. This is useful for providers not using the same certificate to sign OCSP responses and server certificates. - Nginx will use the value of `sslTrustedCertificate` if provided for a virtual host, even if `enableACME` is set. This is useful for providers not using the same certificate to sign OCSP responses and server certificates.
- `lib.formats.yaml`'s `generate` will not generate JSON anymore, but instead use more of the YAML-specific syntax.

View file

@ -0,0 +1,333 @@
# Note: This is a private API, internal to NixOS. Its interface is subject
# to change without notice.
#
# The result of this builder is two disk images:
#
# * `boot` - a small disk formatted with FAT to be used for /boot. FAT is
# chosen to support EFI.
# * `root` - a larger disk with a zpool taking the entire disk.
#
# This two-disk approach is taken to satisfy ZFS's requirements for
# autoexpand.
#
# # Why doesn't autoexpand work with ZFS in a partition?
#
# When ZFS owns the whole disk doesnt really use a partition: it has
# a marker partition at the start and a marker partition at the end of
# the disk.
#
# If ZFS is constrained to a partition, ZFS leaves expanding the partition
# up to the user. Obviously, the user may not choose to do so.
#
# Once the user expands the partition, calling zpool online -e expands the
# vdev to use the whole partition. It doesnt happen automatically
# presumably because zed doesnt get an event saying its partition grew,
# whereas it can and does get an event saying the whole disk it is on is
# now larger.
{ lib
, pkgs
, # The NixOS configuration to be installed onto the disk image.
config
, # size of the FAT boot disk, in megabytes.
bootSize ? 1024
, # The size of the root disk, in megabytes.
rootSize ? 2048
, # The name of the ZFS pool
rootPoolName ? "tank"
, # zpool properties
rootPoolProperties ? {
autoexpand = "on";
}
, # pool-wide filesystem properties
rootPoolFilesystemProperties ? {
acltype = "posixacl";
atime = "off";
compression = "on";
mountpoint = "legacy";
xattr = "sa";
}
, # datasets, with per-attribute options:
# mount: (optional) mount point in the VM
# properties: (optional) ZFS properties on the dataset, like filesystemProperties
# Notes:
# 1. datasets will be created from shorter to longer names as a simple topo-sort
# 2. you should define a root's dataset's mount for `/`
datasets ? { }
, # The files and directories to be placed in the target file system.
# This is a list of attribute sets {source, target} where `source'
# is the file system object (regular file or directory) to be
# grafted in the file system at path `target'.
contents ? []
, # The initial NixOS configuration file to be copied to
# /etc/nixos/configuration.nix. This configuration will be embedded
# inside a configuration which includes the described ZFS fileSystems.
configFile ? null
, # Shell code executed after the VM has finished.
postVM ? ""
, name ? "nixos-disk-image"
, # Disk image format, one of qcow2, qcow2-compressed, vdi, vpc, raw.
format ? "raw"
, # Include a copy of Nixpkgs in the disk image
includeChannel ? true
}:
let
formatOpt = if format == "qcow2-compressed" then "qcow2" else format;
compress = lib.optionalString (format == "qcow2-compressed") "-c";
filenameSuffix = "." + {
qcow2 = "qcow2";
vdi = "vdi";
vpc = "vhd";
raw = "img";
}.${formatOpt} or formatOpt;
bootFilename = "nixos.boot${filenameSuffix}";
rootFilename = "nixos.root${filenameSuffix}";
# FIXME: merge with channel.nix / make-channel.nix.
channelSources =
let
nixpkgs = lib.cleanSource pkgs.path;
in
pkgs.runCommand "nixos-${config.system.nixos.version}" {} ''
mkdir -p $out
cp -prd ${nixpkgs.outPath} $out/nixos
chmod -R u+w $out/nixos
if [ ! -e $out/nixos/nixpkgs ]; then
ln -s . $out/nixos/nixpkgs
fi
rm -rf $out/nixos/.git
echo -n ${config.system.nixos.versionSuffix} > $out/nixos/.version-suffix
'';
closureInfo = pkgs.closureInfo {
rootPaths = [ config.system.build.toplevel ]
++ (lib.optional includeChannel channelSources);
};
modulesTree = pkgs.aggregateModules
(with config.boot.kernelPackages; [ kernel zfs ]);
tools = lib.makeBinPath (
with pkgs; [
config.system.build.nixos-enter
config.system.build.nixos-install
dosfstools
e2fsprogs
gptfdisk
nix
parted
utillinux
zfs
]
);
hasDefinedMount = disk: ((disk.mount or null) != null);
stringifyProperties = prefix: properties: lib.concatStringsSep " \\\n" (
lib.mapAttrsToList
(
property: value: "${prefix} ${lib.escapeShellArg property}=${lib.escapeShellArg value}"
)
properties
);
featuresToProperties = features:
lib.listToAttrs
(builtins.map (feature: {
name = "feature@${feature}";
value = "enabled";
}) features);
createDatasets =
let
datasetlist = lib.mapAttrsToList lib.nameValuePair datasets;
sorted = lib.sort (left: right: (lib.stringLength left.name) < (lib.stringLength right.name)) datasetlist;
cmd = { name, value }:
let
properties = stringifyProperties "-o" (value.properties or {});
in
"zfs create -p ${properties} ${name}";
in
lib.concatMapStringsSep "\n" cmd sorted;
mountDatasets =
let
datasetlist = lib.mapAttrsToList lib.nameValuePair datasets;
mounts = lib.filter ({ value, ... }: hasDefinedMount value) datasetlist;
sorted = lib.sort (left: right: (lib.stringLength left.value.mount) < (lib.stringLength right.value.mount)) mounts;
cmd = { name, value }:
''
mkdir -p /mnt${lib.escapeShellArg value.mount}
mount -t zfs ${name} /mnt${lib.escapeShellArg value.mount}
'';
in
lib.concatMapStringsSep "\n" cmd sorted;
unmountDatasets =
let
datasetlist = lib.mapAttrsToList lib.nameValuePair datasets;
mounts = lib.filter ({ value, ... }: hasDefinedMount value) datasetlist;
sorted = lib.sort (left: right: (lib.stringLength left.value.mount) > (lib.stringLength right.value.mount)) mounts;
cmd = { name, value }:
''
umount /mnt${lib.escapeShellArg value.mount}
'';
in
lib.concatMapStringsSep "\n" cmd sorted;
fileSystemsCfgFile =
let
mountable = lib.filterAttrs (_: value: hasDefinedMount value) datasets;
in
pkgs.runCommand "filesystem-config.nix" {
buildInputs = with pkgs; [ jq nixpkgs-fmt ];
filesystems = builtins.toJSON {
fileSystems = lib.mapAttrs'
(
dataset: attrs:
{
name = attrs.mount;
value = {
fsType = "zfs";
device = "${dataset}";
};
}
)
mountable;
};
passAsFile = [ "filesystems" ];
} ''
(
echo "builtins.fromJSON '''"
jq . < "$filesystemsPath"
echo "'''"
) > $out
nixpkgs-fmt $out
'';
mergedConfig =
if configFile == null
then fileSystemsCfgFile
else
pkgs.runCommand "configuration.nix" {
buildInputs = with pkgs; [ nixpkgs-fmt ];
}
''
(
echo '{ imports = ['
printf "(%s)\n" "$(cat ${fileSystemsCfgFile})";
printf "(%s)\n" "$(cat ${configFile})";
echo ']; }'
) > $out
nixpkgs-fmt $out
'';
image = (
pkgs.vmTools.override {
rootModules =
[ "zfs" "9p" "9pnet_virtio" "virtio_pci" "virtio_blk" ] ++
(pkgs.lib.optional (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) "rtc_cmos");
kernel = modulesTree;
}
).runInLinuxVM (
pkgs.runCommand name
{
QEMU_OPTS = "-drive file=$bootDiskImage,if=virtio,cache=unsafe,werror=report"
+ " -drive file=$rootDiskImage,if=virtio,cache=unsafe,werror=report";
preVM = ''
PATH=$PATH:${pkgs.qemu_kvm}/bin
mkdir $out
bootDiskImage=boot.raw
qemu-img create -f raw $bootDiskImage ${toString bootSize}M
rootDiskImage=root.raw
qemu-img create -f raw $rootDiskImage ${toString rootSize}M
'';
postVM = ''
${if formatOpt == "raw" then ''
mv $bootDiskImage $out/${bootFilename}
mv $rootDiskImage $out/${rootFilename}
'' else ''
${pkgs.qemu}/bin/qemu-img convert -f raw -O ${formatOpt} ${compress} $bootDiskImage $out/${bootFilename}
${pkgs.qemu}/bin/qemu-img convert -f raw -O ${formatOpt} ${compress} $rootDiskImage $out/${rootFilename}
''}
bootDiskImage=$out/${bootFilename}
rootDiskImage=$out/${rootFilename}
set -x
${postVM}
'';
} ''
export PATH=${tools}:$PATH
set -x
cp -sv /dev/vda /dev/sda
cp -sv /dev/vda /dev/xvda
parted --script /dev/vda -- \
mklabel gpt \
mkpart no-fs 1MiB 2MiB \
set 1 bios_grub on \
align-check optimal 1 \
mkpart ESP fat32 2MiB -1MiB \
align-check optimal 2 \
print
sfdisk --dump /dev/vda
zpool create \
${stringifyProperties " -o" rootPoolProperties} \
${stringifyProperties " -O" rootPoolFilesystemProperties} \
${rootPoolName} /dev/vdb
parted --script /dev/vdb -- print
${createDatasets}
${mountDatasets}
mkdir -p /mnt/boot
mkfs.vfat -n ESP /dev/vda2
mount /dev/vda2 /mnt/boot
mount
# Install a configuration.nix
mkdir -p /mnt/etc/nixos
# `cat` so it is mutable on the fs
cat ${mergedConfig} > /mnt/etc/nixos/configuration.nix
export NIX_STATE_DIR=$TMPDIR/state
nix-store --load-db < ${closureInfo}/registration
nixos-install \
--root /mnt \
--no-root-passwd \
--system ${config.system.build.toplevel} \
--substituters "" \
${lib.optionalString includeChannel ''--channel ${channelSources}''}
df -h
umount /mnt/boot
${unmountDatasets}
zpool export ${rootPoolName}
''
);
in
image

View file

@ -0,0 +1,12 @@
{
imports = [ ./amazon-image.nix ];
ec2.zfs = {
enable = true;
datasets = {
"tank/system/root".mount = "/";
"tank/system/var".mount = "/var";
"tank/local/nix".mount = "/nix";
"tank/user/home".mount = "/home";
};
};
}

View file

@ -4,6 +4,7 @@ with lib;
let let
cfg = config.amazonImage; cfg = config.amazonImage;
in { in {
imports = [ ../../../modules/virtualisation/amazon-image.nix ]; imports = [ ../../../modules/virtualisation/amazon-image.nix ];
@ -53,15 +54,7 @@ in {
}; };
}; };
config.system.build.amazonImage = import ../../../lib/make-disk-image.nix { config.system.build.amazonImage = let
inherit lib config;
inherit (cfg) contents format name;
pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package
partitionTableType = if config.ec2.efi then "efi"
else if config.ec2.hvm then "legacy+gpt"
else "none";
diskSize = cfg.sizeMB;
fsType = "ext4";
configFile = pkgs.writeText "configuration.nix" configFile = pkgs.writeText "configuration.nix"
'' ''
{ modulesPath, ... }: { { modulesPath, ... }: {
@ -72,24 +65,96 @@ in {
${optionalString config.ec2.efi '' ${optionalString config.ec2.efi ''
ec2.efi = true; ec2.efi = true;
''} ''}
${optionalString config.ec2.zfs.enable ''
ec2.zfs.enable = true;
networking.hostId = "${config.networking.hostId}";
''}
} }
''; '';
postVM = ''
extension=''${diskImage##*.}
friendlyName=$out/${cfg.name}.$extension
mv "$diskImage" "$friendlyName"
diskImage=$friendlyName
mkdir -p $out/nix-support zfsBuilder = import ../../../lib/make-zfs-image.nix {
echo "file ${cfg.format} $diskImage" >> $out/nix-support/hydra-build-products inherit lib config configFile;
inherit (cfg) contents format name;
pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package
${pkgs.jq}/bin/jq -n \ includeChannel = true;
--arg label ${lib.escapeShellArg config.system.nixos.label} \
--arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ bootSize = 1000; # 1G is the minimum EBS volume
--arg logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$diskImage" | ${pkgs.jq}/bin/jq '."virtual-size"')" \
--arg file "$diskImage" \ rootSize = cfg.sizeMB;
'$ARGS.named' \ rootPoolProperties = {
> $out/nix-support/image-info.json ashift = 12;
''; autoexpand = "on";
}; };
datasets = config.ec2.zfs.datasets;
postVM = ''
extension=''${rootDiskImage##*.}
friendlyName=$out/${cfg.name}
rootDisk="$friendlyName.root.$extension"
bootDisk="$friendlyName.boot.$extension"
mv "$rootDiskImage" "$rootDisk"
mv "$bootDiskImage" "$bootDisk"
mkdir -p $out/nix-support
echo "file ${cfg.format} $bootDisk" >> $out/nix-support/hydra-build-products
echo "file ${cfg.format} $rootDisk" >> $out/nix-support/hydra-build-products
${pkgs.jq}/bin/jq -n \
--arg system_label ${lib.escapeShellArg config.system.nixos.label} \
--arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \
--arg root_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$bootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \
--arg boot_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$rootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \
--arg root "$rootDisk" \
--arg boot "$bootDisk" \
'{}
| .label = $system_label
| .system = $system
| .disks.boot.logical_bytes = $boot_logical_bytes
| .disks.boot.file = $boot
| .disks.root.logical_bytes = $root_logical_bytes
| .disks.root.file = $root
' > $out/nix-support/image-info.json
'';
};
extBuilder = import ../../../lib/make-disk-image.nix {
inherit lib config configFile;
inherit (cfg) contents format name;
pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package
fsType = "ext4";
partitionTableType = if config.ec2.efi then "efi"
else if config.ec2.hvm then "legacy+gpt"
else "none";
diskSize = cfg.sizeMB;
postVM = ''
extension=''${diskImage##*.}
friendlyName=$out/${cfg.name}.$extension
mv "$diskImage" "$friendlyName"
diskImage=$friendlyName
mkdir -p $out/nix-support
echo "file ${cfg.format} $diskImage" >> $out/nix-support/hydra-build-products
${pkgs.jq}/bin/jq -n \
--arg system_label ${lib.escapeShellArg config.system.nixos.label} \
--arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \
--arg logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$diskImage" | ${pkgs.jq}/bin/jq '."virtual-size"')" \
--arg file "$diskImage" \
'{}
| .label = $system_label
| .system = $system
| .logical_bytes = $logical_bytes
| .file = $file
| .disks.root.logical_bytes = $logical_bytes
| .disks.root.file = $file
' > $out/nix-support/image-info.json
'';
};
in if config.ec2.zfs.enable then zfsBuilder else extBuilder;
} }

View file

@ -2,6 +2,52 @@
with lib; with lib;
let
# A scalable variant of the X11 "core" cursor
#
# If not running a fancy desktop environment, the cursor is likely set to
# the default `cursor.pcf` bitmap font. This is 17px wide, so it's very
# small and almost invisible on 4K displays.
fontcursormisc_hidpi = pkgs.xorg.fontcursormisc.overrideAttrs (old:
let
# The scaling constant is 230/96: the scalable `left_ptr` glyph at
# about 23 points is rendered as 17px, on a 96dpi display.
# Note: the XLFD font size is in decipoints.
size = 2.39583 * config.services.xserver.dpi;
sizeString = builtins.head (builtins.split "\\." (toString size));
in
{
postInstall = ''
alias='cursor -xfree86-cursor-medium-r-normal--0-${sizeString}-0-0-p-0-adobe-fontspecific'
echo "$alias" > $out/lib/X11/fonts/Type1/fonts.alias
'';
});
hasHidpi =
config.hardware.video.hidpi.enable &&
config.services.xserver.dpi != null;
defaultFonts =
[ pkgs.dejavu_fonts
pkgs.freefont_ttf
pkgs.gyre-fonts # TrueType substitutes for standard PostScript fonts
pkgs.liberation_ttf
pkgs.unifont
pkgs.noto-fonts-emoji
];
defaultXFonts =
[ (if hasHidpi then fontcursormisc_hidpi else pkgs.xorg.fontcursormisc)
pkgs.xorg.fontmiscmisc
] ++ optionals (config.nixpkgs.config.allowUnfree or false)
[ # these are unfree, and will make usage with xserver fail
pkgs.xorg.fontbhlucidatypewriter100dpi
pkgs.xorg.fontbhlucidatypewriter75dpi
pkgs.xorg.fontbh100dpi
];
in
{ {
imports = [ imports = [
(mkRemovedOptionModule [ "fonts" "enableCoreFonts" ] "Use fonts.fonts = [ pkgs.corefonts ]; instead.") (mkRemovedOptionModule [ "fonts" "enableCoreFonts" ] "Use fonts.fonts = [ pkgs.corefonts ]; instead.")
@ -32,25 +78,9 @@ with lib;
}; };
config = { config = mkMerge [
{ fonts.fonts = mkIf config.fonts.enableDefaultFonts defaultFonts; }
fonts.fonts = mkIf config.fonts.enableDefaultFonts { fonts.fonts = mkIf config.services.xserver.enable defaultXFonts; }
([ ];
pkgs.dejavu_fonts
pkgs.freefont_ttf
pkgs.gyre-fonts # TrueType substitutes for standard PostScript fonts
pkgs.liberation_ttf
pkgs.xorg.fontmiscmisc
pkgs.xorg.fontcursormisc
pkgs.unifont
pkgs.noto-fonts-emoji
] ++ lib.optionals (config.nixpkgs.config.allowUnfree or false) [
# these are unfree, and will make usage with xserver fail
pkgs.xorg.fontbhlucidatypewriter100dpi
pkgs.xorg.fontbhlucidatypewriter75dpi
pkgs.xorg.fontbh100dpi
]);
};
} }

View file

@ -324,7 +324,7 @@ let
}; };
groupOpts = { name, ... }: { groupOpts = { name, config, ... }: {
options = { options = {
@ -358,6 +358,10 @@ let
config = { config = {
name = mkDefault name; name = mkDefault name;
members = mapAttrsToList (n: u: u.name) (
filterAttrs (n: u: elem config.name u.extraGroups) cfg.users
);
}; };
}; };
@ -419,12 +423,7 @@ let
initialPassword initialHashedPassword; initialPassword initialHashedPassword;
shell = utils.toShellPath u.shell; shell = utils.toShellPath u.shell;
}) cfg.users; }) cfg.users;
groups = mapAttrsToList (n: g: groups = attrValues cfg.groups;
{ inherit (g) name gid;
members = g.members ++ (mapAttrsToList (n: u: u.name) (
filterAttrs (n: u: elem g.name u.extraGroups) cfg.users
));
}) cfg.groups;
}); });
systemShells = systemShells =

View file

@ -122,6 +122,9 @@ in
ExecStart = "${pluginsEnv}/bin/octoprint serve -b ${cfg.stateDir}"; ExecStart = "${pluginsEnv}/bin/octoprint serve -b ${cfg.stateDir}";
User = cfg.user; User = cfg.user;
Group = cfg.group; Group = cfg.group;
SupplementaryGroups = [
"dialout"
];
}; };
}; };

View file

@ -6,6 +6,8 @@ let
cfg = config.services.grafana; cfg = config.services.grafana;
opt = options.services.grafana; opt = options.services.grafana;
declarativePlugins = pkgs.linkFarm "grafana-plugins" (builtins.map (pkg: { name = pkg.pname; path = pkg; }) cfg.declarativePlugins); declarativePlugins = pkgs.linkFarm "grafana-plugins" (builtins.map (pkg: { name = pkg.pname; path = pkg; }) cfg.declarativePlugins);
useMysql = cfg.database.type == "mysql";
usePostgresql = cfg.database.type == "postgres";
envOptions = { envOptions = {
PATHS_DATA = cfg.dataDir; PATHS_DATA = cfg.dataDir;
@ -635,7 +637,7 @@ in {
systemd.services.grafana = { systemd.services.grafana = {
description = "Grafana Service Daemon"; description = "Grafana Service Daemon";
wantedBy = ["multi-user.target"]; wantedBy = ["multi-user.target"];
after = ["networking.target"]; after = ["networking.target"] ++ lib.optional usePostgresql "postgresql.service" ++ lib.optional useMysql "mysql.service";
environment = { environment = {
QT_QPA_PLATFORM = "offscreen"; QT_QPA_PLATFORM = "offscreen";
} // mapAttrs' (n: v: nameValuePair "GF_${n}" (toString v)) envOptions; } // mapAttrs' (n: v: nameValuePair "GF_${n}" (toString v)) envOptions;

View file

@ -4,8 +4,10 @@ with lib;
{ {
config = mkIf (any (fs: fs == "exfat") config.boot.supportedFilesystems) { config = mkIf (any (fs: fs == "exfat") config.boot.supportedFilesystems) {
system.fsPackages = if config.boot.kernelPackages.kernelOlder "5.7" then [
system.fsPackages = [ pkgs.exfat ]; pkgs.exfat # FUSE
] else [
pkgs.exfatprogs # non-FUSE
];
}; };
} }

View file

@ -41,17 +41,23 @@ in
boot.growPartition = cfg.hvm; boot.growPartition = cfg.hvm;
fileSystems."/" = { fileSystems."/" = mkIf (!cfg.zfs.enable) {
device = "/dev/disk/by-label/nixos"; device = "/dev/disk/by-label/nixos";
fsType = "ext4"; fsType = "ext4";
autoResize = true; autoResize = true;
}; };
fileSystems."/boot" = mkIf cfg.efi { fileSystems."/boot" = mkIf (cfg.efi || cfg.zfs.enable) {
# The ZFS image uses a partition labeled ESP whether or not we're
# booting with EFI.
device = "/dev/disk/by-label/ESP"; device = "/dev/disk/by-label/ESP";
fsType = "vfat"; fsType = "vfat";
}; };
services.zfs.expandOnBoot = mkIf cfg.zfs.enable "all";
boot.zfs.devNodes = mkIf cfg.zfs.enable "/dev/";
boot.extraModulePackages = [ boot.extraModulePackages = [
config.boot.kernelPackages.ena config.boot.kernelPackages.ena
]; ];

View file

@ -1,7 +1,46 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ let
inherit (lib) types;
in {
options = { options = {
ec2 = { ec2 = {
zfs = {
enable = lib.mkOption {
default = false;
internal = true;
description = ''
Whether the EC2 instance uses a ZFS root.
'';
};
datasets = lib.mkOption {
description = ''
Datasets to create under the `tank` and `boot` zpools.
**NOTE:** This option is used only at image creation time, and
does not attempt to declaratively create or manage datasets
on an existing system.
'';
default = {};
type = types.attrsOf (types.submodule {
options = {
mount = lib.mkOption {
description = "Where to mount this dataset.";
type = types.nullOr types.string;
default = null;
};
properties = lib.mkOption {
description = "Properties to set on this dataset.";
type = types.attrsOf types.string;
default = {};
};
};
});
};
};
hvm = lib.mkOption { hvm = lib.mkOption {
default = lib.versionAtLeast config.system.stateVersion "17.03"; default = lib.versionAtLeast config.system.stateVersion "17.03";
internal = true; internal = true;
@ -18,4 +57,17 @@
}; };
}; };
}; };
config = lib.mkIf config.ec2.zfs.enable {
networking.hostId = lib.mkDefault "00000000";
fileSystems = let
mountable = lib.filterAttrs (_: value: ((value.mount or null) != null)) config.ec2.zfs.datasets;
in lib.mapAttrs'
(dataset: opts: lib.nameValuePair opts.mount {
device = dataset;
fsType = "zfs";
})
mountable;
};
} }

View file

@ -217,6 +217,20 @@ in rec {
}).config.system.build.amazonImage) }).config.system.build.amazonImage)
); );
amazonImageZfs = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system:
with import ./.. { inherit system; };
hydraJob ((import lib/eval-config.nix {
inherit system;
modules =
[ configuration
versionModule
./maintainers/scripts/ec2/amazon-image-zfs.nix
];
}).config.system.build.amazonImage)
);
# Test job for https://github.com/NixOS/nixpkgs/issues/121354 to test # Test job for https://github.com/NixOS/nixpkgs/issues/121354 to test

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "spotify-tui"; pname = "spotify-tui";
version = "0.24.0"; version = "0.25.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Rigellute"; owner = "Rigellute";
repo = "spotify-tui"; repo = "spotify-tui";
rev = "v${version}"; rev = "v${version}";
sha256 = "1vi6b22ygi6nwydjwqirph9k18akbw81m3bci134nrbnrb30glla"; sha256 = "sha256-L5gg6tjQuYoAC89XfKE38KCFONwSAwfNoFEUPH4jNAI=";
}; };
cargoSha256 = "1l91xcgr3hcjaphns1hs0i8w1ynxqwx7rbgpl0i5xnyrkw0gn9lj"; cargoSha256 = "sha256-iucI4/iMF+uXRlnMttobu4xo3IQXq7tGiSSN8eCrLM0=";
nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config python3 ]; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config python3 ];
buildInputs = [ ] buildInputs = [ ]

View file

@ -66,7 +66,7 @@ self: let
# actually unpack source of ada-mode and wisi # actually unpack source of ada-mode and wisi
# which are both needed to compile the tools # which are both needed to compile the tools
# we need at runtime # we need at runtime
phases = "unpackPhase " + old.phases; # not a list, interestingly… dontUnpack = false;
srcs = [ srcs = [
super.ada-mode.src super.ada-mode.src
# ada-mode needs a specific version of wisi, check NEWS or ada-mode's # ada-mode needs a specific version of wisi, check NEWS or ada-mode's

View file

@ -1,5 +1,5 @@
{ lib, mkDerivation, fetchFromGitHub, cmake, doxygen, makeWrapper { lib, mkDerivation, fetchFromGitHub, cmake, doxygen, makeWrapper
, msgpack, neovim, python3Packages, qtbase }: , msgpack, neovim, python3Packages, qtbase, qtsvg }:
mkDerivation rec { mkDerivation rec {
pname = "neovim-qt-unwrapped"; pname = "neovim-qt-unwrapped";
@ -20,6 +20,7 @@ mkDerivation rec {
buildInputs = [ buildInputs = [
neovim.unwrapped # only used to generate help tags at build time neovim.unwrapped # only used to generate help tags at build time
qtbase qtbase
qtsvg
] ++ (with python3Packages; [ ] ++ (with python3Packages; [
jinja2 python msgpack jinja2 python msgpack
]); ]);

View file

@ -10,14 +10,14 @@
python3Packages.buildPythonPackage rec { python3Packages.buildPythonPackage rec {
pname = "hydrus"; pname = "hydrus";
version = "451"; version = "452";
format = "other"; format = "other";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hydrusnetwork"; owner = "hydrusnetwork";
repo = "hydrus"; repo = "hydrus";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-HoaXbnhwh6kDWgRFVs+VttzIY3MaxriteFTE1fwBUYs="; sha256 = "sha256-CSWrmjJ6lFQ6tG403Uf+VAOfvBd1oAhd2kTU/7XA3f0=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -1,14 +1,14 @@
From 76c25147328d71960c70bbdd5a9396aac4a362a2 Mon Sep 17 00:00:00 2001 From b65921873585616c86a591eee9efbc68f84eb3d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com> From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 20 May 2020 14:19:07 -0300 Date: Wed, 25 Aug 2021 12:03:09 -0300
Subject: [PATCH] Fix paths Subject: [PATCH] Fix paths
--- ---
fbmenugen | 14 ++++++-------- fbmenugen | 11 +++++------
1 file changed, 6 insertions(+), 8 deletions(-) 1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/fbmenugen b/fbmenugen diff --git a/fbmenugen b/fbmenugen
index 46a18dc..0c8eb08 100755 index 241be16..5fc9aea 100755
--- a/fbmenugen --- a/fbmenugen
+++ b/fbmenugen +++ b/fbmenugen
@@ -214,9 +214,7 @@ my %CONFIG = ( @@ -214,9 +214,7 @@ my %CONFIG = (
@ -22,15 +22,6 @@ index 46a18dc..0c8eb08 100755
"$home_dir/.local/share/applications", "$home_dir/.local/share/applications",
], ],
#>>> #>>>
@@ -232,7 +230,7 @@ my %CONFIG = (
force_icon_size => 0,
generic_fallback => 0,
locale_support => 1,
- use_gtk3 => 0,
+ use_gtk3 => 1,
VERSION => $version,
);
@@ -252,7 +250,7 @@ if (not -e $config_file) { @@ -252,7 +250,7 @@ if (not -e $config_file) {
} }
@ -40,7 +31,7 @@ index 46a18dc..0c8eb08 100755
require File::Copy; require File::Copy;
File::Copy::copy($etc_schema_file, $schema_file) File::Copy::copy($etc_schema_file, $schema_file)
or warn "$0: can't copy file `$etc_schema_file' to `$schema_file': $!\n"; or warn "$0: can't copy file `$etc_schema_file' to `$schema_file': $!\n";
@@ -570,7 +568,7 @@ EXIT @@ -588,7 +586,7 @@ EXIT
$generated_menu .= begin_category(@{$schema->{fluxbox}}) . <<"FOOTER"; $generated_menu .= begin_category(@{$schema->{fluxbox}}) . <<"FOOTER";
[config] (Configure) [config] (Configure)
[submenu] (System Styles) {Choose a style...} [submenu] (System Styles) {Choose a style...}
@ -49,7 +40,7 @@ index 46a18dc..0c8eb08 100755
[end] [end]
[submenu] (User Styles) {Choose a style...} [submenu] (User Styles) {Choose a style...}
[stylesdir] (~/.fluxbox/styles) [stylesdir] (~/.fluxbox/styles)
@@ -580,12 +578,12 @@ EXIT @@ -598,12 +596,13 @@ EXIT
[exec] (Screenshot - JPG) {import screenshot.jpg && display -resize 50% screenshot.jpg} [exec] (Screenshot - JPG) {import screenshot.jpg && display -resize 50% screenshot.jpg}
[exec] (Screenshot - PNG) {import screenshot.png && display -resize 50% screenshot.png} [exec] (Screenshot - PNG) {import screenshot.png && display -resize 50% screenshot.png}
[exec] (Run) {fbrun} [exec] (Run) {fbrun}
@ -59,11 +50,11 @@ index 46a18dc..0c8eb08 100755
[commanddialog] (Fluxbox Command) [commanddialog] (Fluxbox Command)
[reconfig] (Reload config) [reconfig] (Reload config)
[restart] (Restart) [restart] (Restart)
- [exec] (About) {(fluxbox -v; fluxbox -info | sed 1d) | xmessage -file - -center} [exec] (About) {(fluxbox -v; fluxbox -info | sed 1d) | xmessage -file - -center}
+ [exec] (About) {(@fluxbox@/bin/fluxbox -v; @fluxbox@/bin/fluxbox -info | @gnused@/bin/sed 1d) | @xmessage@/bin/xmessage -file - -center} + [exec] (About) {(@fluxbox@/bin/fluxbox -v; @fluxbox@/bin/fluxbox -info | @gnused@/bin/sed 1d) | @xmessage@/bin/xmessage -file - -center}
[separator] [separator]
[exit] (Exit) [exit] (Exit)
[end] [end]
-- --
2.26.2 2.32.0

View file

@ -11,13 +11,13 @@
perlPackages.buildPerlPackage rec { perlPackages.buildPerlPackage rec {
pname = "fbmenugen"; pname = "fbmenugen";
version = "0.85"; version = "0.86";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "trizen"; owner = "trizen";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1pmms3wzkm8h41a8zrkpn6gq9m9yy5wr5rrzmb84lbacprqq6q7q"; sha256 = "0ya7s8b5xbaplz365bnr580szxxsngrs2n7smj8vz8a7kwi0319q";
}; };
patches = [ patches = [
@ -68,7 +68,7 @@ perlPackages.buildPerlPackage rec {
meta = with lib; { meta = with lib; {
homepage = "https://github.com/trizen/fbmenugen"; homepage = "https://github.com/trizen/fbmenugen";
description = "Simple menu generator for the Fluxbox Window Manager"; description = "Simple menu generator for the Fluxbox Window Manager";
license = licenses.gpl3; license = licenses.gpl3Only;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];
}; };

View file

@ -2,7 +2,7 @@
let let
pname = "joplin-desktop"; pname = "joplin-desktop";
version = "2.1.9"; version = "2.3.5";
name = "${pname}-${version}"; name = "${pname}-${version}";
inherit (stdenv.hostPlatform) system; inherit (stdenv.hostPlatform) system;
@ -16,8 +16,8 @@ let
src = fetchurl { src = fetchurl {
url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}"; url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}";
sha256 = { sha256 = {
x86_64-linux = "1s7zydi90yzafii42m3aaf3niqlmdy2m494j2b3yrz2j26njj4q9"; x86_64-linux = "sha256-Qy/CpIEfAZ9735mwcNaJIw+qVmYXVwQ7gJuUj2lpQc4=";
x86_64-darwin = "1pvl08yhcrnrvdybfmkigaidhfrrg42bb6rzv96zyq9w4k0l0lm8"; x86_64-darwin = "sha256-7I+fhcFFW/WihuUkSE5Pc8RhKszSgByP58H3sKSJbrc=";
}.${system} or throwSystem; }.${system} or throwSystem;
}; };

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "slides"; pname = "slides";
version = "0.4.1"; version = "0.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "maaslalani"; owner = "maaslalani";
repo = "slides"; repo = "slides";
rev = "v${version}"; rev = "v${version}";
sha256 = "1cywqrqj199hmx532h4vn0j17ypswq2zkmv8qpxpayvjwimx4pwk"; sha256 = "175g823n253d3xg8hxycw3gm1hhqb0vz8zs7xxcbdw5rlpd2hjii";
}; };
checkInputs = [ checkInputs = [
@ -18,7 +18,7 @@ buildGoModule rec {
ruby ruby
]; ];
vendorSha256 = "0y6fz9rw702mji571k0gp4kpfx7xbv7rvlnmpfjygy6lmp7wga6f"; vendorSha256 = "13kx47amwvzyzc251iijsbwa52s8bpld4xllb4y85qkwllfnmq2g";
ldflags = [ ldflags = [
"-s" "-w" "-s" "-w"

View file

@ -31,9 +31,9 @@
} }
}, },
"dev": { "dev": {
"version": "94.0.4606.12", "version": "94.0.4606.20",
"sha256": "1yv34wahg1f0l35kvlm3x17wvqdg8yyzmjj6naz2lnl5qai89zr8", "sha256": "0wp9fdw7jkrzhaz8dils7k1ssd6v7kkiz4y9l81s37xxi3xj1drg",
"sha256bin64": "19z9yzj6ig5ym8f9zzs8b4yixkspc0x62sz526r39803pbgs7s7i", "sha256bin64": "059rn0jj2cajrxx57gmr0ndkgixgfqazb73rxbprqj4857w4d5da",
"deps": { "deps": {
"gn": { "gn": {
"version": "2021-08-11", "version": "2021-08-11",

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "cloudflared"; pname = "cloudflared";
version = "2021.8.2"; version = "2021.8.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cloudflare"; owner = "cloudflare";
repo = "cloudflared"; repo = "cloudflared";
rev = version; rev = version;
sha256 = "sha256-5PMKVWBOWkUhmCSttbhu7UdS3dLqr0epJpQL1jfS31c="; sha256 = "sha256-gipLjABvJ1QK98uX7Gl6feHXUei95yHlSNkqlQ7pVg4=";
}; };
vendorSha256 = null; vendorSha256 = null;

View file

@ -7,7 +7,6 @@
, bridge-utils , bridge-utils
, conntrack-tools , conntrack-tools
, buildGoPackage , buildGoPackage
, git
, runc , runc
, kmod , kmod
, libseccomp , libseccomp
@ -44,8 +43,8 @@ with lib;
# Those pieces of software we entirely ignore upstream's handling of, and just # Those pieces of software we entirely ignore upstream's handling of, and just
# make sure they're in the path if desired. # make sure they're in the path if desired.
let let
k3sVersion = "1.21.3+k3s1"; # k3s git tag k3sVersion = "1.21.4+k3s1"; # k3s git tag
k3sCommit = "1d1f220fbee9cdeb5416b76b707dde8c231121f2"; # k3s git commit at the above version k3sCommit = "3e250fdbab72d88f7e6aae57446023a0567ffc97"; # k3s git commit at the above version
traefikChartVersion = "9.18.2"; # taken from ./scripts/download at TRAEFIK_VERSION traefikChartVersion = "9.18.2"; # taken from ./scripts/download at TRAEFIK_VERSION
k3sRootVersion = "0.9.1"; # taken from ./scripts/download at ROOT_VERSION k3sRootVersion = "0.9.1"; # taken from ./scripts/download at ROOT_VERSION
@ -102,7 +101,7 @@ let
k3sRepo = fetchgit { k3sRepo = fetchgit {
url = "https://github.com/k3s-io/k3s"; url = "https://github.com/k3s-io/k3s";
rev = "v${k3sVersion}"; rev = "v${k3sVersion}";
sha256 = "sha256-K4HVXFp5cpByEO4dUwmpzOuhsGh1k7X6k5aShCorTjg="; sha256 = "1w7drvk0bmlmqrxh1y6dxjy7dk6bdrl72pkd25lc1ir6wbzb05h9";
}; };
# Stage 1 of the k3s build: # Stage 1 of the k3s build:
# Let's talk about how k3s is structured. # Let's talk about how k3s is structured.

View file

@ -1,16 +1,16 @@
{ buildGoModule, lib, fetchFromGitHub }: { buildGoModule, lib, fetchFromGitHub }:
buildGoModule rec { buildGoModule rec {
pname = "tfswitch"; pname = "tfswitch";
version = "0.12.1119"; version = "0.12.1168";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "warrensbox"; owner = "warrensbox";
repo = "terraform-switcher"; repo = "terraform-switcher";
rev = version; rev = version;
sha256 = "1xsmr4hnmdg2il3rp39cyhv55ha4qcilcsr00iiija3bzxsm4rya"; sha256 = "sha256-BKqbxja19JxAr9/Cy7LpbZTJrt/pYfwtCbZMY0wwvZc=";
}; };
vendorSha256 = "0mpm4m07v8w02g95cnj73m5gvd118id4ag2pym8d9r2svkyz5n70"; vendorSha256 = "sha256-y8T1MV2xHr9n7XWmB4LikIzyGx+0XKhsxmatnCZFN9I=";
# Disable tests since it requires network access and relies on the # Disable tests since it requires network access and relies on the
# presence of release.hashicorp.com # presence of release.hashicorp.com

View file

@ -1,7 +1,7 @@
{ lib, stdenv, buildPythonApplication, fetchFromGitHub, pythonOlder, { lib, stdenv, buildPythonApplication, fetchFromGitHub, pythonOlder,
attrs, aiohttp, appdirs, click, keyring, Logbook, peewee, janus, attrs, aiohttp, appdirs, click, keyring, Logbook, peewee, janus,
prompt-toolkit, matrix-nio, dbus-python, pydbus, notify2, pygobject3, prompt-toolkit, matrix-nio, dbus-python, pydbus, notify2, pygobject3,
setuptools, fetchpatch, installShellFiles, setuptools, installShellFiles,
pytest, faker, pytest-aiohttp, aioresponses, pytest, faker, pytest-aiohttp, aioresponses,
@ -10,7 +10,7 @@
buildPythonApplication rec { buildPythonApplication rec {
pname = "pantalaimon"; pname = "pantalaimon";
version = "0.9.2"; version = "0.10.2";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -19,17 +19,9 @@ buildPythonApplication rec {
owner = "matrix-org"; owner = "matrix-org";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "11dfv5b2slqybisq6npmrqxrzslh4bjs4093vrc05s94046d9d9n"; sha256 = "sha256-sjaJomKMKSZqLlKWTG7Oa87dXa5SnGQlVnrdS707A1w=";
}; };
patches = [
# accept newer matrix-nio versions
(fetchpatch {
url = "https://github.com/matrix-org/pantalaimon/commit/73f68c76fb05037bd7fe71688ce39eb1f526a385.patch";
sha256 = "0wvqcfan8yp67p6khsqkynbkifksp2422b9jy511mvhpy51sqykl";
})
];
propagatedBuildInputs = [ propagatedBuildInputs = [
aiohttp aiohttp
appdirs appdirs

View file

@ -7,6 +7,8 @@
inherit (perlPackages) PodParser; inherit (perlPackages) PodParser;
}; };
url_hint = callPackage ./url_hint { };
weechat-matrix-bridge = callPackage ./weechat-matrix-bridge { weechat-matrix-bridge = callPackage ./weechat-matrix-bridge {
inherit (luaPackages) cjson luaffi; inherit (luaPackages) cjson luaffi;
}; };

View file

@ -0,0 +1,28 @@
{ lib, stdenv, fetchurl, weechat }:
stdenv.mkDerivation {
pname = "url_hint";
version = "0.8";
src = fetchurl {
url = "https://raw.githubusercontent.com/weechat/scripts/10671d785ea3f9619d0afd0d7a1158bfa4ee3938/python/url_hint.py";
sha256 = "0aw59kq74yqh0qbdkldfl6l83d0bz833232xr2w4741szck43kss";
};
dontUnpack = true;
passthru.scripts = [ "url_hint.py" ];
installPhase = ''
runHook preInstall
install -D $src $out/share/url_hint.py
runHook postInstall
'';
meta = with lib; {
inherit (weechat.meta) platforms;
description = "url_hint.py is a URL opening script.";
license = licenses.mit;
maintainers = with maintainers; [ eraserhd ];
};
}

View file

@ -19,16 +19,16 @@ let
maintainers = with maintainers; [ fliegendewurst ]; maintainers = with maintainers; [ fliegendewurst ];
}; };
version = "0.47.5"; version = "0.47.7";
desktopSource = { desktopSource = {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
sha256 = "16sm93vzlsqmrykbzdvgwszbhq79brd74zp9n9q5wrf4s44xizzv"; sha256 = "1fcrc01wr8ln1i77q9h89i90wwyijpfp58fa717wbdvyly4860sh";
}; };
serverSource = { serverSource = {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
sha256 = "0jk9pf3ljzfdv7d91wxda8z9qz653qas58wsrx42gnf7zxn1l648"; sha256 = "0qp37y3xgbhl6vj2bkwz1lfylkn82kx7n0lcfr58wxwkn00149ry";
}; };
in { in {

View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fastp"; pname = "fastp";
version = "0.20.1"; version = "0.22.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "OpenGene"; owner = "OpenGene";
repo = "fastp"; repo = "fastp";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-pANwppkO9pfV9vctB7HmNCzYRtf+Xt+5HMKzvFuvyFM="; sha256 = "sha256-XR76hNz7iGXQYSBbBandHZ+oU3wyTf1AKlu9Xeq/GyE=";
}; };
buildInputs = [ zlib ]; buildInputs = [ zlib ];

View file

@ -1,16 +1,16 @@
{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip }: { lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "gitui"; pname = "gitui";
version = "0.16.2"; version = "0.17";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "extrawurst"; owner = "extrawurst";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-FRPRkFGf6Z/+smK651wR6ETWrvvQ1AKalxXW6d6otIo="; sha256 = "sha256-UM1L95VKmUh2E56dlKo3TkNYRlib5Hg5VHGokBqTP+s=";
}; };
cargoSha256 = "sha256-3ubeZgB7XNKysy6s+cdg4GDj/Mn4Mdp9VupcbBRTRh4="; cargoSha256 = "sha256-i/Z1pOrg7rKH5uDqkyh7V9jZRHXZ3Bhhw5UpzKWOjJ0=";
nativeBuildInputs = [ python3 perl ]; nativeBuildInputs = [ python3 perl ];
buildInputs = [ openssl ] buildInputs = [ openssl ]

View file

@ -0,0 +1,56 @@
{ lib
, buildGoModule
, fetchFromGitHub
, git
, ghq
}:
buildGoModule rec {
pname = "gst";
version = "5.0.4";
src = fetchFromGitHub {
owner = "uetchy";
repo = "gst";
rev = "v${version}";
sha256 = "0fqgkmhn84402hidxv4niy9himcdwm1h80prkfk9vghwcyynrbsj";
};
vendorSha256 = "0k5xl55vzpl64gwsgaff92jismpx6y7l2ia0kx7gamd1vklf0qwh";
doCheck = false;
nativeBuildInputs = [
git
ghq
];
ldflags = [
"-s" "-w" "-X=main.Version=${version}"
];
doInstallCheck = true;
installCheckPhase = ''
if [[ "$("$out/bin/${pname}" --version)" == "${pname} version ${version}" ]]; then
export HOME=$(mktemp -d)
git config --global user.name "Test User"
git config --global user.email "test@example.com"
git config --global init.defaultBranch "main"
git config --global ghq.user "user"
ghq create test > /dev/null 2>&1
touch $HOME/ghq/github.com/user/test/SmokeTest
$out/bin/${pname} list | grep SmokeTest > /dev/null
echo '${pname} smoke check passed'
else
echo '${pname} smoke check failed'
return 1
fi
'';
meta = {
description = "Supercharge your ghq workflow";
homepage = "https://github.com/uetchy/gst";
maintainers = with lib.maintainers; [ _0x4A6F ];
license = lib.licenses.asl20;
};
}

View file

@ -10,7 +10,7 @@ let
pythonPackages = python.pkgs; pythonPackages = python.pkgs;
unwrapped = pythonPackages.buildPythonPackage rec { unwrapped = pythonPackages.buildPythonPackage rec {
name = "qtile-${version}"; pname = "qtile";
version = "0.18.0"; version = "0.18.0";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -61,6 +61,8 @@ let
}; };
in in
(python.withPackages (ps: [ unwrapped ])).overrideAttrs (_: { (python.withPackages (ps: [ unwrapped ])).overrideAttrs (_: {
# otherwise will be exported as "env", this restores `nix search` behavior
name = "${unwrapped.pname}-${unwrapped.version}";
# export underlying qtile package # export underlying qtile package
passthru = { inherit unwrapped; }; passthru = { inherit unwrapped; };
}) })

View file

@ -759,6 +759,13 @@ rec {
]; ];
}; };
# This provides a /usr/bin/env, for shell scripts using the
# "#!/usr/bin/env executable" shebang.
usrBinEnv = runCommand "usr-bin-env" { } ''
mkdir -p $out/usr/bin
ln -s ${pkgs.coreutils}/bin/env $out/usr/bin
'';
# This provides /bin/sh, pointing to bashInteractive. # This provides /bin/sh, pointing to bashInteractive.
binSh = runCommand "bin-sh" { } '' binSh = runCommand "bin-sh" { } ''
mkdir -p $out/bin mkdir -p $out/bin

View file

@ -21,7 +21,7 @@ in
import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({ import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({
phases = "installPhase fixupPhase distPhase"; dontUnpack = true;
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall

View file

@ -12,13 +12,13 @@
mkDerivation rec { mkDerivation rec {
pname = "adwaita-qt"; pname = "adwaita-qt";
version = "1.3.1"; version = "1.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "FedoraQt"; owner = "FedoraQt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-3uHa7veLzaSIm9WSR/Z0X+aSdXziO1TnI/CQgccrKYg="; sha256 = "sha256-KkqLUhS0JMwJsgu8fv5iGozH3Xv+cXumxx5IewZTTPc=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -1,4 +1,5 @@
{ lib, stdenv { lib
, stdenv
, fetchFromGitHub , fetchFromGitHub
, gdk-pixbuf , gdk-pixbuf
, gtk-engine-murrine , gtk-engine-murrine
@ -8,13 +9,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "marwaita-peppermint"; pname = "marwaita-peppermint";
version = "0.6"; version = "10.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "darkomarko42"; owner = "darkomarko42";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0mhkkx2qa66z4b2h5iynhy63flwdf6b2phd21r1j8kp4m08dynms"; sha256 = "09lqp82aymj3silpwmjkkf4mgv3b1xw7181ck89lz2nxb98sr9im";
}; };
buildInputs = [ buildInputs = [
@ -39,7 +40,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Marwaita GTK theme with Peppermint Os Linux style"; description = "Marwaita GTK theme with Peppermint Os Linux style";
homepage = "https://www.pling.com/p/1399569/"; homepage = "https://www.pling.com/p/1399569/";
license = licenses.gpl3; license = licenses.gpl3Only;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];
}; };

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "kotlin"; pname = "kotlin";
version = "1.5.21"; version = "1.5.30";
src = fetchurl { src = fetchurl {
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
sha256 = "sha256-8zE6/dar8bjHXGKS9OQfLbr+/I9scnYse6mz2u712lk="; sha256 = "sha256-Je69ubsuFl5LqO+/j/lDxF1Pw52//CwcqgWejdgTZ18=";
}; };
propagatedBuildInputs = [ jre ] ; propagatedBuildInputs = [ jre ] ;

View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "imath"; pname = "imath";
version = "3.0.5"; version = "3.1.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "AcademySoftwareFoundation"; owner = "AcademySoftwareFoundation";
repo = "imath"; repo = "imath";
rev = "v${version}"; rev = "v${version}";
sha256 = "0nwf8622j01p699nkkbal6xxs1snzzhz4cn6d76yppgvdhgyahsc"; sha256 = "sha256-X+LY1xtMeYMO6Ri6fmBF2JEDuY6MF7j5XO5YhWMuffM=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "lib3mf"; pname = "lib3mf";
version = "2.1.1"; version = "2.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "3MFConsortium"; owner = "3MFConsortium";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1417xlxc1y5jnipixhbjfrrjgkrprbbraj8647sff9051m3hpxc3"; sha256 = "sha256-WMTTYYgpCIM86a6Jw8iah/YVXN9T5youzEieWL/d+Bc=";
}; };
nativeBuildInputs = [ cmake ninja pkg-config ]; nativeBuildInputs = [ cmake ninja pkg-config ];

View file

@ -8,7 +8,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "openexr"; pname = "openexr";
version = "3.0.5"; version = "3.1.1";
outputs = [ "bin" "dev" "out" "doc" ]; outputs = [ "bin" "dev" "out" "doc" ];
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
owner = "AcademySoftwareFoundation"; owner = "AcademySoftwareFoundation";
repo = "openexr"; repo = "openexr";
rev = "v${version}"; rev = "v${version}";
sha256 = "0inmpby1syyxxzr0sazqvpb8j63vpj09vpkp4xi7m2qd4rxynkph"; sha256 = "1p0l07vfpb25fx6jcgk1747v8x9xgpifx4cvvgi3g2473wlx6pyb";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "openxr-loader"; pname = "openxr-loader";
version = "1.0.18"; version = "1.0.19";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "KhronosGroup"; owner = "KhronosGroup";
repo = "OpenXR-SDK-Source"; repo = "OpenXR-SDK-Source";
rev = "release-${version}"; rev = "release-${version}";
sha256 = "sha256-Ek4gFL10/aRciCoJBNaaSX/Hdbap4X/K4k+KeAfpKDg="; sha256 = "sha256-LEXxqzHzTadgK2PV9Wiud9MzblDHdF4L5T4fVydRJW8=";
}; };
nativeBuildInputs = [ cmake python3 ]; nativeBuildInputs = [ cmake python3 ];

View file

@ -7,14 +7,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ailment"; pname = "ailment";
version = "9.0.9506"; version = "9.0.9572";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "angr"; owner = "angr";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-ikIO6AhoBkmz4+8BLOC55Yh6HbzHJOjlktSDMiC0I38="; sha256 = "sha256-cjVKIlvGu1SCiVkegJ36GevZ9bihYF7n3P/xNqtAapw=";
}; };
propagatedBuildInputs = [ pyvex ]; propagatedBuildInputs = [ pyvex ];

View file

@ -43,14 +43,14 @@ in
buildPythonPackage rec { buildPythonPackage rec {
pname = "angr"; pname = "angr";
version = "9.0.9506"; version = "9.0.9572";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-2bKsLmZeFs7N4YUYxIktDoOn/H8waaOaOJOzyVumuf8="; sha256 = "sha256-ZA2PKyJVXrSs2IvpjMyHGrtAPUpUZFhUzlKURLEWm5o=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -9,14 +9,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "angrop"; pname = "angrop";
version = "9.0.9506"; version = "9.0.9572";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "angr"; owner = "angr";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-dTaTtiMzIm9PfVkjAED9x9zae+vdRcl1kDMtqUWvpkA="; sha256 = "sha256-R4i7hQGwc74/szehcWBjkC6b9DsblluHKWxEk0iSFRI=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -7,13 +7,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "archinfo"; pname = "archinfo";
version = "9.0.9506"; version = "9.0.9572";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "angr"; owner = "angr";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-jGXJpwiP2/O2aJhAP15VGqrekiiB0eiIFCjkzNMbqxw="; sha256 = "sha256-OzgLGjEVOVRnQvWVcci8EGn6gtO8D8QoDnC9dfXGHZU=";
}; };
checkInputs = [ checkInputs = [

View file

@ -3,14 +3,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "awslambdaric"; pname = "awslambdaric";
version = "1.2.0"; version = "1.2.2";
disabled = isPy27; disabled = isPy27;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aws"; owner = "aws";
repo = "aws-lambda-python-runtime-interface-client"; repo = "aws-lambda-python-runtime-interface-client";
rev = version; rev = version;
sha256 = "120qar8iaxj6dmnhjw1c40n2w06f1nyxy57dwh06xdiany698fg4"; sha256 = "1r4b4w5xhf6p4vs7yx89kighlqim9f96v2ryknmrnmblgr4kg0h1";
}; };
postPatch = '' postPatch = ''

View file

@ -11,12 +11,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "azure-mgmt-servicebus"; pname = "azure-mgmt-servicebus";
version = "6.0.0"; version = "7.0.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "f6c64ed97d22d0c03c4ca5fc7594bd0f3d4147659c10110160009b93f541298e"; sha256 = "ee859efec2ec9fc8d059811967b1cb17836f4f5786e7406494a42f51f0667822";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -6,11 +6,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "bitarray"; pname = "bitarray";
version = "2.3.1"; version = "2.3.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-QgPNtE136zCnReZXbIK34zaB8TSzOBBSVvd+cdvTMN0="; sha256 = "sha256-S+47qRZLZs72TxCZ6aO4jpndzQyUOAfplENhPhhLSLQ=";
}; };
checkPhase = '' checkPhase = ''

View file

@ -15,7 +15,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "censys"; pname = "censys";
version = "2.0.5"; version = "2.0.6";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "censys"; owner = "censys";
repo = "censys-python"; repo = "censys-python";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-/vMDNHNUY3mpK9jSDPVhuA050rwZF8O6IjTCLqQZIWc="; sha256 = "sha256-Lbd2Pm79n0cFoGHC2rucxgZijzcVYVJJsq1yzqB9QLk=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -51,8 +51,8 @@ buildPythonPackage rec {
--replace 'backoff = "^1.11.1"' 'backoff = "*"' \ --replace 'backoff = "^1.11.1"' 'backoff = "*"' \
--replace 'requests = ">=2.26.0"' 'requests = "*"' \ --replace 'requests = ">=2.26.0"' 'requests = "*"' \
--replace 'rich = "^10.6.0"' 'rich = "*"' --replace 'rich = "^10.6.0"' 'rich = "*"'
substituteInPlace pytest.ini --replace \ substituteInPlace pytest.ini \
" --cov -rs -p no:warnings" "" --replace "--cov" ""
''; '';
# The tests want to write a configuration file # The tests want to write a configuration file

View file

@ -16,7 +16,9 @@ buildPythonPackage rec {
sourceRoot = "source/${pname}"; sourceRoot = "source/${pname}";
postPatch = '' postPatch = ''
substituteInPlace requirements.txt --replace "protobuf~=3.13.0" "protobuf" substituteInPlace requirements.txt \
--replace "protobuf~=3.13.0" "protobuf" \
--replace "google-api-core[grpc] >= 1.14.0, < 2.0.0dev" "google-api-core[grpc] >= 1.14.0, < 3.0.0dev"
''; '';
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -13,14 +13,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "claripy"; pname = "claripy";
version = "9.0.9506"; version = "9.0.9572";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "angr"; owner = "angr";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-wczwKTtOJ4VC3UZvd1KT6GfGUk5AS90ggLi2lFjhD+Q="; sha256 = "sha256-YC605gIM+l9Tnx6lu0ayrnYPE6Xx+aTgDXPziFY/lDA=";
}; };
# Use upstream z3 implementation # Use upstream z3 implementation

View file

@ -15,7 +15,7 @@
let let
# The binaries are following the argr projects release cycle # The binaries are following the argr projects release cycle
version = "9.0.9506"; version = "9.0.9572";
# Binary files from https://github.com/angr/binaries (only used for testing and only here) # Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub { binaries = fetchFromGitHub {
@ -35,7 +35,7 @@ buildPythonPackage rec {
owner = "angr"; owner = "angr";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-jTVccnCRqsp3EBl/RSKWVekAOsGhRvdIJxRyYV2gI4Q="; sha256 = "sha256-b1LMHeaQqz0fNleRlME0kgSYZGGXBhFKCp0iRr/2A7c=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -1,28 +1,50 @@
{ lib, buildPythonPackage, fetchPypi, requests, coverage, unittest2 }: { lib
, buildPythonPackage
, coverage
, ddt
, fetchFromGitHub
, mock
, pytestCheckHook
, requests
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "codecov"; pname = "codecov";
version = "2.1.11"; version = "2.1.12";
src = fetchPypi { src = fetchFromGitHub {
inherit pname version; owner = "codecov";
sha256 = "6cde272454009d27355f9434f4e49f238c0273b216beda8472a65dc4957f473b"; repo = "codecov-python";
rev = "v${version}";
sha256 = "0bdk1cp3hxydpx9knqfv88ywwzw7yqhywi0inxjd6x53qh75prqy";
}; };
checkInputs = [ unittest2 ]; # Tests only propagatedBuildInputs = [
requests
coverage
];
propagatedBuildInputs = [ requests coverage ]; checkInputs = [
ddt
mock
pytestCheckHook
];
postPatch = '' pytestFlagsArray = [ "tests/test.py" ];
sed -i 's/, "argparse"//' setup.py
'';
# No tests in archive disabledTests = [
doCheck = false; # No git repo available and network
"test_bowerrc_none"
"test_prefix"
"test_send"
];
pythonImportsCheck = [ "codecov" ];
meta = with lib; { meta = with lib; {
description = "Python report uploader for Codecov"; description = "Python report uploader for Codecov";
homepage = "https://codecov.io/"; homepage = "https://codecov.io/";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ fab ];
}; };
} }

View file

@ -5,7 +5,7 @@
, googleapis-common-protos , googleapis-common-protos
, grpcio , grpcio
, protobuf , protobuf
, pytz , proto-plus
, requests , requests
, mock , mock
, pytest , pytest
@ -15,11 +15,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-api-core"; pname = "google-api-core";
version = "1.30.0"; version = "2.0.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0724d354d394b3d763bc10dfee05807813c5210f0bd9b8e2ddf6b6925603411c"; sha256 = "sha256-vZ6wcJ9OEN1v3bMv0HiKGQtDRCbCWL5uAO9A2hNtdo0=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -27,7 +27,7 @@ buildPythonPackage rec {
google-auth google-auth
grpcio grpcio
protobuf protobuf
pytz proto-plus
requests requests
]; ];
@ -47,8 +47,7 @@ buildPythonPackage rec {
helpers used by all Google API clients. helpers used by all Google API clients.
''; '';
homepage = "https://github.com/googleapis/python-api-core"; homepage = "https://github.com/googleapis/python-api-core";
changelog = changelog = "https://github.com/googleapis/python-api-core/blob/v${version}/CHANGELOG.md";
"https://github.com/googleapis/python-api-core/blob/v${version}/CHANGELOG.md";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ SuperSandro2000 ]; maintainers = with maintainers; [ SuperSandro2000 ];
}; };

View file

@ -14,24 +14,22 @@
, pytest-localserver , pytest-localserver
, responses , responses
, rsa , rsa
, six
, pyopenssl , pyopenssl
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-auth"; pname = "google-auth";
version = "1.34.0"; version = "2.0.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-8QlAiLrgRvsG89Gj198UcX6NlZ6RBbecV3Jb1OF1l6I="; sha256 = "sha256-6hrwULPgbrc+RHD3BNIwBzB7wOh8E+AV9rkEYPFAe9M=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
cachetools cachetools
pyasn1-modules pyasn1-modules
rsa rsa
six
pyopenssl pyopenssl
pyu2f pyu2f
]; ];

View file

@ -2,13 +2,18 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-access-context-manager"; pname = "google-cloud-access-context-manager";
version = "0.1.6"; version = "0.1.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "011hbbjqjqk6fskb180hfhhsddz3i2a9gz34sf4wy1j2s4my9xy0"; sha256 = "02adf212c8d280298ffe03a0c91743618693ec394b42cbb85b4a29f8d9544afa";
}; };
postPatch = ''
substituteInPlace setup.py \
--replace "google-api-core[grpc] >= 1.26.0, < 2.0.0dev" "google-api-core[grpc] >= 1.26.0, < 2.0.1"
'';
propagatedBuildInputs = [ google-api-core ]; propagatedBuildInputs = [ google-api-core ];
# No tests in repo # No tests in repo

View file

@ -0,0 +1,25 @@
{ lib, buildPythonPackage, fetchPypi, googleapis-common-protos, protobuf }:
buildPythonPackage rec {
pname = "google-cloud-audit-log";
version = "0.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "5bf5a53c641b13828154ab21fb209669be69d71cd462f5d6456bf87722fc0eeb";
};
propagatedBuildInputs = [ googleapis-common-protos protobuf ];
# tests are a bit wonky to setup and are not very deep either
doCheck = false;
pythonImportsCheck = [ "google.cloud.audit" ];
meta = with lib; {
description = "Google Cloud Audit Protos";
homepage = "https://github.com/googleapis/python-audit-log";
license = licenses.asl20;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

View file

@ -18,11 +18,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-bigquery"; pname = "google-cloud-bigquery";
version = "2.23.3"; version = "2.24.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-FQXtRM7YaU+S+Jqkn9dTQqJR3A1hL/XQjgPTXmANO0I="; sha256 = "sha256-gRHSPir4epbAZGqCqD9i1pS2yIKeeIHrTkN7dURxZJ8=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -53,6 +53,12 @@ buildPythonPackage rec {
# requires credentials # requires credentials
"test_bigquery_magic" "test_bigquery_magic"
"TestBigQuery" "TestBigQuery"
"test_query_retry_539"
"test_query_retry_539"
"test_list_rows_empty_table"
"test_list_rows_page_size"
"test_list_rows_scalars"
"test_list_rows_scalars_extreme"
# Mocking of _ensure_bqstorage_client fails # Mocking of _ensure_bqstorage_client fails
"test_to_arrow_ensure_bqstorage_client_wo_bqstorage" "test_to_arrow_ensure_bqstorage_client_wo_bqstorage"
# requires network # requires network

View file

@ -11,11 +11,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-core"; pname = "google-cloud-core";
version = "1.7.2"; version = "2.0.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-sQMKrcuyrrTuUUdUJjUa+DwQckVrkY+4/bgGZsS7Y7U="; sha256 = "sha256-kO6ZZIzPnhGhZ4Gn/FjRPlj2YrQ5xzfUjCTvGGYsJwI=";
}; };
propagatedBuildInputs = [ google-api-core ]; propagatedBuildInputs = [ google-api-core ];

View file

@ -13,11 +13,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-firestore"; pname = "google-cloud-firestore";
version = "2.2.0"; version = "2.3.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-QMwvMPebC2a09XmKQKYFPwVIbZlnUEaXxTh8hlnS9Js="; sha256 = "sha256-gc68S+utdcO2OSCRAxyTCjnXBfUxWN/D7PfNg3cUzQ8=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -43,6 +43,8 @@ buildPythonPackage rec {
# Tests are broken # Tests are broken
"tests/system/test_system.py" "tests/system/test_system.py"
"tests/system/test_system_async.py" "tests/system/test_system_async.py"
# requires credentials
"tests/unit/v1/test_bulk_writer.py"
]; ];
disabledTests = [ disabledTests = [

View file

@ -4,6 +4,8 @@
, django , django
, flask , flask
, google-api-core , google-api-core
, google-cloud-appengine-logging
, google-cloud-audit-log
, google-cloud-core , google-cloud-core
, google-cloud-testutils , google-cloud-testutils
, mock , mock
@ -22,7 +24,13 @@ buildPythonPackage rec {
sha256 = "sha256-SZ7tXxPKuAXIeAsNFKDZMan/HWXvzN2eaHctQOfa1MU="; sha256 = "sha256-SZ7tXxPKuAXIeAsNFKDZMan/HWXvzN2eaHctQOfa1MU=";
}; };
propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ]; propagatedBuildInputs = [
google-api-core
google-cloud-appengine-logging
google-cloud-audit-log
google-cloud-core
proto-plus
];
checkInputs = [ checkInputs = [
django django

View file

@ -14,11 +14,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-spanner"; pname = "google-cloud-spanner";
version = "3.7.0"; version = "3.8.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-4LGSB7KU+RGvjSQ/w1vXxa5fkfFT4C5omhk/LnGSUng="; sha256 = "sha256-K8K0JjKHWojSVFnUr3GhJP4gflYTXH6V7Mywu4hTvRQ=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -43,8 +43,13 @@ buildPythonPackage rec {
disabledTestPaths = [ disabledTestPaths = [
# Requires credentials # Requires credentials
"tests/system/test_system.py" "tests/system/test_backup_api.py"
"tests/system/test_system_dbapi.py" "tests/system/test_database_api.py"
"tests/system/test_dbapi.py"
"tests/system/test_instance_api.py"
"tests/system/test_session_api.py"
"tests/system/test_streaming_chunking.py"
"tests/system/test_table_api.py"
"tests/unit/spanner_dbapi/test_connect.py" "tests/unit/spanner_dbapi/test_connect.py"
"tests/unit/spanner_dbapi/test_connection.py" "tests/unit/spanner_dbapi/test_connection.py"
"tests/unit/spanner_dbapi/test_cursor.py" "tests/unit/spanner_dbapi/test_cursor.py"

View file

@ -12,11 +12,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-resumable-media"; pname = "google-resumable-media";
version = "1.3.3"; version = "2.0.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-zjhVXSUL1wsMJZi/YemQA8uMVpsBduwOPzi4b5//9YE="; sha256 = "sha256-CUwDgXNGSayTkIPqODO9I5t/upBNJGNC0SaJhAKfIWc=";
}; };
propagatedBuildInputs = [ google-auth google-crc32c requests ]; propagatedBuildInputs = [ google-auth google-crc32c requests ];

View file

@ -16,14 +16,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "hap-python"; pname = "hap-python";
version = "4.0.0"; version = "4.1.0";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ikalchev"; owner = "ikalchev";
repo = "HAP-python"; repo = "HAP-python";
rev = "v${version}"; rev = "v${version}";
sha256 = "1k4gq23j4f7yppxf8rzrrayn6clj48cdzixjdsmv5awhzsf9n6w4"; sha256 = "sha256-vUbcsG6mKPgH+IF5i/BYSIkfIizSZzMWz0Kq0yfuKxE=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -42,8 +42,8 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
# Disable tests requiring network access
disabledTestPaths = [ disabledTestPaths = [
# Disable tests requiring network access
"tests/test_accessory_driver.py" "tests/test_accessory_driver.py"
"tests/test_hap_handler.py" "tests/test_hap_handler.py"
"tests/test_hap_protocol.py" "tests/test_hap_protocol.py"
@ -56,8 +56,11 @@ buildPythonPackage rec {
"test_we_can_start_stop" "test_we_can_start_stop"
"test_push_event" "test_push_event"
"test_bridge_run_stop" "test_bridge_run_stop"
"test_migration_to_include_client_properties"
]; ];
pythonImportsCheck = [ "pyhap" ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/ikalchev/HAP-python"; homepage = "https://github.com/ikalchev/HAP-python";
description = "HomeKit Accessory Protocol implementation in python"; description = "HomeKit Accessory Protocol implementation in python";

View file

@ -1,24 +1,30 @@
{ lib, buildPythonPackage, fetchFromGitHub, isPy27, pytest, omegaconf, pathlib2 }: { lib, buildPythonPackage, fetchFromGitHub, pythonOlder, pytestCheckHook
, importlib-resources, omegaconf, jre_headless, antlr4-python3-runtime }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "hydra"; pname = "hydra";
version = "0.11.3"; version = "1.1.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "facebookresearch"; owner = "facebookresearch";
repo = pname; repo = pname;
rev = version; rev = "v${version}";
sha256 = "0plbls65qfrvvigza3qvy0pwjzgkz8ylpgb1im14k3b125ny41ad"; sha256 = "sha256:1svzysrjg47gb6lxx66fzd8wbhpbbsppprpbqssf5aqvhxgay3qk";
}; };
checkInputs = [ pytest ]; nativeBuildInputs = [ jre_headless ];
propagatedBuildInputs = [ omegaconf ] ++ lib.optional isPy27 pathlib2; checkInputs = [ pytestCheckHook ];
propagatedBuildInputs = [ omegaconf antlr4-python3-runtime ]
++ lib.optionals (pythonOlder "3.9") [ importlib-resources ];
checkPhase = '' # test environment setup broken under Nix for a few tests:
runHook preCheck disabledTests = [
pytest tests/ "test_bash_completion_with_dot_in_path"
runHook postCheck "test_install_uninstall"
''; ];
disabledTestPaths = [ "tests/test_hydra.py" ];
meta = with lib; { meta = with lib; {
description = "A framework for configuring complex applications"; description = "A framework for configuring complex applications";

View file

@ -10,11 +10,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "jenkins-job-builder"; pname = "jenkins-job-builder";
version = "3.9.0"; version = "3.10.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "4a53e146843d567c375c2e61e70a840d75a412402fd78c1dd3da5642a6aaa375"; sha256 = "sha256-8MP8YHIkxDqjPsUYv6ROmuRwcGMzPpsVCRwxga3XdYU=";
}; };
postPatch = '' postPatch = ''

View file

@ -0,0 +1,31 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, matplotlib
}:
buildPythonPackage rec {
pname = "mpldatacursor";
version = "0.7.1";
src = fetchFromGitHub {
owner = "joferkington";
repo = pname;
rev = "v${version}";
sha256 = "0i1lwl6x6hgjq4xwsc138i4v5895lmnpfqwpzpnj5mlck6fy6rda";
};
propagatedBuildInputs = [ matplotlib ];
# No tests included in archive
doCheck = false;
pythonImportsCheck = [ "mpldatacursor" ];
meta = with lib; {
homepage = "https://github.com/joferkington/mpldatacursor";
description = "Interactive data cursors for matplotlib";
license = licenses.mit;
maintainers = with maintainers; [ bzizou ];
};
}

View file

@ -1,20 +1,28 @@
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder { lib, buildPythonPackage, fetchFromGitHub, pytest-mock, pytestCheckHook
, pytest, pytest-runner, pyyaml, six, pathlib2, isPy27 }: , pyyaml, pythonOlder, jre_minimal, antlr4-python3-runtime }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "omegaconf"; pname = "omegaconf";
version = "1.4.1"; version = "2.1.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "omry"; owner = "omry";
repo = pname; repo = pname;
rev = version; rev = "v${version}";
sha256 = "1vpcdjlq54pm8xmkv2hqm2n1ysvz2a9iqgf55x0w6slrb4595cwb"; sha256 = "sha256-0aDlqPXELxQ/lnw4Hd9es8ldYhUP/TacH9AIyaffwnI=";
}; };
checkInputs = [ pytest ]; postPatch = ''
buildInputs = [ pytest-runner ]; substituteInPlace setup.py --replace 'setup_requires=["pytest-runner"]' 'setup_requires=[]'
propagatedBuildInputs = [ pyyaml six ] ++ lib.optional isPy27 pathlib2; '';
checkInputs = [ pytestCheckHook pytest-mock ];
nativeBuildInputs = [ jre_minimal ];
propagatedBuildInputs = [ antlr4-python3-runtime pyyaml ];
disabledTestPaths = [ "tests/test_pydev_resolver_plugin.py" ]; # needs pydevd - not in Nixpkgs
meta = with lib; { meta = with lib; {
description = "A framework for configuring complex applications"; description = "A framework for configuring complex applications";

View file

@ -1,28 +1,45 @@
{ lib, fetchPypi { lib
, buildPythonPackage, pythonOlder , buildPythonPackage
, pytest, pytest-runner , fetchFromGitHub
, parse, six, enum34 , parse
, pytestCheckHook
, pythonOlder
, six
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "parse_type"; pname = "parse-type";
version = "0.5.2"; version = "0.5.6";
src = fetchPypi { src = fetchFromGitHub {
inherit pname version; owner = "jenisys";
sha256 = "02wclgiqky06y36b3q07b7ngpks5j0gmgl6n71ac2j2hscc0nsbz"; repo = "parse_type";
rev = "v${version}";
sha256 = "sha256-CJroqJIi5DpmR8i1lr8OJ+234615PhpVUsqK91XOT3E=";
}; };
checkInputs = [ pytest pytest-runner ]; propagatedBuildInputs = [
propagatedBuildInputs = [ parse six ] ++ lib.optional (pythonOlder "3.4") enum34; parse
six
];
checkPhase = '' checkInputs = [
py.test tests pytestCheckHook
];
postPatch = ''
substituteInPlace pytest.ini \
--replace "--metadata PACKAGE_UNDER_TEST parse_type" "" \
--replace "--metadata PACKAGE_VERSION 0.5.6" "" \
--replace "--html=build/testing/report.html --self-contained-html" "" \
--replace "--junit-xml=build/testing/report.xml" ""
''; '';
pythonImportsCheck = [ "parse_type" ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/jenisys/parse_type";
description = "Simplifies to build parse types based on the parse module"; description = "Simplifies to build parse types based on the parse module";
homepage = "https://github.com/jenisys/parse_type";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ alunduil ]; maintainers = with maintainers; [ alunduil ];
}; };

View file

@ -6,11 +6,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pex"; pname = "pex";
version = "2.1.45"; version = "2.1.46";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "e5b0de7b23e1f578f93559a08a01630481b0af3dc9fb3e130b14b99baa83491b"; sha256 = "28958292ab6a149ef7dd7998939a6e899b2f1ba811407ea1edac9d2d84417dfd";
}; };
nativeBuildInputs = [ setuptools ]; nativeBuildInputs = [ setuptools ];

View file

@ -6,11 +6,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "phonenumbers"; pname = "phonenumbers";
version = "8.12.30"; version = "8.12.31";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "9ca65c36f437881a8f7dac979a5733ae8fb5a0a436aecd47bd2c06494bdf0a20"; sha256 = "sha256-CR7SsxWFZ/EsmfcZVwocys4AF585tE8ea4lfWdk9rcg=";
}; };
checkInputs = [ checkInputs = [

View file

@ -5,13 +5,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "playsound"; pname = "playsound";
version = "1.2.2"; version = "1.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "TaylorSMarks"; owner = "TaylorSMarks";
repo = "playsound"; repo = "playsound";
rev = "907f1fe73375a2156f7e0900c4b42c0a60fa1d00"; rev = "v${version}";
sha256 = "1fh3m115h0c57lj2pfhhqhmsh5awzblb7csi1xc5a6f6slhl059k"; sha256 = "0jbq641lmb0apq4fy6r2zyag8rdqgrz8c4wvydzrzmxrp6yx6wyd";
}; };
doCheck = false; doCheck = false;

View file

@ -19,13 +19,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "plugwise"; pname = "plugwise";
version = "0.12.0"; version = "0.13.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = "python-plugwise"; repo = "python-plugwise";
rev = version; rev = "v${version}";
sha256 = "sha256-fZ0mhsM7LroJgIyBO4eRzZaz2OQxa4Hhj1rNufHXvHI="; sha256 = "1sv421aa6ip74ajxa5imnh188hyx9dq3vwkb6aifi14h2wpr9lh3";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -22,13 +22,6 @@ buildPythonPackage rec {
sha256 = "129sz33a270v120bzl9l98nmvdzn7ns4cf9w2v18lmzlldbyz2vn"; sha256 = "129sz33a270v120bzl9l98nmvdzn7ns4cf9w2v18lmzlldbyz2vn";
}; };
prePatch = ''
substituteInPlace setup.py --replace 'pyjwt==2.0.1' 'pyjwt>=2.0.1'
substituteInPlace setup.py --replace 'ratelimit==2.2.1' 'ratelimit>=2.2.1'
substituteInPlace setup.py --replace 'pytz==2019.2' 'pytz>=2019.2'
substituteInPlace setup.py --replace 'requests==2.24.0' 'requests>=2.24.0'
'';
propagatedBuildInputs = [ propagatedBuildInputs = [
pyjwt pyjwt
ratelimit ratelimit
@ -41,15 +34,6 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
postPatch = ''
# https://github.com/ChrisMandich/PyFlume/issues/18
substituteInPlace setup.py \
--replace "pyjwt==2.0.1" "pyjwt>=2.0.1" \
--replace "ratelimit==2.2.1" "ratelimit>=2.2.1" \
--replace "pytz==2019.2" "pytz>=2019.2" \
--replace "requests==2.24.0" "requests>=2.24.0"
'';
pythonImportsCheck = [ "pyflume" ]; pythonImportsCheck = [ "pyflume" ];
meta = with lib; { meta = with lib; {

View file

@ -8,14 +8,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyfronius"; pname = "pyfronius";
version = "0.6.2"; version = "0.6.3";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nielstron"; owner = "nielstron";
repo = pname; repo = pname;
rev = "release-${version}"; rev = "release-${version}";
sha256 = "03szfgf2g0hs4r92p8jb8alzl7byzrirxsa25630zygmkadzgrz2"; sha256 = "19cgr0y4zfyghpw9hwl9immh5c464dlasnfd8q570k9f0q682249";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -1,23 +1,29 @@
{ lib, buildPythonPackage, fetchFromGitHub }: { lib
, buildPythonPackage
, fetchFromGitHub
, python
}:
buildPythonPackage { buildPythonPackage rec {
pname = "pylev"; pname = "pylev";
version = "1.3.0"; version = "1.4.0";
# No tests in PyPi tarball
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "toastdriven"; owner = "toastdriven";
repo = "pylev"; repo = "pylev";
# Can't use a tag because it's missing rev = "v${version}";
# https://github.com/toastdriven/pylev/issues/10 sha256 = "0fgxjdnvnvavnxmxxd0fl5jyr2f31g3a26bwyxcpy56mgpd095c1";
# rev = "v${version};
rev = "72e3d490515c3188e2acac9c15ea1b466f9ff938";
sha256 = "18dg1rfnqgfl6x4vafiq4la9d7f65xak19gcvngslq0bm1z6hyd8";
}; };
checkPhase = ''
${python.interpreter} -m unittest tests
'';
pythonImportsCheck = [ "pylev" ];
meta = with lib; { meta = with lib; {
description = "Python Levenshtein implementation";
homepage = "https://github.com/toastdriven/pylev"; homepage = "https://github.com/toastdriven/pylev";
description = "A pure Python Levenshtein implementation that's not freaking GPL'd";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ jakewaksbaum ]; maintainers = with maintainers; [ jakewaksbaum ];
}; };

View file

@ -8,13 +8,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pymemcache"; pname = "pymemcache";
version = "3.4.4"; version = "3.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pinterest"; owner = "pinterest";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1ajlhirxhd4pbzgd84k44znjazjbnbdfm3sk64avs0vgcgclq2n7"; sha256 = "sha256-O2qmcLWCUSc1f32irelIZOOuOziOUQXFGcuQJBXPvvM=";
}; };
checkInputs = [ checkInputs = [

View file

@ -13,21 +13,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pymupdf"; pname = "pymupdf";
version = "1.18.16"; version = "1.18.17";
src = fetchPypi { src = fetchPypi {
pname = "PyMuPDF"; pname = "PyMuPDF";
inherit version; inherit version;
sha256 = "b21e39098fbbe0fdf269fdb2d1dd25a3847bbf22785ee8903d3a5637c2d0b9d7"; sha256 = "fa39ee5e91eae77818e07b6bb7e0cb0b402ad88e39a74b08626ce1c2150c5414";
}; };
patchFlags = [ "--binary" "--ignore-whitespace" ];
patches = [
# Add NIX environment support.
# Should be removed next pyMuPDF release.
./nix-support.patch
];
postPatch = '' postPatch = ''
substituteInPlace setup.py \ substituteInPlace setup.py \
--replace '/usr/include/mupdf' ${mupdf.dev}/include/mupdf --replace '/usr/include/mupdf' ${mupdf.dev}/include/mupdf

View file

@ -1,17 +0,0 @@
--- a/setup.py
+++ b/setup.py
@@ -36,10 +36,14 @@ LIBRARIES = {
"opensuse": OPENSUSE,
"fedora": FEDORA,
"alpine": ALPINE,
+ "nix": FEDORA,
}
def load_libraries():
+ if os.getenv("NIX_STORE"):
+ return LIBRARIES["nix"]
+
try:
import distro

View file

@ -2,13 +2,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyrad"; pname = "pyrad";
version = "2.3"; version = "2.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pyradius"; owner = "pyradius";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0hy7999av47s8100afbhxfjb8phbmrqcv530xlvskndby4a8w94k"; sha256 = "sha256-oqgkE0xG/8cmLeRZdGoHkaHbjtByeJwzBJwEdxH8oNY=";
}; };
propagatedBuildInputs = [ netaddr six ]; propagatedBuildInputs = [ netaddr six ];
@ -18,10 +18,12 @@ buildPythonPackage rec {
nosetests -e testBind nosetests -e testBind
''; '';
pythonImportsCheck = [ "pyrad" ];
meta = with lib; { meta = with lib; {
description = "Python RADIUS Implementation"; description = "Python RADIUS Implementation";
homepage = "https://bitbucket.org/zzzeek/sqlsoup"; homepage = "https://bitbucket.org/zzzeek/sqlsoup";
license = licenses.mit; license = licenses.bsd3;
maintainers = [ maintainers.globin ]; maintainers = [ maintainers.globin ];
}; };
} }

View file

@ -16,13 +16,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-engineio"; pname = "python-engineio";
version = "4.0.0"; version = "4.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "miguelgrinberg"; owner = "miguelgrinberg";
repo = "python-engineio"; repo = "python-engineio";
rev = "v${version}"; rev = "v${version}";
sha256 = "00x9pmmnl1yd59wd96ivkiqh4n5nphl8cwk43hf4nqr0icgsyhar"; sha256 = "sha256-QfX8Volz5nabGVhQLXfSD/QooxLsU6DvCq1WRkRZ6hU=";
}; };
checkInputs = [ checkInputs = [

View file

@ -9,13 +9,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-socketio"; pname = "python-socketio";
version = "5.0.4"; version = "5.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "miguelgrinberg"; owner = "miguelgrinberg";
repo = "python-socketio"; repo = "python-socketio";
rev = "v${version}"; rev = "v${version}";
sha256 = "0mpqr53mrdzk9ki24y1inpsfvjlvm7pvxf8q4d52m80i5pcd5v5q"; sha256 = "sha256-jyTTWxShLDDnbT+MYIJIjwpn3xfIB04je78doIOG+FQ=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -6,12 +6,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pythondialog"; pname = "pythondialog";
version = "3.5.1"; version = "3.5.2";
disabled = !isPy3k; disabled = !isPy3k;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "34a0687290571f37d7d297514cc36bd4cd044a3a4355271549f91490d3e7ece8"; sha256 = "4fc11e95540d1d5dbe0a60cd3fb7787354df85ee4b5da21f708ea46cb47bf6d6";
}; };
patchPhase = '' patchPhase = ''

View file

@ -11,11 +11,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyvex"; pname = "pyvex";
version = "9.0.9506"; version = "9.0.9572";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-DseMX41dXmmt44SPVHSIFRIJL1u9yZ3kq8pv8TzC/OQ="; sha256 = "sha256-ish37nO+r1VJY9XS83K8tu60Snhd547n965TFqdBgzs=";
}; };
postPatch = lib.optionalString stdenv.isDarwin '' postPatch = lib.optionalString stdenv.isDarwin ''

View file

@ -9,7 +9,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "rapidfuzz"; pname = "rapidfuzz";
version = "1.4.1"; version = "1.5.0";
disabled = pythonOlder "3.5"; disabled = pythonOlder "3.5";
@ -18,7 +18,7 @@ buildPythonPackage rec {
repo = "RapidFuzz"; repo = "RapidFuzz";
rev = "v${version}"; rev = "v${version}";
fetchSubmodules = true; fetchSubmodules = true;
sha256 = "sha256-uZdD25ATJgRrDAHYSQNp7NvEmW7p3LD9vNmxAbf5Mwk="; sha256 = "sha256-Omo9ActReimYDK9dARG0s32Qq61neDELRechbnwRfwU=";
}; };
checkInputs = [ checkInputs = [

View file

@ -12,14 +12,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "smbprotocol"; pname = "smbprotocol";
version = "1.6.1"; version = "1.6.2";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jborean93"; owner = "jborean93";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0pyjnmrkiqcd0r1s6zl8w91zy0605k7cyy5n4cvv52079gy0axhd"; sha256 = "sha256-nSWZfhZD++I5hM2ijqft2U95kyEe3h/nrSfiT3sQiKE=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -11,11 +11,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "stravalib"; pname = "stravalib";
version = "0.10.2"; version = "0.10.4";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "76db248b24cbd6c51cf93b475d8a8df04ec4b6c6287dca244e47f37a433276d7"; sha256 = "451817c68a11e0c77db9cb628e3c4df0f4806c5a481536598ab3baa1d1c21215";
}; };
checkInputs = [ checkInputs = [

View file

@ -0,0 +1,25 @@
{ lib, buildPythonPackage, fetchPypi, pythonOlder }:
buildPythonPackage rec {
pname = "tensorboard-data-server";
version = "0.6.1";
format = "wheel";
disabled = pythonOlder "3.6";
src = fetchPypi {
pname = "tensorboard_data_server";
inherit version format;
dist = "py3";
python = "py3";
sha256 = "sha256-gJ/piHaC01wffR9U8PQPmLsfdxsUJltFPKBR4s5Y/Kc=";
};
pythonImportsCheck = [ "tensorboard_data_server" ];
meta = with lib; {
description = "Fast data loading for TensorBoard";
homepage = "https://github.com/tensorflow/tensorboard/tree/master/tensorboard/data/server";
license = licenses.asl20;
maintainers = with maintainers; [ abbradar ];
};
}

View file

@ -1,4 +1,7 @@
{ lib, fetchPypi, buildPythonPackage, isPy3k { lib
, fetchPypi
, buildPythonPackage
, pythonOlder
, numpy , numpy
, wheel , wheel
, werkzeug , werkzeug
@ -7,6 +10,8 @@
, markdown , markdown
, absl-py , absl-py
, google-auth-oauthlib , google-auth-oauthlib
, setuptools
, tensorboard-data-server
, tensorboard-plugin-wit , tensorboard-plugin-wit
, tensorboard-plugin-profile , tensorboard-plugin-profile
}: }:
@ -17,27 +22,44 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "tensorflow-tensorboard"; pname = "tensorflow-tensorboard";
version = "2.4.0"; version = "2.6.0";
format = "wheel"; format = "wheel";
disabled = !isPy3k; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
pname = "tensorboard"; pname = "tensorboard";
inherit version format; inherit version format;
dist = "py3";
python = "py3"; python = "py3";
sha256 = "0f17h6i398n8maam0r3rssqvdqnqbwjyf96nnhf482anm1iwdq6d"; sha256 = "sha256-99rEzftS0UyeP3RYXOKq+OYgNiCoZOUfr4SYiwn3u9s=";
}; };
postPatch = ''
chmod u+rwx -R ./dist
pushd dist
wheel unpack --dest unpacked ./*.whl
pushd unpacked/tensorboard-${version}
substituteInPlace tensorboard-${version}.dist-info/METADATA \
--replace "google-auth (<2,>=1.6.3)" "google-auth (<3,>=1.6.3)"
popd
wheel pack ./unpacked/tensorboard-${version}
popd
'';
propagatedBuildInputs = [ propagatedBuildInputs = [
numpy
werkzeug
protobuf
markdown
grpcio
absl-py absl-py
grpcio
google-auth-oauthlib google-auth-oauthlib
markdown
numpy
protobuf
setuptools
tensorboard-data-server
tensorboard-plugin-profile tensorboard-plugin-profile
tensorboard-plugin-wit tensorboard-plugin-wit
werkzeug
# not declared in install_requires, but used at runtime # not declared in install_requires, but used at runtime
# https://github.com/NixOS/nixpkgs/issues/73840 # https://github.com/NixOS/nixpkgs/issues/73840
wheel wheel
@ -60,7 +82,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "TensorFlow's Visualization Toolkit"; description = "TensorFlow's Visualization Toolkit";
homepage = "http://tensorflow.org"; homepage = "https://www.tensorflow.org/";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ abbradar ]; maintainers = with maintainers; [ abbradar ];
}; };

View file

@ -18,7 +18,6 @@ buildGoModule rec {
-s -w -s -w
-X main.Version=v${version} -X main.Version=v${version}
-X main.DefaultBuildkitdImage=earthly/buildkitd:v${version} -X main.DefaultBuildkitdImage=earthly/buildkitd:v${version}
-extldflags -static
''; '';
BUILDTAGS = "dfrunmount dfrunsecurity dfsecrets dfssh dfrunnetwork"; BUILDTAGS = "dfrunmount dfrunsecurity dfsecrets dfssh dfrunnetwork";

View file

@ -2,7 +2,7 @@
buildGoModule rec { buildGoModule rec {
pname = "kustomize"; pname = "kustomize";
version = "4.2.0"; version = "4.3.0";
# rev is the commit of the tag, mainly for kustomize version command output # rev is the commit of the tag, mainly for kustomize version command output
rev = "9e8e7a7fe99ec9fbf801463e8607928322fc5245"; rev = "9e8e7a7fe99ec9fbf801463e8607928322fc5245";
@ -17,7 +17,7 @@ buildGoModule rec {
owner = "kubernetes-sigs"; owner = "kubernetes-sigs";
repo = pname; repo = pname;
rev = "kustomize/v${version}"; rev = "kustomize/v${version}";
sha256 = "sha256-mFF0Yc+j292oajY1i9SApnWaQnVoHxvkGCIurKC0t4o="; sha256 = "sha256-Oo29/H1rWKOMNBIa8N/ih2Bfmclsn/kqv3il6c2muoQ=";
}; };
# TODO: Remove once https://github.com/kubernetes-sigs/kustomize/pull/3708 got merged. # TODO: Remove once https://github.com/kubernetes-sigs/kustomize/pull/3708 got merged.
@ -26,7 +26,7 @@ buildGoModule rec {
# avoid finding test and development commands # avoid finding test and development commands
sourceRoot = "source/kustomize"; sourceRoot = "source/kustomize";
vendorSha256 = "sha256-VMvXDIrg/BkuxZVDHvpfHY/hgwQGz2kw1/hu5lhcYEE="; vendorSha256 = "sha256-oX+6cc5EO2RqK2O212iaW/6CMFCNdYzTpAaqDTFqX1A=";
meta = with lib; { meta = with lib; {
description = "Customization of kubernetes YAML configurations"; description = "Customization of kubernetes YAML configurations";

View file

@ -1,10 +1,9 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, substituteAll , substituteAll
, binutils , binutils
, asciidoc , asciidoctor
, cmake , cmake
, perl , perl
, zstd , zstd
@ -15,13 +14,13 @@
let ccache = stdenv.mkDerivation rec { let ccache = stdenv.mkDerivation rec {
pname = "ccache"; pname = "ccache";
version = "4.3"; version = "4.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-ZBxDTMUZiZJLIYbvACTFwvlss+IZiMjiL0khfM5hFCM="; hash = "sha256-ZewR1srksfKCxehhAg3i8m+0OvmOSF+24njbtcc1GQY=";
}; };
outputs = [ "out" "man" ]; outputs = [ "out" "man" ];
@ -35,16 +34,17 @@ let ccache = stdenv.mkDerivation rec {
src = ./force-objdump-on-darwin.patch; src = ./force-objdump-on-darwin.patch;
objdump = "${binutils.bintools}/bin/objdump"; objdump = "${binutils.bintools}/bin/objdump";
}) })
# Fix clang C++ modules test (remove in next release)
(fetchpatch {
url = "https://github.com/ccache/ccache/commit/8b0c783ffc77d29a3e3520345b776a5c496fd892.patch";
sha256 = "13qllx0qhfrdila6bdij9lk74fhkm3vdj01zgq1ri6ffrv9lqrla";
})
]; ];
nativeBuildInputs = [ asciidoc cmake perl ]; nativeBuildInputs = [ asciidoctor cmake perl ];
buildInputs = [ zstd ]; buildInputs = [ zstd ];
cmakeFlags = [
# Build system does not autodetect redis library presence.
# Requires explicit flag.
"-DREDIS_STORAGE_BACKEND=OFF"
];
doCheck = true; doCheck = true;
checkInputs = [ checkInputs = [
# test/run requires the compgen function which is available in # test/run requires the compgen function which is available in
@ -56,7 +56,7 @@ let ccache = stdenv.mkDerivation rec {
runHook preCheck runHook preCheck
export HOME=$(mktemp -d) export HOME=$(mktemp -d)
ctest --output-on-failure ${lib.optionalString stdenv.isDarwin '' ctest --output-on-failure ${lib.optionalString stdenv.isDarwin ''
-E '^(test.nocpp2|test.basedir|test.multi_arch)$' -E '^(test.nocpp2|test.basedir|test.multi_arch|test.trim_dir)$'
''} ''}
runHook postCheck runHook postCheck
''; '';

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "jiq"; pname = "jiq";
version = "0.7.1"; version = "0.7.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fiatjaf"; owner = "fiatjaf";
repo = pname; repo = pname;
rev = version; rev = "v${version}";
sha256 = "sha256-EPhnfgmn0AufuxwcwRrEEQk+RD97akFJSzngkTl4LmY="; sha256 = "sha256-txhttYngN+dofA3Yp3gZUZPRRZWGug9ysXq1Q0RP7ig=";
}; };
vendorSha256 = "sha256-ZUmOhPGy+24AuxdeRVF0Vnu8zDGFrHoUlYiDdfIV5lc="; vendorSha256 = "sha256-ZUmOhPGy+24AuxdeRVF0Vnu8zDGFrHoUlYiDdfIV5lc=";

View file

@ -1,8 +1,7 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, cmake { lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, cmake
, libiconv , libiconv
, useMimalloc ? false , useMimalloc ? false
# FIXME: Test doesn't pass under rustc 1.52.1 due to different escaping of `'` in string. , doCheck ? true
, doCheck ? false
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -17,9 +16,16 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-6Tbgy77Essi3Hyd5kdJ7JJbx7RuFZQWURfRrpScvPPQ="; sha256 = "sha256-6Tbgy77Essi3Hyd5kdJ7JJbx7RuFZQWURfRrpScvPPQ=";
}; };
patches = [
# Code format and git history check require more dependencies but don't really matter for packaging.
# So just ignore them.
./ignore-git-and-rustfmt-tests.patch
];
buildAndTestSubdir = "crates/rust-analyzer"; buildAndTestSubdir = "crates/rust-analyzer";
cargoBuildFlags = lib.optional useMimalloc "--features=mimalloc"; cargoBuildFlags = lib.optional useMimalloc "--features=mimalloc";
cargoTestFlags = lib.optional useMimalloc "--features=mimalloc";
nativeBuildInputs = lib.optional useMimalloc cmake; nativeBuildInputs = lib.optional useMimalloc cmake;

View file

@ -0,0 +1,18 @@
--- a/crates/rust-analyzer/tests/slow-tests/tidy.rs
+++ b/crates/rust-analyzer/tests/slow-tests/tidy.rs
@@ -6,6 +6,7 @@ use std::{
use xshell::{cmd, pushd, pushenv, read_file};
#[test]
+#[ignore]
fn check_code_formatting() {
let _dir = pushd(sourcegen::project_root()).unwrap();
let _e = pushenv("RUSTUP_TOOLCHAIN", "stable");
@@ -138,6 +139,7 @@ fn check_cargo_toml(path: &Path, text: String) -> () {
}
#[test]
+#[ignore]
fn check_merge_commits() {
let stdout = cmd!("git rev-list --merges --invert-grep --author 'bors\\[bot\\]' HEAD~19..")
.read()

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "vultr-cli"; pname = "vultr-cli";
version = "2.7.0"; version = "2.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vultr"; owner = "vultr";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-3q0in41/ZGuZcMiu+5qT8AGttro2it89xp741RCxAYY="; sha256 = "sha256-BPeOud10cTsZ2flWRMf6F/i9JwnPPDFje3OZIAUa0O8=";
}; };
vendorSha256 = null; vendorSha256 = null;

View file

@ -389,12 +389,12 @@ final: prev:
bufferline-nvim = buildVimPluginFrom2Nix { bufferline-nvim = buildVimPluginFrom2Nix {
pname = "bufferline-nvim"; pname = "bufferline-nvim";
version = "2021-08-21"; version = "2021-08-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "akinsho"; owner = "akinsho";
repo = "bufferline.nvim"; repo = "bufferline.nvim";
rev = "35ac1c1e2e6f7cbf6a1ad027d8bf019a284b28d5"; rev = "21fda2cfb4c692f91e4df486dc2e28a37c628a76";
sha256 = "1sdq5yjav7ak5lkw0kiz8mwffnxva94w1xav8y8kxy8f95b78a2g"; sha256 = "05wi1zb1b3b08av3l8i40jggvb2mpkqmg0w8dqhxannblfkk8h8c";
}; };
meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; meta.homepage = "https://github.com/akinsho/bufferline.nvim/";
}; };
@ -449,12 +449,12 @@ final: prev:
chadtree = buildVimPluginFrom2Nix { chadtree = buildVimPluginFrom2Nix {
pname = "chadtree"; pname = "chadtree";
version = "2021-08-22"; version = "2021-08-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ms-jpq"; owner = "ms-jpq";
repo = "chadtree"; repo = "chadtree";
rev = "b84f08364a3b3a6eb9795ecdab418d1e786b0be4"; rev = "d8089b752346fdccdd4fe85cec82c0f9919823fa";
sha256 = "0jh6xbiqrnldk1l2p1jqfi34wwci7nx2pxhvcv0fi9mb7r5bzvmw"; sha256 = "12nn4467jhhfi2vwsywzf6fqadwjsymmmmny5d4jsbz3l5xhcfmz";
}; };
meta.homepage = "https://github.com/ms-jpq/chadtree/"; meta.homepage = "https://github.com/ms-jpq/chadtree/";
}; };
@ -581,12 +581,12 @@ final: prev:
cmp-nvim-lsp = buildVimPluginFrom2Nix { cmp-nvim-lsp = buildVimPluginFrom2Nix {
pname = "cmp-nvim-lsp"; pname = "cmp-nvim-lsp";
version = "2021-08-16"; version = "2021-08-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hrsh7th"; owner = "hrsh7th";
repo = "cmp-nvim-lsp"; repo = "cmp-nvim-lsp";
rev = "09e4ab0fb66ad07d64b311d1bd7916905bf3364b"; rev = "899f70af0786d4100fb29987b9ab03eac7eedd6a";
sha256 = "0573ywym8favv12g78qln4zx15j1ic26y8j2rbdlh8n22zll0v1x"; sha256 = "1gw478b77smkn3k42h2q3ddq2kcd7vm6mnmjmksvbsfv5xp9pln0";
}; };
meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/"; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/";
}; };
@ -713,12 +713,12 @@ final: prev:
coc-nvim = buildVimPluginFrom2Nix { coc-nvim = buildVimPluginFrom2Nix {
pname = "coc-nvim"; pname = "coc-nvim";
version = "2021-08-22"; version = "2021-08-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "neoclide"; owner = "neoclide";
repo = "coc.nvim"; repo = "coc.nvim";
rev = "5f5e3135de04c9e245c1ecf53b67836c692fd06a"; rev = "595e60210f7d0c9e5a21672428bae8c3f518a3b9";
sha256 = "1cljdxgqxiyq6gg71pg9k5b8iwvj8nzg4m7llzj957lrhfpavfxg"; sha256 = "0mdqb07avwk2f5h5xylq2lkg56jk82dccyrxb17cxfw2dsgbs93m";
}; };
meta.homepage = "https://github.com/neoclide/coc.nvim/"; meta.homepage = "https://github.com/neoclide/coc.nvim/";
}; };
@ -966,12 +966,12 @@ final: prev:
Coqtail = buildVimPluginFrom2Nix { Coqtail = buildVimPluginFrom2Nix {
pname = "Coqtail"; pname = "Coqtail";
version = "2021-08-16"; version = "2021-08-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "whonore"; owner = "whonore";
repo = "Coqtail"; repo = "Coqtail";
rev = "358747255db85579498dfc6e03dcd808d5b81d34"; rev = "b292682c16176f961e11e1e68eb799d9b1b3e4e9";
sha256 = "086q1bx6xz3qzkyll6lszcgljyz8b5w4ywa8wvcv71al3cxd9n7b"; sha256 = "1278z0rgvg65kprxyg02yl2fixrfy9pg5fj3d796nc607ipzdhvb";
}; };
meta.homepage = "https://github.com/whonore/Coqtail/"; meta.homepage = "https://github.com/whonore/Coqtail/";
}; };
@ -1508,12 +1508,12 @@ final: prev:
dracula-vim = buildVimPluginFrom2Nix { dracula-vim = buildVimPluginFrom2Nix {
pname = "dracula-vim"; pname = "dracula-vim";
version = "2021-08-06"; version = "2021-08-22";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dracula"; owner = "dracula";
repo = "vim"; repo = "vim";
rev = "074a6b34952f2d14be196c217a3995749670f627"; rev = "d1ff992bf605c098577b7f0e632e3ea887b71520";
sha256 = "0vvz81dg64pp0x08imcicrqkp4z90ahfxsikhswraslklc1k1ar1"; sha256 = "04zmqz270willnpfsf61pa9xx5i5phx1g6r6nw317r9rs0dnk0wj";
}; };
meta.homepage = "https://github.com/dracula/vim/"; meta.homepage = "https://github.com/dracula/vim/";
}; };
@ -1555,6 +1555,18 @@ final: prev:
meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/";
}; };
editorconfig-nvim = buildVimPluginFrom2Nix {
pname = "editorconfig-nvim";
version = "2021-08-18";
src = fetchFromGitHub {
owner = "gpanders";
repo = "editorconfig.nvim";
rev = "8840aacb025af17e42c6c215a34568f3dbcf94f6";
sha256 = "1flr9mhz33bcrqp6iwnvhsz18hrd4ynvh7qdihnpd5qn0mwf034w";
};
meta.homepage = "https://github.com/gpanders/editorconfig.nvim/";
};
elm-vim = buildVimPluginFrom2Nix { elm-vim = buildVimPluginFrom2Nix {
pname = "elm-vim"; pname = "elm-vim";
version = "2020-09-23"; version = "2020-09-23";
@ -1823,12 +1835,12 @@ final: prev:
friendly-snippets = buildVimPluginFrom2Nix { friendly-snippets = buildVimPluginFrom2Nix {
pname = "friendly-snippets"; pname = "friendly-snippets";
version = "2021-08-19"; version = "2021-08-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rafamadriz"; owner = "rafamadriz";
repo = "friendly-snippets"; repo = "friendly-snippets";
rev = "2d7bcab215c8b7a8f889b371c4060dda2a6c6541"; rev = "d438b0fc71447c502029320377f0ed53603b9e0c";
sha256 = "0kxm6nl167b51gjwli64d9qp5s1cdy9za0zfq9hy8phivjk2pmyl"; sha256 = "0hnn5rlm9gb59afbfi78rs5lp9fq844x8qrpqnwi0kcz8b3d6bp7";
}; };
meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
}; };
@ -2039,12 +2051,12 @@ final: prev:
gitsigns-nvim = buildVimPluginFrom2Nix { gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns-nvim"; pname = "gitsigns-nvim";
version = "2021-08-16"; version = "2021-08-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lewis6991"; owner = "lewis6991";
repo = "gitsigns.nvim"; repo = "gitsigns.nvim";
rev = "70705a33ab816c61011ed9c97ebb5925eaeb89c1"; rev = "1ddb1f64f5fb15dac2d02e52af918d1fb11feb2d";
sha256 = "1bcrba17icpdmk69p284kb2k3jpwimnbcn5msa7xq46wj97hy12k"; sha256 = "0y33dsxhw55h28kvqq3655cmnl4nq4z497v69xa72872gf1dsi80";
}; };
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
}; };
@ -2808,12 +2820,12 @@ final: prev:
lightspeed-nvim = buildVimPluginFrom2Nix { lightspeed-nvim = buildVimPluginFrom2Nix {
pname = "lightspeed-nvim"; pname = "lightspeed-nvim";
version = "2021-08-21"; version = "2021-08-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ggandor"; owner = "ggandor";
repo = "lightspeed.nvim"; repo = "lightspeed.nvim";
rev = "177ef542f6f26147f16be7b07c1e6fcfa66bf128"; rev = "9a613fb6ea8b8a41e7956f272c8cd0dc9a65102b";
sha256 = "0c6bwdgi2d43jar05zcfarsas3r7y9v7igr3ldsgd7491wf8hjhg"; sha256 = "1l19cn04ibw0pd1isw02mllqxzp4gy4jd0mnv4mzf24ydjkyixkn";
}; };
meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/";
}; };
@ -2964,12 +2976,12 @@ final: prev:
luasnip = buildVimPluginFrom2Nix { luasnip = buildVimPluginFrom2Nix {
pname = "luasnip"; pname = "luasnip";
version = "2021-08-22"; version = "2021-08-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "l3mon4d3"; owner = "l3mon4d3";
repo = "luasnip"; repo = "luasnip";
rev = "6d398e3443933a68607215538e614662d2ffa5c8"; rev = "2ee1dfa64e14201a1016cd7088b612a0d2a116e2";
sha256 = "0ll54nqa3lxzhxyjsya8y4qiyyicfsp5yz25mjdgqmvvf4i39jxz"; sha256 = "0hqj4xv3mxdcknjqhazvnsk01jdc3x6qqgyyf6sy5d4kxm5q9q0w";
}; };
meta.homepage = "https://github.com/l3mon4d3/luasnip/"; meta.homepage = "https://github.com/l3mon4d3/luasnip/";
}; };
@ -3468,12 +3480,12 @@ final: prev:
neosnippet-vim = buildVimPluginFrom2Nix { neosnippet-vim = buildVimPluginFrom2Nix {
pname = "neosnippet-vim"; pname = "neosnippet-vim";
version = "2021-08-20"; version = "2021-08-22";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Shougo"; owner = "Shougo";
repo = "neosnippet.vim"; repo = "neosnippet.vim";
rev = "c1634915a8f798cded2bef39c6f24a9d988aca10"; rev = "3f6f5f8ad34d63ecb1060dbd6d7e2513238da528";
sha256 = "02cvrxfy6n7z5xl5ijw2fkz81j7lm18agyx6qs11a5l5f515h4a2"; sha256 = "14f0ksrn4grkpjfn766hxg1p19dryngxai33b2322dy0qaw244d2";
}; };
meta.homepage = "https://github.com/Shougo/neosnippet.vim/"; meta.homepage = "https://github.com/Shougo/neosnippet.vim/";
}; };
@ -3696,12 +3708,12 @@ final: prev:
null-ls-nvim = buildVimPluginFrom2Nix { null-ls-nvim = buildVimPluginFrom2Nix {
pname = "null-ls-nvim"; pname = "null-ls-nvim";
version = "2021-08-18"; version = "2021-08-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jose-elias-alvarez"; owner = "jose-elias-alvarez";
repo = "null-ls.nvim"; repo = "null-ls.nvim";
rev = "f907d945d0285f42dc9ebffbc075ea725b93b6aa"; rev = "414ed4690583315705955c80cdf52e86cfc134aa";
sha256 = "1jg6wxknbzirq9j880yki8bm8v1zdkk60fyis67syf722vric9i8"; sha256 = "084n4x0ikhxh9h33cqyzr3ajxd9zm9x7lh2q8dv0i5jlyxyb1grf";
}; };
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
}; };
@ -3864,12 +3876,12 @@ final: prev:
nvim-dap-ui = buildVimPluginFrom2Nix { nvim-dap-ui = buildVimPluginFrom2Nix {
pname = "nvim-dap-ui"; pname = "nvim-dap-ui";
version = "2021-08-15"; version = "2021-08-22";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rcarriga"; owner = "rcarriga";
repo = "nvim-dap-ui"; repo = "nvim-dap-ui";
rev = "c9fc568ca157429cd76986ca2bfaa60488a7d2fb"; rev = "8f34bb2e4700d83a84402ec776d4d3336e0e63f9";
sha256 = "09jk0v2ki0hsy1m2hg3dwi66yaqn670vnjbbrbdxrq55n260gds3"; sha256 = "1lfrmi48vkkr92zfwzr5mbdczfw2w9lw04bvwnx77ir798lbp6mc";
}; };
meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";
}; };
@ -3912,24 +3924,24 @@ final: prev:
nvim-gps = buildVimPluginFrom2Nix { nvim-gps = buildVimPluginFrom2Nix {
pname = "nvim-gps"; pname = "nvim-gps";
version = "2021-08-22"; version = "2021-08-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "smiteshp"; owner = "smiteshp";
repo = "nvim-gps"; repo = "nvim-gps";
rev = "f365bc331c1fd752429427cdfed4aa142e9fc74f"; rev = "a4be468d8991840641c8db5cc6bbbffc3dafd79d";
sha256 = "1phzrw37y9gzcimy5r3phy2x53c9b2q5l3v5ipcx1k4q6pfkh026"; sha256 = "09mn8gysbs54bhicg9s52s87c472h10cmvi76fyljgxrkpbjssw3";
}; };
meta.homepage = "https://github.com/smiteshp/nvim-gps/"; meta.homepage = "https://github.com/smiteshp/nvim-gps/";
}; };
nvim-highlite = buildVimPluginFrom2Nix { nvim-highlite = buildVimPluginFrom2Nix {
pname = "nvim-highlite"; pname = "nvim-highlite";
version = "2021-08-21"; version = "2021-08-22";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Iron-E"; owner = "Iron-E";
repo = "nvim-highlite"; repo = "nvim-highlite";
rev = "dd827f091554065736105c72e1256d1fc8f4f445"; rev = "671869d981c47ccb2f7370145062a9cd9967d17b";
sha256 = "11jndab13dhd6pqzbd385awzhmxvzz68aza09qmfqkjvmcs1gy8c"; sha256 = "14fs6h79ccb0mp9mcllqz42pkqialvs7gwp83xlpgy0kphgksndf";
}; };
meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
}; };
@ -3984,12 +3996,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix { nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig"; pname = "nvim-lspconfig";
version = "2021-08-20"; version = "2021-08-22";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "neovim"; owner = "neovim";
repo = "nvim-lspconfig"; repo = "nvim-lspconfig";
rev = "9adbacf29835bf521a99a8d3f0b6f2157b1b9166"; rev = "5b0fa84ee35006e06142f98b8a5b28d79cfa5000";
sha256 = "0k4b6qsrvlgxr600x9wgkfdraqczx49zqyqfz88xf6pjbx0zyach"; sha256 = "0in0r3irawmgxp1prwryw3dpxj7gd6pviv14w8a7hnw1sd2g84l8";
}; };
meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
}; };
@ -5139,12 +5151,12 @@ final: prev:
sql-nvim = buildVimPluginFrom2Nix { sql-nvim = buildVimPluginFrom2Nix {
pname = "sql-nvim"; pname = "sql-nvim";
version = "2021-08-21"; version = "2021-08-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tami5"; owner = "tami5";
repo = "sql.nvim"; repo = "sql.nvim";
rev = "eb1f0512c3b781740090877b39bc9332c01edb46"; rev = "a0370391af2998e11c6320ba08a57d5a1827c0ed";
sha256 = "1dykwqv01fcf8k2q8fz7z4zgc9wh4v551b9mwm44n2lqzg35swzg"; sha256 = "13k9rdjwrmrv6vm2rn2b3ga02fcmig2ainllh8dxzpln3c3idwbp";
}; };
meta.homepage = "https://github.com/tami5/sql.nvim/"; meta.homepage = "https://github.com/tami5/sql.nvim/";
}; };
@ -5247,12 +5259,12 @@ final: prev:
symbols-outline-nvim = buildVimPluginFrom2Nix { symbols-outline-nvim = buildVimPluginFrom2Nix {
pname = "symbols-outline-nvim"; pname = "symbols-outline-nvim";
version = "2021-08-21"; version = "2021-08-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "simrat39"; owner = "simrat39";
repo = "symbols-outline.nvim"; repo = "symbols-outline.nvim";
rev = "40b7d5cbaa51c031061827c48e6a05748db7e91d"; rev = "6f376ef4ceb88ff7f0d9e3141dbe2a2e0854e785";
sha256 = "1mk4g1kgg2as3kk010wd9x2f4v60an68mqflpk97ng6a52laj5nw"; sha256 = "1882gb76hp4zpwyljrzl26qjwyyvnavhfv529nj5z5x41vyhsks5";
}; };
meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/"; meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/";
}; };
@ -5501,12 +5513,12 @@ final: prev:
telescope-nvim = buildVimPluginFrom2Nix { telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope-nvim"; pname = "telescope-nvim";
version = "2021-08-21"; version = "2021-08-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-telescope"; owner = "nvim-telescope";
repo = "telescope.nvim"; repo = "telescope.nvim";
rev = "8381a215e091dc9e1f6ad9ceaeadf35ef3cfed8f"; rev = "79dc995f820150d5de880c08e814af327ff7e965";
sha256 = "0cn1ynvva8nzjyrp285ficfa74wky0gikii2hysdi0g4ndnh6ypa"; sha256 = "0acyzc0k14dvd7j4ihvg84fz9lp1alwbf6qbnq083y6pd37mhj7b";
}; };
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
}; };
@ -5622,12 +5634,12 @@ final: prev:
toggleterm-nvim = buildVimPluginFrom2Nix { toggleterm-nvim = buildVimPluginFrom2Nix {
pname = "toggleterm-nvim"; pname = "toggleterm-nvim";
version = "2021-08-22"; version = "2021-08-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "akinsho"; owner = "akinsho";
repo = "toggleterm.nvim"; repo = "toggleterm.nvim";
rev = "5a4429d33cc8f286a0ad30b89084ec5284d6a652"; rev = "317caf587448fc8d42189d2dc27dab076857aeb0";
sha256 = "0rflwn9bbnffly5i66n3hxrf9cgbpqphqc2p6bjpxlyydda1vdx3"; sha256 = "1gl27njvik0dfg9412gwnqi6ar6nqhpfhliyjm5w96pxaa6xlafp";
}; };
meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/";
}; };
@ -6654,12 +6666,12 @@ final: prev:
vim-dadbod = buildVimPluginFrom2Nix { vim-dadbod = buildVimPluginFrom2Nix {
pname = "vim-dadbod"; pname = "vim-dadbod";
version = "2021-06-02"; version = "2021-08-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tpope"; owner = "tpope";
repo = "vim-dadbod"; repo = "vim-dadbod";
rev = "9e4fdb8ab029c0436728a96e1c92677737c2e784"; rev = "6f8b99868fd5560d6eb47f82ca76ec62e3d5ae78";
sha256 = "1rmiza1km214mvlrdaqycv5hk8ki35giab11b9ggwcigbh743h01"; sha256 = "0n1hvyv9555rgi3qajy3d59v1nqdwcrr0l4nqzc0pr0cg9q7d6g3";
}; };
meta.homepage = "https://github.com/tpope/vim-dadbod/"; meta.homepage = "https://github.com/tpope/vim-dadbod/";
}; };
@ -7170,12 +7182,12 @@ final: prev:
vim-fugitive = buildVimPluginFrom2Nix { vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive"; pname = "vim-fugitive";
version = "2021-08-22"; version = "2021-08-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tpope"; owner = "tpope";
repo = "vim-fugitive"; repo = "vim-fugitive";
rev = "5d1a276b455dd9a32375a5ac84050adff67062e3"; rev = "8cdb51622fbdbf780edff35ee22d74ad9983698e";
sha256 = "1bm3fwbg9nmdxpvaqrs31g88ij5b5wxip2s4j9v1i0c0w5jplxjn"; sha256 = "18073gnl90n7h8j3rk6shs79455svwa47n5jxyb44m1957hvzfgb";
}; };
meta.homepage = "https://github.com/tpope/vim-fugitive/"; meta.homepage = "https://github.com/tpope/vim-fugitive/";
}; };

View file

@ -193,6 +193,7 @@ google/vim-jsonnet
google/vim-maktaba google/vim-maktaba
gorkunov/smartpairs.vim gorkunov/smartpairs.vim
gotcha/vimelette gotcha/vimelette
gpanders/editorconfig.nvim
gregsexton/gitv gregsexton/gitv
gruvbox-community/gruvbox as gruvbox-community gruvbox-community/gruvbox as gruvbox-community
gu-fan/riv.vim gu-fan/riv.vim

Some files were not shown because too many files have changed in this diff Show more