Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
3ce63131a1
@ -47,6 +47,88 @@ These functions write `text` to the Nix store. This is useful for creating scrip
|
||||
|
||||
Many more commands wrap `writeTextFile` including `writeText`, `writeTextDir`, `writeScript`, and `writeScriptBin`. These are convenience functions over `writeTextFile`.
|
||||
|
||||
Here are a few examples:
|
||||
```nix
|
||||
# Writes my-file to /nix/store/<store path>
|
||||
writeTextFile {
|
||||
name = "my-file";
|
||||
text = ''
|
||||
Contents of File
|
||||
'';
|
||||
}
|
||||
# See also the `writeText` helper function below.
|
||||
|
||||
# Writes executable my-file to /nix/store/<store path>/bin/my-file
|
||||
writeTextFile {
|
||||
name = "my-file";
|
||||
text = ''
|
||||
Contents of File
|
||||
'';
|
||||
executable = true;
|
||||
destination = "/bin/my-file";
|
||||
}
|
||||
# Writes contents of file to /nix/store/<store path>
|
||||
writeText "my-file"
|
||||
''
|
||||
Contents of File
|
||||
'';
|
||||
# Writes contents of file to /nix/store/<store path>/share/my-file
|
||||
writeTextDir "share/my-file"
|
||||
''
|
||||
Contents of File
|
||||
'';
|
||||
# Writes my-file to /nix/store/<store path> and makes executable
|
||||
writeScript "my-file"
|
||||
''
|
||||
Contents of File
|
||||
'';
|
||||
# Writes my-file to /nix/store/<store path>/bin/my-file and makes executable.
|
||||
writeScriptBin "my-file"
|
||||
''
|
||||
Contents of File
|
||||
'';
|
||||
# Writes my-file to /nix/store/<store path> and makes executable.
|
||||
writeShellScript "my-file"
|
||||
''
|
||||
Contents of File
|
||||
'';
|
||||
# Writes my-file to /nix/store/<store path>/bin/my-file and makes executable.
|
||||
writeShellScriptBin "my-file"
|
||||
''
|
||||
Contents of File
|
||||
'';
|
||||
|
||||
```
|
||||
|
||||
## `concatTextFile`, `concatText`, `concatScript` {#trivial-builder-concatText}
|
||||
|
||||
These functions concatenate `files` to the Nix store in a single file. This is useful for configuration files structured in lines of text. `concatTextFile` takes an attribute set and expects two arguments, `name` and `files`. `name` corresponds to the name used in the Nix store path. `files` will be the files to be concatenated. You can also set `executable` to true to make this file have the executable bit set.
|
||||
`concatText` and`concatScript` are simple wrappers over `concatTextFile`.
|
||||
|
||||
Here are a few examples:
|
||||
```nix
|
||||
|
||||
# Writes my-file to /nix/store/<store path>
|
||||
concatTextFile {
|
||||
name = "my-file";
|
||||
files = [ drv1 "${drv2}/path/to/file" ];
|
||||
}
|
||||
# See also the `concatText` helper function below.
|
||||
|
||||
# Writes executable my-file to /nix/store/<store path>/bin/my-file
|
||||
concatTextFile {
|
||||
name = "my-file";
|
||||
files = [ drv1 "${drv2}/path/to/file" ];
|
||||
executable = true;
|
||||
destination = "/bin/my-file";
|
||||
}
|
||||
# Writes contents of files to /nix/store/<store path>
|
||||
concatText "my-file" [ file1 file2 ]
|
||||
|
||||
# Writes contents of files to /nix/store/<store path>
|
||||
concatScript "my-file" [ file1 file2 ]
|
||||
```
|
||||
|
||||
## `writeShellApplication` {#trivial-builder-writeShellApplication}
|
||||
|
||||
This can be used to easily produce a shell script that has some dependencies (`runtimeInputs`). It automatically sets the `PATH` of the script to contain all of the listed inputs, sets some sanity shellopts (`errexit`, `nounset`, `pipefail`), and checks the resulting script with [`shellcheck`](https://github.com/koalaman/shellcheck).
|
||||
@ -72,6 +154,26 @@ validation.
|
||||
## `symlinkJoin` {#trivial-builder-symlinkJoin}
|
||||
|
||||
This can be used to put many derivations into the same directory structure. It works by creating a new derivation and adding symlinks to each of the paths listed. It expects two arguments, `name`, and `paths`. `name` is the name used in the Nix store path for the created derivation. `paths` is a list of paths that will be symlinked. These paths can be to Nix store derivations or any other subdirectory contained within.
|
||||
Here is an example:
|
||||
```nix
|
||||
# adds symlinks of hello and stack to current build and prints "links added"
|
||||
symlinkJoin { name = "myexample"; paths = [ pkgs.hello pkgs.stack ]; postBuild = "echo links added"; }
|
||||
```
|
||||
This creates a derivation with a directory structure like the following:
|
||||
```
|
||||
/nix/store/sglsr5g079a5235hy29da3mq3hv8sjmm-myexample
|
||||
|-- bin
|
||||
| |-- hello -> /nix/store/qy93dp4a3rqyn2mz63fbxjg228hffwyw-hello-2.10/bin/hello
|
||||
| `-- stack -> /nix/store/6lzdpxshx78281vy056lbk553ijsdr44-stack-2.1.3.1/bin/stack
|
||||
`-- share
|
||||
|-- bash-completion
|
||||
| `-- completions
|
||||
| `-- stack -> /nix/store/6lzdpxshx78281vy056lbk553ijsdr44-stack-2.1.3.1/share/bash-completion/completions/stack
|
||||
|-- fish
|
||||
| `-- vendor_completions.d
|
||||
| `-- stack.fish -> /nix/store/6lzdpxshx78281vy056lbk553ijsdr44-stack-2.1.3.1/share/fish/vendor_completions.d/stack.fish
|
||||
...
|
||||
```
|
||||
|
||||
## `writeReferencesToFile` {#trivial-builder-writeReferencesToFile}
|
||||
|
||||
|
||||
@ -214,7 +214,7 @@ in rec {
|
||||
|
||||
manualEpub = runCommand "nixos-manual-epub"
|
||||
{ inherit sources;
|
||||
buildInputs = [ libxml2.bin libxslt.bin zip ];
|
||||
nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin buildPackages.zip ];
|
||||
}
|
||||
''
|
||||
# Generate the epub manual.
|
||||
|
||||
@ -196,9 +196,7 @@ in
|
||||
protocols.source = pkgs.iana-etc + "/etc/protocols";
|
||||
|
||||
# /etc/hosts: Hostname-to-IP mappings.
|
||||
hosts.source = pkgs.runCommand "hosts" {} ''
|
||||
cat ${escapeShellArgs cfg.hostFiles} > $out
|
||||
'';
|
||||
hosts.source = pkgs.concatText "hosts" cfg.hostFiles;
|
||||
|
||||
# /etc/netgroup: Network-wide groups.
|
||||
netgroup.text = mkDefault "";
|
||||
|
||||
@ -76,7 +76,7 @@ let
|
||||
} ''
|
||||
export NIX_STORE_DIR=$TMPDIR/store
|
||||
export NIX_STATE_DIR=$TMPDIR/state
|
||||
${pkgs.nix}/bin/nix-instantiate \
|
||||
${pkgs.buildPackages.nix}/bin/nix-instantiate \
|
||||
--show-trace \
|
||||
--eval --json --strict \
|
||||
--argstr libPath "$libPath" \
|
||||
|
||||
@ -14,6 +14,8 @@ let
|
||||
|
||||
in
|
||||
{
|
||||
imports = [ (mkRemovedOptionModule [ "services" "sniproxy" "logDir" ] "Now done by LogsDirectory=. Set to a custom path if you log to a different folder in your config.") ];
|
||||
|
||||
options = {
|
||||
services.sniproxy = {
|
||||
enable = mkEnableOption "sniproxy server";
|
||||
@ -50,13 +52,6 @@ in
|
||||
}
|
||||
'';
|
||||
};
|
||||
|
||||
logDir = mkOption {
|
||||
type = types.str;
|
||||
default = "/var/log/sniproxy/";
|
||||
description = "Location of the log directory for sniproxy.";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
@ -66,18 +61,12 @@ in
|
||||
description = "sniproxy server";
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
preStart = ''
|
||||
test -d ${cfg.logDir} || {
|
||||
echo "Creating initial log directory for sniproxy in ${cfg.logDir}"
|
||||
mkdir -p ${cfg.logDir}
|
||||
chmod 640 ${cfg.logDir}
|
||||
}
|
||||
chown -R ${cfg.user}:${cfg.group} ${cfg.logDir}
|
||||
'';
|
||||
|
||||
serviceConfig = {
|
||||
Type = "forking";
|
||||
ExecStart = "${pkgs.sniproxy}/bin/sniproxy -c ${configFile}";
|
||||
LogsDirectory = "sniproxy";
|
||||
LogsDirectoryMode = "0640";
|
||||
Restart = "always";
|
||||
};
|
||||
};
|
||||
|
||||
@ -25,8 +25,8 @@ let
|
||||
};
|
||||
|
||||
connect = mkOption {
|
||||
type = types.int;
|
||||
description = "To which port the decrypted connection should be forwarded.";
|
||||
type = types.either types.str types.int;
|
||||
description = "Port or IP:Port to which the decrypted connection should be forwarded.";
|
||||
};
|
||||
|
||||
cert = mkOption {
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
trivialBuild rec {
|
||||
pname = "apheleia";
|
||||
version = "1.1.2+unstable=2021-10-03";
|
||||
version = "1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raxod502";
|
||||
repo = pname;
|
||||
rev = "8b9d576f2fda10d0c9051fc03c1eb1d9791e32fd";
|
||||
hash = "sha256-QwGlCdHBll16mbfQxGw1EORZFUxYCZSt8ThYTTGjRpo=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-yd9yhQOs0+RB8RKaXnV/kClDm8cO97RkC8yw5b8IKRo=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@ -23,8 +23,12 @@ trivialBuild rec {
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/raxod502/apheleia";
|
||||
description = "Asynchronous buffer reformat";
|
||||
longDescription = ''
|
||||
Run code formatter on buffer contents without moving point, using RCS
|
||||
patches and dynamic programming.
|
||||
'';
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ AndersonTorres leungbk ];
|
||||
platforms = emacs.meta.platforms;
|
||||
inherit (emacs.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
trivialBuild {
|
||||
pname = "bqn-mode";
|
||||
version = "0.pre+date=2021-12-03";
|
||||
version = "0.pre+date=2022-01-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "museoa";
|
||||
repo = "bqn-mode";
|
||||
rev = "38fba1193e0d1101f3b90bd76e419c011651ad6f";
|
||||
sha256 = "0fdfz3kmrdgmx2i6fgrrj1cvapvrgnc3ahnwx3aayrpl1f091439";
|
||||
rev = "86ef8b4d32d272b2765cd4a6e6e0b70a4f3e99a2";
|
||||
hash = "sha256-6ygV/iNzzpZ77w+Dh/snHAzUxrbfaU9TxuNOtJK6pNQ=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -234,10 +234,10 @@
|
||||
elpaBuild {
|
||||
pname = "auctex";
|
||||
ename = "auctex";
|
||||
version = "13.0.14";
|
||||
version = "13.0.15";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/auctex-13.0.14.tar";
|
||||
sha256 = "1gmqdcg9s6xf8kvzh1j27nbimakd5cy8pwsn0il19l026kxjimr8";
|
||||
url = "https://elpa.gnu.org/packages/auctex-13.0.15.tar";
|
||||
sha256 = "1rm8s02d1mx5sw7yj65zlr07xhimnmvqav7f45nz2h8bwka02c3c";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -335,14 +335,29 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
blist = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "blist";
|
||||
ename = "blist";
|
||||
version = "0.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/blist-0.1.tar";
|
||||
sha256 = "0p9jx7m05ynfi3bnd91jghw7101ym8qzm5r42rb1vy85pcf9lbad";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/blist.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
bluetooth = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "bluetooth";
|
||||
ename = "bluetooth";
|
||||
version = "0.2";
|
||||
version = "0.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/bluetooth-0.2.el";
|
||||
sha256 = "1dq04p6ms0zx4awlypp4crkz7dzal4xg8ac7p8fqacz196rczssp";
|
||||
url = "https://elpa.gnu.org/packages/bluetooth-0.3.tar";
|
||||
sha256 = "1q27hk4j7k0q9vqgn9nq7q0vhn9jdqbygs7d9lv5gwfhdzdnl4az";
|
||||
};
|
||||
packageRequires = [ dash emacs ];
|
||||
meta = {
|
||||
@ -681,10 +696,10 @@
|
||||
elpaBuild {
|
||||
pname = "consult";
|
||||
ename = "consult";
|
||||
version = "0.13";
|
||||
version = "0.14";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/consult-0.13.tar";
|
||||
sha256 = "08hwvyj9sif9r92nhd09prwlryyqgnifjfqj51xgx98m0rg7ks3p";
|
||||
url = "https://elpa.gnu.org/packages/consult-0.14.tar";
|
||||
sha256 = "0lb72j4nxvaar2vip6jlyn62b9z2p2vsmijk3m9nsrshbqnlf0rc";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -711,10 +726,10 @@
|
||||
elpaBuild {
|
||||
pname = "corfu";
|
||||
ename = "corfu";
|
||||
version = "0.16";
|
||||
version = "0.17";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/corfu-0.16.tar";
|
||||
sha256 = "04xgq5rkz8a0lykcyjsxq76yapbzz8vfw8gxqvdx0y58bhcw82y6";
|
||||
url = "https://elpa.gnu.org/packages/corfu-0.17.tar";
|
||||
sha256 = "13nmbyrsvglzv57n9srl0kz75y07v8imr6c99nbf1mssli3h6n7y";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -816,10 +831,10 @@
|
||||
elpaBuild {
|
||||
pname = "csv-mode";
|
||||
ename = "csv-mode";
|
||||
version = "1.17";
|
||||
version = "1.18";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/csv-mode-1.17.tar";
|
||||
sha256 = "16kv3n70pl4h3jfmmqy9bzflsm4nv7cwvrj7g4mgy8yb76nbyka2";
|
||||
url = "https://elpa.gnu.org/packages/csv-mode-1.18.tar";
|
||||
sha256 = "0fv7hvsfbc9n4hsgg3ywk8qf4ig5a986zfq0lwnjj8pcz1bpmrxj";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
@ -921,10 +936,10 @@
|
||||
elpaBuild {
|
||||
pname = "devdocs";
|
||||
ename = "devdocs";
|
||||
version = "0.2";
|
||||
version = "0.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/devdocs-0.2.tar";
|
||||
sha256 = "1npc7yra7pvf86ahmz1h7hnjxrz15ar1vjcalg4ilizypycpgrwj";
|
||||
url = "https://elpa.gnu.org/packages/devdocs-0.3.tar";
|
||||
sha256 = "03asw26nsnnx7hmyqhksq165vpii0h8y6qjjn0x4sdkyyns16yp7";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1176,10 +1191,10 @@
|
||||
elpaBuild {
|
||||
pname = "eev";
|
||||
ename = "eev";
|
||||
version = "20211205";
|
||||
version = "20211226";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/eev-20211205.tar";
|
||||
sha256 = "0qicm3ym9n6iamlj0xyzn8729gfwjp5lwq6lj8r3ydgs4ggsr4jy";
|
||||
url = "https://elpa.gnu.org/packages/eev-20211226.tar";
|
||||
sha256 = "15ggg7sv4m5yc8ldyyffz7vgaj00xbw15zga0x2lpdfmahh6y2as";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1294,10 +1309,10 @@
|
||||
elpaBuild {
|
||||
pname = "embark";
|
||||
ename = "embark";
|
||||
version = "0.13";
|
||||
version = "0.14";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/embark-0.13.tar";
|
||||
sha256 = "04x3cfikfvzr2xl1zh6kj0q31160kmh1vrzyrla3n6f8z5qch63x";
|
||||
url = "https://elpa.gnu.org/packages/embark-0.14.tar";
|
||||
sha256 = "12d4lza54sf493z9hx1fqlrhrx19girrdh560syi4gg03kg8s7nr";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1314,10 +1329,10 @@
|
||||
elpaBuild {
|
||||
pname = "embark-consult";
|
||||
ename = "embark-consult";
|
||||
version = "0.2";
|
||||
version = "0.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/embark-consult-0.2.tar";
|
||||
sha256 = "0f1022yk6d88glrrawa8cl6yd5n44p8wnbfwn0f8z6j1n8wxq37z";
|
||||
url = "https://elpa.gnu.org/packages/embark-consult-0.3.tar";
|
||||
sha256 = "1l38bnphfq65r2fjy8zi7a8l4h361bfz756sswa3r7446jhd48rv";
|
||||
};
|
||||
packageRequires = [ consult emacs embark ];
|
||||
meta = {
|
||||
@ -1334,10 +1349,10 @@
|
||||
elpaBuild {
|
||||
pname = "emms";
|
||||
ename = "emms";
|
||||
version = "7.8";
|
||||
version = "8";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/emms-7.8.tar";
|
||||
sha256 = "1nlb9rrdlbcqghph30r9i9m1brbdha818czbms0zhzdisxb0smi0";
|
||||
url = "https://elpa.gnu.org/packages/emms-8.tar";
|
||||
sha256 = "1iffh6n8q9xag25m9bgnpywa27bkdvvz2gr500hdgwwddgdm4pq8";
|
||||
};
|
||||
packageRequires = [ cl-lib nadvice seq ];
|
||||
meta = {
|
||||
@ -1699,10 +1714,10 @@
|
||||
elpaBuild {
|
||||
pname = "gnorb";
|
||||
ename = "gnorb";
|
||||
version = "1.6.9";
|
||||
version = "1.6.10";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/gnorb-1.6.9.tar";
|
||||
sha256 = "027qqcxd3531f0j6frwlnw542lis4xgsx0ss1mdwb6hqc5f0vaxm";
|
||||
url = "https://elpa.gnu.org/packages/gnorb-1.6.10.tar";
|
||||
sha256 = "0kwgpyydnzphlw8rwyw9rim3j1awd0njxssm47db76nwwyxl1ry3";
|
||||
};
|
||||
packageRequires = [ cl-lib ];
|
||||
meta = {
|
||||
@ -1751,10 +1766,10 @@
|
||||
elpaBuild {
|
||||
pname = "gnugo";
|
||||
ename = "gnugo";
|
||||
version = "3.1.1";
|
||||
version = "3.1.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/gnugo-3.1.1.tar";
|
||||
sha256 = "035rgiz42q042h41l4cvf0hr8igy2vyn3s1hsl2pgh2dq2jjylv6";
|
||||
url = "https://elpa.gnu.org/packages/gnugo-3.1.2.tar";
|
||||
sha256 = "138gzdyi8scqimvs49da66j8f5a43bhgpasn1bxzdj2zffwlwp6g";
|
||||
};
|
||||
packageRequires = [ ascii-art-to-unicode cl-lib xpm ];
|
||||
meta = {
|
||||
@ -1949,14 +1964,29 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
ilist = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "ilist";
|
||||
ename = "ilist";
|
||||
version = "0.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ilist-0.1.tar";
|
||||
sha256 = "1ihh44276ivgykva805540nkkrqmc61lydv20l99si3amg07q9bh";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/ilist.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
ioccur = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "ioccur";
|
||||
ename = "ioccur";
|
||||
version = "2.5";
|
||||
version = "2.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ioccur-2.5.tar";
|
||||
sha256 = "06a6djln2rry3qnb063yarji3p18hcpp5zrw7q43a45k7qaiaji8";
|
||||
url = "https://elpa.gnu.org/packages/ioccur-2.6.tar";
|
||||
sha256 = "0k7nr73gmd0z5zqkwdacvfsmyflri3f15a15zpr7va28pnxqzsdk";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
@ -2108,10 +2138,10 @@
|
||||
elpaBuild {
|
||||
pname = "js2-mode";
|
||||
ename = "js2-mode";
|
||||
version = "20201220";
|
||||
version = "20211229";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/js2-mode-20201220.tar";
|
||||
sha256 = "0zdrp8lap1ijrmsn9jsnvm44b6vxlgh9vcla5ysh1ga95zkjxrwm";
|
||||
url = "https://elpa.gnu.org/packages/js2-mode-20211229.tar";
|
||||
sha256 = "0qf7z0mmrvlncf1ac6yiza5wmcaf588d53ma41vhj58adaahimz6";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
@ -2168,10 +2198,10 @@
|
||||
elpaBuild {
|
||||
pname = "kind-icon";
|
||||
ename = "kind-icon";
|
||||
version = "0.1.3";
|
||||
version = "0.1.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/kind-icon-0.1.3.tar";
|
||||
sha256 = "0iqbjlqna5n8dx78350macs129wnri7kgmxk2qf3w9bj6qp760sn";
|
||||
url = "https://elpa.gnu.org/packages/kind-icon-0.1.4.tar";
|
||||
sha256 = "00pyvnq4dx51l2wbhvm6k6cx5xmy32j4h1lkr5kr8s3j5w83ip25";
|
||||
};
|
||||
packageRequires = [ emacs svg-lib ];
|
||||
meta = {
|
||||
@ -2183,10 +2213,10 @@
|
||||
elpaBuild {
|
||||
pname = "kiwix";
|
||||
ename = "kiwix";
|
||||
version = "1.1.4";
|
||||
version = "1.1.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/kiwix-1.1.4.tar";
|
||||
sha256 = "1ls11a7fc6d4gj85g8m09r95fvc4ppc0k0fs28d1hzybmgl89rgl";
|
||||
url = "https://elpa.gnu.org/packages/kiwix-1.1.5.tar";
|
||||
sha256 = "17k4aa8s9m24c572qvl5a481iw9ny6wmd5yrg47iv4d2lb2i13h2";
|
||||
};
|
||||
packageRequires = [ emacs request ];
|
||||
meta = {
|
||||
@ -2363,10 +2393,10 @@
|
||||
elpaBuild {
|
||||
pname = "marginalia";
|
||||
ename = "marginalia";
|
||||
version = "0.10";
|
||||
version = "0.11";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/marginalia-0.10.tar";
|
||||
sha256 = "0sw4kfqda3z9bph4vgzqvg045li64ww2gdc2cgddi2m5p7anq20g";
|
||||
url = "https://elpa.gnu.org/packages/marginalia-0.11.tar";
|
||||
sha256 = "0mri8awary11hwg6lib903q5jcv2isnf8mi62mgndiki5s9cgrbs";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2547,10 +2577,10 @@
|
||||
elpaBuild {
|
||||
pname = "modus-themes";
|
||||
ename = "modus-themes";
|
||||
version = "1.7.0";
|
||||
version = "2.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/modus-themes-1.7.0.tar";
|
||||
sha256 = "1ncpgya5lbwr5z7gbq59prfqqnjxhqgaylcjr23mwrhbvvfrj5ff";
|
||||
url = "https://elpa.gnu.org/packages/modus-themes-2.0.0.tar";
|
||||
sha256 = "16kvkm7hsdk6jfdjkzafwdkwwri7cqki29qxqqhzkpwwghqlissl";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2706,10 +2736,10 @@
|
||||
elpaBuild {
|
||||
pname = "nano-modeline";
|
||||
ename = "nano-modeline";
|
||||
version = "0.2";
|
||||
version = "0.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/nano-modeline-0.2.tar";
|
||||
sha256 = "13m8j8jnd33wwv1siv6frzdbs7bhspg859sflq58vimv444zjzac";
|
||||
url = "https://elpa.gnu.org/packages/nano-modeline-0.5.tar";
|
||||
sha256 = "0f6xgrxykd5jmlzf9xmywh0jc2jfq698m4nqk60h40dm6pi0gfi2";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2890,10 +2920,10 @@
|
||||
elpaBuild {
|
||||
pname = "org";
|
||||
ename = "org";
|
||||
version = "9.5.1";
|
||||
version = "9.5.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/org-9.5.1.tar";
|
||||
sha256 = "033q5rpk8kfp43qymll339dybk4ig3gc6jz7av6zwjjcz2iawpj1";
|
||||
url = "https://elpa.gnu.org/packages/org-9.5.2.tar";
|
||||
sha256 = "12pvr47b11pq5rncpb3x8y11fhnakk5bi73j9l9w4d4ss3swcrnh";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2935,10 +2965,10 @@
|
||||
elpaBuild {
|
||||
pname = "org-transclusion";
|
||||
ename = "org-transclusion";
|
||||
version = "1.0.1";
|
||||
version = "1.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/org-transclusion-1.0.1.tar";
|
||||
sha256 = "1mn66a82nk3daf2vjw6pg9zgff48inik04ffizgm6cdlgn6ymrcs";
|
||||
url = "https://elpa.gnu.org/packages/org-transclusion-1.1.1.tar";
|
||||
sha256 = "12dp5fc7iw78qx2f501ch8mvhvw90bxg8hhvx0kz3y24gf2h8d4d";
|
||||
};
|
||||
packageRequires = [ emacs org ];
|
||||
meta = {
|
||||
@ -3160,10 +3190,10 @@
|
||||
elpaBuild {
|
||||
pname = "posframe";
|
||||
ename = "posframe";
|
||||
version = "1.1.2";
|
||||
version = "1.1.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/posframe-1.1.2.tar";
|
||||
sha256 = "0vrv46v7qwmax5m1i6b7lwdh789dfr18ggxjl4bk05qn7waway6j";
|
||||
url = "https://elpa.gnu.org/packages/posframe-1.1.5.tar";
|
||||
sha256 = "1kyd3r926hhs03mmpyvbjjyqcbvqrxk62rrscgfyl7rqi9ar56i0";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -3220,10 +3250,10 @@
|
||||
elpaBuild {
|
||||
pname = "pyim";
|
||||
ename = "pyim";
|
||||
version = "3.9.5";
|
||||
version = "4.0.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/pyim-3.9.5.tar";
|
||||
sha256 = "1dj46yprbl3l6n83aj0hsnd0rwjcp4ypyg2nhwig39wxirwlf9an";
|
||||
url = "https://elpa.gnu.org/packages/pyim-4.0.3.tar";
|
||||
sha256 = "110d9d8xglnyv0cn0slwk3msgqq8rs01xq2qmx5ya7i2v77gd5ql";
|
||||
};
|
||||
packageRequires = [ async emacs xr ];
|
||||
meta = {
|
||||
@ -4016,10 +4046,10 @@
|
||||
elpaBuild {
|
||||
pname = "svg-lib";
|
||||
ename = "svg-lib";
|
||||
version = "0.2";
|
||||
version = "0.2.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/svg-lib-0.2.tar";
|
||||
sha256 = "0361w1paqrgqlv8wj5vf9ifssddrk2bwlarp2c2wzlxks3ahdf2x";
|
||||
url = "https://elpa.gnu.org/packages/svg-lib-0.2.4.tar";
|
||||
sha256 = "0vcf3vbrzhgwssf6mi4xyic32yzjsrllp2zaqdk3c0qjvq9w4wxa";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -4027,6 +4057,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
svg-tag-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib, svg-lib }:
|
||||
elpaBuild {
|
||||
pname = "svg-tag-mode";
|
||||
ename = "svg-tag-mode";
|
||||
version = "0.3.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/svg-tag-mode-0.3.2.tar";
|
||||
sha256 = "1sg05dg0d9ai21l8rgpqywmwgw29sl21x2zkvlv04rl3hdvdq75y";
|
||||
};
|
||||
packageRequires = [ emacs svg-lib ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/svg-tag-mode.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
swiper = callPackage ({ elpaBuild, emacs, fetchurl, ivy, lib }:
|
||||
elpaBuild {
|
||||
pname = "swiper";
|
||||
@ -4155,10 +4200,10 @@
|
||||
elpaBuild {
|
||||
pname = "tramp";
|
||||
ename = "tramp";
|
||||
version = "2.5.1.5";
|
||||
version = "2.5.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/tramp-2.5.1.5.tar";
|
||||
sha256 = "1g3xf97q5h6sr67w9bphcbbqx9jz2lbl8lij5rz1r0zbsnlcv7n8";
|
||||
url = "https://elpa.gnu.org/packages/tramp-2.5.2.tar";
|
||||
sha256 = "1j71x3q6x9xyf21capjxcp85b7z2x9khrqsd2sy2s3qwxz3jbg5n";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -4436,10 +4481,10 @@
|
||||
elpaBuild {
|
||||
pname = "vertico";
|
||||
ename = "vertico";
|
||||
version = "0.17";
|
||||
version = "0.19";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/vertico-0.17.tar";
|
||||
sha256 = "1zhrkdhnc32wsc5f958hwa7mgf2vcjh3x6ng1cpndds5yllxb7s9";
|
||||
url = "https://elpa.gnu.org/packages/vertico-0.19.tar";
|
||||
sha256 = "1i9aqxsplmzyy7nv4czspa66a6v33lnng1d8zsgjf1m9sz0kyzxp";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -4456,10 +4501,10 @@
|
||||
elpaBuild {
|
||||
pname = "vertico-posframe";
|
||||
ename = "vertico-posframe";
|
||||
version = "0.4.2";
|
||||
version = "0.4.8";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/vertico-posframe-0.4.2.tar";
|
||||
sha256 = "1kajkjnjlisws2zdahy3bym942f3zvf05qhbmw9i2lv54jiy07pz";
|
||||
url = "https://elpa.gnu.org/packages/vertico-posframe-0.4.8.tar";
|
||||
sha256 = "1cvihfj59qycd3kifxbg9ndrmiihc62si8q5b8fxc1p20acw4f69";
|
||||
};
|
||||
packageRequires = [ emacs posframe vertico ];
|
||||
meta = {
|
||||
@ -4730,16 +4775,16 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
xpm = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
xpm = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, queue }:
|
||||
elpaBuild {
|
||||
pname = "xpm";
|
||||
ename = "xpm";
|
||||
version = "1.0.4";
|
||||
version = "1.0.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/xpm-1.0.4.tar";
|
||||
sha256 = "075miyashh9cm3b0gk6ngld3rm8bfgnh4qxnhxmmvjgzf6a64grh";
|
||||
url = "https://elpa.gnu.org/packages/xpm-1.0.5.tar";
|
||||
sha256 = "13p6s6b2v7h4bnwdkkrd1qz84jd7g2s18w0czhpxv6hvj9sqf5hx";
|
||||
};
|
||||
packageRequires = [];
|
||||
packageRequires = [ cl-lib queue ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/xpm.html";
|
||||
license = lib.licenses.free;
|
||||
|
||||
@ -69,7 +69,10 @@ in {
|
||||
melpaBuild {
|
||||
inherit pname ename commit;
|
||||
version = if isNull version then "" else
|
||||
lib.concatStringsSep "." (map toString version);
|
||||
lib.concatStringsSep "." (map toString
|
||||
# Hack: Melpa archives contains versions with parse errors such as [ 4 4 -4 413 ] which should be 4.4-413
|
||||
# This filter method is still technically wrong, but it's computationally cheap enough and tapers over the issue
|
||||
(builtins.filter (n: n > 0) version));
|
||||
# TODO: Broken should not result in src being null (hack to avoid eval errors)
|
||||
src = if (isNull sha256 || broken) then null else
|
||||
lib.getAttr fetcher (fetcherGenerators args sourceArgs);
|
||||
|
||||
@ -229,8 +229,6 @@
|
||||
|
||||
sv-kalender = callPackage ./sv-kalender { };
|
||||
|
||||
tramp = callPackage ./tramp { };
|
||||
|
||||
youtube-dl = callPackage ./youtube-dl { };
|
||||
|
||||
# From old emacsPackages (pre emacsPackagesNg)
|
||||
|
||||
@ -60,6 +60,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
anzu = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "anzu";
|
||||
ename = "anzu";
|
||||
version = "0.64";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/anzu-0.64.tar";
|
||||
sha256 = "1znw7wlpjb3d8wsijqziiq21j966x95q9g5j16wx48xyrrzr1mcs";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/anzu.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
apache-mode = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "apache-mode";
|
||||
@ -105,6 +120,26 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
autothemer = callPackage ({ cl-lib ? null
|
||||
, dash
|
||||
, elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
, lib }:
|
||||
elpaBuild {
|
||||
pname = "autothemer";
|
||||
ename = "autothemer";
|
||||
version = "0.2.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/autothemer-0.2.3.tar";
|
||||
sha256 = "10r4lf3nl7mk6yzfcyld5k0njslw8ly2sd0iz1zkzywnv31lsxnd";
|
||||
};
|
||||
packageRequires = [ cl-lib dash emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/autothemer.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
bison-mode = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "bison-mode";
|
||||
@ -120,6 +155,36 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
boxquote = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "boxquote";
|
||||
ename = "boxquote";
|
||||
version = "2.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/boxquote-2.2.tar";
|
||||
sha256 = "0vcqm78b5fsizkn2xalnzmdci5m02yxxypcr9q2sai04j7lhmwd9";
|
||||
};
|
||||
packageRequires = [ cl-lib ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/boxquote.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
buttercup = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "buttercup";
|
||||
ename = "buttercup";
|
||||
version = "1.24";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/buttercup-1.24.tar";
|
||||
sha256 = "1ch949xf03gw9r5v32akx7hqnq7zrp3qr3gcic5b52yl5nmy8mhn";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/buttercup.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
caml = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "caml";
|
||||
@ -135,6 +200,38 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
cider = callPackage ({ clojure-mode
|
||||
, elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
, lib
|
||||
, parseedn
|
||||
, queue
|
||||
, seq
|
||||
, sesman
|
||||
, spinner }:
|
||||
elpaBuild {
|
||||
pname = "cider";
|
||||
ename = "cider";
|
||||
version = "1.2.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/cider-1.2.0.tar";
|
||||
sha256 = "1dkn5mcp4vyk6h4mqrn7fcqjs4h0dx1y1b1pcg2jpyx11mhdpjxf";
|
||||
};
|
||||
packageRequires = [
|
||||
clojure-mode
|
||||
emacs
|
||||
parseedn
|
||||
queue
|
||||
seq
|
||||
sesman
|
||||
spinner
|
||||
];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/cider.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
clojure-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "clojure-mode";
|
||||
@ -278,6 +375,139 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
evil-anzu = callPackage ({ anzu, elpaBuild, evil, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "evil-anzu";
|
||||
ename = "evil-anzu";
|
||||
version = "0.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/evil-anzu-0.2.tar";
|
||||
sha256 = "0fv7kan67g24imhbgggrg8r4pjhpmicpq3g8g1wnq8p9zkwxbm7s";
|
||||
};
|
||||
packageRequires = [ anzu evil ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/evil-anzu.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
evil-exchange = callPackage ({ cl-lib ? null
|
||||
, elpaBuild
|
||||
, evil
|
||||
, fetchurl
|
||||
, lib }:
|
||||
elpaBuild {
|
||||
pname = "evil-exchange";
|
||||
ename = "evil-exchange";
|
||||
version = "0.41";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/evil-exchange-0.41.tar";
|
||||
sha256 = "1i07c0zc75mbgb6hzj6py248gxzy0mk3xyaskvwlc371fyyn6v6c";
|
||||
};
|
||||
packageRequires = [ cl-lib evil ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/evil-exchange.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
evil-indent-plus = callPackage ({ cl-lib ? null
|
||||
, elpaBuild
|
||||
, evil
|
||||
, fetchurl
|
||||
, lib }:
|
||||
elpaBuild {
|
||||
pname = "evil-indent-plus";
|
||||
ename = "evil-indent-plus";
|
||||
version = "1.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/evil-indent-plus-1.0.1.tar";
|
||||
sha256 = "0wnn5xjdbc70cxwllz1gf6xf91ijlfhlps7gkb9c3v1kwpsfp3s3";
|
||||
};
|
||||
packageRequires = [ cl-lib evil ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/evil-indent-plus.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
evil-lisp-state = callPackage ({ bind-map
|
||||
, elpaBuild
|
||||
, evil
|
||||
, fetchurl
|
||||
, lib
|
||||
, smartparens }:
|
||||
elpaBuild {
|
||||
pname = "evil-lisp-state";
|
||||
ename = "evil-lisp-state";
|
||||
version = "8.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/evil-lisp-state-8.2.tar";
|
||||
sha256 = "0hwv39rkwadm3jri84nf9mw48ybd5a0y02yzjp5cayy7alpf6zcn";
|
||||
};
|
||||
packageRequires = [ bind-map evil smartparens ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/evil-lisp-state.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
evil-matchit = callPackage ({ elpaBuild, emacs, evil, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "evil-matchit";
|
||||
ename = "evil-matchit";
|
||||
version = "2.4.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/evil-matchit-2.4.1.tar";
|
||||
sha256 = "0ybw0jfjkwiz4ln3z5pizbw5d9d612crpk410czcyi8adyj018nc";
|
||||
};
|
||||
packageRequires = [ emacs evil ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/evil-matchit.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
evil-nerd-commenter = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "evil-nerd-commenter";
|
||||
ename = "evil-nerd-commenter";
|
||||
version = "3.5.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/evil-nerd-commenter-3.5.6.tar";
|
||||
sha256 = "0bv7s2jcgi3ma3dspczy7jrb55vqkhsz0rq0nz14qiay5j9dwghd";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/evil-nerd-commenter.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
evil-numbers = callPackage ({ elpaBuild, emacs, evil, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "evil-numbers";
|
||||
ename = "evil-numbers";
|
||||
version = "0.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/evil-numbers-0.6.tar";
|
||||
sha256 = "0zl16ljb64cawcj11f4ndz941sllj8nhgjcb4w0r1afxbvpn5rss";
|
||||
};
|
||||
packageRequires = [ emacs evil ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/evil-numbers.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
evil-visualstar = callPackage ({ elpaBuild, evil, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "evil-visualstar";
|
||||
ename = "evil-visualstar";
|
||||
version = "0.2.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/evil-visualstar-0.2.0.tar";
|
||||
sha256 = "0vjhwdp2ms7k008mm68vzlkxrq0zyrsf4r10w57w77qg5a96151c";
|
||||
};
|
||||
packageRequires = [ evil ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/evil-visualstar.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
flymake-kondor = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "flymake-kondor";
|
||||
@ -293,16 +523,16 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
geiser = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
geiser = callPackage ({ elpaBuild, emacs, fetchurl, lib, transient }:
|
||||
elpaBuild {
|
||||
pname = "geiser";
|
||||
ename = "geiser";
|
||||
version = "0.19";
|
||||
version = "0.22";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-0.19.tar";
|
||||
sha256 = "13w6gx6y8ilppcpfib5293600n0xy4xc4xa6idpmbcfd2pkmnw1x";
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-0.22.tar";
|
||||
sha256 = "0jcxjfn9d7cnsir2pva0axaz180d01sn0l9f175sj57ws8spj2h2";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
packageRequires = [ emacs transient ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/geiser.html";
|
||||
license = lib.licenses.free;
|
||||
@ -312,10 +542,10 @@
|
||||
elpaBuild {
|
||||
pname = "geiser-chez";
|
||||
ename = "geiser-chez";
|
||||
version = "0.16";
|
||||
version = "0.17";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-chez-0.16.tar";
|
||||
sha256 = "016b7n5rv7fyrw4lqcprhhf2rai5vvmmc8a13l4w3a30rwcgm7cd";
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-chez-0.17.tar";
|
||||
sha256 = "139x7b3q5n04ig0m263jljm4bsjiiyvi3f84pcq3bgnj3dk5dlxh";
|
||||
};
|
||||
packageRequires = [ emacs geiser ];
|
||||
meta = {
|
||||
@ -387,10 +617,10 @@
|
||||
elpaBuild {
|
||||
pname = "geiser-guile";
|
||||
ename = "geiser-guile";
|
||||
version = "0.19";
|
||||
version = "0.20.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.19.tar";
|
||||
sha256 = "1rjml11gkl80x4hmh84m84r4qb3kxi36d7mwm25n791v5fs1cl32";
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.20.1.tar";
|
||||
sha256 = "0psm53ryh1wica2730xcw4lc2jv06d08wnjfyd8f61952zzj57k7";
|
||||
};
|
||||
packageRequires = [ emacs geiser ];
|
||||
meta = {
|
||||
@ -524,14 +754,29 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
gotham-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "gotham-theme";
|
||||
ename = "gotham-theme";
|
||||
version = "1.1.9";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/gotham-theme-1.1.9.tar";
|
||||
sha256 = "0ikczh9crs02hlvnpdknxfbpqmpiicdbshjhi5pz3v7ynizj64vm";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/gotham-theme.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
goto-chg = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "goto-chg";
|
||||
ename = "goto-chg";
|
||||
version = "1.7.4";
|
||||
version = "1.7.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/goto-chg-1.7.4.tar";
|
||||
sha256 = "1sg2gp48b83gq0j821lk241lwyxkhqr6w5d1apbnkm3qf08qjwba";
|
||||
url = "https://elpa.nongnu.org/nongnu/goto-chg-1.7.5.tar";
|
||||
sha256 = "08wdrwmgy5hanir6py6wiq0pq4lbv9jiyz1m3h947kb35kxalmks";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -539,6 +784,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
gruvbox-theme = callPackage ({ autothemer, elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "gruvbox-theme";
|
||||
ename = "gruvbox-theme";
|
||||
version = "1.26.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/gruvbox-theme-1.26.0.tar";
|
||||
sha256 = "19q5i0jz01hdn09wwg929yva6278fhyvk68id5p9dyi8h2n73djn";
|
||||
};
|
||||
packageRequires = [ autothemer ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/gruvbox-theme.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
guru-mode = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "guru-mode";
|
||||
@ -641,10 +901,10 @@
|
||||
elpaBuild {
|
||||
pname = "idris-mode";
|
||||
ename = "idris-mode";
|
||||
version = "0.9.18";
|
||||
version = "1.1.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/idris-mode-0.9.18.tar";
|
||||
sha256 = "1z4wsqzxsmn1vdqp44b32m4wzs4bbnsyzv09v9ggr4l4h2j4c3x5";
|
||||
url = "https://elpa.nongnu.org/nongnu/idris-mode-1.1.0.tar";
|
||||
sha256 = "00xbb63kidkygs2zp334nw38gn5mrbky3ii0g8c9k9si4k1dn5gq";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs prop-menu ];
|
||||
meta = {
|
||||
@ -806,6 +1066,43 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
mentor = callPackage ({ async
|
||||
, cl-lib ? null
|
||||
, elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
, lib
|
||||
, seq
|
||||
, xml-rpc }:
|
||||
elpaBuild {
|
||||
pname = "mentor";
|
||||
ename = "mentor";
|
||||
version = "0.3.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/mentor-0.3.5.tar";
|
||||
sha256 = "01zrvfk2njzyzjzkvp5hv5cjl1k1qjrila1ab4bv26gf6bkq5xh3";
|
||||
};
|
||||
packageRequires = [ async cl-lib emacs seq xml-rpc ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/mentor.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
moe-theme = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "moe-theme";
|
||||
ename = "moe-theme";
|
||||
version = "1.0.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/moe-theme-1.0.2.tar";
|
||||
sha256 = "1hdbm6hw94yyw5cdgfmc5fgnfc2glf0ba8a9ch2y33nzjawklb8x";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/moe-theme.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
monokai-theme = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "monokai-theme";
|
||||
@ -821,6 +1118,27 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
mpv = callPackage ({ cl-lib ? null
|
||||
, elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
, json ? null
|
||||
, lib
|
||||
, org }:
|
||||
elpaBuild {
|
||||
pname = "mpv";
|
||||
ename = "mpv";
|
||||
version = "0.2.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/mpv-0.2.0.tar";
|
||||
sha256 = "14d5376y9b3jxxhzjcscx03ss61yd129dkb0ki9gmp2sk7cns3n5";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs json org ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/mpv.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
multiple-cursors = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "multiple-cursors";
|
||||
@ -881,6 +1199,102 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
org-journal = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }:
|
||||
elpaBuild {
|
||||
pname = "org-journal";
|
||||
ename = "org-journal";
|
||||
version = "2.1.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/org-journal-2.1.2.tar";
|
||||
sha256 = "1s5hadcps283c5a1sy8fp1ih064l0hl97frj93jw3fkx6jwbqf0v";
|
||||
};
|
||||
packageRequires = [ emacs org ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/org-journal.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
org-mime = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "org-mime";
|
||||
ename = "org-mime";
|
||||
version = "0.2.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/org-mime-0.2.4.tar";
|
||||
sha256 = "048psi5h8ln83pra4f24iq794w00b8p8pk67cylbd8afjdhh2x1r";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/org-mime.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
org-superstar = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }:
|
||||
elpaBuild {
|
||||
pname = "org-superstar";
|
||||
ename = "org-superstar";
|
||||
version = "1.5.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/org-superstar-1.5.1.tar";
|
||||
sha256 = "0qwnjd6i3mzkvwdwpm3hn8hp3jwza43x1xq1hfi8d6fa9mwzw9nl";
|
||||
};
|
||||
packageRequires = [ emacs org ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/org-superstar.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
pacmacs = callPackage ({ cl-lib ? null
|
||||
, dash
|
||||
, elpaBuild
|
||||
, emacs
|
||||
, f
|
||||
, fetchurl
|
||||
, lib }:
|
||||
elpaBuild {
|
||||
pname = "pacmacs";
|
||||
ename = "pacmacs";
|
||||
version = "0.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/pacmacs-0.1.tar";
|
||||
sha256 = "0vhxxnk8n4h2klvr4xahsm845dwds895fxxgcs7dz2262g9myd93";
|
||||
};
|
||||
packageRequires = [ cl-lib dash emacs f ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/pacmacs.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
parseclj = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "parseclj";
|
||||
ename = "parseclj";
|
||||
version = "1.0.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/parseclj-1.0.6.tar";
|
||||
sha256 = "0cs6a394pll9sl8ybpsygg9mkznpz119f8hjgw3n7mgkwfc5a30k";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/parseclj.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
parseedn = callPackage ({ elpaBuild, emacs, fetchurl, lib, map, parseclj }:
|
||||
elpaBuild {
|
||||
pname = "parseedn";
|
||||
ename = "parseedn";
|
||||
version = "1.0.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/parseedn-1.0.6.tar";
|
||||
sha256 = "1274pr91hcrvy4srdy2dw14hbcg2qy24z4klx6mashgzb1r42n3d";
|
||||
};
|
||||
packageRequires = [ emacs map parseclj ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/parseedn.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
pdf-tools = callPackage ({ elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
@ -920,10 +1334,10 @@
|
||||
elpaBuild {
|
||||
pname = "popup";
|
||||
ename = "popup";
|
||||
version = "0.5.8";
|
||||
version = "0.5.9";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/popup-0.5.8.tar";
|
||||
sha256 = "1amwxsymzvzmj8696fa6i0cqx4ac581rvr4dwkri7akkr7amh3yh";
|
||||
url = "https://elpa.nongnu.org/nongnu/popup-0.5.9.tar";
|
||||
sha256 = "0zyn6q3fwj20y7zdk49jbid2h3yf8l5x8y1kv9mj717kjbxiw063";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -961,6 +1375,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
rainbow-delimiters = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "rainbow-delimiters";
|
||||
ename = "rainbow-delimiters";
|
||||
version = "2.1.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/rainbow-delimiters-2.1.5.tar";
|
||||
sha256 = "0bb7sqjgpm3041srr44l23p3mcjhvnpxl594ma25pbs11qqipz5w";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/rainbow-delimiters.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
request = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "request";
|
||||
@ -995,10 +1424,10 @@
|
||||
elpaBuild {
|
||||
pname = "rust-mode";
|
||||
ename = "rust-mode";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/rust-mode-1.0.2.tar";
|
||||
sha256 = "08zkq5md20ppqlvd5xxsbzargs6ffzmjr1b1pq9i937l3n9d4swl";
|
||||
url = "https://elpa.nongnu.org/nongnu/rust-mode-1.0.3.tar";
|
||||
sha256 = "1hg5hr5jma5v4rilchwyyw1fzm8lkfd3fxay0sb9dgzrgypvh5am";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1040,6 +1469,36 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
sesman = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "sesman";
|
||||
ename = "sesman";
|
||||
version = "0.3.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/sesman-0.3.2.tar";
|
||||
sha256 = "1nv0xh6dklpw1jq8b9biv70gzqa7par5jbqacx2lx0xhkyf0c7c1";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/sesman.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
shellcop = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "shellcop";
|
||||
ename = "shellcop";
|
||||
version = "0.0.7";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/shellcop-0.0.7.tar";
|
||||
sha256 = "1zwj22bf37ffdbz5iqkwz5mzzsxffhj521dmwkgp5sh4r1fwip8a";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/shellcop.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
slime = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, macrostep }:
|
||||
elpaBuild {
|
||||
pname = "slime";
|
||||
@ -1119,10 +1578,10 @@
|
||||
elpaBuild {
|
||||
pname = "subed";
|
||||
ename = "subed";
|
||||
version = "0.0.2";
|
||||
version = "0.0.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/subed-0.0.2.tar";
|
||||
sha256 = "1q9sb8kn1g5hvmm5zl4hm90fvf5kb82da69y24x7yzgs6axy0dga";
|
||||
url = "https://elpa.nongnu.org/nongnu/subed-0.0.3.tar";
|
||||
sha256 = "1qwpzj9j5fbis6vlgnqyilc49gbnxf48wcrjl8kljwzna3hsk7bx";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1175,6 +1634,57 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
tangotango-theme = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "tangotango-theme";
|
||||
ename = "tangotango-theme";
|
||||
version = "0.0.7";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/tangotango-theme-0.0.7.tar";
|
||||
sha256 = "0xl90c7hzzd2wanz41mb5ikjgrfga28qb893yvdcy0pa6mgdmpmx";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/tangotango-theme.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
telephone-line = callPackage ({ cl-generic
|
||||
, cl-lib ? null
|
||||
, elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
, lib
|
||||
, seq }:
|
||||
elpaBuild {
|
||||
pname = "telephone-line";
|
||||
ename = "telephone-line";
|
||||
version = "0.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/telephone-line-0.5.tar";
|
||||
sha256 = "09glq2ljd10mqx54i3vflk7yjb1abhykzm9kng4wrw5156ssn6zs";
|
||||
};
|
||||
packageRequires = [ cl-generic cl-lib emacs seq ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/telephone-line.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
toc-org = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "toc-org";
|
||||
ename = "toc-org";
|
||||
version = "1.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/toc-org-1.1.tar";
|
||||
sha256 = "1wy48z4x756r7k6v9znn3f6bfxh867vy58wal7wmhxxig6sn9bk3";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/toc-org.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
tuareg = callPackage ({ caml, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "tuareg";
|
||||
@ -1220,6 +1730,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
visual-fill-column = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "visual-fill-column";
|
||||
ename = "visual-fill-column";
|
||||
version = "2.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/visual-fill-column-2.4.tar";
|
||||
sha256 = "0100v17s9w9nqjpr7h3zianfy1i4i71idk2qrlzqzcd8qn1m3vjx";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/visual-fill-column.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
web-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "web-mode";
|
||||
@ -1274,10 +1799,10 @@
|
||||
elpaBuild {
|
||||
pname = "with-editor";
|
||||
ename = "with-editor";
|
||||
version = "3.0.5";
|
||||
version = "3.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/with-editor-3.0.5.tar";
|
||||
sha256 = "0bri6jr99133k9w0d754rw2f6hgjzndczngfw2lf2rvxks448krm";
|
||||
url = "https://elpa.nongnu.org/nongnu/with-editor-3.1.1.tar";
|
||||
sha256 = "175k68mr0n3v5l3gbv2fsdfznm9yjy32l3ay6hj0d4c53kw76hvn";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1285,6 +1810,36 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
ws-butler = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "ws-butler";
|
||||
ename = "ws-butler";
|
||||
version = "0.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/ws-butler-0.6.tar";
|
||||
sha256 = "1mm1c2awq2vs5fz773f1pa6ham29ws1agispxfjvj5nx15a0kqzl";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/ws-butler.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
xml-rpc = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "xml-rpc";
|
||||
ename = "xml-rpc";
|
||||
version = "1.6.15";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/xml-rpc-1.6.15.tar";
|
||||
sha256 = "0z87rn7zbd8335iqfvk16zpvby66l0izzw438pxdr7kf60i5vgwl";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/xml-rpc.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
yaml-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "yaml-mode";
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
{ callPackage }:
|
||||
{
|
||||
org = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "org";
|
||||
ename = "org";
|
||||
version = "20210929";
|
||||
src = fetchurl {
|
||||
url = "https://orgmode.org/elpa/org-20210929.tar";
|
||||
sha256 = "1fxhxjy48jxvs16x7270c4qj6n4lm952sn7q369c88gbf2jqxis4";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/org.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "org-plus-contrib";
|
||||
ename = "org-plus-contrib";
|
||||
version = "20210929";
|
||||
src = fetchurl {
|
||||
url = "https://orgmode.org/elpa/org-plus-contrib-20210929.tar";
|
||||
sha256 = "0bn80kji2h423d39c0am2r3p2hwvdxs9rm31xa4810dff27ihxb1";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/org-plus-contrib.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,29 +0,0 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, emacs
|
||||
, texinfo
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tramp";
|
||||
version = "2.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/tramp/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-+jjWBcj2dP9Xyj4dzpAX86KnajVa9eFDcjD9xTw6vks=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
emacs
|
||||
texinfo
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.gnu.org/software/tramp";
|
||||
description = "Transparently access remote files from Emacs (latest version)";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
inherit (emacs.meta) platforms;
|
||||
};
|
||||
}
|
||||
@ -1,7 +1,9 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, nixos
|
||||
, testVersion
|
||||
, testEqualDerivation
|
||||
, hello
|
||||
}:
|
||||
|
||||
@ -16,8 +18,15 @@ stdenv.mkDerivation rec {
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru.tests.version =
|
||||
testVersion { package = hello; };
|
||||
passthru.tests = {
|
||||
version = testVersion { package = hello; };
|
||||
|
||||
invariant-under-noXlibs =
|
||||
testEqualDerivation
|
||||
"hello must not be rebuilt when environment.noXlibs is set."
|
||||
hello
|
||||
(nixos { environment.noXlibs = true; }).pkgs.hello;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A program that produces a familiar, friendly greeting";
|
||||
|
||||
@ -5,8 +5,8 @@ self: super: {
|
||||
_: {
|
||||
src = pkgs.fetchgit {
|
||||
url = "https://github.com/NixOS/nixops.git";
|
||||
rev = "7ebdd8ace8d6bcefc18ee9e3e590f8bfa3368771";
|
||||
sha256 = "16pwxs5bca6cd83f0rs4sf5r8yf07wmha051waysmxs9xxl856yc";
|
||||
rev = "0c989d79c9052ebf52f12964131f4fc31ac20a18";
|
||||
sha256 = "07jz9grq3hjn1g9xybln5phbjhn2zsldcnan3lal6syzjggja6v1";
|
||||
};
|
||||
}
|
||||
);
|
||||
|
||||
@ -38,14 +38,14 @@ python-versions = "*"
|
||||
|
||||
[[package]]
|
||||
name = "boto3"
|
||||
version = "1.20.8"
|
||||
version = "1.20.20"
|
||||
description = "The AWS SDK for Python"
|
||||
category = "main"
|
||||
optional = false
|
||||
python-versions = ">= 3.6"
|
||||
|
||||
[package.dependencies]
|
||||
botocore = ">=1.23.8,<1.24.0"
|
||||
botocore = ">=1.23.20,<1.24.0"
|
||||
jmespath = ">=0.7.1,<1.0.0"
|
||||
s3transfer = ">=0.5.0,<0.6.0"
|
||||
|
||||
@ -54,7 +54,7 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"]
|
||||
|
||||
[[package]]
|
||||
name = "botocore"
|
||||
version = "1.23.8"
|
||||
version = "1.23.20"
|
||||
description = "Low-level, data-driven core of boto 3."
|
||||
category = "main"
|
||||
optional = false
|
||||
@ -89,7 +89,7 @@ pycparser = "*"
|
||||
|
||||
[[package]]
|
||||
name = "charset-normalizer"
|
||||
version = "2.0.7"
|
||||
version = "2.0.9"
|
||||
description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet."
|
||||
category = "main"
|
||||
optional = false
|
||||
@ -194,7 +194,7 @@ testing = ["coverage (<5)", "pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3
|
||||
|
||||
[[package]]
|
||||
name = "libvirt-python"
|
||||
version = "7.9.0"
|
||||
version = "7.10.0"
|
||||
description = "The libvirt virtualization API python binding"
|
||||
category = "main"
|
||||
optional = false
|
||||
@ -227,7 +227,7 @@ typing-extensions = "^3.7.4"
|
||||
type = "git"
|
||||
url = "https://github.com/NixOS/nixops.git"
|
||||
reference = "master"
|
||||
resolved_reference = "7ebdd8ace8d6bcefc18ee9e3e590f8bfa3368771"
|
||||
resolved_reference = "0c989d79c9052ebf52f12964131f4fc31ac20a18"
|
||||
|
||||
[[package]]
|
||||
name = "nixops-aws"
|
||||
@ -643,7 +643,7 @@ test = ["pytest"]
|
||||
|
||||
[[package]]
|
||||
name = "typeguard"
|
||||
version = "2.13.0"
|
||||
version = "2.13.2"
|
||||
description = "Run-time type checker for Python"
|
||||
category = "main"
|
||||
optional = false
|
||||
@ -697,12 +697,12 @@ boto = [
|
||||
{file = "boto-2.49.0.tar.gz", hash = "sha256:ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a"},
|
||||
]
|
||||
boto3 = [
|
||||
{file = "boto3-1.20.8-py3-none-any.whl", hash = "sha256:c0ac23cc36dc484edd1edd28903b5712cb07507af1ae19b2e8d6db176416d9e2"},
|
||||
{file = "boto3-1.20.8.tar.gz", hash = "sha256:81ebdcabc534a52e2b7a2bfcbe1a1d7f1e34f028f7fe1cb16ccd80e34cea867a"},
|
||||
{file = "boto3-1.20.20-py3-none-any.whl", hash = "sha256:6c173ffaf0604e34d6865edf7a9a71e1b3e79bd441b8b465ca4b2d44f840806d"},
|
||||
{file = "boto3-1.20.20.tar.gz", hash = "sha256:2c5377b6ab74eeccccd16f0f21537ede87b05c8322b0ccc852a68f36ea6c16c9"},
|
||||
]
|
||||
botocore = [
|
||||
{file = "botocore-1.23.8-py3-none-any.whl", hash = "sha256:a0c7cfea155a0202ab197a016736dd4e6a26f9e416bdd9cdd2c9a3fb88ffa5a8"},
|
||||
{file = "botocore-1.23.8.tar.gz", hash = "sha256:ae4ed9666199020a9e53c3d3efc0a7d417315cd2313b70cb013282afe70ac358"},
|
||||
{file = "botocore-1.23.20-py3-none-any.whl", hash = "sha256:98275e47c941cada6507089ecfe91e420972209b1deeceaf55a89ea50d046347"},
|
||||
{file = "botocore-1.23.20.tar.gz", hash = "sha256:22e1c7b4b2b8b11d7001ca5ef2b41bda9a8be46fb3cb994a2948462666ac5ef1"},
|
||||
]
|
||||
certifi = [
|
||||
{file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"},
|
||||
@ -761,8 +761,8 @@ cffi = [
|
||||
{file = "cffi-1.15.0.tar.gz", hash = "sha256:920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954"},
|
||||
]
|
||||
charset-normalizer = [
|
||||
{file = "charset-normalizer-2.0.7.tar.gz", hash = "sha256:e019de665e2bcf9c2b64e2e5aa025fa991da8720daa3c1138cadd2fd1856aed0"},
|
||||
{file = "charset_normalizer-2.0.7-py3-none-any.whl", hash = "sha256:f7af805c321bfa1ce6714c51f254e0d5bb5e5834039bc17db7ebe3a4cec9492b"},
|
||||
{file = "charset-normalizer-2.0.9.tar.gz", hash = "sha256:b0b883e8e874edfdece9c28f314e3dd5badf067342e42fb162203335ae61aa2c"},
|
||||
{file = "charset_normalizer-2.0.9-py3-none-any.whl", hash = "sha256:1eecaa09422db5be9e29d7fc65664e6c33bd06f9ced7838578ba40d58bdf3721"},
|
||||
]
|
||||
colorama = [
|
||||
{file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"},
|
||||
@ -775,6 +775,8 @@ cryptography = [
|
||||
{file = "cryptography-3.4.8-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:34dae04a0dce5730d8eb7894eab617d8a70d0c97da76b905de9efb7128ad7085"},
|
||||
{file = "cryptography-3.4.8-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1eb7bb0df6f6f583dd8e054689def236255161ebbcf62b226454ab9ec663746b"},
|
||||
{file = "cryptography-3.4.8-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:9965c46c674ba8cc572bc09a03f4c649292ee73e1b683adb1ce81e82e9a6a0fb"},
|
||||
{file = "cryptography-3.4.8-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:3c4129fc3fdc0fa8e40861b5ac0c673315b3c902bbdc05fc176764815b43dd1d"},
|
||||
{file = "cryptography-3.4.8-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:695104a9223a7239d155d7627ad912953b540929ef97ae0c34c7b8bf30857e89"},
|
||||
{file = "cryptography-3.4.8-cp36-abi3-win32.whl", hash = "sha256:21ca464b3a4b8d8e86ba0ee5045e103a1fcfac3b39319727bc0fc58c09c6aff7"},
|
||||
{file = "cryptography-3.4.8-cp36-abi3-win_amd64.whl", hash = "sha256:3520667fda779eb788ea00080124875be18f2d8f0848ec00733c0ec3bb8219fc"},
|
||||
{file = "cryptography-3.4.8-pp36-pypy36_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:d2a6e5ef66503da51d2110edf6c403dc6b494cc0082f85db12f54e9c5d4c3ec5"},
|
||||
@ -815,15 +817,31 @@ jsonpickle = [
|
||||
{file = "jsonpickle-2.0.0.tar.gz", hash = "sha256:0be49cba80ea6f87a168aa8168d717d00c6ca07ba83df3cec32d3b30bfe6fb9a"},
|
||||
]
|
||||
libvirt-python = [
|
||||
{file = "libvirt-python-7.9.0.tar.gz", hash = "sha256:8535cffa5fbf05185648f9f57a2f71899c3bc12c897d320351c53725a48e5359"},
|
||||
{file = "libvirt-python-7.10.0.tar.gz", hash = "sha256:267774bbdf99d47515274542880499437dc94ae291771f5663c62020a62da975"},
|
||||
]
|
||||
markupsafe = [
|
||||
{file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53"},
|
||||
{file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:36bc903cbb393720fad60fc28c10de6acf10dc6cc883f3e24ee4012371399a38"},
|
||||
{file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad"},
|
||||
{file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d"},
|
||||
{file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646"},
|
||||
{file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:4dc8f9fb58f7364b63fd9f85013b780ef83c11857ae79f2feda41e270468dd9b"},
|
||||
{file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:20dca64a3ef2d6e4d5d615a3fd418ad3bde77a47ec8a23d984a12b5b4c74491a"},
|
||||
{file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:cdfba22ea2f0029c9261a4bd07e830a8da012291fbe44dc794e488b6c9bb353a"},
|
||||
{file = "MarkupSafe-2.0.1-cp310-cp310-win32.whl", hash = "sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28"},
|
||||
{file = "MarkupSafe-2.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134"},
|
||||
{file = "MarkupSafe-2.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51"},
|
||||
{file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:0955295dd5eec6cb6cc2fe1698f4c6d84af2e92de33fbcac4111913cd100a6ff"},
|
||||
{file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:0446679737af14f45767963a1a9ef7620189912317d095f2d9ffa183a4d25d2b"},
|
||||
{file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:f826e31d18b516f653fe296d967d700fddad5901ae07c622bb3705955e1faa94"},
|
||||
{file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872"},
|
||||
{file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:905fec760bd2fa1388bb5b489ee8ee5f7291d692638ea5f67982d968366bef9f"},
|
||||
{file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c"},
|
||||
{file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724"},
|
||||
{file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:baa1a4e8f868845af802979fcdbf0bb11f94f1cb7ced4c4b8a351bb60d108145"},
|
||||
{file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:deb993cacb280823246a026e3b2d81c493c53de6acfd5e6bfe31ab3402bb37dd"},
|
||||
{file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:63f3268ba69ace99cab4e3e3b5840b03340efed0948ab8f78d2fd87ee5442a4f"},
|
||||
{file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:8d206346619592c6200148b01a2142798c989edcb9c896f9ac9722a99d4e77e6"},
|
||||
{file = "MarkupSafe-2.0.1-cp36-cp36m-win32.whl", hash = "sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d"},
|
||||
{file = "MarkupSafe-2.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9"},
|
||||
{file = "MarkupSafe-2.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567"},
|
||||
@ -832,14 +850,27 @@ markupsafe = [
|
||||
{file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:d7f9850398e85aba693bb640262d3611788b1f29a79f0c93c565694658f4071f"},
|
||||
{file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:6a7fae0dd14cf60ad5ff42baa2e95727c3d81ded453457771d02b7d2b3f9c0c2"},
|
||||
{file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:b7f2d075102dc8c794cbde1947378051c4e5180d52d276987b8d28a3bd58c17d"},
|
||||
{file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85"},
|
||||
{file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6"},
|
||||
{file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864"},
|
||||
{file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d6c7ebd4e944c85e2c3421e612a7057a2f48d478d79e61800d81468a8d842207"},
|
||||
{file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:f0567c4dc99f264f49fe27da5f735f414c4e7e7dd850cfd8e69f0862d7c74ea9"},
|
||||
{file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:89c687013cb1cd489a0f0ac24febe8c7a666e6e221b783e53ac50ebf68e45d86"},
|
||||
{file = "MarkupSafe-2.0.1-cp37-cp37m-win32.whl", hash = "sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415"},
|
||||
{file = "MarkupSafe-2.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914"},
|
||||
{file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9"},
|
||||
{file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:be98f628055368795d818ebf93da628541e10b75b41c559fdf36d104c5787066"},
|
||||
{file = "MarkupSafe-2.0.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:1d609f577dc6e1aa17d746f8bd3c31aa4d258f4070d61b2aa5c4166c1539de35"},
|
||||
{file = "MarkupSafe-2.0.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:7d91275b0245b1da4d4cfa07e0faedd5b0812efc15b702576d103293e252af1b"},
|
||||
{file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298"},
|
||||
{file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:47ab1e7b91c098ab893b828deafa1203de86d0bc6ab587b160f78fe6c4011f75"},
|
||||
{file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:97383d78eb34da7e1fa37dd273c20ad4320929af65d156e35a5e2d89566d9dfb"},
|
||||
{file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b"},
|
||||
{file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a"},
|
||||
{file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6"},
|
||||
{file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:aca6377c0cb8a8253e493c6b451565ac77e98c2951c45f913e0b52facdcff83f"},
|
||||
{file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:04635854b943835a6ea959e948d19dcd311762c5c0c6e1f0e16ee57022669194"},
|
||||
{file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6300b8454aa6930a24b9618fbb54b5a68135092bc666f7b06901f897fa5c2fee"},
|
||||
{file = "MarkupSafe-2.0.1-cp38-cp38-win32.whl", hash = "sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64"},
|
||||
{file = "MarkupSafe-2.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833"},
|
||||
{file = "MarkupSafe-2.0.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26"},
|
||||
@ -849,6 +880,12 @@ markupsafe = [
|
||||
{file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:4efca8f86c54b22348a5467704e3fec767b2db12fc39c6d963168ab1d3fc9135"},
|
||||
{file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:ab3ef638ace319fa26553db0624c4699e31a28bb2a835c5faca8f8acf6a5a902"},
|
||||
{file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509"},
|
||||
{file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1"},
|
||||
{file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac"},
|
||||
{file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6"},
|
||||
{file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:4296f2b1ce8c86a6aea78613c34bb1a672ea0e3de9c6ba08a960efe0b0a09047"},
|
||||
{file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9f02365d4e99430a12647f09b6cc8bab61a6564363f313126f775eb4f6ef798e"},
|
||||
{file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5b6d930f030f8ed98e3e6c98ffa0652bdb82601e7a016ec2ab5d7ff23baa78d1"},
|
||||
{file = "MarkupSafe-2.0.1-cp39-cp39-win32.whl", hash = "sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74"},
|
||||
{file = "MarkupSafe-2.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8"},
|
||||
{file = "MarkupSafe-2.0.1.tar.gz", hash = "sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a"},
|
||||
@ -945,8 +982,8 @@ sphinxcontrib-serializinghtml = [
|
||||
{file = "sphinxcontrib_serializinghtml-1.1.5-py2.py3-none-any.whl", hash = "sha256:352a9a00ae864471d3a7ead8d7d79f5fc0b57e8b3f95e9867eb9eb28999b92fd"},
|
||||
]
|
||||
typeguard = [
|
||||
{file = "typeguard-2.13.0-py3-none-any.whl", hash = "sha256:0bc44d1ff865b522eda969627868b0e001c8329296ce50aededbea03febc79ee"},
|
||||
{file = "typeguard-2.13.0.tar.gz", hash = "sha256:04e38f92eb59410c9375d3be23df65e0a7643f2e8bcbd421423d808d2f9e99df"},
|
||||
{file = "typeguard-2.13.2-py3-none-any.whl", hash = "sha256:4f7da3d80dda5e42d6973f11f33da3542b8bf86edc12ba926b2dbad62adf3fcf"},
|
||||
{file = "typeguard-2.13.2.tar.gz", hash = "sha256:7e50071590ab997509aa0977609eb5cf9d73d84c1f416cb4fab78b77a9d15326"},
|
||||
]
|
||||
typing-extensions = [
|
||||
{file = "typing_extensions-3.10.0.2-py2-none-any.whl", hash = "sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7"},
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "flexget";
|
||||
version = "3.2.7";
|
||||
version = "3.2.8";
|
||||
|
||||
# Fetch from GitHub in order to use `requirements.in`
|
||||
src = fetchFromGitHub {
|
||||
owner = "flexget";
|
||||
repo = "flexget";
|
||||
rev = "v${version}";
|
||||
sha256 = "12nj1jcxbkpc0x59rg59fsryignpppsx0wiwncdv6fzr58pdhd3v";
|
||||
sha256 = "0hr19f678pyd7mnzclfv7imh9s2m01k92dza1csyfacclvri8m07";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ callPackage, libsForQt5 }:
|
||||
|
||||
let
|
||||
stableVersion = "2.2.18";
|
||||
stableVersion = "2.2.28";
|
||||
previewVersion = stableVersion;
|
||||
addVersion = args:
|
||||
let version = if args.stable then stableVersion else previewVersion;
|
||||
@ -18,16 +18,16 @@ let
|
||||
});
|
||||
};
|
||||
commonOverrides = [
|
||||
(mkOverride "psutil" "5.6.7"
|
||||
"1an5llivfkwpbcfaapbx78p8sfnvzyfypf60wfxihib1mjr8xbgz")
|
||||
(mkOverride "psutil" "5.8.0"
|
||||
"sha256-DJzLmat2Al8vC77PNB1GVunBNR24zIoDzNYuMYq0tcY=")
|
||||
(mkOverride "jsonschema" "3.2.0"
|
||||
"0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68")
|
||||
];
|
||||
};
|
||||
mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { };
|
||||
mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { };
|
||||
guiSrcHash = "118z6asl6hsv0777rld4plnrwzkbkh3gb9lg9i6bqrjs93p028fw";
|
||||
serverSrcHash = "0gd37zpvibhlvqqpflpwlrgg8g9rpbxwi9w9fsym00mfwf7sdd3b";
|
||||
guiSrcHash = "sha256-5GPGn0ZFlqoKkb5BOzxf2FqwPlu7hZe4ysWDGSROCj0=";
|
||||
serverSrcHash = "sha256-7xsgpm4KFeGFbW81/oMUGQSwXWXnBPTHzVVR0/cUe6U=";
|
||||
in {
|
||||
guiStable = mkGui {
|
||||
stable = true;
|
||||
|
||||
@ -32,6 +32,10 @@ in python.pkgs.buildPythonPackage rec {
|
||||
postFixup = ''
|
||||
wrapQtApp "$out/bin/gns3"
|
||||
'';
|
||||
postPatch = ''
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "sentry-sdk==1.3.1" "sentry-sdk>=1.3.1" \
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Graphical Network Simulator 3 GUI (${branch} release)";
|
||||
|
||||
@ -8,12 +8,12 @@ let
|
||||
(self: super: {
|
||||
aiofiles = super.aiofiles.overridePythonAttrs (oldAttrs: rec {
|
||||
pname = "aiofiles";
|
||||
version = "0.5.0";
|
||||
version = "0.7.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Tinche";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "17bsg2x5r0q6jy74hajnbp717pvbf752w0wgih6pbb4hdvfg5lcf";
|
||||
sha256 = "sha256-njQ7eRYJO+dUrwO5pZwKHXn9nVSGYcEhwhs3x5BMc28=";
|
||||
};
|
||||
doCheck = false;
|
||||
});
|
||||
@ -36,8 +36,10 @@ in python.pkgs.buildPythonPackage {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "aiohttp==3.6.2" "aiohttp>=3.6.2" \
|
||||
--replace "py-cpuinfo==7.0.0" "py-cpuinfo>=8.0.0"
|
||||
--replace "aiohttp==3.7.4" "aiohttp>=3.7.4" \
|
||||
--replace "Jinja2==3.0.1" "Jinja2>=3.0.1" \
|
||||
--replace "sentry-sdk==1.3.1" "sentry-sdk>=1.3.1" \
|
||||
--replace "async-timeout==3.0.1" "async-timeout>=3.0.1" \
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
|
||||
@ -13,27 +13,13 @@
|
||||
|
||||
pythonPackages.buildPythonPackage rec {
|
||||
pname = "deluge";
|
||||
version = "2.0.3";
|
||||
version = "2.0.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.deluge-torrent.org/source/2.0/${pname}-${version}.tar.xz";
|
||||
sha256 = "14d8kn2pvr1qv8mwqrxmj85jycr73vwfqz12hzag0ararbkfhyky";
|
||||
sha256 = "sha256-xL0Eq/0hG2Uhi+A/PEbSb0QCSITeEOAYWfuFb91vJdg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/deluge-torrent/deluge/commit/d6c96d629183e8bab2167ef56457f994017e7c85.patch";
|
||||
sha256 = "sha256-slGMt2bgp36pjDztJUXFeZNbzdJsus0s9ARRD6IpNUw=";
|
||||
name = "fix_ngettext_warning.patch";
|
||||
})
|
||||
|
||||
(fetchpatch {
|
||||
url = "https://github.com/deluge-torrent/deluge/commit/351664ec071daa04161577c6a1c949ed0f2c3206.patch";
|
||||
sha256 = "sha256-ry1LFgMe9lys66xAvATcPqIa3rzBPWVnsf8FL1dXkHo=";
|
||||
name = "fix_logging_on_py38.patch";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [
|
||||
twisted
|
||||
Mako
|
||||
|
||||
76
pkgs/applications/office/appflowy/default.nix
Normal file
76
pkgs/applications/office/appflowy/default.nix
Normal file
@ -0,0 +1,76 @@
|
||||
{ stdenv,
|
||||
lib,
|
||||
fetchzip,
|
||||
autoPatchelfHook,
|
||||
makeWrapper,
|
||||
copyDesktopItems,
|
||||
makeDesktopItem,
|
||||
gtk3,
|
||||
openssl,
|
||||
xdg-user-dirs
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "appflowy";
|
||||
version = "0.0.2";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-linux-x86.tar.gz";
|
||||
sha256 = "1fvv4mlgf0vqcq5zh0zl2xr44saz0sm47r8whcywwrmcm0l66iv6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
makeWrapper
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
openssl
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
dontConfigure = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/opt/
|
||||
mkdir -p $out/bin/
|
||||
|
||||
# Copy archive contents to the outpout directory
|
||||
cp -r ./* $out/opt/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
preFixup = let
|
||||
libPath = lib.makeLibraryPath [
|
||||
xdg-user-dirs
|
||||
];
|
||||
in ''
|
||||
# Add missing libraries to appflowy using the ones it comes with
|
||||
makeWrapper $out/opt/app_flowy $out/bin/appflowy \
|
||||
--set LD_LIBRARY_PATH "$out/opt/lib/:${libPath}"
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = pname;
|
||||
desktopName = "AppFlowy";
|
||||
comment = meta.description;
|
||||
exec = "appflowy";
|
||||
categories = "Office;";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An open-source alternative to Notion";
|
||||
homepage = "https://www.appflowy.io/";
|
||||
license = licenses.agpl3Only;
|
||||
changelog = "https://github.com/AppFlowy-IO/appflowy/releases/tag/${version}";
|
||||
maintainers = with maintainers; [ darkonion0 ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
110
pkgs/applications/science/logic/klee/default.nix
Normal file
110
pkgs/applications/science/logic/klee/default.nix
Normal file
@ -0,0 +1,110 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, llvmPackages_9
|
||||
, clang_9
|
||||
, python3
|
||||
, zlib
|
||||
, z3
|
||||
, stp
|
||||
, cryptominisat
|
||||
, gperftools
|
||||
, sqlite
|
||||
, gtest
|
||||
, lit
|
||||
, debug ? false
|
||||
}:
|
||||
|
||||
let
|
||||
kleePython = python3.withPackages (ps: with ps; [ tabulate ]);
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "klee";
|
||||
version = "2.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "klee";
|
||||
repo = "klee";
|
||||
rev = "v${version}";
|
||||
sha256 = "Ar3BKfADjJvvP0dI9+x/l3RDs8ncx4jmO7ol4MgOr4M=";
|
||||
};
|
||||
buildInputs = [
|
||||
llvmPackages_9.llvm clang_9 z3 stp cryptominisat
|
||||
gperftools sqlite
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
checkInputs = [
|
||||
gtest
|
||||
|
||||
# Should appear BEFORE lit, since lit passes through python rather
|
||||
# than the python environment we make.
|
||||
kleePython
|
||||
(lit.override { python3 = kleePython; })
|
||||
];
|
||||
|
||||
cmakeFlags = let
|
||||
buildType = if debug then "Debug" else "Release";
|
||||
in
|
||||
[
|
||||
"-DCMAKE_BUILD_TYPE=${buildType}"
|
||||
"-DKLEE_RUNTIME_BUILD_TYPE=${buildType}"
|
||||
"-DENABLE_POSIX_RUNTIME=ON"
|
||||
"-DENABLE_UNIT_TESTS=ON"
|
||||
"-DENABLE_SYSTEM_TESTS=ON"
|
||||
"-DGTEST_SRC_DIR=${gtest.src}"
|
||||
"-DGTEST_INCLUDE_DIR=${gtest.src}/googletest/include"
|
||||
"-Wno-dev"
|
||||
];
|
||||
|
||||
# Silence various warnings during the compilation of fortified bitcode.
|
||||
NIX_CFLAGS_COMPILE = ["-Wno-macro-redefined"];
|
||||
|
||||
prePatch = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
/* This patch is currently necessary for the unit test suite to run correctly.
|
||||
* See https://www.mail-archive.com/klee-dev@imperial.ac.uk/msg03136.html
|
||||
* and https://github.com/klee/klee/pull/1458 for more information.
|
||||
*/
|
||||
patches = map fetchpatch [
|
||||
{
|
||||
name = "fix-gtest";
|
||||
sha256 = "F+/6videwJZz4sDF9lnV4B8lMx6W11KFJ0Q8t1qUDf4=";
|
||||
url = "https://github.com/klee/klee/pull/1458.patch";
|
||||
}
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
checkTarget = "check";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A symbolic virtual machine built on top of LLVM";
|
||||
longDescription = ''
|
||||
KLEE is a symbolic virtual machine built on top of the LLVM compiler
|
||||
infrastructure. Currently, there are two primary components:
|
||||
|
||||
1. The core symbolic virtual machine engine; this is responsible for
|
||||
executing LLVM bitcode modules with support for symbolic values. This
|
||||
is comprised of the code in lib/.
|
||||
|
||||
2. A POSIX/Linux emulation layer oriented towards supporting uClibc, with
|
||||
additional support for making parts of the operating system environment
|
||||
symbolic.
|
||||
|
||||
Additionally, there is a simple library for replaying computed inputs on
|
||||
native code (for closed programs). There is also a more complicated
|
||||
infrastructure for replaying the inputs generated for the POSIX/Linux
|
||||
emulation layer, which handles running native programs in an environment
|
||||
that matches a computed test input, including setting up files, pipes,
|
||||
environment variables, and passing command line arguments.
|
||||
'';
|
||||
homepage = "https://klee.github.io/";
|
||||
license = licenses.ncsa;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ numinit ];
|
||||
};
|
||||
}
|
||||
@ -40,24 +40,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "icewm";
|
||||
version = "2.6.0";
|
||||
version = "2.9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ice-wm";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-R06tiWS9z6K5Nbi+vvk7DyozpcFdrHleMeh7Iq/FfHQ=";
|
||||
hash = "sha256-ne2lqo9CAhGgC8dd9R03zhFXy9nPBQR0NcfAY0DeVj4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/ice-wm/icewm/pull/57
|
||||
# Fix trailing -I that leads to "to generate dependencies you must specify either '-M' or '-MM'"
|
||||
(fetchpatch {
|
||||
url = "https://github.com/ice-wm/icewm/pull/57/commits/ebd2c45341cc31755758a423392a0f78a64d2d37.patch";
|
||||
sha256 = "16m9znd3ijcfl7la3l27ac3clx8l9qng3fprkpxqcifd89ny1ml5";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
asciidoc
|
||||
cmake
|
||||
|
||||
43
pkgs/build-support/test-equal-derivation.nix
Normal file
43
pkgs/build-support/test-equal-derivation.nix
Normal file
@ -0,0 +1,43 @@
|
||||
{ lib, runCommand, emptyFile, nix-diff }:
|
||||
|
||||
/*
|
||||
Checks that two packages produce the exact same build instructions.
|
||||
|
||||
This can be used to make sure that a certain difference of configuration,
|
||||
such as the presence of an overlay does not cause a cache miss.
|
||||
|
||||
When the derivations are equal, the return value is an empty file.
|
||||
Otherwise, the build log explains the difference via `nix-diff`.
|
||||
|
||||
Example:
|
||||
|
||||
testEqualDerivation
|
||||
"The hello package must stay the same when enabling checks."
|
||||
hello
|
||||
(hello.overrideAttrs(o: { doCheck = true; }))
|
||||
|
||||
*/
|
||||
assertion: a: b:
|
||||
let
|
||||
drvA = builtins.unsafeDiscardOutputDependency a.drvPath or (throw "testEqualDerivation second argument must be a package");
|
||||
drvB = builtins.unsafeDiscardOutputDependency b.drvPath or (throw "testEqualDerivation third argument must be a package");
|
||||
name =
|
||||
if a?name
|
||||
then lib.strings.sanitizeDerivationName "testEqualDerivation-${a.name}"
|
||||
else "testEqualDerivation";
|
||||
in
|
||||
if drvA == drvB then
|
||||
emptyFile
|
||||
else
|
||||
runCommand name
|
||||
{
|
||||
inherit assertion drvA drvB;
|
||||
nativeBuildInputs = [ nix-diff ];
|
||||
} ''
|
||||
echo "$assertion"
|
||||
echo "However, the derivations differ:"
|
||||
echo
|
||||
echo nix-diff $drvA $drvB
|
||||
nix-diff $drvA $drvB
|
||||
exit 1
|
||||
''
|
||||
@ -322,6 +322,67 @@ rec {
|
||||
$CC -x c code.c -o "$n"
|
||||
'';
|
||||
|
||||
|
||||
/* concat a list of files to the nix store.
|
||||
* The contents of files are added to the file in the store.
|
||||
*
|
||||
* Examples:
|
||||
* # Writes my-file to /nix/store/<store path>
|
||||
* concatTextFile {
|
||||
* name = "my-file";
|
||||
* files = [ drv1 "${drv2}/path/to/file" ];
|
||||
* }
|
||||
* # See also the `concatText` helper function below.
|
||||
*
|
||||
* # Writes executable my-file to /nix/store/<store path>/bin/my-file
|
||||
* concatTextFile {
|
||||
* name = "my-file";
|
||||
* files = [ drv1 "${drv2}/path/to/file" ];
|
||||
* executable = true;
|
||||
* destination = "/bin/my-file";
|
||||
* }
|
||||
*/
|
||||
concatTextFile =
|
||||
{ name # the name of the derivation
|
||||
, files
|
||||
, executable ? false # run chmod +x ?
|
||||
, destination ? "" # relative path appended to $out eg "/bin/foo"
|
||||
, checkPhase ? "" # syntax checks, e.g. for scripts
|
||||
, meta ? { }
|
||||
}:
|
||||
runCommandLocal name
|
||||
{ inherit files executable checkPhase meta destination; }
|
||||
''
|
||||
file=$out$destination
|
||||
mkdir -p "$(dirname "$file")"
|
||||
cat $files > "$file"
|
||||
|
||||
(test -n "$executable" && chmod +x "$file") || true
|
||||
eval "$checkPhase"
|
||||
'';
|
||||
|
||||
|
||||
/*
|
||||
* Writes a text file to nix store with no optional parameters available.
|
||||
*
|
||||
* Example:
|
||||
* # Writes contents of files to /nix/store/<store path>
|
||||
* concatText "my-file" [ file1 file2 ]
|
||||
*
|
||||
*/
|
||||
concatText = name: files: concatTextFile { inherit name files; };
|
||||
|
||||
/*
|
||||
* Writes a text file to nix store with and mark it as executable.
|
||||
*
|
||||
* Example:
|
||||
* # Writes contents of files to /nix/store/<store path>
|
||||
* concatScript "my-file" [ file1 file2 ]
|
||||
*
|
||||
*/
|
||||
concatScript = name: files: concatTextFile { inherit name files; executable = true; };
|
||||
|
||||
|
||||
/*
|
||||
* Create a forest of symlinks to the files in `paths'.
|
||||
*
|
||||
|
||||
12
pkgs/build-support/trivial-builders/test/concat-test.nix
Normal file
12
pkgs/build-support/trivial-builders/test/concat-test.nix
Normal file
@ -0,0 +1,12 @@
|
||||
{ callPackage, lib, pkgs, runCommand, concatText, writeText, hello, emptyFile }:
|
||||
let
|
||||
stri = writeText "pathToTest";
|
||||
txt1 = stri "abc";
|
||||
txt2 = stri hello;
|
||||
res = concatText "textToTest" [ txt1 txt2 ];
|
||||
in
|
||||
runCommand "test-concatPaths" { } ''
|
||||
diff -U3 <(cat ${txt1} ${txt2}) ${res}
|
||||
diff -U3 ${concatText "void" []} ${emptyFile}
|
||||
touch $out
|
||||
''
|
||||
@ -72,14 +72,14 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libvirt";
|
||||
version = "7.9.0";
|
||||
version = "7.10.0";
|
||||
|
||||
src =
|
||||
if buildFromTarball then
|
||||
fetchurl
|
||||
{
|
||||
url = "https://libvirt.org/sources/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-gpzytfV0J5xA8ERuEWiBXT82uJcQVgJjyiznAlb3Low=";
|
||||
sha256 = "sha256-yzGAFK8JcyeSjG49cpIuO+AqPmQBJHsqpS2auOC0gPk=";
|
||||
}
|
||||
else
|
||||
fetchFromGitLab
|
||||
@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Ua6+EKLES3385fqhH2+qwnwE+X/nmWqIBxCXXE3SVhs=";
|
||||
sha256 = "sha256-bB8LsjZFeJbMmmC0YRPyMag2MBhwagUFC7aB1KhZEkA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "htslib";
|
||||
version = "1.13";
|
||||
version = "1.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/samtools/htslib/releases/download/${version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-8kB9+fl/C7awdlZXnkGhylEARkBntrIb+WKi6ksO/WU=";
|
||||
sha256 = "sha256-7SIbj1L0gS+BDuvgzFbNg1WlydIcYtFCrAWtDaFHk18=";
|
||||
};
|
||||
|
||||
# perl is only used during the check phase.
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "uriparser";
|
||||
version = "0.9.5";
|
||||
version = "0.9.6";
|
||||
|
||||
# Release tarball differs from source tarball
|
||||
src = fetchurl {
|
||||
url = "https://github.com/uriparser/uriparser/releases/download/${pname}-${version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0v30qr5hl3xybl9nzwaw46kblwn94w5xpri22wanrrpjlzmn306x";
|
||||
sha256 = "9ce4c3f151e78579f23937b44abecb428126863ad02e594e115e882353de905b";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "23.1.0";
|
||||
version = "24.0.0";
|
||||
pname = "azure-mgmt-compute";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "49dbb0f51006d557cbd0b22999cb9ecf3eabc2be46d96efcc6d651c6b33754b3";
|
||||
sha256 = "04e60fd3e73fc036ad74497e81277faedb7e048c8c1d7511d37ad7471b4cfc50";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bitarray";
|
||||
version = "2.3.4";
|
||||
version = "2.3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f19c62425576d3d1821ed711b94d1a4e5ede8f05ca121e99b6d978ed49c7a765";
|
||||
sha256 = "60285184cb02fdba5e1cc8605ac84e150a50f940e9383ab43564e5258d1f47bb";
|
||||
};
|
||||
|
||||
checkPhase = ''
|
||||
|
||||
@ -9,11 +9,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cornice";
|
||||
version = "6.0.0";
|
||||
version = "6.0.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "532485ed53cae81ef476aaf4cc7c2e0208749ad1959119c46efefdeea5546eba";
|
||||
sha256 = "6edf6f206ff1c3d108d7a7b9ae640a2f4737cfc04f0914ccc4eefe511d3a8985";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pyramid simplejson six venusian ];
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "enamlx";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "frmdstryr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1fwfh5h1l68zwkjayf71dmxrhjbscsh87p4mskzkwwaj5cxsva90";
|
||||
sha256 = "10sn7wd4fjz8nkzprd8wa5da5dg8w91r0rngqaipwnpq1dz54b5s";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,14 +1,15 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
# Check inputs
|
||||
, fetchpatch
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastjsonschema";
|
||||
version = "2.15.1";
|
||||
version = "2.15.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.3";
|
||||
|
||||
@ -17,11 +18,25 @@ buildPythonPackage rec {
|
||||
repo = "python-fastjsonschema";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-ltxFJ3V5/bckusspQ5o0F4reMoB4KpYWPHF8ZNXGqVQ=";
|
||||
hash = "sha256-zrdQVFfLZxZRr9qvss4CI3LJK97xl+bY+AcPzcweYeU=";
|
||||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
dontUseSetuptoolsCheck = true;
|
||||
|
||||
patches = [
|
||||
# Can be removed with the next release, https://github.com/horejsek/python-fastjsonschema/pull/134
|
||||
(fetchpatch {
|
||||
name = "fix-exception-name.patch";
|
||||
url = "https://github.com/horejsek/python-fastjsonschema/commit/f639dcba0299926d688e1d8d08a6a91bfe70ce8b.patch";
|
||||
sha256 = "sha256-yPV5ZNeyAobLrYf5QHanPsEomBPJ/7ZN2148R8NO4/U=";
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
disabledTests = [
|
||||
"benchmark"
|
||||
# these tests require network access
|
||||
@ -29,10 +44,12 @@ buildPythonPackage rec {
|
||||
"definitions"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "fastjsonschema" ];
|
||||
pythonImportsCheck = [
|
||||
"fastjsonschema"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast JSON schema validator for Python.";
|
||||
description = "JSON schema validator for Python";
|
||||
homepage = "https://horejsek.github.io/python-fastjsonschema/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ drewrisinger ];
|
||||
|
||||
@ -11,12 +11,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "GeoAlchemy2";
|
||||
version = "0.10.1";
|
||||
version = "0.10.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "3b51f4d0558b7effb9add93aaa813c7a160ed293c346f5379a6fa1c8049af062";
|
||||
sha256 = "3db833746e11bc802b754751ec94eaab81009a9ad8fe647d461fe76d1a47a3fd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "0.15.0";
|
||||
version = "0.16.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-jTUMnBtV0wVFWe+4MWOAvFDLvminM0gVTm0hkBOvnH8=";
|
||||
sha256 = "sha256-+l6VeF3vOO5MBW9FLlnE/Anm8vps2Sl6Nmf2N9QiArQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jdatetime";
|
||||
version = "3.7.0";
|
||||
version = "3.8.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f06876c926b8cf88b2f0f68d6cda2b0ff86002385877c9867970e1d017ef82a8";
|
||||
sha256 = "389a0723a8011379a5e34386ec466cb3f65b2d5cb5422702c1d3aecb6ac192d0";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "libvirt";
|
||||
version = "7.9.0";
|
||||
version = "7.10.0";
|
||||
|
||||
src = assert version == libvirt.version; fetchFromGitLab {
|
||||
owner = "libvirt";
|
||||
repo = "libvirt-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cfCyQ3KTv0lYTZMriUhm6psBAcJJIcmR/M9V/lrLmVE=";
|
||||
sha256 = "sha256-I1FNjNwWRyDAUSq2Co9EnjAbzKQtS0Rx8vHgPsFzSYw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -10,11 +10,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lightgbm";
|
||||
version = "3.3.1";
|
||||
version = "3.3.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "5b9f31759ab4e94d9409deb03104c55b0a40058a6ccea804022046d926bc4904";
|
||||
sha256 = "5d25d16e77c844c297ece2044df57651139bc3c8ad8c4108916374267ac68b64";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mdformat";
|
||||
version = "0.7.11";
|
||||
version = "0.7.12";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "executablebooks";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-EhMoGSCtlEcm1+1aHn9DhBnLQvolhq62SMF/AdaY1/E=";
|
||||
sha256 = "sha256-h85UzzE84TksZipcbbBaOC/sPv8HQMwiEGCgTdi/8J0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,43 +1,52 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, databases
|
||||
, typesystem
|
||||
, aiomysql
|
||||
, aiosqlite
|
||||
, pytestCheckHook
|
||||
, pytest-cov
|
||||
, typing-extensions
|
||||
, asyncpg
|
||||
, buildPythonPackage
|
||||
, databases
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, typesystem
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "orm";
|
||||
version = "0.1.5";
|
||||
version = "0.3.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "encode";
|
||||
repo = "orm";
|
||||
rev = version;
|
||||
sha256 = "1g70cr0559iyqfzidwh6n2qq6d4dcnrr4sg0jkn1s4qzka828mj7";
|
||||
hash = "sha256-nlKEWdqttFnjBnXutlxTy9oILqFzKHKKPJpTtCUbJ5k=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiomysql
|
||||
aiosqlite
|
||||
asyncpg
|
||||
databases
|
||||
typesystem
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
aiosqlite
|
||||
pytestCheckHook
|
||||
pytest-cov
|
||||
typing-extensions
|
||||
];
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "typesystem==0.3.1" "typesystem"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "orm" ];
|
||||
# Tests require databases
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"orm"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An async ORM";
|
||||
homepage = "https://github.com/encode/orm";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pudb";
|
||||
version = "2021.2.2";
|
||||
version = "2022.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "82a524ab4b89d2c701b089071ccc6afa9c8a838504e3d68eb33faa8a8abbe4cb";
|
||||
sha256 = "e827a4b489dcad561189535db6677becbf32164b2b44df00786eb2d5e00c587e";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydevccu";
|
||||
version = "0.0.9";
|
||||
version = "0.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -15,14 +15,9 @@ buildPythonPackage rec {
|
||||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-/4sJ5T17nCcTjg1Me4zTlOEOkK1py9kl2YeLGv4X6us=";
|
||||
sha256 = "sha256-bLXACJPiHZlJzoDm7N9RWskN+qQddSkGFX9d4YcTaLo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Fix file name, https://github.com/danielperna84/pydevccu/pull/8
|
||||
mv pydevccu/paramset_descriptions/HmIP-STDH.json pydevccu/paramset_descriptions/HmIP-STHD.json
|
||||
'';
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyrogram";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "pyrogram";
|
||||
repo = "pyrogram";
|
||||
rev = "v${version}";
|
||||
sha256 = "0clbnhk1icr4vl29693r6r28f5by5n6pjxjqih21g3yd64q55q3q";
|
||||
sha256 = "09rxdd5bl1yby76xd3wcyrmlb4glixs637nj1w05gh2rp3gppkf8";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "schema-salad";
|
||||
version = "8.2.20211222191353";
|
||||
version = "8.2.20220103095339";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "bae31897a9f5c16546081811728cc20296455dc805ffd0bac0064de6cbbcbf88";
|
||||
sha256 = "051690a2f89b98e35100cd2cb489406a5169a60c2f27a716f3f287a42d45be2d";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-futures";
|
||||
version = "3.3.1";
|
||||
version = "3.3.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "bbdad92cec642693bac10fbbecf834776009db7782d91dc293bdd123be73186d";
|
||||
sha256 = "f47bf00704ef8ff05726a7e86fcf0986de998992fbdd880986121baa8b7184bf";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -5,12 +5,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-pytz";
|
||||
version = "2021.3.3";
|
||||
version = "2021.3.4";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-9tIdZoeTWhYV20ZLHh34ANGVAsNrwEhvQ759/SxASUc=";
|
||||
sha256 = "101da53091013bb07403468c20d36930d749d3918054ac46f9c1bfc607dadf7d";
|
||||
};
|
||||
|
||||
# Modules doesn't have tests
|
||||
|
||||
@ -5,12 +5,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-setuptools";
|
||||
version = "57.4.5";
|
||||
version = "57.4.6";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-pGAO/cpoozIErZwIP9mWbWOu5hp9AH6RK2r8b/V9bgI=";
|
||||
sha256 = "65ef8946fc31aed946177629e681861217aceb8fc9b75a44ba987d7eea9388aa";
|
||||
};
|
||||
|
||||
# Module doesn't have tests
|
||||
|
||||
@ -1,23 +1,24 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, isPy27
|
||||
, pytestCheckHook
|
||||
, pytest-cov
|
||||
, jinja2
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "typesystem";
|
||||
version = "0.2.4";
|
||||
disabled = isPy27;
|
||||
version = "0.4.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "encode";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1k0jwcky17zwaz2vx4x2zbsnp270g4mgn7kx5bpl8jgx76qmsnba";
|
||||
hash = "sha256-fjnheHWjIDbJY1iXCRKCpqTCwtUWK9YXbynRCZquQ7c=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -27,23 +28,16 @@ buildPythonPackage rec {
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
pytest-cov
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# https://github.com/encode/typesystem/issues/102. cosmetic issue where python3.8 changed
|
||||
# the default string formatting of regular expression flags which breaks test assertion
|
||||
"test_to_json_schema_complex_regular_expression"
|
||||
];
|
||||
disabledTestPaths = [
|
||||
# for some reason jinja2 not picking up forms directory (1% of tests)
|
||||
"tests/test_forms.py"
|
||||
pythonImportsCheck = [
|
||||
"typesystem"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A type system library for Python";
|
||||
homepage = "https://github.com/encode/typesystem";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
, buildPythonPackage
|
||||
, fastjsonschema
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, future-typing
|
||||
, inflection
|
||||
, mypy
|
||||
@ -18,7 +19,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "typical";
|
||||
version = "2.7.9";
|
||||
version = "2.8.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -27,13 +28,9 @@ buildPythonPackage rec {
|
||||
owner = "seandstewart";
|
||||
repo = "typical";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ITIsSM92zftnvqLiVGFl//IbBb8N3ffkkqohzOx2JO4=";
|
||||
hash = "sha256-DRjQmoZzWw5vpwIx70wQg6EO/aHqyX7RWpWZ9uOxSTg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./use-poetry-core.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
@ -56,6 +53,15 @@ buildPythonPackage rec {
|
||||
pandas
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Switch to poetry-core, https://github.com/seandstewart/typical/pull/193
|
||||
(fetchpatch {
|
||||
name = "switch-to-poetry-core.patch";
|
||||
url = "https://github.com/seandstewart/typical/commit/66b3c34f8969b7fb1f684f0603e514405bab0dd7.patch";
|
||||
sha256 = "sha256-c7qJOtHmJRnVEGl+OADB3HpjvMK8aYDD9+0gplOn9pQ=";
|
||||
})
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# We use orjson
|
||||
"test_ujson"
|
||||
@ -65,6 +71,8 @@ buildPythonPackage rec {
|
||||
|
||||
disabledTestPaths = [
|
||||
"benchmark/"
|
||||
# Tests are failing on Hydra
|
||||
"tests/mypy/test_mypy.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/pyproject.toml b/pyproject.toml
|
||||
index a588a0d..43da394 100644
|
||||
--- a/pyproject.toml
|
||||
+++ b/pyproject.toml
|
||||
@@ -154,7 +154,7 @@ exclude = '''
|
||||
|
||||
[build-system]
|
||||
requires = ["poetry>=0.12"]
|
||||
-build-backend = "poetry.masonry.api"
|
||||
+build-backend = "poetry.core.masonry.api"
|
||||
|
||||
[bumpver]
|
||||
current_version = "v2.7.5"
|
||||
@ -28,6 +28,7 @@
|
||||
, meson
|
||||
, nim
|
||||
, nodePackages
|
||||
, parinfer-rust
|
||||
, skim
|
||||
, sqlite
|
||||
, statix
|
||||
@ -515,6 +516,8 @@ self: super: {
|
||||
configurePhase = "cd vim";
|
||||
});
|
||||
|
||||
parinfer-rust = parinfer-rust;
|
||||
|
||||
range-highlight-nvim = super.range-highlight-nvim.overrideAttrs (old: {
|
||||
dependencies = with self; [ cmd-parser-nvim ];
|
||||
});
|
||||
|
||||
@ -23,13 +23,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mosquitto";
|
||||
version = "2.0.12";
|
||||
version = "2.0.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eclipse";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0bn6vpk6gdxrnm3aw3j2g0ny6cx2arv8pmv4x8302pr6qcrz57s6";
|
||||
sha256 = "0ns4dxywsy9hsmd3ybanxvzwdvzs0szc2rg43c310l4xb1sd8wm2";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.isDarwin [
|
||||
|
||||
@ -61,6 +61,7 @@ with pkgs;
|
||||
writeStringReferencesToFile = callPackage ../build-support/trivial-builders/test/writeStringReferencesToFile.nix {};
|
||||
references = callPackage ../build-support/trivial-builders/test/references.nix {};
|
||||
overriding = callPackage ../build-support/trivial-builders/test-overriding.nix {};
|
||||
concat = callPackage ../build-support/trivial-builders/test/concat-test.nix {};
|
||||
};
|
||||
|
||||
writers = callPackage ../build-support/writers/test.nix {};
|
||||
|
||||
@ -158,7 +158,7 @@ let
|
||||
"73054bd19866577e7e327518afc8f47e1639a11aea29a7466354b81804f4a676";
|
||||
|
||||
azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "23.1.0" "zip"
|
||||
"sha256-N+zUTEnOyn18lDHlkUj+vRXX/sJhZR7XLd1YdV50ULA=";
|
||||
"sha256-Sduw9RAG1VfL0LIpmcuezz6rwr5G2W78xtZRxrM3VLM=";
|
||||
|
||||
azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip"
|
||||
"12ai4qps73ivawh0yzvgb148ksx02r30pqlvfihx497j62gsi1cs";
|
||||
|
||||
@ -12,15 +12,15 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "bat";
|
||||
version = "0.18.3";
|
||||
version = "0.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sharkdp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3XwnlSPlyEE4oznXK59/rooZLtj1+VbozprXU2W0J5I=";
|
||||
sha256 = "sha256-XF5wMLHdiyasB2H6thk6OrkAm5bZZmlPFlBl02k52qU=";
|
||||
};
|
||||
cargoSha256 = "sha256-g5yfE/s1N6EgI2ikiJbypI4iQbXPu6zGNoSVC6ldoWo=";
|
||||
cargoSha256 = "sha256-GipH9CBzvfaDqov1v9bKtrsRhUfiQ/AhBi1p+gBTwzM=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ];
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "duf";
|
||||
version = "0.6.2";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "muesli";
|
||||
repo = "duf";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-aRXm31sGHvHPpqPck5+jplbWT52OzaiQIgU/C7llJs8=";
|
||||
sha256 = "sha256-Usdu7f3XPTIT39H23vfP0XBlvNPgPA+3BMyOzFOyLHQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "153z0ccd556c0wpnxgyjq7m0c4y2z6fxsqq2p77kly9nr8cpzdb9";
|
||||
vendorSha256 = "sha256-6PV/v+rk63FIR2M0Q7EzqjVvWIwHtK6TQpEYxkXLQ50=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];
|
||||
|
||||
|
||||
@ -11,12 +11,12 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nix-eval-jobs";
|
||||
version = "0.0.2";
|
||||
version = "0.0.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-kZw/nPJqWuBMMnDWsWF3oMY93QYVRem1XTbaxdbQ2oM=";
|
||||
hash = "sha256:0flnqn1vkr55sipii82vwjfkhv4p835d01f6yhlpbalxwy2kr14r";
|
||||
};
|
||||
buildInputs = [
|
||||
boost
|
||||
|
||||
@ -147,6 +147,8 @@ with pkgs;
|
||||
{ name = "auto-patchelf-hook"; deps = [ bintools ]; }
|
||||
../build-support/setup-hooks/auto-patchelf.sh;
|
||||
|
||||
appflowy = callPackage ../applications/office/appflowy { };
|
||||
|
||||
appimageTools = callPackage ../build-support/appimage {
|
||||
buildFHSUserEnv = buildFHSUserEnvBubblewrap;
|
||||
};
|
||||
@ -10135,6 +10137,8 @@ with pkgs;
|
||||
|
||||
termplay = callPackage ../tools/misc/termplay { };
|
||||
|
||||
testEqualDerivation = callPackage ../build-support/test-equal-derivation.nix { };
|
||||
|
||||
tetrd = callPackage ../applications/networking/tetrd { };
|
||||
|
||||
tewisay = callPackage ../tools/misc/tewisay { };
|
||||
@ -26595,6 +26599,8 @@ with pkgs;
|
||||
|
||||
klayout = libsForQt5.callPackage ../applications/misc/klayout { };
|
||||
|
||||
klee = callPackage ../applications/science/logic/klee { };
|
||||
|
||||
kmetronome = libsForQt5.callPackage ../applications/audio/kmetronome { };
|
||||
|
||||
kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { };
|
||||
|
||||
@ -20744,12 +20744,12 @@ let
|
||||
|
||||
SysVirt = buildPerlModule rec {
|
||||
pname = "Sys-Virt";
|
||||
version = "7.9.0";
|
||||
version = "7.10.0";
|
||||
src = fetchFromGitLab {
|
||||
owner = "libvirt";
|
||||
repo = "libvirt-perl";
|
||||
rev = "v7.9.0";
|
||||
sha256 = "sha256-QxY6TRVQWrN689CD76CQZeyXsDVWxk24N1v67DCvmDo=";
|
||||
rev = "v7.10.0";
|
||||
sha256 = "sha256-cXuzg4bBwCftdZhz3e50L+4fO0RWX5Tl8zDOoydECd4=";
|
||||
};
|
||||
nativeBuildInputs = [ pkgs.pkg-config ];
|
||||
buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ];
|
||||
|
||||
Loading…
Reference in New Issue
Block a user