Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2023-02-22 06:01:53 +00:00 committed by GitHub
commit f95edd46da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
55 changed files with 10606 additions and 9436 deletions

View file

@ -2467,6 +2467,12 @@
githubId = 3471749;
name = "Claudio Bley";
};
cbrewster = {
email = "cbrewster@hey.com";
github = "cbrewster";
githubId = 9086315;
name = "Connor Brewster";
};
cburstedde = {
email = "burstedde@ins.uni-bonn.de";
github = "cburstedde";

View file

@ -96,7 +96,7 @@ in {
type = types.nullOr types.path;
default = null;
description = lib.mdDoc ''
File containing environment variables to be passed to the mautrix-telegram service.
File containing environment variables to be passed to the mautrix-facebook service.
Any config variable can be overridden by setting `MAUTRIX_FACEBOOK_SOME_KEY` to override the `some.key` variable.
'';

View file

@ -6,7 +6,10 @@ import ../make-test-python.nix (
};
nodes = {
podman = { pkgs, ... }: {
rootful = { pkgs, ... }: {
virtualisation.podman.enable = true;
};
rootless = { pkgs, ... }: {
virtualisation.podman.enable = true;
users.users.alice = {
@ -49,101 +52,109 @@ import ../make-test-python.nix (
return f"su {user} -l -c {cmd}"
podman.wait_for_unit("sockets.target")
rootful.wait_for_unit("sockets.target")
rootless.wait_for_unit("sockets.target")
dns.wait_for_unit("sockets.target")
docker.wait_for_unit("sockets.target")
start_all()
with subtest("Run container as root with runc"):
podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg")
podman.succeed(
rootful.succeed("tar cv --files-from /dev/null | podman import - scratchimg")
rootful.succeed(
"podman run --runtime=runc -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
)
podman.succeed("podman ps | grep sleeping")
podman.succeed("podman stop sleeping")
podman.succeed("podman rm sleeping")
rootful.succeed("podman ps | grep sleeping")
rootful.succeed("podman stop sleeping")
rootful.succeed("podman rm sleeping")
with subtest("Run container as root with crun"):
podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg")
podman.succeed(
rootful.succeed("tar cv --files-from /dev/null | podman import - scratchimg")
rootful.succeed(
"podman run --runtime=crun -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
)
podman.succeed("podman ps | grep sleeping")
podman.succeed("podman stop sleeping")
podman.succeed("podman rm sleeping")
rootful.succeed("podman ps | grep sleeping")
rootful.succeed("podman stop sleeping")
rootful.succeed("podman rm sleeping")
with subtest("Run container as root with the default backend"):
podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg")
podman.succeed(
rootful.succeed("tar cv --files-from /dev/null | podman import - scratchimg")
rootful.succeed(
"podman run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
)
podman.succeed("podman ps | grep sleeping")
podman.succeed("podman stop sleeping")
podman.succeed("podman rm sleeping")
rootful.succeed("podman ps | grep sleeping")
rootful.succeed("podman stop sleeping")
rootful.succeed("podman rm sleeping")
# start systemd session for rootless
podman.succeed("loginctl enable-linger alice")
podman.succeed(su_cmd("whoami"))
podman.sleep(1)
rootless.succeed("loginctl enable-linger alice")
rootless.succeed(su_cmd("whoami"))
rootless.sleep(1)
with subtest("Run container rootless with runc"):
podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg"))
podman.succeed(
rootless.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg"))
rootless.succeed(
su_cmd(
"podman run --runtime=runc -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
)
)
podman.succeed(su_cmd("podman ps | grep sleeping"))
podman.succeed(su_cmd("podman stop sleeping"))
podman.succeed(su_cmd("podman rm sleeping"))
rootless.succeed(su_cmd("podman ps | grep sleeping"))
rootless.succeed(su_cmd("podman stop sleeping"))
rootless.succeed(su_cmd("podman rm sleeping"))
with subtest("Run container rootless with crun"):
podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg"))
podman.succeed(
rootless.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg"))
rootless.succeed(
su_cmd(
"podman run --runtime=crun -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
)
)
podman.succeed(su_cmd("podman ps | grep sleeping"))
podman.succeed(su_cmd("podman stop sleeping"))
podman.succeed(su_cmd("podman rm sleeping"))
rootless.succeed(su_cmd("podman ps | grep sleeping"))
rootless.succeed(su_cmd("podman stop sleeping"))
rootless.succeed(su_cmd("podman rm sleeping"))
with subtest("Run container rootless with the default backend"):
podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg"))
podman.succeed(
rootless.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg"))
rootless.succeed(
su_cmd(
"podman run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
)
)
podman.succeed(su_cmd("podman ps | grep sleeping"))
podman.succeed(su_cmd("podman stop sleeping"))
podman.succeed(su_cmd("podman rm sleeping"))
rootless.succeed(su_cmd("podman ps | grep sleeping"))
rootless.succeed(su_cmd("podman stop sleeping"))
rootless.succeed(su_cmd("podman rm sleeping"))
with subtest("rootlessport"):
rootless.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg"))
rootless.succeed(
su_cmd(
"podman run -d -p 9000:8888 --name=rootlessport -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin -w ${pkgs.writeTextDir "index.html" "<h1>Testing</h1>"} scratchimg ${pkgs.python3}/bin/python -m http.server 8888"
)
)
rootless.succeed(su_cmd("podman ps | grep rootlessport"))
rootless.wait_until_succeeds(su_cmd("${pkgs.curl}/bin/curl localhost:9000 | grep Testing"))
rootless.succeed(su_cmd("podman stop rootlessport"))
rootless.succeed(su_cmd("podman rm rootlessport"))
with subtest("Run container with init"):
podman.succeed(
rootful.succeed(
"tar cv -C ${pkgs.pkgsStatic.busybox} . | podman import - busybox"
)
pid = podman.succeed("podman run --rm busybox readlink /proc/self").strip()
pid = rootful.succeed("podman run --rm busybox readlink /proc/self").strip()
assert pid == "1"
pid = podman.succeed("podman run --rm --init busybox readlink /proc/self").strip()
pid = rootful.succeed("podman run --rm --init busybox readlink /proc/self").strip()
assert pid == "2"
with subtest("aardvark-dns"):
dns.succeed("tar cv --files-from /dev/null | podman import - scratchimg")
dns.succeed(
"podman run -d --name=webserver -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin -w ${pkgs.writeTextDir "index.html" "<h1>Hi</h1>"} scratchimg ${pkgs.python3}/bin/python -m http.server 8000"
)
dns.succeed("podman ps | grep webserver")
dns.succeed("""
for i in `seq 0 120`; do
podman run --rm --name=client -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg ${pkgs.curl}/bin/curl http://webserver:8000 >/dev/console \
&& exit 0
sleep 0.5
done
exit 1
""")
dns.succeed("podman stop webserver")
dns.succeed("podman rm webserver")
dns.succeed("tar cv --files-from /dev/null | podman import - scratchimg")
dns.succeed(
"podman run -d --name=webserver -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin -w ${pkgs.writeTextDir "index.html" "<h1>Testing</h1>"} scratchimg ${pkgs.python3}/bin/python -m http.server 8000"
)
dns.succeed("podman ps | grep webserver")
dns.wait_until_succeeds(
"podman run --rm --name=client -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg ${pkgs.curl}/bin/curl http://webserver:8000 | grep Testing"
)
dns.succeed("podman stop webserver")
dns.succeed("podman rm webserver")
with subtest("A podman member can use the docker cli"):
docker.succeed(su_cmd("docker version"))

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -11,7 +11,13 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-+zRXihWg65DtyX3yD04CsW8aXIvNph36PW2veeg36lg=";
};
cargoPatches = [ ./cargo-lock.patch ];
cargoLock = {
lockFile = ./Cargo.lock;
};
postPatch = ''
ln -s ${./Cargo.lock} Cargo.lock
'';
nativeBuildInputs = [ pkg-config ];
buildInputs = [ alsa-lib openssl ];

View file

@ -1,20 +1,17 @@
#!nix-shell
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p coreutils gnugrep git cargo
# This updates cargo-lock.patch for the netease-music-tui version listed in
# default.nix.
set -eu -o verbose
set -euo pipefail
here=$PWD
version=$(cat default.nix | grep '^ version = "' | cut -d '"' -f 2)
here=$(dirname "$0")
version=$(grep '^ version = "' "$here/default.nix" | cut -d '"' -f 2)
checkout=$(mktemp -d)
git clone -b "$version" --depth=1 https://github.com/betta-cyber/netease-music-tui "$checkout"
cd "$checkout"
git clone -b "v$version" --depth=1 https://github.com/betta-cyber/netease-music-tui "$checkout"
cargo generate-lockfile
git add -f Cargo.lock
git diff HEAD -- Cargo.lock > "$here"/cargo-lock.patch
cargo generate-lockfile --manifest-path "$checkout/Cargo.toml"
cp "$checkout/Cargo.lock" "$here"
cd "$here"
rm -rf "$checkout"

View file

@ -49,10 +49,10 @@
elpaBuild {
pname = "annotate";
ename = "annotate";
version = "1.8.1";
version = "1.8.5";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/annotate-1.8.1.tar";
sha256 = "00rpaki0vf6aiwa4by1v3hba79jmx1g7c283q1gibp4ka7grxzc2";
url = "https://elpa.nongnu.org/nongnu/annotate-1.8.5.tar";
sha256 = "0f5h9ymcg4n0zn3yaq1s0h5sfrq3pbcswda9875yhlcprzbrgyq7";
};
packageRequires = [];
meta = {
@ -135,6 +135,23 @@
license = lib.licenses.free;
};
}) {};
auto-dim-other-buffers = callPackage ({ elpaBuild
, fetchurl
, lib }:
elpaBuild {
pname = "auto-dim-other-buffers";
ename = "auto-dim-other-buffers";
version = "2.1.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/auto-dim-other-buffers-2.1.1.tar";
sha256 = "0a7xdp25bny5ykf7808jwmziad8myf8yp01p07f20bsrl4m0bzz6";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/auto-dim-other-buffers.html";
license = lib.licenses.free;
};
}) {};
autothemer = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "autothemer";
@ -150,6 +167,21 @@
license = lib.licenses.free;
};
}) {};
bash-completion = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "bash-completion";
ename = "bash-completion";
version = "3.1.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/bash-completion-3.1.1.tar";
sha256 = "19vs0rflqm1z4r17pv1qx6v60g03x4n2b7503rjr2d0ljrwkbpcp";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/bash-completion.html";
license = lib.licenses.free;
};
}) {};
better-jumper = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "better-jumper";
@ -195,6 +227,21 @@
license = lib.licenses.free;
};
}) {};
blow = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "blow";
ename = "blow";
version = "1.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/blow-1.0.tar";
sha256 = "0z2y3vq8m4x9ihn84x7p2vgkxprrrvhavcgwll897gsc9khp1xda";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/blow.html";
license = lib.licenses.free;
};
}) {};
boxquote = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "boxquote";
@ -214,10 +261,10 @@
elpaBuild {
pname = "buttercup";
ename = "buttercup";
version = "1.28";
version = "1.29";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/buttercup-1.28.tar";
sha256 = "0gli1cxqiqg4adln7svplcc6rk718q4gn6idwxbzx8mgcwhmw75f";
url = "https://elpa.nongnu.org/nongnu/buttercup-1.29.tar";
sha256 = "0k9canfnxzhbk5m33z3bfxw7l2bvvhdiv9x357lf6gs8vg19158p";
};
packageRequires = [ emacs ];
meta = {
@ -225,6 +272,21 @@
license = lib.licenses.free;
};
}) {};
camera = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "camera";
ename = "camera";
version = "0.2";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/camera-0.2.tar";
sha256 = "1hdq24xy685wzjz3hfxwqmcmsvajcrkr4va4lmvgvdmkvmfk92cj";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/camera.html";
license = lib.licenses.free;
};
}) {};
caml = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "caml";
@ -268,10 +330,10 @@
elpaBuild {
pname = "cider";
ename = "cider";
version = "1.5.0";
version = "1.6.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/cider-1.5.0.tar";
sha256 = "0vggh2l92m8hm2wqzcyka439fs0kzbbfknfgyn79hf2f2f405534";
url = "https://elpa.nongnu.org/nongnu/cider-1.6.0.tar";
sha256 = "038wzwi4y0240wb5i03v89x308c07nzflfv3804zyldr44yk9qky";
};
packageRequires = [
clojure-mode
@ -291,10 +353,10 @@
elpaBuild {
pname = "clojure-mode";
ename = "clojure-mode";
version = "5.15.1";
version = "5.16.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.15.1.tar";
sha256 = "14j6v32cbj52n91f7ckbjlam60rszh05r09bwv579p1xs2m7s7q3";
url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.16.0.tar";
sha256 = "1m0g7sqjs6phkkf3mx2dyxr62a48rqq69lp6r5bfa6kcbr2n4g2m";
};
packageRequires = [ emacs ];
meta = {
@ -434,6 +496,36 @@
license = lib.licenses.free;
};
}) {};
denote-refs = callPackage ({ denote, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "denote-refs";
ename = "denote-refs";
version = "0.1.2";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/denote-refs-0.1.2.tar";
sha256 = "1s2q9j2xg2g293ip7w2bq2kjk6pasaf6cmvzcbh0k00yx8aa2alp";
};
packageRequires = [ denote emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/denote-refs.html";
license = lib.licenses.free;
};
}) {};
devhelp = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "devhelp";
ename = "devhelp";
version = "1.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/devhelp-1.0.tar";
sha256 = "16zx748n24diqqk3jhgyz74s71kqzl7h7l6j9nkz40cpcn18ddiz";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/devhelp.html";
license = lib.licenses.free;
};
}) {};
diff-ansi = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "diff-ansi";
@ -509,6 +601,21 @@
license = lib.licenses.free;
};
}) {};
eat = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "eat";
ename = "eat";
version = "0.6";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/eat-0.6.tar";
sha256 = "14174hra9x3l98nrpg0x9g499lwhlxr8qg51zdrlyky0k4v0x3iw";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/eat.html";
license = lib.licenses.free;
};
}) {};
edit-indirect = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "edit-indirect";
@ -574,6 +681,21 @@
license = lib.licenses.free;
};
}) {};
engine-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "engine-mode";
ename = "engine-mode";
version = "2.2.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/engine-mode-2.2.1.tar";
sha256 = "1m5i3pyi4y90jvwgypxzl3qwhq5j6gazwijalhjcgb6gnpsm81kv";
};
packageRequires = [ cl-lib ];
meta = {
homepage = "https://elpa.gnu.org/packages/engine-mode.html";
license = lib.licenses.free;
};
}) {};
evil = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "evil";
@ -653,6 +775,21 @@
license = lib.licenses.free;
};
}) {};
evil-iedit-state = callPackage ({ elpaBuild, evil, fetchurl, iedit, lib }:
elpaBuild {
pname = "evil-iedit-state";
ename = "evil-iedit-state";
version = "1.3";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/evil-iedit-state-1.3.tar";
sha256 = "1dsdlhi58xsdsgkdhpnlkx1gkwc4m5sks99ph8lbj179vd1gszn6";
};
packageRequires = [ evil iedit ];
meta = {
homepage = "https://elpa.gnu.org/packages/evil-iedit-state.html";
license = lib.licenses.free;
};
}) {};
evil-indent-plus = callPackage ({ cl-lib ? null
, elpaBuild
, evil
@ -711,10 +848,10 @@
elpaBuild {
pname = "evil-nerd-commenter";
ename = "evil-nerd-commenter";
version = "3.5.8";
version = "3.6.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/evil-nerd-commenter-3.5.8.tar";
sha256 = "0hrzwca24dy4g9h7v5csqpwvsfj1ns4gqlnlf1q5i0jqvhvklnj5";
url = "https://elpa.nongnu.org/nongnu/evil-nerd-commenter-3.6.0.tar";
sha256 = "0709qlxhvmapdnl8bhqvg39cm6x4659mg0jzz5b9hmis5bpj1kiq";
};
packageRequires = [ emacs ];
meta = {
@ -752,6 +889,36 @@
license = lib.licenses.free;
};
}) {};
flx = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "flx";
ename = "flx";
version = "0.6.2";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/flx-0.6.2.tar";
sha256 = "0xmxin1k758nskrxhmvi4m5vbcfi2ncfp5n9q18mlc1j45vwawpx";
};
packageRequires = [ cl-lib ];
meta = {
homepage = "https://elpa.gnu.org/packages/flx.html";
license = lib.licenses.free;
};
}) {};
flx-ido = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, flx, lib }:
elpaBuild {
pname = "flx-ido";
ename = "flx-ido";
version = "0.6.2";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/flx-ido-0.6.2.tar";
sha256 = "1jdk87v605m4brvf0pxfd6bz0j2r217cw9pmrpl38nrszbngh67l";
};
packageRequires = [ cl-lib flx ];
meta = {
homepage = "https://elpa.gnu.org/packages/flx-ido.html";
license = lib.licenses.free;
};
}) {};
flymake-kondor = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "flymake-kondor";
@ -777,10 +944,10 @@
elpaBuild {
pname = "flymake-popon";
ename = "flymake-popon";
version = "0.5";
version = "0.5.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/flymake-popon-0.5.tar";
sha256 = "1q1adxsrx8sjw6pffwxvk0yrgbz0rbrzi1g7g7zq5952vnz4dnn0";
url = "https://elpa.nongnu.org/nongnu/flymake-popon-0.5.1.tar";
sha256 = "0vk20affwb7qcg7nm6n2ssrrgljisqn45a8jagrf947l2kgaccvd";
};
packageRequires = [ emacs flymake popon posframe ];
meta = {
@ -833,14 +1000,29 @@
license = lib.licenses.free;
};
}) {};
gc-buffers = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "gc-buffers";
ename = "gc-buffers";
version = "1.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/gc-buffers-1.0.tar";
sha256 = "15zpg4j25bk7y2wgqsd57c4c6h3xvigf39hjnzh3g1hlrqk2lv0g";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/gc-buffers.html";
license = lib.licenses.free;
};
}) {};
geiser = callPackage ({ elpaBuild, emacs, fetchurl, lib, project }:
elpaBuild {
pname = "geiser";
ename = "geiser";
version = "0.28";
version = "0.28.2";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/geiser-0.28.tar";
sha256 = "0qp732j16cdmkpqv4vjplh9kcdbb1s4gfwff2d7k1sg4wqi8sa95";
url = "https://elpa.nongnu.org/nongnu/geiser-0.28.2.tar";
sha256 = "1d2g673zn59ggcr2sx9dsxibaqh6b456v4wbpg3wb5ph63rzrh8m";
};
packageRequires = [ emacs project ];
meta = {
@ -932,10 +1114,10 @@
elpaBuild {
pname = "geiser-guile";
ename = "geiser-guile";
version = "0.28.0";
version = "0.28.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.28.0.tar";
sha256 = "0nw77psyvl9lackyq5l60k84f1dyddn8y2sxm5b1z71gjkp481zi";
url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.28.1.tar";
sha256 = "0imh2vdc757vimwxi7pjdv09f83js76nbk7dg861qg0bcqf21g3i";
};
packageRequires = [ emacs geiser transient ];
meta = {
@ -1054,14 +1236,29 @@
license = lib.licenses.free;
};
}) {};
gnu-indent = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "gnu-indent";
ename = "gnu-indent";
version = "1.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/gnu-indent-1.0.tar";
sha256 = "0h2kj19k3b9sw1bp0fk37kmc4xwvd3ajlgfa8s13jnvggx77nn8a";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/gnu-indent.html";
license = lib.licenses.free;
};
}) {};
gnuplot = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "gnuplot";
ename = "gnuplot";
version = "0.8.0";
version = "0.8.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/gnuplot-0.8.0.tar";
sha256 = "1f27y18ivcdwlkgr3ql4qcbgzdp6vk1bkw2wlryrclpydbb1nya3";
url = "https://elpa.nongnu.org/nongnu/gnuplot-0.8.1.tar";
sha256 = "015b8ly4wmz03bcysbwy4d63r42sicwqa0j2j4aiis1kpy4lj3xw";
};
packageRequires = [ emacs ];
meta = {
@ -1129,6 +1326,21 @@
license = lib.licenses.free;
};
}) {};
gruber-darker-theme = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "gruber-darker-theme";
ename = "gruber-darker-theme";
version = "0.7";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/gruber-darker-theme-0.7.tar";
sha256 = "0k2njsg7bwy4i7ll5d9dpqawylgkfvp74bany8g487xvspjscrji";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/gruber-darker-theme.html";
license = lib.licenses.free;
};
}) {};
gruvbox-theme = callPackage ({ autothemer, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "gruvbox-theme";
@ -1256,10 +1468,10 @@
elpaBuild {
pname = "hl-block-mode";
ename = "hl-block-mode";
version = "0.1";
version = "0.2";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/hl-block-mode-0.1.tar";
sha256 = "08b2n8i0qmjp5r6ijlg66g0j8aiwhrczxyf0ssr9jbga43k4swzq";
url = "https://elpa.nongnu.org/nongnu/hl-block-mode-0.2.tar";
sha256 = "1qrq238arblk8v8nf98kcdckfhwzi27w5zbl31yvf36xz69l9y8n";
};
packageRequires = [ emacs ];
meta = {
@ -1267,6 +1479,21 @@
license = lib.licenses.free;
};
}) {};
hl-column = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "hl-column";
ename = "hl-column";
version = "1.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/hl-column-1.0.tar";
sha256 = "00y4g912s341p30xnb0qgj0gmzsqm696v06kjgy9yva5qgw51f03";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/hl-column.html";
license = lib.licenses.free;
};
}) {};
htmlize = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "htmlize";
@ -1286,10 +1513,10 @@
elpaBuild {
pname = "idle-highlight-mode";
ename = "idle-highlight-mode";
version = "1.1.3";
version = "1.1.4";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/idle-highlight-mode-1.1.3.tar";
sha256 = "05w2rqc71h1f13ysdfjma90s35kj5d5i2szcw54cqyky8rymx5dp";
url = "https://elpa.nongnu.org/nongnu/idle-highlight-mode-1.1.4.tar";
sha256 = "1j7y03b90gf3pl0xbfirm973k31l7nx90is69m3jrfai2f9qnflr";
};
packageRequires = [ emacs ];
meta = {
@ -1355,10 +1582,10 @@
elpaBuild {
pname = "inf-ruby";
ename = "inf-ruby";
version = "2.6.2";
version = "2.7.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/inf-ruby-2.6.2.tar";
sha256 = "09p9pny4p0bfw6lw5pf17spyd77jb0pliapp3mfn7r3w8l8wi8xc";
url = "https://elpa.nongnu.org/nongnu/inf-ruby-2.7.0.tar";
sha256 = "0wzzhr10q8mnai024g5nprsnl0bcdlqfrh4nxf8qq43paah28i6f";
};
packageRequires = [ emacs ];
meta = {
@ -1381,6 +1608,21 @@
license = lib.licenses.free;
};
}) {};
iwindow = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib, seq }:
elpaBuild {
pname = "iwindow";
ename = "iwindow";
version = "1.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/iwindow-1.0.tar";
sha256 = "076i0p9kq48hxkkwzzapnni6cpdr25hdrw9bs2cly8w4v5rmd6rj";
};
packageRequires = [ compat emacs seq ];
meta = {
homepage = "https://elpa.gnu.org/packages/iwindow.html";
license = lib.licenses.free;
};
}) {};
j-mode = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "j-mode";
@ -1471,14 +1713,29 @@
license = lib.licenses.free;
};
}) {};
lorem-ipsum = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "lorem-ipsum";
ename = "lorem-ipsum";
version = "0.4";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/lorem-ipsum-0.4.tar";
sha256 = "05zk11g0w3bnabxf5937hrkc3k58vlrh1bk61dar9gfbfdq3ijyg";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/lorem-ipsum.html";
license = lib.licenses.free;
};
}) {};
lua-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "lua-mode";
ename = "lua-mode";
version = "20210802";
version = "20221027";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/lua-mode-20210802.tar";
sha256 = "1yarwai9a0w4yywd0ajdkif4g26z98zw91lg1z78qw0k61qjmnh6";
url = "https://elpa.nongnu.org/nongnu/lua-mode-20221027.tar";
sha256 = "1irdlw77ny0a28msrbn4lm66ixrlf2grsj4izhpdm1n0yv66xvfc";
};
packageRequires = [ emacs ];
meta = {
@ -1598,6 +1855,36 @@
license = lib.licenses.free;
};
}) {};
meow = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "meow";
ename = "meow";
version = "1.4.2";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/meow-1.4.2.tar";
sha256 = "1iwysqxmaw85k7g742nx8z9vr3nnmwaidwjmx5n96cyssf64hgkv";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/meow.html";
license = lib.licenses.free;
};
}) {};
minibar = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "minibar";
ename = "minibar";
version = "0.2";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/minibar-0.2.tar";
sha256 = "0idb91vp0pbichv2gfs314av6cgx5mkrn9w3yxwj81if1bvsmw0h";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/minibar.html";
license = lib.licenses.free;
};
}) {};
moe-theme = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "moe-theme";
@ -1703,10 +1990,10 @@
elpaBuild {
pname = "nix-mode";
ename = "nix-mode";
version = "1.4.4";
version = "1.5.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/nix-mode-1.4.4.tar";
sha256 = "1nn74671273s5mjxzbdqvpwqx6w12zya21sxhzw51k2fs68vwh23";
url = "https://elpa.nongnu.org/nongnu/nix-mode-1.5.0.tar";
sha256 = "0zi7xmh777pqzgcv18jqwywvidpa984p0m705p6a9fns7dvv53j7";
};
packageRequires = [ emacs magit-section transient ];
meta = {
@ -1748,10 +2035,10 @@
elpaBuild {
pname = "org-contrib";
ename = "org-contrib";
version = "0.4";
version = "0.4.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/org-contrib-0.4.tar";
sha256 = "05r7w0h9v1vfhv1dd2vaabq2gm8ra70s1cirlp75s343b0z28ca6";
url = "https://elpa.nongnu.org/nongnu/org-contrib-0.4.1.tar";
sha256 = "0xhlsbqjj1zivlz44hdlkcwqalfjwds5fv2pcwn0rskfhr73xp9a";
};
packageRequires = [ emacs org ];
meta = {
@ -1885,6 +2172,21 @@
license = lib.licenses.free;
};
}) {};
paredit = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "paredit";
ename = "paredit";
version = "26";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/paredit-26.tar";
sha256 = "08f8nm3qyk0b4x7mkgra0zjpn9mmfnpr5g7yrvdzvms38y919qlh";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/paredit.html";
license = lib.licenses.free;
};
}) {};
parseclj = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "parseclj";
@ -1954,10 +2256,10 @@
elpaBuild {
pname = "pdf-tools";
ename = "pdf-tools";
version = "1.0";
version = "1.0.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/pdf-tools-1.0.tar";
sha256 = "0cjr7y2ikf2al43wrzlqdpbksj0ww6m0nvmlz97slx8nk94k2qyf";
url = "https://elpa.nongnu.org/nongnu/pdf-tools-1.0.0.tar";
sha256 = "0p9q9a11s68s95z8n0i45x1w8mg476bpnrvijg6i83779dmrpxh0";
};
packageRequires = [ emacs let-alist tablist ];
meta = {
@ -2014,10 +2316,10 @@
elpaBuild {
pname = "projectile";
ename = "projectile";
version = "2.6.0";
version = "2.7.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/projectile-2.6.0.tar";
sha256 = "0r0ylllx7vr903sjci1i6yf4xzn7k4azaw9l3azvc3mzrrjagvvj";
url = "https://elpa.nongnu.org/nongnu/projectile-2.7.0.tar";
sha256 = "1ibxsa1lv9aiplkfplamyn2wc2c6vfwfszyaicfx79aq2w9427bg";
};
packageRequires = [ emacs ];
meta = {
@ -2062,10 +2364,10 @@
elpaBuild {
pname = "racket-mode";
ename = "racket-mode";
version = "1.0.20221118.122133";
version = "1.0.20230209.92406";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20221118.122133.tar";
sha256 = "0a2lpvkarcw5rlydm3va7ajjsyhfbj023h93n6n94pjvllhn2rp2";
url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20230209.92406.tar";
sha256 = "1gs70pba6jjix6hnph6z2a2yjs9ka6xnhjl6qi8jcwyamkbpjiry";
};
packageRequires = [ emacs ];
meta = {
@ -2137,10 +2439,10 @@
elpaBuild {
pname = "rfc-mode";
ename = "rfc-mode";
version = "1.3.0";
version = "1.4.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/rfc-mode-1.3.0.tar";
sha256 = "1wdqp03rrx7ar21nvbnrb7518c3vgf41z00bav00pw8cdx5c4m10";
url = "https://elpa.nongnu.org/nongnu/rfc-mode-1.4.0.tar";
sha256 = "0036ypsjm35x8vwrlm346wcqmh85kbjmw0813q65z6k0gvmnwldj";
};
packageRequires = [ emacs ];
meta = {
@ -2201,10 +2503,10 @@
elpaBuild {
pname = "scad-mode";
ename = "scad-mode";
version = "93.1";
version = "93.2";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/scad-mode-93.1.tar";
sha256 = "0k9wqz2nd4j0wz2y300nn6rs8a9vpshnaa2hx6f8649k4y87bblp";
url = "https://elpa.nongnu.org/nongnu/scad-mode-93.2.tar";
sha256 = "0gp7ghmch5wkbby0avmlgj5kajiccbarjrx1szh9r3f3gi1ahawj";
};
packageRequires = [ emacs ];
meta = {
@ -2246,10 +2548,10 @@
elpaBuild {
pname = "scroll-on-jump";
ename = "scroll-on-jump";
version = "0.1";
version = "0.2";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/scroll-on-jump-0.1.tar";
sha256 = "0y6r0aa14sv8yh56w46s840bdkgq6y234qz1jbbsgklx42cw6zgg";
url = "https://elpa.nongnu.org/nongnu/scroll-on-jump-0.2.tar";
sha256 = "09yndis96ps18i252h66ins1hi3zn27410s5hahkj2989q4cqi1s";
};
packageRequires = [ emacs ];
meta = {
@ -2411,10 +2713,10 @@
elpaBuild {
pname = "subed";
ename = "subed";
version = "1.0.24";
version = "1.0.29";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/subed-1.0.24.tar";
sha256 = "1x9w858pgyhd7hlvn85h379f8sfvf8ly3a9596q4jkqbcp9riymq";
url = "https://elpa.nongnu.org/nongnu/subed-1.0.29.tar";
sha256 = "0q2sfdypj929y4fllk97rsb2bxm9a1izjy1f0z2viz5hz0hpqp26";
};
packageRequires = [ emacs ];
meta = {
@ -2426,10 +2728,10 @@
elpaBuild {
pname = "sweeprolog";
ename = "sweeprolog";
version = "0.8.8";
version = "0.17.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.8.8.tar";
sha256 = "0h9vn4kc1f1vxvzxv14hbv24skjmishg408s4d8g39bylhj5c5s4";
url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.17.0.tar";
sha256 = "0k51k77g1mivs3ijnkl0i51v9bfjmivwnbkqwza9kclxd4dwlvyy";
};
packageRequires = [ emacs ];
meta = {
@ -2486,10 +2788,10 @@
elpaBuild {
pname = "systemd";
ename = "systemd";
version = "1.6";
version = "1.6.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/systemd-1.6.tar";
sha256 = "1khfnx2qmg1i4m6axyya0xbzr3c9j136b8pzmqdnd6jamxh43wcg";
url = "https://elpa.nongnu.org/nongnu/systemd-1.6.1.tar";
sha256 = "0h6iwdi3j2ypgcwnyjs8rdlz5f8j25cya6z4v3n2phnkqbncmgx6";
};
packageRequires = [ emacs ];
meta = {
@ -2548,6 +2850,21 @@
license = lib.licenses.free;
};
}) {};
testcover-mark-line = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "testcover-mark-line";
ename = "testcover-mark-line";
version = "0.3";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/testcover-mark-line-0.3.tar";
sha256 = "18nlkm7p6fmaziqqbb4jmhpypn0b6233qd0c19xp16kjbxpg7ifh";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/testcover-mark-line.html";
license = lib.licenses.free;
};
}) {};
textile-mode = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "textile-mode";
@ -2642,10 +2959,10 @@
elpaBuild {
pname = "undo-fu";
ename = "undo-fu";
version = "0.4";
version = "0.5";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/undo-fu-0.4.tar";
sha256 = "15r0lkzbxgvnwdmaxgiwnik2z8622gdzmpxllv8pfr36y6jmsgs8";
url = "https://elpa.nongnu.org/nongnu/undo-fu-0.5.tar";
sha256 = "0akn8gw3wavsfhxa9m426jkjacsw3k8vaxymhqrzy18lpvg5hysw";
};
packageRequires = [ emacs ];
meta = {
@ -2657,10 +2974,10 @@
elpaBuild {
pname = "undo-fu-session";
ename = "undo-fu-session";
version = "0.2";
version = "0.4";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/undo-fu-session-0.2.tar";
sha256 = "1vxyazcxw2gxvxh96grsff1lijsd5fh3pjzkbkj7axn3myavp374";
url = "https://elpa.nongnu.org/nongnu/undo-fu-session-0.4.tar";
sha256 = "1p9qr9hzqiv1kgnglskny7m7lh2f8r4l0cf53431nf8hrp806qah";
};
packageRequires = [ emacs ];
meta = {
@ -2672,10 +2989,10 @@
elpaBuild {
pname = "vc-fossil";
ename = "vc-fossil";
version = "20220707";
version = "20221120";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/vc-fossil-20220707.tar";
sha256 = "0l33y8mij6rw4h47ryqpjxr1i2xzis98rbi230izkvsc6w7qf89q";
url = "https://elpa.nongnu.org/nongnu/vc-fossil-20221120.tar";
sha256 = "0ygacnq1w64iw8al2gcyjjwgvbnm2l97sw4lf5a2x6ms0fgnbdgk";
};
packageRequires = [];
meta = {
@ -2702,10 +3019,10 @@
elpaBuild {
pname = "visual-fill-column";
ename = "visual-fill-column";
version = "2.5";
version = "2.5.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/visual-fill-column-2.5.tar";
sha256 = "0mqhm7xkxpzjk96n6qybqg2780kbjg1w7ash88zhnbp8kvy0rrwi";
url = "https://elpa.nongnu.org/nongnu/visual-fill-column-2.5.1.tar";
sha256 = "1q2cimrcr4knh716cdnhs8nspk08w8x7bsbhx69s9hpzgr7mjq58";
};
packageRequires = [ emacs ];
meta = {
@ -2717,10 +3034,10 @@
elpaBuild {
pname = "web-mode";
ename = "web-mode";
version = "17.3.3";
version = "17.3.8";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.3.tar";
sha256 = "1ci28dfg6k4hwiqz85v9c24n7s52z29ghfyfjg971lq4mfqbx4yy";
url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.8.tar";
sha256 = "0g163mgf1kc2bfkh8b2s9jl5cmzgcni2g25hxmyxb4rz3v30z4ca";
};
packageRequires = [ emacs ];
meta = {
@ -2748,21 +3065,36 @@
license = lib.licenses.free;
};
}) {};
wgrep = callPackage ({ elpaBuild, fetchurl, lib }:
wgrep = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "wgrep";
ename = "wgrep";
version = "2.3.3";
version = "3.0.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/wgrep-2.3.3.tar";
sha256 = "12w9vsawqnd0rvsahx8vdiabds8rl1zkpmspmcqn28jprbql734r";
url = "https://elpa.nongnu.org/nongnu/wgrep-3.0.0.tar";
sha256 = "0vg23ydwkqrmhlll45gf2fjdxj9chx9bl9m0pgwrlkjw0ncxj3qp";
};
packageRequires = [];
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/wgrep.html";
license = lib.licenses.free;
};
}) {};
why-this = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "why-this";
ename = "why-this";
version = "2.0.4";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/why-this-2.0.4.tar";
sha256 = "0hqvqix9hqaki23vw3xilkcr84ak2vz4lwczr54s87x13idrg4px";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/why-this.html";
license = lib.licenses.free;
};
}) {};
with-editor = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "with-editor";
@ -2793,6 +3125,41 @@
license = lib.licenses.free;
};
}) {};
workroom = callPackage ({ compat
, elpaBuild
, emacs
, fetchurl
, lib
, project }:
elpaBuild {
pname = "workroom";
ename = "workroom";
version = "2.3";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/workroom-2.3.tar";
sha256 = "0c05pbxkrcgsjk7zcyxiacxrpxyvf85rf38nhaqhxbywh4j071fg";
};
packageRequires = [ compat emacs project ];
meta = {
homepage = "https://elpa.gnu.org/packages/workroom.html";
license = lib.licenses.free;
};
}) {};
writegood-mode = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "writegood-mode";
ename = "writegood-mode";
version = "2.2.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/writegood-mode-2.2.0.tar";
sha256 = "08b1650v6qsb3x1s5k4n5m2aqx1n26gc4wj822fm9s49k8vcpzl8";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/writegood-mode.html";
license = lib.licenses.free;
};
}) {};
ws-butler = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "ws-butler";
@ -2815,10 +3182,10 @@
elpaBuild {
pname = "xah-fly-keys";
ename = "xah-fly-keys";
version = "22.0.20221031102959";
version = "22.9.20230207171612";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-22.0.20221031102959.tar";
sha256 = "08i6y3ry0sp597vz0zl7c50lnp04fszydw6m1093sb5nlifbhrb8";
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-22.9.20230207171612.tar";
sha256 = "0m633k8rx2k3gwbh3hndkmn3k804pg7j7xmqw6yf8j2a2ym4893b";
};
packageRequires = [ emacs ];
meta = {
@ -2826,6 +3193,21 @@
license = lib.licenses.free;
};
}) {};
xkcd = callPackage ({ elpaBuild, fetchurl, json ? null, lib }:
elpaBuild {
pname = "xkcd";
ename = "xkcd";
version = "1.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/xkcd-1.1.tar";
sha256 = "1yszrba4cvisiy7m16rzpj7plbnafj4c7bdgxvqwxwhsasfmh6ag";
};
packageRequires = [ json ];
meta = {
homepage = "https://elpa.gnu.org/packages/xkcd.html";
license = lib.licenses.free;
};
}) {};
xml-rpc = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "xml-rpc";

