3
0
Fork 0
forked from mirrors/nixpkgs

Merge master into haskell-updates

This commit is contained in:
github-actions[bot] 2022-07-30 00:13:25 +00:00 committed by GitHub
commit 093f236f30
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
197 changed files with 2762 additions and 7723 deletions

View file

@ -11,4 +11,5 @@
<xsl:param name="toc.section.depth" select="0" />
<xsl:param name="admon.style" select="''" />
<xsl:param name="callout.graphics.extension" select="'.svg'" />
<xsl:param name="generate.consistent.ids" select="1" />
</xsl:stylesheet>

View file

@ -16,6 +16,7 @@ rec {
isx86 = { cpu = { family = "x86"; }; };
isAarch32 = { cpu = { family = "arm"; bits = 32; }; };
isAarch64 = { cpu = { family = "arm"; bits = 64; }; };
isAarch = { cpu = { family = "arm"; }; };
isMips = { cpu = { family = "mips"; }; };
isMips32 = { cpu = { family = "mips"; bits = 32; }; };
isMips64 = { cpu = { family = "mips"; bits = 64; }; };

View file

@ -426,7 +426,9 @@ OK
</term>
<listitem>
<para>
You <emphasis>must</emphasis> set the option
You must select a boot-loader, either system-boot or
GRUB. The recommended option is systemd-boot: set the
option
<xref linkend="opt-boot.loader.systemd-boot.enable" />
to <literal>true</literal>.
<literal>nixos-generate-config</literal> should do this
@ -440,6 +442,23 @@ OK
<link linkend="opt-boot.loader.systemd-boot.enable"><literal>boot.loader.systemd-boot</literal></link>
as well.
</para>
<para>
If you want to use GRUB, set
<xref linkend="opt-boot.loader.grub.device" /> to
<literal>nodev</literal> and
<xref linkend="opt-boot.loader.grub.efiSupport" /> to
<literal>true</literal>.
</para>
<para>
With system-boot, you should not need any special
configuration to detect other installed systems. With
GRUB, set
<xref linkend="opt-boot.loader.grub.useOSProber" /> to
<literal>true</literal>, but this will only detect
windows partitions, not other linux distributions. If
you dual boot another linux distribution, use
system-boot instead.
</para>
</listitem>
</varlistentry>
</variablelist>

View file

@ -133,6 +133,14 @@
<link xlink:href="options.html#opt-services.infnoise.enable">services.infnoise</link>.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://github.com/jtroo/kanata">kanata</link>,
a tool to improve keyboard comfort and usability with advanced
customization. Available as
<link xlink:href="options.html#opt-services.kanata.enable">services.kanata</link>.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://github.com/aiberia/persistent-evdev">persistent-evdev</link>,

View file

@ -303,7 +303,8 @@ Use the following commands:
UEFI systems
: You *must* set the option [](#opt-boot.loader.systemd-boot.enable)
: You must select a boot-loader, either system-boot or GRUB. The recommended
option is systemd-boot: set the option [](#opt-boot.loader.systemd-boot.enable)
to `true`. `nixos-generate-config` should do this automatically
for new configurations when booted in UEFI mode.
@ -312,6 +313,15 @@ Use the following commands:
[`boot.loader.systemd-boot`](#opt-boot.loader.systemd-boot.enable)
as well.
: If you want to use GRUB, set [](#opt-boot.loader.grub.device) to `nodev` and
[](#opt-boot.loader.grub.efiSupport) to `true`.
: With system-boot, you should not need any special configuration to detect
other installed systems. With GRUB, set [](#opt-boot.loader.grub.useOSProber)
to `true`, but this will only detect windows partitions, not other linux
distributions. If you dual boot another linux distribution, use system-boot
instead.
If you need to configure networking for your machine the
configuration options are described in [](#sec-networking). In
particular, while wifi is supported on the installation image, it is

View file

@ -58,6 +58,10 @@ In addition to numerous new and upgraded packages, this release has the followin
- [infnoise](https://github.com/leetronics/infnoise), a hardware True Random Number Generator dongle.
Available as [services.infnoise](options.html#opt-services.infnoise.enable).
- [kanata](https://github.com/jtroo/kanata), a tool to improve keyboard comfort and usability with advanced customization.
Available as [services.kanata](options.html#opt-services.kanata.enable).
- [persistent-evdev](https://github.com/aiberia/persistent-evdev), a daemon to add virtual proxy devices that mirror a physical input device but persist even if the underlying hardware is hot-plugged. Available as [services.persistent-evdev](#opt-services.persistent-evdev.enable).
- [schleuder](https://schleuder.org/), a mailing list manager with PGP support. Enable using [services.schleuder](#opt-services.schleuder.enable).

View file

@ -447,6 +447,7 @@
./services/hardware/interception-tools.nix
./services/hardware/irqbalance.nix
./services/hardware/joycond.nix
./services/hardware/kanata.nix
./services/hardware/lcd.nix
./services/hardware/lirc.nix
./services/hardware/nvidia-optimus.nix

View file

@ -0,0 +1,156 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.kanata;
keyboard = {
options = {
device = mkOption {
type = types.str;
example = "/dev/input/by-id/usb-0000_0000-event-kbd";
description = "Path to the keyboard device.";
};
config = mkOption {
type = types.lines;
example = ''
(defsrc
grv 1 2 3 4 5 6 7 8 9 0 - = bspc
tab q w e r t y u i o p [ ] \
caps a s d f g h j k l ; ' ret
lsft z x c v b n m , . / rsft
lctl lmet lalt spc ralt rmet rctl)
(deflayer qwerty
grv 1 2 3 4 5 6 7 8 9 0 - = bspc
tab q w e r t y u i o p [ ] \
@cap a s d f g h j k l ; ' ret
lsft z x c v b n m , . / rsft
lctl lmet lalt spc ralt rmet rctl)
(defalias
;; tap within 100ms for capslk, hold more than 100ms for lctl
cap (tap-hold 100 100 caps lctl))
'';
description = ''
Configuration other than defcfg.
See <link xlink:href="https://github.com/jtroo/kanata"/> for more information.
'';
};
extraDefCfg = mkOption {
type = types.lines;
default = "";
example = "danger-enable-cmd yes";
description = ''
Configuration of defcfg other than linux-dev.
See <link xlink:href="https://github.com/jtroo/kanata"/> for more information.
'';
};
};
};
mkName = name: "kanata-${name}";
mkConfig = name: keyboard: pkgs.writeText "${mkName name}-config.kdb" ''
(defcfg
${keyboard.extraDefCfg}
linux-dev ${keyboard.device})
${keyboard.config}
'';
mkService = name: keyboard: nameValuePair (mkName name) {
description = "kanata for ${keyboard.device}";
# Because path units are used to activate service units, which
# will start the old stopped services during "nixos-rebuild
# switch", stopIfChanged here is a workaround to make sure new
# services are running after "nixos-rebuild switch".
stopIfChanged = false;
serviceConfig = {
ExecStart = ''
${cfg.package}/bin/kanata \
--cfg ${mkConfig name keyboard}
'';
DynamicUser = true;
SupplementaryGroups = with config.users.groups; [
input.name
uinput.name
];
# hardening
DeviceAllow = [
"/dev/uinput w"
"char-input r"
];
CapabilityBoundingSet = "";
DevicePolicy = "closed";
IPAddressDeny = "any";
LockPersonality = true;
MemoryDenyWriteExecute = true;
PrivateNetwork = true;
PrivateUsers = true;
ProcSubset = "pid";
ProtectClock = true;
ProtectControlGroups = true;
ProtectHome = true;
ProtectHostname = true;
ProtectKernelLogs = true;
ProtectKernelModules = true;
ProtectKernelTunables = true;
ProtectProc = "invisible";
RestrictAddressFamilies = "none";
RestrictNamespaces = true;
RestrictRealtime = true;
SystemCallArchitectures = "native";
SystemCallFilter = [
"@system-service"
"~@privileged"
"~@resources"
];
UMask = "0077";
};
};
mkPath = name: keyboard: nameValuePair (mkName name) {
description = "kanata trigger for ${keyboard.device}";
wantedBy = [ "multi-user.target" ];
pathConfig = {
PathExists = keyboard.device;
};
};
in
{
options.services.kanata = {
enable = mkEnableOption "kanata";
package = mkOption {
type = types.package;
default = pkgs.kanata;
defaultText = lib.literalExpression "pkgs.kanata";
example = lib.literalExpression "pkgs.kanata-with-cmd";
description = ''
kanata package to use.
If you enable danger-enable-cmd, pkgs.kanata-with-cmd should be used.
'';
};
keyboards = mkOption {
type = types.attrsOf (types.submodule keyboard);
default = { };
description = "Keyboard configurations.";
};
};
config = lib.mkIf cfg.enable {
hardware.uinput.enable = true;
systemd = {
paths = mapAttrs' mkPath cfg.keyboards;
services = mapAttrs' mkService cfg.keyboards;
};
};
meta.maintainers = with lib.maintainers; [ linj ];
}

View file

@ -48,9 +48,10 @@ in
freeformType = settingsFormat.type;
};
default = {
default = { };
defaultText = ''
metrics = {
wal_directory = "\${STATE_DIRECTORY}";
wal_directory = "\''${STATE_DIRECTORY}";
global.scrape_interval = "5s";
};
integrations = {
@ -59,8 +60,7 @@ in
node_exporter.enabled = true;
replace_instance_label = true;
};
};
'';
example = {
metrics.global.remote_write = [{
url = "\${METRICS_REMOTE_WRITE_URL}";
@ -104,6 +104,20 @@ in
};
config = mkIf cfg.enable {
services.grafana-agent.settings = {
# keep this in sync with config.services.grafana-agent.settings.defaultText.
metrics = {
wal_directory = mkDefault "\${STATE_DIRECTORY}";
global.scrape_interval = mkDefault "5s";
};
integrations = {
agent.enabled = mkDefault true;
agent.scrape_integration = mkDefault true;
node_exporter.enabled = mkDefault true;
replace_instance_label = mkDefault true;
};
};
systemd.services.grafana-agent = {
wantedBy = [ "multi-user.target" ];
script = ''

View file

@ -19,7 +19,8 @@ in
./evilwm.nix
./exwm.nix
./fluxbox.nix
./fvwm.nix
./fvwm2.nix
./fvwm3.nix
./herbstluftwm.nix
./i3.nix
./jwm.nix

View file

@ -1,41 +0,0 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.xserver.windowManager.fvwm;
fvwm = pkgs.fvwm.override { enableGestures = cfg.gestures; };
in
{
###### interface
options = {
services.xserver.windowManager.fvwm = {
enable = mkEnableOption "Fvwm window manager";
gestures = mkOption {
default = false;
type = types.bool;
description = "Whether or not to enable libstroke for gesture support";
};
};
};
###### implementation
config = mkIf cfg.enable {
services.xserver.windowManager.session = singleton
{ name = "fvwm";
start =
''
${fvwm}/bin/fvwm &
waitPID=$!
'';
};
environment.systemPackages = [ fvwm ];
};
}

View file

@ -0,0 +1,47 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.xserver.windowManager.fvwm2;
fvwm2 = pkgs.fvwm2.override { enableGestures = cfg.gestures; };
in
{
imports = [
(mkRenamedOptionModule
[ "services" "xserver" "windowManager" "fvwm" ]
[ "services" "xserver" "windowManager" "fvwm2" ])
];
###### interface
options = {
services.xserver.windowManager.fvwm2 = {
enable = mkEnableOption "Fvwm2 window manager";
gestures = mkOption {
default = false;
type = types.bool;
description = "Whether or not to enable libstroke for gesture support";
};
};
};
###### implementation
config = mkIf cfg.enable {
services.xserver.windowManager.session = singleton
{ name = "fvwm2";
start =
''
${fvwm2}/bin/fvwm &
waitPID=$!
'';
};
environment.systemPackages = [ fvwm2 ];
};
}

View file

@ -0,0 +1,35 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.xserver.windowManager.fvwm3;
inherit (pkgs) fvwm3;
in
{
###### interface
options = {
services.xserver.windowManager.fvwm3 = {
enable = mkEnableOption "Fvwm3 window manager";
};
};
###### implementation
config = mkIf cfg.enable {
services.xserver.windowManager.session = singleton
{ name = "fvwm3";
start =
''
${fvwm3}/bin/fvwm3 &
waitPID=$!
'';
};
environment.systemPackages = [ fvwm3 ];
};
}

View file

@ -35,13 +35,13 @@
stdenv.mkDerivation rec {
pname = "easyeffects";
version = "6.2.6";
version = "6.2.8";
src = fetchFromGitHub {
owner = "wwmm";
repo = "easyeffects";
rev = "v${version}";
sha256 = "sha256-1kXYh2Qk0Wj0LgHTcRVAKro7LAPV/UM5i9VmHjmxTx0=";
sha256 = "sha256-iADECt0m74Irm3JEQgZVLCr6Z2SKATAh9SvPwzd7HCo=";
};
nativeBuildInputs = [

View file

@ -2,11 +2,11 @@
let
pname = "ledger-live-desktop";
version = "2.44.0";
version = "2.45.0";
src = fetchurl {
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
hash = "sha256-STUkvQ22WnMm8AApz9zjfNeFXhtEUsl/OJIZkFgkd5s=";
hash = "sha256-jw4ocBtyxhPhI2GnhL9tbduY4iIQK53vUHB64qSGXKI=";
};
appimageContents = appimageTools.extractType2 {

View file

@ -0,0 +1,42 @@
From 14635f8a87423f7682e22c4d4bc34551cfe1d10d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 30 Jun 2022 07:33:44 +0000
Subject: [PATCH] make near-test-contracts optional
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
---
Cargo.lock | 1 -
tools/state-viewer/Cargo.toml | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index e1d8b2a83..3317587f5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5253,7 +5253,6 @@ dependencies = [
"near-primitives",
"near-primitives-core",
"near-store",
- "near-test-contracts",
"nearcore",
"node-runtime",
"once_cell",
diff --git a/tools/state-viewer/Cargo.toml b/tools/state-viewer/Cargo.toml
index 02346bf71..51cfc4cb5 100644
--- a/tools/state-viewer/Cargo.toml
+++ b/tools/state-viewer/Cargo.toml
@@ -30,7 +30,7 @@ near-network = { path = "../../chain/network" }
near-primitives = { path = "../../core/primitives" }
near-primitives-core = { path = "../../core/primitives-core" }
near-store = { path = "../../core/store" }
-near-test-contracts = { path = "../../runtime/near-test-contracts" }
+#near-test-contracts = { path = "../../runtime/near-test-contracts" }
nearcore = { path = "../../nearcore" }
node-runtime = { path = "../../runtime/runtime" }
--
2.36.1

View file

@ -4,7 +4,7 @@
}:
rustPlatform.buildRustPackage rec {
pname = "nearcore";
version = "1.27.0";
version = "1.28.0";
# https://github.com/near/nearcore/tags
src = fetchFromGitHub {
@ -12,10 +12,12 @@ rustPlatform.buildRustPackage rec {
repo = "nearcore";
# there is also a branch for this version number, so we need to be explicit
rev = "refs/tags/${version}";
sha256 = "sha256-B9HqUa0mBSvsCPzxPt4NqpV99rV4lmQ9Q/z9lxob9oM=";
sha256 = "sha256-DRVlD74XTYgy3GeUd/7OIl2aie8nEJLmrmmkwPRkrA8=";
};
cargoSha256 = "sha256-6GIt3J6y/O8XaHQJKRSPRgK2XbghMLif4e2Btdww9Ng=";
cargoSha256 = "sha256-hTqje17EdVkgqReuLnizaK3cBJuqXJXC6x5NuoKJLbs=";
cargoPatches = [ ./0001-make-near-test-contracts-optional.patch ];
postPatch = ''
substituteInPlace neard/build.rs \

View file

@ -38,13 +38,13 @@ let
in
stdenv.mkDerivation rec {
pname = "cudatext";
version = "1.167.0";
version = "1.167.5";
src = fetchFromGitHub {
owner = "Alexey-T";
repo = "CudaText";
rev = version;
sha256 = "sha256-cK96lcncSojEcQrZIPiJ9j9F4cIcaXvWNI9wuR3tVBU=";
sha256 = "sha256-sCqzVXBB2BClepD6+mrHw3GmFh17W0RVp4yTuNO4M3w=";
};
postPatch = ''

View file

@ -16,8 +16,8 @@
},
"ATSynEdit": {
"owner": "Alexey-T",
"rev": "2022.07.18",
"sha256": "sha256-3ae1XAGu+4p+EVReH7VZZOTOwOu5juybPXjK7XN16CQ="
"rev": "2022.07.22",
"sha256": "sha256-Uw5opguC49FjnklL6RTgxCz+9BwBDJDjqsUXS1sWs9M="
},
"ATSynEdit_Cmp": {
"owner": "Alexey-T",
@ -26,13 +26,13 @@
},
"EControl": {
"owner": "Alexey-T",
"rev": "2022.06.14",
"sha256": "sha256-P21Tb/hhQvXvT3LhM3lw4B0joQ2cFxsOXjljKaut6OM="
"rev": "2022.07.20",
"sha256": "sha256-pCIt21m34BuDbWLn+CQwqsMQHVWHtctME63Bjx1B9hE="
},
"ATSynEdit_Ex": {
"owner": "Alexey-T",
"rev": "2022.06.14",
"sha256": "sha256-Kcl3y5SN9DKUDL3ozjMrlsObsMVtGuU5iWrpLoMbPz4="
"rev": "2022.07.20",
"sha256": "sha256-f/BdOMcx7NTpKgaFTz4MbK3O0GcUepyMPyRdhnZImjU="
},
"Python-for-Lazarus": {
"owner": "Alexey-T",

View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "jove";
version = "4.17.3.7";
version = "4.17.4.6";
src = fetchFromGitHub {
owner = "jonmacs";
repo = "jove";
rev = version;
sha256 = "sha256-fD87FIWZlfJE2tVX+0QaiGGqu+tJFHheXe1guJR/Hxg=";
sha256 = "sha256-UCjqF0i43TSvtG5uxb2SA/F9oGBeo/WdEVJlrSSHV8g=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -10,12 +10,12 @@
stdenv.mkDerivation rec {
pname = "authy";
# curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/authy?channel=stable' | jq '.download_url,.version'
version = "2.2.0";
rev = "10";
version = "2.2.1";
rev = "11";
src = fetchurl {
url = "https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_${rev}.snap";
sha256 = "sha256-sB9/fVV/qp+DfjxpvzIUHsLkeEu35i2rEv1/JYMytG8=";
sha256 = "sha256-/a0pMXVd7mEp7oaN2mBIJv5uOv1zQ3gvfgiz1XL9ZmM=";
};
nativeBuildInputs = [ autoPatchelfHook makeWrapper squashfsTools ];

View file

@ -0,0 +1,38 @@
{ lib, buildGoModule, installShellFiles, fetchFromGitHub }:
buildGoModule rec {
pname = "gum";
version = "0.1.0";
src = fetchFromGitHub {
owner = "charmbracelet";
repo = pname;
rev = "v${version}";
sha256 = "sha256-od0jJPfvczlru9hhO8ravGou6yYP91L2k37NYm2hD+k=";
};
vendorSha256 = "sha256-uX0CQRqrM0/fj14owcUUpYph2j5ZwJITG53na31N6kg=";
nativeBuildInputs = [
installShellFiles
];
ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];
postInstall = ''
$out/bin/gum man > gum.1
installManPage gum.1
installShellCompletion --cmd gum \
--bash <($out/bin/gum completion bash) \
--fish <($out/bin/gum completion fish) \
--zsh <($out/bin/gum completion zsh)
'';
meta = with lib; {
description = "Tasty Bubble Gum for your shell";
homepage = "https://github.com/charmbracelet/gum";
changelog = "https://github.com/charmbracelet/gum/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ maaslalani ];
};
}

View file

@ -4,14 +4,14 @@
}:
stdenv.mkDerivation rec {
version = "0.8.2";
version = "0.8.3";
pname = "gummi";
src = pkgs.fetchFromGitHub {
owner = "alexandervdm";
repo = "gummi";
rev = version;
sha256 = "sha256-7txAyzJrEoGPjchXstMWIF1Vy+aoba6aa6+JNUYnKQs=";
sha256 = "sha256-71n71KjLmICp4gznd27NlbyA3kayje3hYk/cwkOXEO0=";
};
nativeBuildInputs = [

View file

@ -1,4 +1,5 @@
{ lib
, fetchpatch
, python3Packages
, fetchFromGitHub
, wrapQtAppsHook
@ -9,15 +10,37 @@ with python3Packages;
buildPythonApplication rec {
pname = "inkcut";
version = "2.1.3";
version = "2.1.5";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "0px0xdv6kyzkkpmvryrdfavv1qy2xrqdxkpmhvx1gj649xcabv32";
rev = "refs/tags/v${version}";
sha256 = "sha256-S5IrNWVoUp1w+P7DrKlOUOyY3Q16CHSct9ndZOB3UpU=";
};
patches = [
# fix opening the extension on inkscape 1.2
# https://github.com/inkcut/inkcut/pull/340
(fetchpatch {
url = "https://github.com/inkcut/inkcut/commit/d5d5d0ab3c588c576b668f4c7b07a10609ba2fd0.patch";
hash = "sha256-szfiOujuV7OOwYK/OU51m9FK6dzkbWds+h0cr5dGIg4=";
})
# fix loading a document from stdin (as used from the extension)
# https://github.com/inkcut/inkcut/issues/341
(fetchpatch {
url = "https://github.com/inkcut/inkcut/commit/748ab4157f87afec37dadd715094e87d02c9c739.patch";
hash = "sha256-ZGiwZru2bUYu749YSz5vxmGwLTAoYIAsafcX6PmdbYo=";
revert = true;
})
# fix distutils deprecation error
# https://github.com/inkcut/inkcut/pull/343
(fetchpatch {
url = "https://github.com/inkcut/inkcut/commit/9fb95204981bcc51401a1bc10caa02d1fae0d6cb.patch";
hash = "sha256-nriys7IWPGykZjVz+DIDsE9Tm40DewkHQlIUaxFwtzM=";
})
];
postPatch = ''
substituteInPlace inkcut/device/transports/printer/plugin.py \
--replace ", 'lpr', " ", '${cups}/bin/lpr', "
@ -53,7 +76,7 @@ buildPythonApplication rec {
];
dontWrapQtApps = true;
makeWrapperArgs = [ "\${qtWrapperArgs[@]}" ];
makeWrapperArgs = [ "--unset" "PYTHONPATH" "\${qtWrapperArgs[@]}" ];
postInstall = ''
mkdir -p $out/share/inkscape/extensions

View file

@ -13,13 +13,13 @@
mkDerivation rec {
pname = "k4dirstat";
version = "3.3.0";
version = "3.4.0";
src = fetchFromGitHub {
owner = "jeromerobert";
repo = pname;
rev = version;
hash = "sha256-KLvWSDv4x0tMhAPqp8yNQed2i7R0MPbvadHddSJ1Nx4=";
hash = "sha256-+JhMSatgCunzxIVSYIzt1L7O36LYbcFw7vmokgNffPY=";
};
nativeBuildInputs = [ extra-cmake-modules ];

View file

@ -11,14 +11,14 @@
rustPlatform.buildRustPackage rec {
pname = "leetcode-cli";
version = "0.3.10";
version = "0.3.11";
src = fetchCrate {
inherit pname version;
sha256 = "SkJLA49AXNTpiWZByII2saYLyN3bAAJTlCvhamlOEXA=";
sha256 = "sha256-DHtIhiRPRGuO6Rf1d9f8r0bMOHqAaJleUvYNyPiX6mc=";
};
cargoSha256 = "xhKF4qYOTdt8iCSPY5yT8tH3l54HdkOAIS2SBGzqsdo=";
cargoSha256 = "sha256-Suk/nQ+JcoD9HO9x1lYp+p4qx0DZ9dt0p5jPz0ZQB+k=";
nativeBuildInputs = [
pkg-config

View file

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, pythonPackages }:
stdenv.mkDerivation rec {
version = "0.7.8";
version = "0.7.9";
pname = "mwic";
src = fetchurl {
url = "https://github.com/jwilk/mwic/releases/download/${version}/${pname}-${version}.tar.gz";
sha256 = "0nnhziz9v523hpciylnxfajmxabh2ig5iawzwrfpf7aww70v330x";
sha256 = "sha256-i7DSvUBUMOvn2aYpwYOCDHKq0nkleknD7k2xopo+C5s=";
};
makeFlags=["PREFIX=\${out}"];

View file

@ -19,13 +19,13 @@
mkDerivation rec {
pname = "organicmaps";
version = "2022.06.29-3";
version = "2022.07.27-3";
src = fetchFromGitHub {
owner = "organicmaps";
repo = "organicmaps";
rev = "${version}-android";
sha256 = "sha256-/K3bxnb6y+9nEuGvoIpPl218xmNqjOWgpV8hQ/W12ZA=";
sha256 = "sha256-nn24SWyTm8hhj3KrIJWIeOVotV3wn3l7CQopnSCVrX4=";
fetchSubmodules = true;
};

View file

@ -12,21 +12,15 @@ python3.pkgs.buildPythonApplication rec {
# PyPI has old alpha version. Since then the project has switched from using a
# seemingly abandoned D-Bus package pydbus and started using maintained
# dbus-next. So let's use latest from GitHub.
version = "unstable-2022-03-21";
version = "unstable-2022-07-18";
src = fetchFromGitHub {
owner = "mdellweg";
repo = "pass_secret_service";
rev = "149f8557e07098eee2f46561eea61e83255ac59b";
sha256 = "sha256-+/pFi6+K8rl0Ihm6cp/emUQVtau6+Apl8/VEr9AI0Xs=";
rev = "fadc09be718ae1e507eeb8719f3a2ea23edb6d7a";
hash = "sha256-lrNU5bkG4/fMu5rDywfiI8vNHyBsMf/fiWIeEHug03c=";
};
patches = [
# Only needed until https://github.com/mdellweg/pass_secret_service/pull/30
# is merged.
./int_from_bytes-deprecation-fix.patch
];
# Need to specify session.conf file for tests because it won't be found under
# /etc/ in check phase.
postPatch = ''

View file

@ -1,22 +0,0 @@
--- a/pass_secret_service/interfaces/session.py
+++ b/pass_secret_service/interfaces/session.py
@@ -4,7 +4,6 @@
import os
import hmac
from hashlib import sha256
-from cryptography.utils import int_from_bytes
from cryptography.hazmat.backends import default_backend
from cryptography.hazmat.primitives.ciphers import Cipher
from cryptography.hazmat.primitives.ciphers.modes import CBC
@@ -27,9 +26,9 @@ class Session(ServiceInterface, SerialMixin):
@classmethod
@run_in_executor
def _create_dh(cls, input):
- priv_key = int_from_bytes(os.urandom(0x80), "big")
+ priv_key = int.from_bytes(os.urandom(0x80), "big")
pub_key = pow(2, priv_key, dh_prime)
- shared_secret = pow(int_from_bytes(input, "big"), priv_key, dh_prime)
+ shared_secret = pow(int.from_bytes(input, "big"), priv_key, dh_prime)
salt = b"\x00" * 0x20
shared_key = hmac.new(salt, shared_secret.to_bytes(0x80, "big"), sha256).digest()
aes_key = hmac.new(shared_key, b"\x01", sha256).digest()[:0x10]

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "snixembed";
version = "0.3.1";
version = "0.3.3";
src = fetchFromSourcehut {
owner = "~steef";
repo = pname;
rev = version;
sha256 = "0yy1i4463q43aq98qk4nvvzpw4i6bid2bywwgf6iq545pr3glfj5";
sha256 = "sha256-co32Xlklg6KVyi+xEoDJ6TeN28V+wCSx73phwnl/05E=";
};
nativeBuildInputs = [ pkg-config vala ];

View file

@ -0,0 +1,43 @@
{ lib
, stdenv
, fetchFromSourcehut
, meson
, ninja
, pkg-config
, wayland
, pango
, wayland-protocols
, conf ? null
}:
let
# There is a configuration in src/config.def.hpp, which we use by default
configFile = if lib.isDerivation conf || builtins.isPath conf then conf else "src/config.def.hpp";
in
stdenv.mkDerivation rec {
pname = "somebar";
version = "1.0.0";
src = fetchFromSourcehut {
owner = "~raphi";
repo = "somebar";
rev = "${version}";
sha256 = "sha256-snCW7dC8JI/pg1+HLjX0JXsTzwa3akA6rLcSNgKLF0c=";
};
nativeBuildInputs = [ meson ninja pkg-config ];
buildInputs = [ pango wayland wayland-protocols ];
prePatch = ''
cp ${configFile} src/config.hpp
'';
meta = with lib; {
homepage = "https://git.sr.ht/~raphi/somebar";
description = "dwm-like bar for dwl";
license = licenses.mit;
maintainers = with maintainers; [ magnouvean ];
platforms = platforms.linux;
};
}

View file

@ -1,11 +1,11 @@
{
"packageVersion": "102.0.1-1",
"packageVersion": "103.0-3",
"source": {
"rev": "102.0.1-1",
"sha256": "10f9gngn04nwrhcqkdznx7209c4javscqz8arswyrn4c8rc5x6w5"
"rev": "103.0-3",
"sha256": "1d8qh0s5zjh10cyyawpvr7ywygg1ibh1r0rx0vnqv1qakj3y4jcq"
},
"firefox": {
"version": "102.0.1",
"sha512": "a930d359fb81e473b963a93f6db5110871e9fd57f6d0f352513047d363d930dd4811e8dd786c2f6f3541c3871eb1c0169b718652d9ee076fd13a20f52af30417"
"version": "103.0",
"sha512": "016c2f276fb94e5174626f7d8b1a821b2de0f5a07f8a10f00a7ea4d4285591b0c23dd3ef45306579de79b3dfa99ccc527224c33f3319f61cf088b1f4bd097f9e"
}
}

View file

@ -32,14 +32,15 @@
stdenv.mkDerivation rec {
pname = "calls";
version = "41.1";
version = "42.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = pname;
rev = version;
sha256 = "1vbw9x5s3ww11f3lnqivc74rjlmi9fk1hzaq1idrdcck3gvif0h8";
fetchSubmodules = true;
hash = "sha256-ASKK9PB5FAD10CR5O+L2WgMjCzmIalithHL8jV0USiM=";
};
outputs = [ "out" "devdoc" ];

View file

@ -1,9 +1,9 @@
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
let
version = "0.31.4";
sha256 = "182h6is1kq3yc7il1a0xr5mbrsn3z900dkzxb4m79gl5lsrpb1vm";
manifestsSha256 = "0h37ydgykl5kc50zwqn8xyi89aby75937cqaiw1hkpnw9ilc0akz";
version = "0.31.5";
sha256 = "0dv34y79229n63i5as0qxf3lmlsfyk8p277i09hrq1vn86wnjdm7";
manifestsSha256 = "1p5f05lgbv2hhl5dbank2mmhmhlkxn1rfnh09x02j22ldrvk3zzl";
manifests = fetchzip {
url =
@ -23,7 +23,7 @@ in buildGoModule rec {
inherit sha256;
};
vendorSha256 = "sha256-2DeX5si2yVh1C+ikkg9xEpcf2trEBr0qPp+9fgbMfO4=";
vendorSha256 = "sha256-bTvVf6fsrWLayOwwxBo2iOz5Di4dHEiV45uGkAyWrMU=";
postUnpack = ''
cp -r ${manifests} source/cmd/flux/manifests

View file

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "k0sctl";
version = "0.13.0";
version = "0.13.1";
src = fetchFromGitHub {
owner = "k0sproject";
repo = pname;
rev = "v${version}";
sha256 = "sha256-A50PbZTgv0EfL5aqTiTEOdfRXUgKGzTsRIiMgXItkxI=";
sha256 = "sha256-1SlVGQLU/7UmcvyKD/BaJSBCdOWACteQtR2Os4THPaU=";
};
vendorSha256 = "sha256-2i6SoixE5RitRuJpOU4LdzN9JY/76c3mjsbsXlQp854=";
vendorSha256 = "sha256-vTcFJ7L8FW0IZBNarje/Oc3+jSRMga8+/nPLvqus2vY=";
ldflags = [
"-s"

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kconf";
version = "1.11.0";
version = "1.12.0";
src = fetchFromGitHub {
owner = "particledecay";
repo = "kconf";
rev = "v${version}";
sha256 = "sha256-V+B1vqI/MLASqEy6DZiB71h7EkUfrxVKIMxriRK6pyY=";
sha256 = "sha256-aEZTwXccKZDXRNWr4XS2ZpqtEnNGbsIVau8zPvaHTkk=";
};
vendorSha256 = "sha256-Fq3V3vYaofB0TWt3t7uW1Dd7MlwMvh8RaRVpdq9XZh4=";
vendorSha256 = "sha256-7mzk2OP1p8FfRsbs4B6XP/szBeckm7Q7hf8AkbZUG2Q=";
ldflags = [
"-s" "-w" "-X github.com/particledecay/kconf/build.Version=${version}"

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "krelay";
version = "0.0.2";
version = "0.0.4";
src = fetchFromGitHub {
owner = "knight42";
repo = pname;
rev = "v${version}";
sha256 = "sha256-7P+pGiML/1aZEpYAWtAPEhrBAo8e8ATcemrH8tD73w8=";
sha256 = "sha256-NAIRzHWXD4z6lpwi+nVVoCIzfWdaMdrWwht24KgQh3c=";
};
vendorSha256 = "sha256-PrL3GYP5K6ZaSAShwuDQA7WfOVJeQraxZ8jrtnajR9g=";
vendorSha256 = "sha256-1/zy5gz1wvinwzRjjhvrIHdjO/Jy/ragqM5QQaAajXI=";
subPackages = [ "cmd/client" ];

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kubectl-tree";
version = "0.4.1";
version = "0.4.2";
src = fetchFromGitHub {
owner = "ahmetb";
repo = pname;
rev = "v${version}";
sha256 = "sha256-5+INUr7ewSJrFwdhDgdrRu+xDB3FkWRjWbbVJO8cgkc=";
sha256 = "sha256-tE3ujknd7GDjTPIzZaL1Ynm6F9tJI/R1u2l0nCttjrI=";
};
vendorSha256 = "sha256-/GLzIoFHXpTmY2601zA83tB2V2XS0rWy1bEDQ6P6D8k=";
vendorSha256 = "sha256-EQEsOJ/IZoR+9CjfFtQmBGeUXgmtACDvvpKCgnep+go=";
meta = with lib; {
description = "kubectl plugin to browse Kubernetes object hierarchies as a tree";

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kubedb-cli";
version = "0.25.0";
version = "0.27.0";
src = fetchFromGitHub {
owner = "kubedb";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-hRLju3nVLy0eDgqGeReHaF8p7oOlpo1T0IbLq4h/uwg=";
sha256 = "sha256-1mxSW1mL2GwVfyh6QfybCRL0GTO4kVyck1Uhjjfo7Wo=";
};
vendorSha256 = null;

View file

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "kubeone";
version = "1.4.0";
version = "1.4.5";
src = fetchFromGitHub {
owner = "kubermatic";
repo = "kubeone";
rev = "v${version}";
sha256 = "sha256-uij5daVHKIfxx+8UTmU/HKSbf/RTRFuO8mCQdsC80qI=";
sha256 = "sha256-2+67ctiFkEV4UU7vcF/s+qJWDpdzSRaiy9pa9zt+ccA=";
};
vendorSha256 = "sha256-kI5i1us3Ooh603HOz9Y+HlfPUy/1J8z89/jvKEenpLw=";

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kyverno";
version = "1.7.1";
version = "1.7.2";
src = fetchFromGitHub {
owner = "kyverno";
repo = "kyverno";
rev = "v${version}";
sha256 = "sha256-MHEVGJNuZozug0l+V1bRIykOe5PGA3aU3wfBV2TH/Lo=";
sha256 = "sha256-Lx+ae0Eb8iVKurXpsb3NPTFrh59vxxf4fA18o1JTIv0=";
};
ldflags = [
@ -18,7 +18,7 @@ buildGoModule rec {
"-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00"
];
vendorSha256 = "sha256-DUe1cy6PgI5qiB9BpDJxnTlBFuy/BmyqCoxRo7Ums1I=";
vendorSha256 = "sha256-bpuEEoWobFPVsNZKKuOKTQGvV+/NAgaM4M63bv5y0Rk=";
subPackages = [ "cmd/cli/kubectl-kyverno" ];

View file

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "nerdctl";
version = "0.20.0";
version = "0.22.0";
src = fetchFromGitHub {
owner = "containerd";
repo = pname;
rev = "v${version}";
sha256 = "sha256-5bigfsig2LkZoLUlA6764ttG85CNi6rmOgQck+/zc5c=";
sha256 = "sha256-XsAAhSJPb/ZpZb6x0c/soFI8FPrZhX6U76rDQs1Sw04=";
};
vendorSha256 = "sha256-Ei4L35/RN2en7gOUzvGflBivTlBy2YnUvTHqcCe5HN4=";
vendorSha256 = "sha256-kpEdskjmRLM8TpjX6z19E8iG+wwI0vfULNWbPgeW3YM=";
nativeBuildInputs = [ makeWrapper installShellFiles ];

View file

@ -5,17 +5,17 @@
buildGoModule rec {
pname = "nomad-pack";
version = "2022-05-12";
rev = "bee6e8e078ff31fee916b864fbf3648294dbcdf5";
version = "0.0.1-techpreview.3";
rev = "3b4163b3b826c8408ae824238daaa45307d03380";
src = fetchFromGitHub {
owner = "hashicorp";
repo = pname;
inherit rev;
sha256 = "sha256-28Dx9z7T+4WXl4voAzlSR2h3HcZMSzOuX7FHLJ4q9Sc=";
sha256 = "sha256-Br+BJRAo9qSJQjg2awQTnsYz76WReVWsTUw6XoUb1YY=";
};
vendorSha256 = "sha256-hPsO842gmk77qc27slV2TiYNI7Ofw1RqGgcLP1gdgJ0=";
vendorSha256 = "sha256-dUPDwKdkBXBfyfbFxrpgHwZ0Q5jB7aamClNmv+tLCGA=";
# skip running go tests as they require network access
doCheck = false;

View file

@ -22,11 +22,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "gajim";
version = "1.4.6";
version = "1.4.7";
src = fetchurl {
url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz";
sha256 = "sha256-iiZ2Nv6voq67+OJ26hk+3JQSKevx9ti8s6DreSAsQk8=";
sha256 = "sha256-GkgHvzo0sxBIgk5P/3Yr0eFiL0ZOc6QmwJaE3Ck2hPM=";
};
buildInputs = [

View file

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "signal-cli";
version = "0.10.8";
version = "0.10.9";
# Building from source would be preferred, but is much more involved.
src = fetchurl {
url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}-Linux.tar.gz";
sha256 = "sha256-vZBFYPim/qBC8hJHvp5gK6P2JxIs9rzR/hIMjW3kNM8=";
sha256 = "sha256-2XmEUMx222yseewpiJY2rvc+JIMo7ROw3NA/4WIJnm4=";
};
buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ];

View file

@ -9,7 +9,7 @@
stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "5.50.0"; # Please backport all updates to the stable channel.
version = "5.52.0"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "sha256-3/a0+FTRSI7MdI/4mAhKl/KEBoEM1rqTUUWTpNFJTSA=";
sha256 = "sha256-KFldVpKICRX2n/ccvqxpt1Dz6QwH2g+wqXRHAXI/iyY=";
};
nativeBuildInputs = [

View file

@ -73,7 +73,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkg-config cmake ninja yasm ];
buildInputs = [
propagatedBuildInputs = [
libjpeg
openssl
libopus
@ -120,13 +120,5 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
propagatedBuildInputs = [
# Required for linking downstream binaries.
abseil-cpp
openh264
usrsctp
libvpx
];
meta.license = lib.licenses.bsd3;
}

View file

@ -3,12 +3,12 @@ electron, libsecret }:
stdenv.mkDerivation rec {
pname = "tutanota-desktop";
version = "3.95.4";
version = "3.98.15";
src = fetchurl {
url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/${pname}-${version}-unpacked-linux.tar.gz";
name = "tutanota-desktop-${version}.tar.gz";
sha256 = "0kkkp0nw4fby4663w7g0k2y1sg89pm336slzii1s3n70h8cak3dx";
sha256 = "sha256-yuSFDLQ7ckuZYuXREbW0VvMapzO2VhVIH1Ccr1uQHmo=";
};
nativeBuildInputs = [

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "nali";
version = "0.4.2";
version = "0.5.0";
src = fetchFromGitHub {
owner = "zu1k";
repo = "nali";
rev = "v${version}";
sha256 = "sha256-7NUUX4hDwvMBBQvxiB7P/lNHKgxwOFObdD6DUd0vX5c=";
sha256 = "sha256-rK+UKECwG+2WcltV4zhODSFZ1EGkmLTBggLgKGMCAGI=";
};
vendorSha256 = "sha256-Ld5HehK5MnPwl6KtIl0b4nQRiXO4DjKVPL1iti/WBIQ=";
vendorSha256 = "sha256-pIJsCBevCVMg6NXc96f6hAbFK5VKwjFwCe34A+54NW8=";
subPackages = [ "." ];
meta = with lib; {

View file

@ -26,7 +26,7 @@
mkDerivation rec {
pname = "nextcloud-client";
version = "3.5.2";
version = "3.5.3";
outputs = [ "out" "dev" ];
@ -34,7 +34,7 @@ mkDerivation rec {
owner = "nextcloud";
repo = "desktop";
rev = "v${version}";
sha256 = "sha256-lNsAdYErd3m1bNhvSDVJ5Rfqt8lutNJ1+2DCmntL6pM=";
sha256 = "sha256-J6ukQ29DpCgmX9MF+evWXAy3usl0xB/xv4inBPS8nQI=";
};
patches = [

View file

@ -0,0 +1,22 @@
{ lib, fetchFromGitHub, buildGoModule }:
buildGoModule {
pname = "tcping-go";
version = "unstable-2022-05-28";
src = fetchFromGitHub {
owner = "cloverstd";
repo = "tcping";
rev = "83f644c761819f7c4386f0645cd0a337eccfc62e";
sha256 = "sha256-GSkNfaGMJbBqDg8DKhDtLAuUg1yF3FbBdxcf4oG50rI=";
};
vendorSha256 = "sha256-Q+aFgi7GCAn3AxDuGtRG4DdPhI7gQKEo7A9iu1YcTsQ=";
meta = with lib; {
description = "Ping over TCP instead of ICMP, written in Go";
homepage = "https://github.com/cloverstd/tcping";
license = licenses.mit;
maintainers = with maintainers; [ bcdarwin ];
};
}

View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "opensmt";
version = "2.3.1";
version = "2.4.1";
src = fetchFromGitHub {
owner = "usi-verification-and-security";
repo = "opensmt";
rev = "v${version}";
sha256 = "sha256-3F4Q/ZWlgkiiW7QVjnaaDLSNLVdfAOSmwYdQo1v9Lv4=";
sha256 = "sha256-Hy+NCR0gbU06WnfIyKy6XTH94vd0CevwGbZ7KlXVvIQ=";
};
nativeBuildInputs = [ cmake bison flex ];

View file

@ -1,13 +0,0 @@
diff --git a/src/sage/misc/sagedoc.py b/src/sage/misc/sagedoc.py
index 08c4225b87..3a9bbe4ed0 100644
--- a/src/sage/misc/sagedoc.py
+++ b/src/sage/misc/sagedoc.py
@@ -1402,6 +1402,8 @@ class _sage_doc:
sage: identity_matrix.__doc__ in browse_sage_doc(identity_matrix, 'rst')
True
sage: browse_sage_doc(identity_matrix, 'html', False) # optional - sphinx sagemath_doc_html
+ ...
+ FutureWarning: The configuration setting "embed_images" will be removed in Docutils 1.2. Use "image_loading: link".
'...div...File:...Type:...Definition:...identity_matrix...'
In the 'text' version, double colons have been replaced with

View file

@ -112,22 +112,27 @@ stdenv.mkDerivation rec {
# adapted from https://trac.sagemath.org/ticket/23712#comment:22
./patches/tachyon-renamed-focallength.patch
# docutils 0.18.1 now triggers Sphinx warnings. tolerate them for
# now, because patching Sphinx is not feasible. remove when Sphinx
# 5.0 hits nixpkgs.
# https://github.com/sphinx-doc/sphinx/pull/10372
./patches/docutils-0.18.1-deprecation.patch
(fetchSageDiff {
name = "eclib-20220621-update.patch";
base = "9.7.beta4";
rev = "9b65d73399b33043777ba628a4d318638aec6e0e";
sha256 = "sha256-pcb9Q9a0ROCZTyfT7TRMtgEqCom8SgrtAaZ8ATgeqVI=";
})
# https://trac.sagemath.org/ticket/34149
(fetchSageDiff {
name = "sphinx-5-update.patch";
base = "9.7.beta6";
rev = "6f9ceb7883376a1cacda51d84ec7870121860482";
sha256 = "sha256-prTCwBfl/wNXIkdjKLiMSe/B64wCXOjOTr4AVNiFruw=";
})
];
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
# do not create .orig backup files if patch applies with fuzz
patchFlags = [ "--no-backup-if-mismatch" "-p1" ];
postPatch = ''
# Make sure sage can at least be imported without setting any environment
# variables. It won't be close to feature complete though.

View file

@ -16,6 +16,7 @@
, termcolor
, tomlkit
, typing-extensions
, chardet
, argcomplete, fetchPypi
}:
@ -34,13 +35,13 @@ in
buildPythonApplication rec {
pname = "commitizen";
version = "2.21.2";
version = "2.29.2";
src = fetchFromGitHub {
owner = "commitizen-tools";
repo = pname;
rev = "v${version}";
sha256 = "sha256-7S676bpSrlAqpbgDj9nAo0WjeitbbHoYc693MJm35Js=";
hash = "sha256-4mK+GA1rfctJkMv4ZMfXE/qih/9fF0kwT6bIcLVB/Bk=";
deepClone = true;
};
@ -49,6 +50,7 @@ buildPythonApplication rec {
nativeBuildInputs = [ poetry ];
propagatedBuildInputs = [
chardet
termcolor
questionary
colorama
@ -85,6 +87,8 @@ buildPythonApplication rec {
"test_bump_on_git_with_hooks_no_verify_disabled"
"test_bump_on_git_with_hooks_no_verify_enabled"
"test_bump_patch_increment"
"test_bump_pre_commit_changelog"
"test_bump_pre_commit_changelog_fails_always"
"test_bump_tag_exists_raises_exception"
"test_bump_when_bumpping_is_not_support"
"test_bump_when_version_inconsistent_in_version_files"

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "git-credential-1password";
version = "1.0.0";
version = "1.1.1";
src = fetchFromGitHub {
owner = "develerik";
repo = pname;
rev = "v${version}";
sha256 = "sha256-WMEUa0mSxmeFXQBejwxtlhWuuLKguugavRaBUVpYA3g=";
sha256 = "sha256-F3XhBVTV8TgVNrOePm3F+uWspkllBlZ/yRyUxrCG0xw=";
};
vendorSha256 = "sha256-eUjaSpmQpSOvSBW+7ajXiEDepkyvHsIiEY0RGpfnao0=";
vendorSha256 = "sha256-2CNGAuvO8IeNUhFnMEj8NjZ2Qm0y+i/0ktNCd3A8Ans=";
meta = with lib; {
description = "A git credential helper for 1Password";

View file

@ -21,11 +21,11 @@ let
self = python3Packages.buildPythonApplication rec {
pname = "mercurial${lib.optionalString fullBuild "-full"}";
version = "6.2";
version = "6.2.1";
src = fetchurl {
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
sha256 = "sha256-04K14/q4kxEmATIBcxQWV0s1roV4dAS7KggZ9Bu4iXI=";
sha256 = "sha256-isXXog0cKtVNTCY9E0FkZG3DSo46a+1pz76rr404gto=";
};
format = "other";
@ -35,7 +35,7 @@ let
cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
inherit src;
name = "mercurial-${version}";
sha256 = "sha256-L4BbU6GTq54DFucqvBZeWtA8zUPvPCwmtIxv/SxgAXk=";
sha256 = "sha256-shmeTQSCpQLrRUbL5bu9nAiPideZUe31YNCrClLM1eI=";
sourceRoot = "mercurial-${version}/rust";
} else null;
cargoRoot = if rustSupport then "rust" else null;

View file

@ -1,34 +0,0 @@
{ lib, stdenv, fetchurl, cmake, libxml2, libxslt, boost, libarchive, python2, antlr2,
curl
}:
with lib;
stdenv.mkDerivation rec {
version = "0.9.5_beta";
pname = "srcml";
src = fetchurl {
url = "http://www.sdml.cs.kent.edu/lmcrs/srcML-${version}-src.tar.gz";
sha256 = "13pswdi75qjsw7z75lz7l3yjsvb58drihla2mwj0f9wfahaj3pam";
};
prePatch = ''
patchShebangs .
substituteInPlace CMake/install.cmake --replace /usr/local $out
'';
patches = [
./gcc6.patch
];
nativeBuildInputs = [ cmake antlr2 ];
buildInputs = [ libxml2 libxslt boost libarchive python2 curl ];
meta = {
description = "Infrastructure for exploration, analysis, and manipulation of source code";
homepage = "https://www.srcml.org";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ leenaars ];
};
}

View file

@ -1,26 +0,0 @@
diff --git i/CMake/config.cmake w/CMake/config.cmake
index 28f8047..c596cf8 100644
--- i/CMake/config.cmake
+++ w/CMake/config.cmake
@@ -95,7 +95,7 @@ else()
find_package(LibXml2 REQUIRED)
find_package(CURL REQUIRED)
set(Boost_NO_BOOST_CMAKE ON)
- set(Boost_USE_STATIC_LIBS ON)
+ set(Boost_USE_STATIC_LIBS OFF)
find_package(Boost COMPONENTS program_options filesystem system thread regex date_time REQUIRED)
# add include directories
diff --git i/src/libsrcml/srcml_reader_handler.hpp w/src/libsrcml/srcml_reader_handler.hpp
index 0b23fed..c02dfef 100644
--- i/src/libsrcml/srcml_reader_handler.hpp
+++ w/src/libsrcml/srcml_reader_handler.hpp
@@ -456,7 +456,7 @@ public :
if(uri == SRCML_CPP_NS_URI) {
- if(archive->language != 0) {
+ if(srcml_check_language(archive->language->c_str()) != 0) {
if(*archive->language == "C++" || *archive->language == "C" || *archive->language == "Objective-C")
archive->options |= SRCML_OPTION_CPP | SRCML_OPTION_CPP_NOMACRO;

View file

@ -65,13 +65,13 @@ let
in
stdenv.mkDerivation rec {
pname = "aegisub";
version = "3.3.2-20220612";
version = "3.3.3";
src = fetchFromGitHub {
owner = "wangqr";
repo = pname;
rev = "91f8b5f91eb960bad19899c10af08aca34f9b697";
sha256 = "sha256-lPkPWSsncsBKJHDnma9cUXsQJynruT9JpPkMTHdQ/e8=";
rev = "v${version}";
sha256 = "sha256-oKhLv81EFudrJaaJ2ga3pVh4W5Hd2YchpjsoYoqRm78=";
};
nativeBuildInputs = [

View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "wf-recorder";
version = "0.2.1";
version = "0.3.0";
src = fetchFromGitHub {
owner = "ammen99";
repo = pname;
rev = "v${version}";
sha256 = "1cw6kpcbl33wh95pvy32xrsrm6kkk1awccr3phyh885xjs3b3iim";
sha256 = "sha256-othFp97rUrdUoAXkup8VvpcyPHs5iYNFyRE3h3rcmqE=";
};
nativeBuildInputs = [ meson ninja pkg-config wayland-scanner scdoc ];
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
inherit (src.meta) homepage;
changelog = "https://github.com/ammen99/wf-recorder/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ yuka ];
platforms = platforms.linux;
};
}

View file

@ -10,16 +10,16 @@
buildGoModule rec{
pname = "flintlock";
version = "0.1.0-alpha.9";
version = "0.1.1";
src = fetchFromGitHub {
owner = "weaveworks";
repo = "flintlock";
rev = "v${version}";
sha256 = "sha256-Xw3g2wh0fPUknSuAKoJL3jxVZS50wSPZ9Wz05zkTVXM=";
sha256 = "sha256-uzsLvmp30pxDu0VtzRD1H4onL4sT/RC3CBnzfahm0Fw=";
};
vendorSha256 = "sha256-EjVlM6AD+O/z6+R5TRBmmRWbrP4C+qyvsnEjwOkDkUE=";
vendorSha256 = "sha256-vkSO+mIEPO8urEYqMjQLoHB4mtSxfJC74zHWpQbQL9g=";
subPackages = [ "cmd/flintlock-metrics" "cmd/flintlockd" ];

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "imgcrypt";
version = "1.1.4";
version = "1.1.6";
src = fetchFromGitHub {
owner = "containerd";
repo = pname;
rev = "v${version}";
sha256 = "sha256-a5IQahhonaXA74gY+zR6BbV9MdyEu70j0E6YlNmN3DA=";
sha256 = "sha256-ytoxdwmyg7IlJOhC6FPI9dnoiptEQrlAAPV57/O3M4U=";
};
ldflags = [

View file

@ -1,6 +1,25 @@
{ autoreconfHook, enableGestures ? false, lib, stdenv, fetchFromGitHub
, pkg-config, cairo, fontconfig, freetype, libXft, libXcursor, libXinerama
, libXpm, libXt, librsvg, libpng, fribidi, perl, libstroke, readline, libxslt }:
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, cairo
, fontconfig
, freetype
, fribidi
, libXcursor
, libXft
, libXinerama
, libXpm
, libXt
, libpng
, librsvg
, libstroke
, libxslt
, perl
, pkg-config
, readline
, enableGestures ? false
}:
stdenv.mkDerivation rec {
pname = "fvwm";
@ -10,34 +29,38 @@ stdenv.mkDerivation rec {
owner = "fvwmorg";
repo = pname;
rev = version;
sha256 = "14jwckhikc9n4h93m00pzjs7xm2j0dcsyzv3q5vbcnknp6p4w5dh";
hash = "sha256-sBVOrrl2WrZ2wWN/r1kDUtR+tPwXgDoSJDaxGeFkXJI=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [
cairo
fontconfig
freetype
libXft
fribidi
libXcursor
libXft
libXinerama
libXpm
libXt
librsvg
libpng
fribidi
librsvg
libxslt
perl
readline
libxslt
] ++ lib.optional enableGestures libstroke;
configureFlags = [ "--enable-mandoc" "--disable-htmldoc" ];
configureFlags = [
"--enable-mandoc"
"--disable-htmldoc"
];
meta = {
meta = with lib; {
homepage = "http://fvwm.org";
description = "A multiple large virtual desktop window manager";
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ edanaher ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ edanaher ];
};
}

View file

@ -0,0 +1,88 @@
{ lib
, stdenv
, fetchFromGitHub
, asciidoctor
, autoreconfHook
, cairo
, fontconfig
, freetype
, fribidi
, imlib
, libSM
, libX11
, libXcursor
, libXft
, libXi
, libXinerama
, libXpm
, libXrandr
, libXt
, libevent
, libintl
, libpng
, librsvg
, libstroke
, libxslt
, perl
, pkg-config
, python3
, readline
, sharutils
}:
stdenv.mkDerivation (finalAttrs: {
pname = "fvwm3";
version = "1.0.4";
src = fetchFromGitHub {
owner = "fvwmorg";
repo = "fvwm3";
rev = finalAttrs.version;
hash = "sha256-ByMSX4nwXkp+ly39C2+cYy3e9B0vnGcJlyIiS7V6zoI=";
};
nativeBuildInputs = [
autoreconfHook
asciidoctor
pkg-config
];
buildInputs = [
cairo
fontconfig
freetype
fribidi
imlib
libSM
libX11
libXcursor
libXft
libXi
libXinerama
libXpm
libXrandr
libXt
libevent
libintl
libpng
librsvg
libstroke
libxslt
perl
python3
readline
sharutils
];
configureFlags = [
"--enable-mandoc"
];
meta = with lib; {
homepage = "http://fvwm.org";
description = "A multiple large virtual desktop window manager - Version 3";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ AndersonTorres ];
inherit (libX11.meta) platforms;
};
})

View file

@ -1,5 +1,7 @@
{ callPackage, pkgs }:
{
{ lib, pkgs }:
lib.makeScope pkgs.newScope (self: with self; {
#### CORE EFL
efl = callPackage ./efl { };
@ -13,4 +15,5 @@
evisum = callPackage ./evisum { };
rage = callPackage ./rage { };
terminology = callPackage ./terminology { };
}
})

View file

@ -12,6 +12,7 @@
, lxqt-build-tools
, libfm-qt
, libexif
, menu-cache
, lxqtUpdateScript
}:
@ -42,6 +43,7 @@ mkDerivation rec {
xorg.libpthreadstubs
xorg.libXdmcp
libexif
menu-cache
];
passthru.updateScript = lxqtUpdateScript { inherit pname version src; };

View file

@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "gleam";
version = "0.21.0";
version = "0.22.1";
src = fetchFromGitHub {
owner = "gleam-lang";
repo = pname;
rev = "v${version}";
sha256 = "sha256-BI8qEaNasNxcMJ7jJYKyFP3ypgh+P39F9tAzzqxA4BI=";
sha256 = "sha256-/mP15jPZiiavnZ7fwFehSSzJUtVVmksj1xfbDOycxmQ=";
};
nativeBuildInputs = [ pkg-config ];
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] ++
lib.optionals stdenv.isDarwin [ Security libiconv ];
cargoSha256 = "sha256-avwdgX7FaBIOMumJknWBLc50JgtzGpM6S+Du7U/FE6Q=";
cargoSha256 = "sha256-JAQQiCnl/EMKCMqoL8WkwUcjng+MSz2Cjb3L5yyrQ+E=";
meta = with lib; {
description = "A statically typed language for the Erlang VM";

View file

@ -67,5 +67,6 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ ninjin raskin ];
platforms = [ "x86_64-linux" ];
mainProgram = "julia";
};
}

View file

@ -67,5 +67,6 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ ninjin raskin ];
platforms = [ "x86_64-linux" ];
mainProgram = "julia";
};
}

View file

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "cgal";
version = "5.4";
version = "5.5";
src = fetchFromGitHub {
owner = "CGAL";
repo = "releases";
rev = "CGAL-${version}";
sha256 = "sha256-flrVWsvGAdGVCZ1Ygy9z30w6aU8WAzpMLv+JbP2CKjE=";
sha256 = "sha256-C576lYTQd6mgJPBqFRN3Ty6WYeXcXlDZ5sRtDwOuKSo=";
};
# note: optional component libCGAL_ImageIO would need zlib and opengl;

View file

@ -117,7 +117,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
broken = stdenv.isDarwin;
broken = stdenv.isDarwin && withDemoAgent;
description = "Geolocation framework and some data providers";
homepage = "https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home";
maintainers = with maintainers; [ raskin ];

View file

@ -12,13 +12,13 @@ assert mpiSupport -> mpi != null;
stdenv.mkDerivation rec {
pname = "highfive${lib.optionalString mpiSupport "-mpi"}";
version = "2.3.1";
version = "2.4.1";
src = fetchFromGitHub {
owner = "BlueBrain";
repo = "HighFive";
rev = "v${version}";
sha256 = "qaIThJGdoLgs82h+W4BKQEu1yy1bB8bZFiuxI7IxInw=";
sha256 = "sha256-P60S3UR8wC3BHxRiqFdSjn6Akvykud40g5yEko5dIjw=";
};
nativeBuildInputs = [ cmake ];

View file

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "libgphoto2";
version = "2.5.29";
version = "2.5.30";
src = fetchFromGitHub {
owner = "gphoto";
repo = "libgphoto2";
rev = "libgphoto2-${builtins.replaceStrings [ "." ] [ "_" ] version}-release";
sha256 = "sha256-Js5gbD57lhtqBX6joGMiLKUwkPDaSclnTrwBR87AliQ=";
sha256 = "sha256-4UwD283mKhZwC7setBU0BLRLsyfjD/6m/InSedrqgAU=";
};
depsBuildBuild = [ pkg-config ];

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libite";
version = "2.5.1";
version = "2.5.2";
src = fetchFromGitHub {
owner = "troglobit";
repo = "libite";
rev = "v${version}";
sha256 = "sha256-G9X0ZMyasS9praogWnLDU1LeTvK4fYPgJ89o2y3AIJI=";
sha256 = "sha256-iviHxGXYUMjTgafkG4aqeHd9cnHA2VNhYG2eUta9R0Q=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];

View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "libplctag";
version = "2.5.0";
version = "2.5.1";
src = fetchFromGitHub {
owner = "libplctag";
repo = "libplctag";
rev = "v${version}";
sha256 = "sha256-Xzdljx08aXwD6pE1f/3YBAjvrSzvs2fcXmmLH04GFyg=";
sha256 = "sha256-ZD7mf6O1iBGmZ2bRWfnM0WPuP1itIi9TxZ5rK4uvBTw=";
};
nativeBuildInputs = [ cmake ];

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libspiro";
version = "20200505";
version = "20220722";
src = fetchFromGitHub {
owner = "fontforge";
repo = pname;
rev = version;
sha256 = "1b5bw5qxqlral96y1n5f3sh9yxm2yij3zkqjmlgd8r1k4j0d3nqw";
sha256 = "sha256-qNff53wyf8YhFVOn169K7smCXrSxdiZWxWOU8VTcjSI=";
};
nativeBuildInputs = [ pkg-config autoreconfHook ];

View file

@ -3,7 +3,7 @@
}:
let
version = "2.0.6";
version = "2.0.7";
# Make sure we override python, so the correct version is chosen
boostPython = boost.override { enablePython = true; inherit python; };
@ -16,7 +16,7 @@ in stdenv.mkDerivation {
owner = "arvidn";
repo = "libtorrent";
rev = "v${version}";
sha256 = "sha256-SQ9yRuINxYJH0LIC3XK7Ssl/TO+DUxIRtdXz684bm8w=";
sha256 = "sha256-ikDtx1BIikVEL5jf37byNbuS+ft1lDtHUlFqegndapw=";
fetchSubmodules = true;
};

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "libva-utils";
version = "2.14.0";
version = "2.15.0";
src = fetchFromGitHub {
owner = "intel";
repo = "libva-utils";
rev = version;
sha256 = "sha256-WuNJCFBbXbLSftL+L15ruq9PxM1XhIfYpP/IccB+aBs=";
sha256 = "sha256-oElqJqOa/Q+2NE6gZS2tJnFJfalP6HsuUduk8cbuy84=";
};
nativeBuildInputs = [ meson ninja pkg-config ];

View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "qrcodegen";
version = "1.7.0";
version = "1.8.0";
src = fetchFromGitHub {
owner = "nayuki";
repo = "QR-Code-generator";
rev = "v${version}";
sha256 = "sha256-WH6O3YE/+NNznzl52TXZYL+6O25GmKSnaFqDDhRl4As=";
sha256 = "sha256-aci5SFBRNRrSub4XVJ2luHNZ2pAUegjgQ6pD9kpkaTY=";
};
preBuild = ''

View file

@ -2,14 +2,14 @@
buildDunePackage rec {
pname = "fix";
version = "20211231";
version = "20220121";
src = fetchFromGitLab {
domain = "gitlab.inria.fr";
owner = "fpottier";
repo = "fix";
rev = "${version}";
sha256 = "sha256-T/tbiC95yzPb60AiEcvMRU47D8xUZNN5C4X33Y1VB9E=";
sha256 = "sha256-suWkZDLnXEO/4QCGmNuyLFOV0LJsFOMD13gxOcgu6JQ=";
};
minimumOCamlVersion = "4.03";

View file

@ -354,9 +354,9 @@ with self;
ocaml-compiler-libs = janePackage {
pname = "ocaml-compiler-libs";
version = "0.12.3";
version = "0.12.4";
minimumOCamlVersion = "4.04.1";
hash = "00nrar7h2pyflbdiq6wwwrb4k5jh9iff0jllihzm6ms8d5pspsg5";
hash = "sha256-W+KUguz55yYAriHRMcQy8gRPzh2TZSJnexG1JI8TLgI=";
meta.description = "OCaml compiler libraries repackaged";
};

View file

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "adafruit-platformdetect";
version = "3.26.0";
version = "3.27.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "Adafruit-PlatformDetect";
inherit version;
hash = "sha256-lkzTJfjJNKsMmLet9VXv5Ao8+Dks4P0+0nRpWHHs3G0=";
hash = "sha256-Ez3VQO52GgPhTXr1xlxr4BvouI41PVzppkutiqVjrUI=";
};
nativeBuildInputs = [

View file

@ -26,11 +26,20 @@ buildPythonPackage rec {
};
patches = [
# python310: Fix tests
# https://github.com/enthought/apptools/issues/303
(fetchpatch {
url = "https://github.com/enthought/apptools/commit/10fb73916124f7ae7edf6c6688a05ad95678488f.patch";
sha256 = "sha256-izAcP5RWobLvnk2PQx31SX/TUGkw+prbYbjamYVmtjY=";
name = "fix_python310_tests.patch";
})
# python39: importlib_resources -> importlib.resources. This patch will be included
# in the next release after 5.1.0.
(fetchpatch {
url = "https://github.com/enthought/apptools/commit/0ae4f52f19a8c0ca9d7926e17c7de949097f24b4.patch";
sha256 = "165aiwjisr5c3lasg7xblcha7y1y5bq23vi3g9gc80c24bzwcbsw";
name = "fix_importlib-resources_naming.patch";
})
];
@ -52,14 +61,6 @@ buildPythonPackage rec {
export HOME=$TMP
'';
disabledTestPaths = lib.optionals (pythonAtLeast "3.10") [
# https://github.com/enthought/apptools/issues/303
"apptools/io/h5/tests/test_dict_node.py"
"apptools/io/h5/tests/test_file.py"
"apptools/io/h5/tests/test_table_node.py"
];
pythonImportsCheck = [
"apptools"
];

View file

@ -2,11 +2,11 @@
, buildPythonPackage
, fetchFromGitHub
, gibberish-detector
, isPy27
, mock
, pkgs
, pyahocorasick
, pytestCheckHook
, pythonOlder
, pyyaml
, requests
, responses
@ -15,14 +15,16 @@
buildPythonPackage rec {
pname = "detect-secrets";
version = "1.2.0";
disabled = isPy27;
version = "1.3.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "Yelp";
repo = pname;
rev = "v${version}";
hash = "sha256-4VcV06iaL3NAj7qF8RyfWV1zgrt928AQfjGeuO2Pbjk=";
hash = "sha256-Dl/2HgCacDko/ug9nGA9X+LyOkuDot11H28lxrgkwdE=";
leaveDotGit = true;
};
@ -58,7 +60,9 @@ buildPythonPackage rec {
"test_start_halfway"
];
pythonImportsCheck = [ "detect_secrets" ];
pythonImportsCheck = [
"detect_secrets"
];
meta = with lib; {
description = "An enterprise friendly way of detecting and preventing secrets in code";

View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "dvc-data";
version = "0.0.24";
version = "0.1.5";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-Sk4l9TL0SU6sPrBBed/Y4xDB/GzVzv2YTUD0IdjhB2M=";
hash = "sha256-SQ4w2Yqho5kbM4fRQkji69wOV8rYAIyFFve7pTEjgMM=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "glean-parser";
version = "6.1.1";
version = "6.1.2";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -23,7 +23,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "glean_parser";
inherit version;
hash = "sha256-vEGleqQytNYyy/DfHwqxrHIOMCj4sZTavfuxyDc5O30=";
hash = "sha256-EqD+ztwRRNd/pXHgQi/z/qTbrcOB1jG+qACmsvWPT38=";
};
postPatch = ''

View file

@ -2,7 +2,6 @@
, beautifulsoup4
, buildPythonPackage
, click
, dataclasses
, dataclasses-json
, fetchFromGitHub
, htmlmin
@ -19,16 +18,16 @@
buildPythonPackage rec {
pname = "json-schema-for-humans";
version = "0.41.3";
version = "0.41.6";
format = "pyproject";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "coveooss";
repo = pname;
rev = "v${version}";
hash = "sha256-PEialHz5MJxi4PbtHYpx2CY78KgAKclijbF6cPr36vY=";
hash = "sha256-t5t+tZwhzOHpI2nc69baWtZamEOeouseMuVBnCQyjzQ=";
};
postPatch = ''
@ -50,8 +49,6 @@ buildPythonPackage rec {
pytz
pyyaml
requests
] ++ lib.optionals (pythonOlder "3.7") [
dataclasses
];
checkInputs = [

View file

@ -17,20 +17,24 @@ buildPythonPackage rec {
};
patches = [
# Fix flapping test; https://github.com/python-metar/python-metar/issues/161
(fetchpatch {
# Fix flapping test; https://github.com/python-metar/python-metar/issues/161
url = "https://github.com/python-metar/python-metar/commit/716fa76682e6c2936643d1cf62e3d302ef29aedd.patch";
hash = "sha256-y82NN+KDryOiH+eG+2ycXCO9lqQLsah4+YpGn6lM2As=";
name = "fix_flapping_test.patch";
})
# Fix circumvent a sometimes impossible test
# https://github.com/python-metar/python-metar/issues/165
(fetchpatch {
url = "https://github.com/python-metar/python-metar/commit/b675f4816d15fbfc27e23ba9a40cdde8bb06a552.patch";
hash = "sha256-v+E3Ckwxb42mpGzi2C3ka96wHvurRNODMU3xLxDoVZI=";
name = "fix_impossible_test.patch";
})
];
checkInputs = [ pytestCheckHook ];
disabledTests = [
# https://github.com/python-metar/python-metar/issues/165
"test_033_parseTime_auto_month"
];
pythonImportsCheck = [ "metar" ];
meta = with lib; {

View file

@ -0,0 +1,65 @@
{ buildPythonPackage
, fetchFromGitHub
, lib
, plantuml
, markdown
, requests
, six
, runCommand
, writeText
, plantuml-markdown
}:
let
pname = "plantuml-markdown";
version = "3.6.2";
in
buildPythonPackage {
inherit pname version;
src = fetchFromGitHub {
owner = "mikitex70";
repo = pname;
rev = version;
sha256 = "sha256-IADKU4EQHLLH5uD5iBAUiumFp5nyTNGt1LWoWdfbvJM=";
};
propagatedBuildInputs = [
plantuml
markdown
requests
six
];
# The package uses a custom script that downloads a certain version of plantuml for testing.
doCheck = false;
pythonImportsCheck = [ "plantuml_markdown" ];
passthru.tests.example-doc =
let
exampleDoc = writeText "plantuml-markdown-example-doc.md" ''
```plantuml
Bob -> Alice: Hello
```
'';
in
runCommand "plantuml-markdown-example-doc"
{
nativeBuildInputs = [ plantuml-markdown ];
} ''
markdown_py -x plantuml_markdown ${exampleDoc} > $out
! grep -q "Error" $out
'';
meta = with lib; {
description = "PlantUML plugin for Python-Markdown";
longDescription = ''
This plugin implements a block extension which can be used to specify a PlantUML
diagram which will be converted into an image and inserted in the document.
'';
homepage = "https://github.com/mikitex70/plantuml-markdown";
license = licenses.bsd2;
maintainers = with maintainers; [ nikstur ];
};
}

View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "pygls";
version = "0.11.3";
version = "0.12";
format = "setuptools";
disabled = !isPy3k;
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "openlawlibrary";
repo = pname;
rev = "v${version}";
sha256 = "sha256-/nmDaA67XzrrmfwlBm5syTS4hn25m30Zb3gvOdL+bR8=";
sha256 = "sha256-PEfGxOUsiZ5WLmoQkOP2RRWJlIKi+42lOu55C3C+k8A=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -1,19 +1,39 @@
{ lib, buildPythonPackage, fetchPypi
, setuptools }:
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
version = "2.3.0";
pname = "pyshp";
version = "2.3.1";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-glBk6kA6zxNehGz4sJJEmUMOa+HNN6DzS+cTCQZhfTw=";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "GeospatialPython";
repo = pname;
rev = version;
hash = "sha256-yfxhgk8a1rdpGVkE1sjJqT6tiFLimhu2m2SjGxLI6wo=";
};
pythonImportsCheck = [ "shapefile" ];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"shapefile"
];
disabledTests = [
# Requires network access
"test_reader_url"
];
meta = with lib; {
description = "Pure Python read/write support for ESRI Shapefile format";
description = "Python read/write support for ESRI Shapefile format";
homepage = "https://github.com/GeospatialPython/pyshp";
license = licenses.mit;
maintainers = with maintainers; [ ];

View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "questionary";
version = "1.10.0";
version = "unstable-2022-07-27";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -18,8 +18,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "tmbo";
repo = pname;
rev = version;
sha256 = "14k24fq2nmk90iv0k7pnmmdhmk8z261397wg52sfcsccyhpdw3i7";
rev = "848b040c5b7086ffe75bd92c656e15e94d905146";
hash = "sha256-W0d1Uoy5JdN3BFfeyk1GG0HBzmgKoBApaGad0UykZaY=";
};
nativeBuildInputs = [

View file

@ -14,12 +14,12 @@
buildPythonPackage rec {
pname = "sphinx-autoapi";
version = "1.8.4";
version = "1.9.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "8c4ec5fbedc1e6e8f4692bcc4fcd1abcfb9e8dfca8a4ded60ad811a743c22ccc";
sha256 = "sha256-yJfqM33xatDN4wfL3+K+ziB3iN3hWH+k/IuFfR/F3Lo=";
};
propagatedBuildInputs = [ astroid jinja2 pyyaml sphinx unidecode ];

View file

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-setuptools";
version = "63.2.1";
version = "63.2.2";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-KVekCt38pccSX9jThqnv2lN5CYxuZqCOAiV/0c6kITE=";
sha256 = "sha256-qaoMAdXzRDzVRAJtX/yXuV3a33MdqxNBnDk9Q/2GF8A=";
};
# Module doesn't have tests

View file

@ -43,13 +43,13 @@ in
stdenv.mkDerivation rec {
pname = "quickemu";
version = "3.15";
version = "3.16";
src = fetchFromGitHub {
owner = "quickemu-project";
repo = "quickemu";
rev = version;
sha256="sha256-ako/eh8cMWKvdrgm9VTgSH67nA2igKUlJZtBeH1bu4Y=";
sha256 = "sha256-vzgCPpr0ThDXOkvaOcbyvNkJvvoFpDnx68f1Y8sWUcc=";
};
patches = [

View file

@ -1,10 +1,6 @@
{
"version": "0.1.10",
"assets": {
"aarch64-darwin": {
"asset": "scala-cli-x86_64-apple-darwin.gz",
"sha256": "1dqvvdwmakdbbq02h33impv84jzks6ba33jgaf2py4rri6hr84rg"
},
"x86_64-darwin": {
"asset": "scala-cli-x86_64-apple-darwin.gz",
"sha256": "1dqvvdwmakdbbq02h33impv84jzks6ba33jgaf2py4rri6hr84rg"

View file

@ -0,0 +1,26 @@
{ lib, rustPlatform, fetchFromGitHub, testers, cbfmt }:
rustPlatform.buildRustPackage rec {
pname = "cbfmt";
version = "0.1.1";
src = fetchFromGitHub {
owner = "lukas-reineke";
repo = pname;
rev = "v${version}";
sha256 = "sha256-cTX7eBcEZiTJm3b1d2Mwu7NdbtHjeF+dkc3YMede0cQ=";
};
cargoSha256 = "sha256-vEInZplfgrM4gD5wPATl7j5iTo9pSstElfd0Lq9giJw=";
passthru.tests.version = testers.testVersion {
package = cbfmt;
};
meta = with lib; {
description = "A tool to format codeblocks inside markdown and org documents";
homepage = "https://github.com/lukas-reineke/cbfmt";
license = licenses.mit;
maintainers = [ maintainers.stehessel ];
};
}

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "dagger";
version = "0.2.25";
version = "0.2.27";
src = fetchFromGitHub {
owner = "dagger";
repo = "dagger";
rev = "v${version}";
sha256 = "sha256-O2Y1F0IjsCfOvTZdOeuvRj5t7UXO9A8sUOgj/1TwuFw=";
sha256 = "sha256-NOdr/C2a4A1uC9al2gkrGKJ01/R9TUpHjwuQNpSGHCo=";
};
vendorSha256 = "sha256-zoa17vU2049FJj+Ns3AV01XEMMWzzJ9HSpKp1Hl6CCU=";
vendorSha256 = "sha256-+TKdLtR5W4RtOs1qpA1EVc6RS6/SQT8OWNwwllSsBqQ=";
subPackages = [
"cmd/dagger"

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