View file

@ -1,24 +1,24 @@
{ lib, mkDerivationWith, fetchurl, python3Packages
{ lib, mkDerivationWith, fetchFromGitHub, python3Packages
, file, intltool, gobject-introspection, libgudev
, udisks, gexiv2, gst_all_1, libnotify
, udisks, gexiv2, gst_all_1, libnotify, ifuse, libimobiledevice
, exiftool, gdk-pixbuf, libmediainfo, vmtouch
}:
mkDerivationWith python3Packages.buildPythonApplication rec {
pname = "rapid-photo-downloader";
version = "0.9.18";
version = "0.9.34";
src = fetchurl {
url = "https://launchpad.net/rapid/pyqt/${version}/+download/${pname}-${version}.tar.gz";
sha256 = "15p7sssg6vmqbm5xnc4j5dr89d7gl7y5qyq44a240yl5aqkjnybw";
src = fetchFromGitHub {
owner = "damonlynch";
repo = "rapid-photo-downloader";
rev = "v${version}";
hash = "sha256-4VC1fwQh9L3c5tgLUaC36p9QHL4dR2vkWc2XlNl0Xzw=";
};
# Disable version check and fix install tests
# Disable version check
postPatch = ''
substituteInPlace raphodo/constants.py \
--replace "disable_version_check = False" "disable_version_check = True"
substituteInPlace raphodo/rescan.py \
--replace "from preferences" "from raphodo.preferences"
'';
nativeBuildInputs = [
@ -28,9 +28,15 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
# Package has no generally usable unit tests.
# The included doctests expect specific, hardcoded hardware to be present.
doCheck = false;
# Instead, we just make sure the program runs enough to report its version.
checkPhase = ''
export XDG_DATA_HOME=$(mktemp -d)
export QT_QPA_PLATFORM=offscreen
$out/bin/rapid-photo-downloader --detailed-version
'';
# NOTE: Without gobject-introspection in buildInputs, launching fails with
# NOTE: Without gobject-introspection in buildInputs and strictDeps = false,
# launching fails with:
# "Namespace [Notify / GExiv2 / GUdev] not available"
buildInputs = [
gdk-pixbuf
@ -46,7 +52,11 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
udisks
];
strictDeps = false;
propagatedBuildInputs = with python3Packages; [
ifuse
libimobiledevice
pyqt5
pygobject3
gphoto2
@ -57,15 +67,19 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
arrow
python-dateutil
easygui
babel
colour
pillow
pyheif
pymediainfo
sortedcontainers
rawkit
requests
colorlog
pyprind
setuptools
show-in-file-manager
tenacity
];
] ++ lib.optional (pythonOlder "3.8") importlib-metadata;
preFixup = ''
makeWrapperArgs+=(

View file

@ -10,22 +10,22 @@
}:
let
openShiftVersion = "4.12.0";
openShiftVersion = "4.12.1";
okdVersion = "4.11.0-0.okd-2022-11-05-030711";
podmanVersion = "4.3.1";
writeKey = "cvpHsNcmGCJqVzf6YxrSnVlwFSAZaYtp";
in
buildGoModule rec {
version = "2.13.1";
version = "2.14.0";
pname = "crc";
gitCommit = "b5b864fdd4ed047027f439db96c2658aa194d2bc";
gitCommit = "868d96cd4f73dad72df54475c52c65f9741dc240";
modRoot = "cmd/crc";
src = fetchFromGitHub {
owner = "crc-org";
repo = "crc";
rev = "v${version}";
sha256 = "sha256-0e62mQ01pt0kClrEx4ss2T8BN1+0aQiCFPyDg5agbTU";
sha256 = "sha256-q1OJJTveXoNzW9lohQOY7LVR3jOyiQZX5nHBgRupxTM=";
};
vendorSha256 = null;
@ -55,7 +55,6 @@ buildGoModule rec {
export HOME=$(mktemp -d)
'';
passthru.tests.version = testers.testVersion {
package = crc;
command = ''
@ -69,6 +68,6 @@ buildGoModule rec {
description = "Manages a local OpenShift 4.x cluster or a Podman VM optimized for testing and development purposes";
homepage = "https://crc.dev";
license = licenses.asl20;
maintainers = with maintainers; [ shikanime tricktron ];
maintainers = with maintainers; [ matthewpi shikanime tricktron ];
};
}

View file

@ -2,24 +2,15 @@
python3.pkgs.buildPythonApplication rec {
pname = "fava";
version = "1.23.1";
version = "1.24";
format = "pyproject";
src = python3.pkgs.fetchPypi {
inherit pname version;
sha256 = "sha256-Uw8UIJa+Dtsy+o31I1ynLyhZrFNX42NFRXu1O2ISbzU=";
hash = "sha256-Ep+8O93L/CG4qcBFzCBMRasK/ySp8+cU59LcyZRTJtg=";
};
patches = [
./flask-babel.patch
];
pythonRelaxDeps = [
"cheroot"
"Flask-Babel"
];
nativeBuildInputs = with python3.pkgs; [ setuptools-scm pythonRelaxDepsHook ];
nativeBuildInputs = with python3.pkgs; [ setuptools-scm ];
propagatedBuildInputs = with python3.pkgs; [
babel

View file

@ -1,14 +0,0 @@
diff --git a/src/fava/application.py b/src/fava/application.py
index 811c1de4..19de051a 100644
--- a/src/fava/application.py
+++ b/src/fava/application.py
@@ -148,8 +148,7 @@ def get_locale() -> str | None:
return request.accept_languages.best_match(["en"] + LANGUAGES)
-BABEL = Babel(app)
-BABEL.localeselector(get_locale)
+BABEL = Babel(app, locale_selector=get_locale)
for function in template_filters.FILTERS:

View file

@ -0,0 +1,82 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, dtkwidget
, qt5integration
, qt5platform-plugins
, dde-qt-dbus-factory
, cmake
, qttools
, pkg-config
, wrapQtAppsHook
, runtimeShell
, qtbase
, gtest
}:
stdenv.mkDerivation rec {
pname = "dde-calendar";
version = "5.8.30";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "sha256-8/UXq9W3Gb1Lg/nOji6zcHJts6lgY2uDxvrBxQs3Zio=";
};
patches = [
(fetchpatch {
name = "chore: use GNUInstallDirs in CmakeLists";
url = "https://github.com/linuxdeepin/dde-calendar/commit/b9d9555d90a36318eeee62ece49250b4bf8acd10.patch";
sha256 = "sha256-pvgxZPczs/lkwNjysNuVu+1AY69VZlxOn7hR9A02/3M=";
})
];
postPatch = ''
substituteInPlace calendar-service/src/dbmanager/huanglidatabase.cpp \
--replace "/usr/share/dde-calendar/data/huangli.db" "$out/share/dde-calendar/data/huangli.db"
substituteInPlace calendar-service/src/main.cpp \
--replace "/usr/share/dde-calendar/translations" "$out/share/dde-calendar/translations"
substituteInPlace calendar-service/assets/data/com.deepin.dataserver.Calendar.service \
--replace "/usr/lib/deepin-daemon/dde-calendar-service" "$out/lib/deepin-daemon/dde-calendar-service"
substituteInPlace calendar-client/assets/dbus/com.deepin.Calendar.service \
--replace "/usr/bin/dde-calendar" "$out/bin/dde-calendar"
substituteInPlace calendar-service/{src/{csystemdtimercontrol.cpp,jobremindmanager.cpp},assets/{data/com.dde.calendarserver.calendar.service,dde-calendar-service.desktop}} \
--replace "/bin/bash" "${runtimeShell}"
'';
nativeBuildInputs = [
cmake
qttools
pkg-config
wrapQtAppsHook
];
buildInputs = [
dtkwidget
qt5platform-plugins
dde-qt-dbus-factory
gtest
];
cmakeFlags = [ "-DVERSION=${version}" ];
# qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
qtWrapperArgs = [
"--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
];
postFixup = ''
wrapQtApp $out/lib/deepin-daemon/dde-calendar-service
'';
meta = with lib; {
description = "Calendar for Deepin Desktop Environment";
homepage = "https://github.com/linuxdeepin/dde-calendar";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = teams.deepin.members;
};
}

View file

@ -30,6 +30,7 @@ let
udisks2-qt5 = callPackage ./library/udisks2-qt5 { };
#### CORE
dde-calendar = callPackage ./core/dde-calendar { };
dde-polkit-agent = callPackage ./core/dde-polkit-agent { };
dpa-ext-gnomekeyring = callPackage ./core/dpa-ext-gnomekeyring { };

View file

@ -1,6 +1,8 @@
{ lib
, stdenv
, fetchFromGitHub
, gmic
, gmic-qt
}:
stdenv.mkDerivation rec {
@ -28,6 +30,11 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
passthru.tests = {
# Need to update in lockstep.
inherit gmic gmic-qt;
};
meta = with lib; {
homepage = "http://cimg.eu/";
description = "A small, open source, C++ toolkit for image processing";

View file

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "ngtcp2";
version = "0.13.0";
version = "0.13.1";
src = fetchFromGitHub {
owner = "ngtcp2";
repo = pname;
rev = "v${version}";
sha256 = "sha256-rKEF5R1GubgFiblmdTqh26PxTRxIqXUJHxj0Qwd3N00=";
sha256 = "sha256-bkTbnf7vyTxA623JVGUgrwAuXK7d8kzijOK1F4Sh4yY=";
};
outputs = [ "out" "dev" "doc" ];

View file

@ -1,6 +1,18 @@
{ config, stdenv, lib, fetchFromGitHub, cmake, gtest, doCheck ? true
, cudaSupport ? config.cudaSupport or false, ncclSupport ? false
, rLibrary ? false, cudaPackages, llvmPackages, R, rPackages }:
{ config
, stdenv
, lib
, fetchFromGitHub
, cmake
, gtest
, doCheck ? true
, cudaSupport ? config.cudaSupport or false
, ncclSupport ? false
, rLibrary ? false
, cudaPackages
, llvmPackages
, R
, rPackages
}:
assert ncclSupport -> cudaSupport;
# Disable regular tests when building the R package
@ -51,9 +63,13 @@ stdenv.mkDerivation rec {
cmakeFlags = lib.optionals doCheck [ "-DGOOGLE_TEST=ON" ]
++ lib.optionals cudaSupport [
"-DUSE_CUDA=ON"
"-DCUDA_HOST_COMPILER=${cudaPackages.cudatoolkit.cc}/bin/cc"
] ++ lib.optionals (cudaSupport
"-DUSE_CUDA=ON"
# Their CMakeLists.txt does not respect CUDA_HOST_COMPILER, instead using the CXX compiler.
# https://github.com/dmlc/xgboost/blob/ccf43d4ba0a94e2f0a3cc5a526197539ae46f410/CMakeLists.txt#L145
"-DCMAKE_C_COMPILER=${cudaPackages.cudatoolkit.cc}/bin/gcc"
"-DCMAKE_CXX_COMPILER=${cudaPackages.cudatoolkit.cc}/bin/g++"
] ++ lib.optionals
(cudaSupport
&& lib.versionAtLeast cudaPackages.cudatoolkit.version "11.4.0")
[ "-DBUILD_WITH_CUDA_CUB=ON" ]
++ lib.optionals ncclSupport [ "-DUSE_NCCL=ON" ]

View file

@ -8,14 +8,14 @@
buildDunePackage rec {
pname = "git";
version = "3.10.1";
version = "3.12.0";
minimalOCamlVersion = "4.08";
duneVersion = "3";
src = fetchurl {
url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz";
sha256 = "sha256-plu69FIpyJcuZ8nJ3QnufLnDEjtcsoAd8czKHfzTkd8=";
hash = "sha256-qgd5fny23J6pcOdgwB3Yt1UxJii2XE25OjcSVFdLMKA=";
};
# remove changelog for the carton package

View file

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "adafruit-platformdetect";
version = "3.40.2";
version = "3.40.3";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "Adafruit-PlatformDetect";
inherit version;
hash = "sha256-NLbKvC/7N10Y7l94sfiWCmBz92qlgufb1S62Adod4WA=";
hash = "sha256-phG9DEl4JlrIN3zil0SQRZ+DnktpunK094nxVQ9Cksw=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "ailment";
version = "9.2.38";
version = "9.2.39";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
hash = "sha256-nhvFBXOoxCWaSjUdPyQP234URI50DM3ZoweRK9d1LIA=";
hash = "sha256-JO46r+eNBmMzCaXvpcQU3pnn833ABeMYnFlxh7bTHB8=";
};
nativeBuildInputs = [

View file

@ -31,7 +31,7 @@
buildPythonPackage rec {
pname = "angr";
version = "9.2.38";
version = "9.2.39";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -40,7 +40,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "v${version}";
hash = "sha256-9/7GiF+Q7AUmKEqleVF8brCFSAqswalXxgPCApD19ZE=";
hash = "sha256-De8np0Q+/JeWYAVmT7DtMOTOsdSh8DddTeNTBOl1KXk=";
};
propagatedBuildInputs = [

View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "archinfo";
version = "9.2.38";
version = "9.2.39";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
hash = "sha256-fpYoX5+TrZaozq7E3qBlhYUPrbbL3fb+wadQToLqtU0=";
hash = "sha256-vmavJwt8YPpG0xW15lzX1gvuOiViWazqHUDiImlZGPo=";
};
nativeBuildInputs = [

View file

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "asyncua";
version = "1.0.0";
version = "1.0.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "FreeOpcUa";
repo = "opcua-asyncio";
rev = "v${version}";
hash = "sha256-wBtI3ZlsvOkNvl/q0X9cm2hNRUBW1oB/kZOo8lqo4dQ=";
hash = "sha256-6A4z+tiQ2oUlB9t44wlW64j5sjWFMAgqT3Xt0FdJCBs=";
};
propagatedBuildInputs = [

View file

@ -6,19 +6,22 @@
, httpx
, orjson
, packaging
, pythonOlder
, xmltodict
}:
buildPythonPackage rec {
pname = "axis";
version = "46";
version = "47";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "Kane610";
repo = pname;
rev = "v${version}";
hash = "sha256-alhezwRPag+6JoC4zbusWdxFyZQ2dZl04Uj1PkiN4qo=";
rev = "refs/tags/v${version}";
hash = "sha256-a8YvFX3IcbX4Sm75GzGv7vIyMmSHxwGejyq6nE7foOE=";
};
propagatedBuildInputs = [
@ -32,7 +35,10 @@ buildPythonPackage rec {
# Tests requires a server on localhost
doCheck = false;
pythonImportsCheck = [ "axis" ];
pythonImportsCheck = [
"axis"
];
meta = with lib; {
description = "Python library for communicating with devices from Axis Communications";

View file

@ -22,13 +22,13 @@
buildPythonPackage rec {
pname = "binwalk${lib.optionalString visualizationSupport "-full"}";
version = "2.3.3";
version = "2.3.4";
src = fetchFromGitHub {
owner = "ReFirmLabs";
repo = "binwalk";
rev = "v${version}";
sha256 = "0phqyqv34vhh80dgipiggs4n3iq2vfjk9ywx2c5d8g61vzgbd2g8";
sha256 = "sha256-hlPbzqGRSXcIqlI+SNKq37CnnHd1IoMBNSjhyeAM1TE=";
};
patches = [

View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "claripy";
version = "9.2.38";
version = "9.2.39";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-nKUp8N1T6fcXd1V9Ppqb5fFy8UHGPE/tiyHIanhgUoE=";
hash = "sha256-Qr/wyaa5vDWd/0TEn9utdeaq6SINtopd49LuQddECvw=";
};
nativeBuildInputs = [

View file

@ -16,7 +16,7 @@
let
# The binaries are following the argr projects release cycle
version = "9.2.38";
version = "9.2.39";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
@ -38,7 +38,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
hash = "sha256-3B62NMlAGv4Q6HOkACafBETbOj4QsWsvfrTAM+5b9NY=";
hash = "sha256-RwcVh2lmY5l4mbd4GG0C0PH+u4NDuTkGJRgyAVgpFMM=";
};
nativeBuildInputs = [

View file

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "fakeredis";
version = "2.9.0";
version = "2.9.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "dsoftwareinc";
repo = "fakeredis-py";
rev = "refs/tags/v${version}";
hash = "sha256-7sX+XDhyMtijwcwKK1Bt7n26v24qinb4HDVQD8zUg2M=";
hash = "sha256-YwUNjEM0Lmj14fTqQXy78LRzlfffy7KZOTulufkeRZA=";
};
nativeBuildInputs = [

View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "hatasmota";
version = "0.6.3";
version = "0.6.4";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "emontnemery";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-aGCAQAZb8mChe/N43h6O21mhiPPm3XPM56cGqScWlxE=";
hash = "sha256-fE5klk4ToayRyUmE2xtcMMsH4VKOKZHqvBCa9GG84rU=";
};
propagatedBuildInputs = [

View file

@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "mistune";
version = "2.0.4";
version = "2.0.5";
format = "pyproject";
src = fetchPypi {
inherit pname version;
sha256 = "9ee0a66053e2267aba772c71e06891fa8f1af6d4b01d5e84e267b4570d4d9808";
hash = "sha256-AkYRPLJJLbh1xr5Wl0p8iTMzvybNkokchfYxUc7gnTQ=";
};
nativeBuildInputs = [
@ -27,6 +27,7 @@ buildPythonPackage rec {
pythonImportsCheck = [ "mistune" ];
meta = with lib; {
changelog = "https://github.com/lepture/mistune/blob/v${version}/docs/changes.rst";
description = "A sane Markdown parser with useful plugins and renderers";
homepage = "https://github.com/lepture/mistune";
license = licenses.bsd3;

View file

@ -3,18 +3,21 @@
, fetchFromGitHub
, setuptools
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "multimethod";
version = "1.6";
version = "1.9.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "coady";
repo = pname;
rev = "v${version}";
sha256 = "09vrxzv8q0lqsbh6d83wjdd29ja66rj31y7wmyha14jk603fd9k0";
rev = "refs/tags/v${version}";
hash = "sha256-KfO+6bZOZOv9SWTV4eqJTWb3/PeCpnXknSF47ddZR5o=";
};
nativeBuildInputs = [
@ -31,7 +34,8 @@ buildPythonPackage rec {
meta = with lib; {
description = "Multiple argument dispatching";
homepage = "https://github.com/coady/multimethod";
homepage = "https://coady.github.io/multimethod/";
changelog = "https://github.com/coady/multimethod/tree/v${version}#changes";
license = licenses.asl20;
maintainers = teams.determinatesystems.members;
};

View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "nextdns";
version = "1.2.2";
version = "1.3.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "bieniu";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-F6vTOwE8WdcELH+W7VuRbGDLD+7+a09iai/TDMBfv4s=";
hash = "sha256-+ApchGB/+mV5i751jTfZoP8XJ3VAYPCwx6VoRkq5950=";
};
propagatedBuildInputs = [

View file

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "peaqevcore";
version = "12.0.1";
version = "12.0.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-nhipggmTd0BgYOPo4SoezrvPmw7wQL71K5y1EKoHRDw=";
hash = "sha256-TfIzTbVXhS+DxroxBqfodS4HAQBPJQ4/Vo4Jh8VjYfM=";
};
postPatch = ''

View file

@ -0,0 +1,25 @@
{ lib
, buildPythonPackage
, fetchPypi
, cffi
, libheif
}:
buildPythonPackage rec {
pname = "pyheif";
version = "0.7.1";
src = fetchPypi {
inherit pname version;
hash = "sha256-hqXFF0N51xRrXtGmiJL69yaKE1+39QOaARv7em6QMgA=";
};
propagatedBuildInputs = [ cffi libheif ];
meta = with lib; {
homepage = "https://github.com/carsales/pyheif";
description = "Python interface to libheif library";
license = licenses.asl20;
maintainers = with maintainers; [ ];
};
}

View file

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "pyvex";
version = "9.2.38";
version = "9.2.39";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-9Cv0Quh0uN/DxOG1J2QCFb8fqRJTyovixmU8X721t8o=";
hash = "sha256-IQCMvP4o/aV+/tkP9SS5tlSNAdI6yRxYPczdF9jm1aY=";
};
nativeBuildInputs = [

View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "screenlogicpy";
version = "0.7.1";
version = "0.7.2";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "dieselrabbit";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-goziVk8OmPKkDb5oVSo/TVLLzwwqx3/Vlw0s/P9+Wss=";
hash = "sha256-0yQ0upLkx5oroEH9BvIOfM5bgmVJw8o83IeAao5ncVs=";
};
propagatedBuildInputs = [

View file

@ -0,0 +1,39 @@
{ lib
, stdenv
, buildPythonPackage
, fetchPypi
, pythonOlder
, importlib-metadata
, packaging
, pyxdg
}:
buildPythonPackage rec {
pname = "show-in-file-manager";
version = "1.1.4";
src = fetchPypi {
inherit pname version;
hash = "sha256-FdFuSodbniF7A40C8CnDgAxKatZF4/c8nhB+omurOts=";
};
propagatedBuildInputs = [
packaging
]
++ lib.optional (stdenv.isLinux) pyxdg
++ lib.optional (pythonOlder "3.8") importlib-metadata;
meta = with lib; {
homepage = "https://github.com/damonlynch/showinfilemanager";
description = "Open the system file manager and select files in it";
longDescription = ''
Show in File Manager is a Python package to open the system file
manager and optionally select files in it. The point is not to
open the files, but to select them in the file manager, thereby
highlighting the files and allowing the user to quickly do
something with them.
'';
license = licenses.mit;
maintainers = with maintainers; [ ];
};
}

View file

@ -1,51 +1,51 @@
{
version = "2.9.3";
version = "2.11.0";
linux_py_37_cpu = {
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.9.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
sha256 = "0p1a4dlqj7kl4a3aad33r083f5pfspc0hm0x9a3b1qvvgaldww08";
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.11.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
sha256 = "0m360pj7ix57d30s9inq9g5cbv7jrgnk2ryygj8irfw569rrzk7x";
};
linux_py_38_cpu = {
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.9.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
sha256 = "1zq39ls1asha4zkrfqvg5375mmryf20hc1fi243k8z077391ihhv";
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.11.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
sha256 = "1kx4rj15fnbmznpyjjbkw5mf0b03gw97h7ijlqf1kcdjzmbm24la";
};
linux_py_39_cpu = {
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.9.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
sha256 = "16gz4bcw2gvwh3264wc8a2lyfr542avhgdrnmd0pxwszqg45rkdj";
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.11.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
sha256 = "1isvyiwrhis8i2xjx5mmsrxv2i7fl0hg1jaa1pgw70c6sz5vqm0r";
};
linux_py_310_cpu = {
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.9.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
sha256 = "1a5s19x8ybncmpx8hr116bm6cvjar3b0sj8k8w2wrpxhh02sndwh";
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.11.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
sha256 = "1ni7yrk33xdh6zpy840y3hbidmfgj9dxp690yxrjwarr3694465k";
};
linux_py_37_gpu = {
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.9.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
sha256 = "03zh1fzi7s5incxghgnk4hm9m9kg989pn420g532grzj1f85x23f";
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.11.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
sha256 = "14r2sa25gmpda6kysv7dbbrzmaxb47jq2fpy9dfcfbiwsrzszwhi";
};
linux_py_38_gpu = {
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.9.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
sha256 = "1czajraildk4acwn3rd921wfarl1jwbnmfiwk57ijsx5s9q4d328";
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.11.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
sha256 = "1z8g3j1a8bzpfl3cwf74wal9npfyzr89l14wrrjmd311w9c06z25";
};
linux_py_39_gpu = {
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.9.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
sha256 = "0rk1ii9dqi856bgm596igbragvcwk3799cz05x6gyjkixdkbk5jj";
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.11.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
sha256 = "1nfhw5fwkvwyvcap41756avrg4c8xm0xrdgj8spqfjvamc3chcqp";
};
linux_py_310_gpu = {
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.9.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
sha256 = "1q6pf6140qza16p1yxw2z3n7ndfq3by2k6wc45lhpx4bl1vs7my7";
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.11.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
sha256 = "1vckr15ys8cks8pj9yld4zyhm8w7bjnc8yq6q1g3145fl99ygac1";
};
mac_py_37_cpu = {
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.9.3-cp37-cp37m-macosx_10_14_x86_64.whl";
sha256 = "05y3y18ggnrfzrcrzkxkb3djbhsm8001s1l1nmvvv9zq8v02b6hp";
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.11.0-cp37-cp37m-macosx_10_14_x86_64.whl";
sha256 = "12lk1wx5dqklc210xya3sbm3gl4163454k13d2nnk94z2iwi376j";
};
mac_py_38_cpu = {
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.9.3-cp38-cp38-macosx_10_14_x86_64.whl";
sha256 = "0qgzqdfv4q5bl6hd932jd6zfp47abva59nyrgxw19kiz0gzq3lw9";
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.11.0-cp38-cp38-macosx_10_14_x86_64.whl";
sha256 = "1j4y6vhlpz27xllwr9n0gswmwld221ws8sl5wdn56hi347r2jv85";
};
mac_py_39_cpu = {
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.9.3-cp39-cp39-macosx_10_14_x86_64.whl";
sha256 = "1zjvjyvz0lshvqf5sc80bxkdwnk8b43abwmzsm9m6dyl8waj5d5r";
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.11.0-cp39-cp39-macosx_10_14_x86_64.whl";
sha256 = "11ylm1a2mxf9lz958p39q2pag4mqss6zsfxagk3ybwj1lsy2bkyr";
};
mac_py_310_cpu = {
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.9.3-cp310-cp310-macosx_10_14_x86_64.whl";
sha256 = "0pncslab7m9d89syaad7n3fgxygkr07d5prir225a42kym8slni8";
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.11.0-cp310-cp310-macosx_10_14_x86_64.whl";
sha256 = "1l6jnmi14sbxbrpwqw3bq6mv1mn5rhbkx9j3dxfnhh10dkn9y13c";
};
}

View file

@ -1,6 +1,6 @@
#!/usr/bin/env bash
version="2.9.3"
version="2.11.0"
bucket="https://storage.googleapis.com/tensorflow"

View file

@ -1,24 +0,0 @@
{ mkDerivation, fetchFromGitHub, fetchpatch
, aeson, aeson-pretty, attoparsec, base, bytestring, conduit, conduit-extra
, containers, exceptions, mtl, optparse-simple, parsec, scientific, lib
, text, unordered-containers, vector
}:
mkDerivation rec {
pname = "jl";
version = "0.1.0";
sha256 = "15vvn3swjpc5qmdng1fcd8m9nif4qnjmpmxc9hdw5cswzl055lkj";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson attoparsec base bytestring containers exceptions mtl parsec
scientific text unordered-containers vector
];
executableHaskellDepends = [
aeson aeson-pretty base bytestring conduit conduit-extra containers
mtl optparse-simple text vector
];
license = lib.licenses.bsd3;
description = "Functional sed for JSON";
maintainers = with lib.maintainers; [ fgaz ];
homepage = "https://github.com/chrisdone/jl";
}

View file

@ -41,6 +41,7 @@ buildDotnetModule rec {
meta = with lib; {
description = "API Support for your favorite torrent trackers";
homepage = "https://github.com/Jackett/Jackett/";
changelog = "https://github.com/Jackett/Jackett/releases/tag/v${version}";
license = licenses.gpl2Only;
maintainers = with maintainers; [ edwtjo nyanloutre purcell ];
};

View file

@ -47,6 +47,7 @@ in stdenv.mkDerivation rec {
meta = with lib; {
description = "A Usenet/BitTorrent movie downloader";
homepage = "https://radarr.video/";
changelog = "https://github.com/Radarr/Radarr/releases/tag/v${version}";
license = licenses.gpl3Only;
maintainers = with maintainers; [ edwtjo purcell ];
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];

View file

@ -56,15 +56,16 @@ stdenv.mkDerivation rec {
runHook preInstall
mkdir -p $out/bin $out/share/outline
mv node_modules build $out/share/outline/
mv public node_modules build $out/share/outline/
node_modules=$out/share/outline/node_modules
build=$out/share/outline/build
# On NixOS the WorkingDirectory is set to the build directory, as
# this contains files needed in the onboarding process. This folder
# must also contain the `public` folder for mail notifications to
# work, as it contains the mail templates.
mv public $out/share/outline/build
node_modules=$out/share/outline/node_modules
build=$out/share/outline/build
ln -s $out/share/outline/public $build/public
makeWrapper ${nodejs}/bin/node $out/bin/outline-server \
--add-flags $build/server/index.js \

View file

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "zimfw";
version = "1.11.1";
version = "1.11.2";
src = fetchFromGitHub {
owner = "zimfw";
repo = "zimfw";
rev = "v${version}";
## zim only needs this one file to be installed.
sparseCheckout = [ "zimfw.zsh" ];
sha256 = "sha256-ZL/x5FNklRa5JnZ5UUofnIcW4dCInaEvTLBQfMJDWIM=";
sha256 = "sha256-FgTCdSSDp8pvscRUD4vVk/peoCI4e9FPoCuHP25wxXA=";
};
strictDeps = true;
dontConfigure = true;

View file

@ -1,23 +1,23 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.5)
CFPropertyList (3.0.6)
rexml
addressable (2.8.1)
public_suffix (>= 2.0.2, < 6.0)
artifactory (3.0.15)
atomos (0.1.3)
aws-eventstream (1.2.0)
aws-partitions (1.660.0)
aws-sdk-core (3.167.0)
aws-partitions (1.714.0)
aws-sdk-core (3.170.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.5)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.59.0)
aws-sdk-kms (1.62.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.117.1)
aws-sdk-s3 (1.119.1)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
@ -36,8 +36,8 @@ GEM
unf (>= 0.0.5, < 1.0.0)
dotenv (2.8.1)
emoji_regex (3.2.3)
excon (0.94.0)
faraday (1.10.2)
excon (0.99.0)
faraday (1.10.3)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
@ -66,7 +66,7 @@ GEM
faraday_middleware (1.2.0)
faraday (~> 1.0)
fastimage (2.2.6)
fastlane (2.211.0)
fastlane (2.212.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
@ -106,9 +106,9 @@ GEM
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
gh_inspector (1.1.3)
google-apis-androidpublisher_v3 (0.31.0)
google-apis-androidpublisher_v3 (0.34.0)
google-apis-core (>= 0.9.1, < 2.a)
google-apis-core (0.9.1)
google-apis-core (0.11.0)
addressable (~> 2.5, >= 2.5.1)
googleauth (>= 0.16.2, < 2.a)
httpclient (>= 2.8.1, < 3.a)
@ -117,8 +117,8 @@ GEM
retriable (>= 2.0, < 4.a)
rexml
webrick
google-apis-iamcredentials_v1 (0.16.0)
google-apis-core (>= 0.9.1, < 2.a)
google-apis-iamcredentials_v1 (0.17.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-playcustomapp_v1 (0.12.0)
google-apis-core (>= 0.9.1, < 2.a)
google-apis-storage_v1 (0.19.0)
@ -148,11 +148,11 @@ GEM
http-cookie (1.0.5)
domain_name (~> 0.5)
httpclient (2.8.3)
jmespath (1.6.1)
json (2.6.2)
jwt (2.5.0)
jmespath (1.6.2)
json (2.6.3)
jwt (2.7.0)
memoist (0.16.2)
mini_magick (4.11.0)
mini_magick (4.12.0)
mini_mime (1.1.2)
multi_json (1.15.0)
multipart-post (2.0.0)
@ -161,7 +161,7 @@ GEM
optparse (0.1.1)
os (1.1.4)
plist (3.6.0)
public_suffix (5.0.0)
public_suffix (5.0.1)
rake (13.0.6)
representable (3.2.0)
declarative (< 0.1.0)
@ -178,7 +178,7 @@ GEM
faraday (>= 0.17.5, < 3.a)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
simctl (1.6.8)
simctl (1.6.10)
CFPropertyList
naturally
terminal-notifier (2.0.0)
@ -194,7 +194,7 @@ GEM
unf_ext
unf_ext (0.0.8.2)
unicode-display_width (1.8.0)
webrick (1.7.0)
webrick (1.8.1)
word_wrap (1.0.0)
xcodeproj (1.22.0)
CFPropertyList (>= 2.3.3, < 4.0)
@ -215,4 +215,4 @@ DEPENDENCIES
fastlane
BUNDLED WITH
2.3.24
2.4.6

View file

@ -45,10 +45,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ycbhr5329f13sjm1f3vc0iid3mmnxyg8230sp98p8jxh4c8bkwv";
sha256 = "1dpdx2l1h0nglxxd82khijyxdfa0p2v4s6b5fv2j33jd3k97da05";
type = "gem";
};
version = "1.660.0";
version = "1.714.0";
};
aws-sdk-core = {
dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
@ -56,10 +56,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "095nj7sf8914y60m1grnpy7cm6ybnw4ywnc0j84gz2vgv1m8awfk";
sha256 = "0zc4zhv2wq7s5p8c9iaplama1lpg2kwldg81j83c8w4xydf1wd2r";
type = "gem";
};
version = "3.167.0";
version = "3.170.0";
};
aws-sdk-kms = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
@ -67,10 +67,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lq1f03gy02f8z5fpc61kngkja8kkgk2m8cc6g42aij0iszjw03c";
sha256 = "070s86pxrbq98iddq6shdq7g0lrzgsdqnsnc5l4kygvqimliq4dr";
type = "gem";
};
version = "1.59.0";
version = "1.62.0";
};
aws-sdk-s3 = {
dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
@ -78,10 +78,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "17ah9j82313ynb8nkcbq21fa3dy1a3v6lk5kdrhphazbpb2xmxkn";
sha256 = "1rpnlzsl52znhcki13jkwdshgwf51pn26267481f4fa842gr7xgp";
type = "gem";
};
version = "1.117.1";
version = "1.119.1";
};
aws-sigv4 = {
dependencies = ["aws-eventstream"];
@ -110,10 +110,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "193l8r1ycd3dcxa7lsb4pqcghbk56dzc5244m6y8xmv88z6m31d7";
sha256 = "1a36zn77yyibqsfpka0i8vgf3yv98ic2b9wwlbc29566y8wpa2bq";
type = "gem";
};
version = "3.0.5";
version = "3.0.6";
};
claide = {
groups = ["default"];
@ -213,10 +213,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "094kbi32i56p08348b95amg9dz5c9prn5jywhkcghsd3d6kll981";
sha256 = "0j826kfvzn7nc5pv950n270r0sx1702k988ad11cdlav3dcxxw09";
type = "gem";
};
version = "0.94.0";
version = "0.99.0";
};
faraday = {
dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"];
@ -224,10 +224,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1d5ipsv069dhgv9zhxgj8pz4j52yhgvfm01aq881yz7qgjd7ilxp";
sha256 = "1c760q0ks4vj4wmaa7nh1dgvgqiwaw0mjr7v8cymy7i3ffgjxx90";
type = "gem";
};
version = "1.10.2";
version = "1.10.3";
};
faraday-cookie_jar = {
dependencies = ["faraday" "http-cookie"];
@ -368,10 +368,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1h8w77nq8sbvqvv01sq3xynrizfg80yzas9wlbx3a18gqsvk4hjh";
sha256 = "1c7j1w0jyxn8gfk69s2h1v1pxfpk9s1hc8a9inblkj0zlba7cikl";
type = "gem";
};
version = "2.211.0";
version = "2.212.0";
};
gh_inspector = {
groups = ["default"];
@ -389,10 +389,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "14rndcs6jlq679cq760ww3grnqsq71kbq0sjsllgf9mngsxhcg7n";
sha256 = "09almff2kzdkciai63365q18wy0dfjhj48h8wa7lk77pjbfxgqfp";
type = "gem";
};
version = "0.31.0";
version = "0.34.0";
};
google-apis-core = {
dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "webrick"];
@ -400,10 +400,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0d5h7sm8asxg252dnkk91sq51ynk1m06i15an6s04ihsi5ja64n0";
sha256 = "184zkm5agi7r5fl79hgahjpydsc4d23nd2ynh2sr9z8gs2w4h82f";
type = "gem";
};
version = "0.9.1";
version = "0.11.0";
};
google-apis-iamcredentials_v1 = {
dependencies = ["google-apis-core"];
@ -411,10 +411,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "07d6c8pf4fam9bzkz5fjqypklclq774m0h7ahyxv0hn5zb3hkw4b";
sha256 = "0ysil0bkh755kmf9xvw5szhk1yyh3gqzwfsrbwsrl77gsv7jarcs";
type = "gem";
};
version = "0.16.0";
version = "0.17.0";
};
google-apis-playcustomapp_v1 = {
dependencies = ["google-apis-core"];
@ -528,30 +528,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0";
sha256 = "1cdw9vw2qly7q7r41s7phnac264rbsdqgj4l0h4nqgbjb157g393";
type = "gem";
};
version = "1.6.1";
version = "1.6.2";
};
json = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0yk5d10yvspkc5jyvx9gc1a9pn1z8v4k2hvjk1l88zixwf3wf3cl";
sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6";
type = "gem";
};
version = "2.6.2";
version = "2.6.3";
};
jwt = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0kcmnx6rgjyd7sznai9ccns2nh7p7wnw3mi8a7vf2wkm51azwddq";
sha256 = "09yj3z5snhaawh2z1w45yyihzmh57m6m7dp8ra8gxavhj5kbiq5p";
type = "gem";
};
version = "2.5.0";
version = "2.7.0";
};
memoist = {
groups = ["default"];
@ -568,10 +568,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1aj604x11d9pksbljh0l38f70b558rhdgji1s9i763hiagvvx2hs";
sha256 = "0slh78f9z6n0l1i2km7m48yz7l4fjrk88sj1f4mh1wb39sl2yc37";
type = "gem";
};
version = "4.11.0";
version = "4.12.0";
};
mini_mime = {
groups = ["default"];
@ -658,10 +658,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6";
sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35";
type = "gem";
};
version = "5.0.0";
version = "5.0.1";
};
rake = {
groups = ["default"];
@ -761,10 +761,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1v9rsdmg5c5kkf8ps47xnrfbvjnq11sbaifr186jwkh4npawz00x";
sha256 = "0sr3z4kmp6ym7synicyilj9vic7i9nxgaszqx6n1xn1ss7s7g45r";
type = "gem";
};
version = "1.6.8";
version = "1.6.10";
};
terminal-notifier = {
groups = ["default"];
@ -874,10 +874,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7";
sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r";
type = "gem";
};
version = "1.7.0";
version = "1.8.1";
};
word_wrap = {
groups = ["default"];

View file

@ -25,6 +25,8 @@
, gnused
, coreutils
, jq
, nix-update-script
, gimpPlugins
}:
let
@ -50,13 +52,13 @@ assert lib.assertMsg (builtins.all (d: d != null) variants.${variant}.extraDeps
mkDerivation rec {
pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}";
version = "3.2.0";
version = "3.2.1";
src = fetchFromGitHub {
owner = "c-koi";
repo = "gmic-qt";
rev = "v.${version}";
sha256 = "sha256-I5XC7zbDyBPFj4zul9rshoyeVV0hRQQ3aZQzEvYrgdc=";
sha256 = "sha256-z+GtYLBcHVufXwdeSd8WKmPmU1+/EKMv26kNaEgyt5w=";
};
nativeBuildInputs = [
@ -97,7 +99,17 @@ mkDerivation rec {
wrapQtApp "$out/${gimp.targetPluginDir}/gmic_gimp_qt/gmic_gimp_qt"
'';
passthru = {
tests = {
gimp-plugin = gimpPlugins.gmic;
};
updateScript = nix-update-script { };
};
meta = with lib; {
# Broken since 3.2.0 update, cannot handle system gmic and cimg.
broken = true;
description = variants.${variant}.description;
homepage = "http://gmic.eu/";
license = licenses.gpl3Plus;

View file

@ -21,11 +21,12 @@
, gnused
, coreutils
, jq
, gmic-qt
}:
stdenv.mkDerivation rec {
pname = "gmic";
version = "3.2.0";
version = "3.2.1";
outputs = [ "out" "lib" "dev" "man" ];
@ -33,7 +34,7 @@ stdenv.mkDerivation rec {
owner = "dtschump";
repo = "gmic";
rev = "v.${version}";
hash = "sha256-lrIlzxXWqv046G5uRkBQnjvysaIcv+iDKxjuUEJWqcs=";
hash = "sha256-oEH4GlSV+642TGSJJhV4yzydh1hAQZfzwaiPAZFNQtI=";
};
# TODO: build this from source
@ -41,7 +42,7 @@ stdenv.mkDerivation rec {
gmic_stdlib = fetchurl {
name = "gmic_stdlib.h";
url = "http://gmic.eu/gmic_stdlib${lib.replaceStrings ["."] [""] version}.h";
hash = "sha256-kWHzA1Dk7F4IROq/gk+RJllry3BABMbssJxhkQ6Cp2M=";
hash = "sha256-f8d9jTVnHwSoyMuiM+Qv86e/BYX9SSx9cl3borihxnc=";
};
nativeBuildInputs = [
@ -81,6 +82,11 @@ stdenv.mkDerivation rec {
'';
passthru = {
tests = {
# Needs to update in lockstep.
inherit gmic-qt;
};
updateScript = writeShellScript "${pname}-update-script" ''
set -o errexit
PATH=${lib.makeBinPath [ common-updater-scripts curl gnugrep gnused coreutils jq ]}
@ -95,7 +101,7 @@ stdenv.mkDerivation rec {
for component in src gmic_stdlib; do
# The script will not perform an update when the version attribute is up to date from previous platform run
# We need to clear it before each run
update-source-version "--source-key=$component" "gmic" 0 "$(printf '0%.0s' {1..64})"
update-source-version "--source-key=$component" "gmic" 0 "${lib.fakeHash}"
update-source-version "--source-key=$component" "gmic" $latestVersion
done
'';

View file

@ -11,6 +11,7 @@
, Security
, xorg
, zlib
, buildPackages
}:
rustPlatform.buildRustPackage rec {
@ -47,24 +48,20 @@ rustPlatform.buildRustPackage rec {
--replace "#version" "${version}"
'';
postInstall = ''
# Do not nag users about installing shell integration, since
# it is impure.
wrapProgram $out/bin/broot \
--set BR_INSTALL no
postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ''
# Install shell function for bash.
$out/bin/broot --print-shell-function bash > br.bash
${stdenv.hostPlatform.emulator buildPackages} $out/bin/broot --print-shell-function bash > br.bash
install -Dm0444 -t $out/etc/profile.d br.bash
# Install shell function for zsh.
$out/bin/broot --print-shell-function zsh > br.zsh
${stdenv.hostPlatform.emulator buildPackages} $out/bin/broot --print-shell-function zsh > br.zsh
install -Dm0444 br.zsh $out/share/zsh/site-functions/br
# Install shell function for fish
$out/bin/broot --print-shell-function fish > br.fish
${stdenv.hostPlatform.emulator buildPackages} $out/bin/broot --print-shell-function fish > br.fish
install -Dm0444 -t $out/share/fish/vendor_functions.d br.fish
'' + ''
# install shell completion files
OUT_DIR=$releaseDir/build/broot-*/out
@ -73,6 +70,11 @@ rustPlatform.buildRustPackage rec {
installShellCompletion --zsh $OUT_DIR/{_br,_broot}
installManPage man/broot.1
# Do not nag users about installing shell integration, since
# it is impure.
wrapProgram $out/bin/broot \
--set BR_INSTALL no
'';
doInstallCheck = true;

View file

@ -0,0 +1,40 @@
{ lib
, stdenv
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "nsc";
version = "2.7.6";
src = fetchFromGitHub {
owner = "nats-io";
repo = pname;
rev = "v${version}";
hash = "sha256-aieUCQ5JVJQs4RoTGaXwfTv3xC1ozSsQyfCLsD245go=";
};
ldflags = [
"-s"
"-w"
"-X main.version=v${version}"
"-X main.builtBy=nixpkgs"
];
vendorHash = "sha256-gDwppx0ORG+pXzTdGtUVbiFyTD/P7avt+/V89Gl0QYY=";
preCheck = ''
# Tests attempt to write to the home directory.
export HOME=$(mktemp -d)
'';
meta = {
description = "A tool for creating NATS account and user access configurations";
homepage = "https://github.com/nats-io/nsc";
license = with lib.licenses; [ asl20 ];
maintainers = with lib.maintainers; [ cbrewster ];
mainProgram = "nsc";
broken = stdenv.isDarwin;
};
}

View file

@ -8639,7 +8639,7 @@ with pkgs;
jitterentropy = callPackage ../development/libraries/jitterentropy { };
jl = haskellPackages.callPackage ../development/tools/jl { };
jl = haskellPackages.jl;
jless = callPackage ../development/tools/jless {
inherit (darwin.apple_sdk.frameworks) AppKit;
@ -9215,6 +9215,8 @@ with pkgs;
natscli = callPackage ../tools/system/natscli { };
nsc = callPackage ../tools/system/nsc { };
nbench = callPackage ../tools/misc/nbench { };
nbtscanner = callPackage ../tools/security/nbtscanner {

View file

@ -8195,6 +8195,8 @@ self: super: with self; {
pyhs100 = callPackage ../development/python-modules/pyhs100 { };
pyheif = callPackage ../development/python-modules/pyheif { };
pyi2cflash = callPackage ../development/python-modules/pyi2cflash { };
pyialarm = callPackage ../development/python-modules/pyialarm { };
@ -10561,6 +10563,8 @@ self: super: with self; {
should-dsl = callPackage ../development/python-modules/should-dsl { };
show-in-file-manager = callPackage ../development/python-modules/show-in-file-manager { };
showit = callPackage ../development/python-modules/showit { };
shtab = callPackage ../development/python-modules/shtab { };