Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
2921710cec
|
|
@ -14,19 +14,25 @@ for example when using an 'old' hash in a fixed-output derivation.
|
|||
Examples:
|
||||
|
||||
```nix
|
||||
passthru.tests.version = testVersion { package = hello; };
|
||||
passthru.tests.version = testers.testVersion { package = hello; };
|
||||
|
||||
passthru.tests.version = testVersion {
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = seaweedfs;
|
||||
command = "weed version";
|
||||
};
|
||||
|
||||
passthru.tests.version = testVersion {
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = key;
|
||||
command = "KeY --help";
|
||||
# Wrong '2.5' version in the code. Drop on next version.
|
||||
version = "2.5";
|
||||
};
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = ghr;
|
||||
# The output needs to contain the 'version' string without any prefix or suffix.
|
||||
version = "v${version}";
|
||||
};
|
||||
```
|
||||
|
||||
## `testEqualDerivation` {#tester-testEqualDerivation}
|
||||
|
|
@ -42,7 +48,7 @@ Otherwise, the build log explains the difference via `nix-diff`.
|
|||
Example:
|
||||
|
||||
```nix
|
||||
testEqualDerivation
|
||||
testers.testEqualDerivation
|
||||
"The hello package must stay the same when enabling checks."
|
||||
hello
|
||||
(hello.overrideAttrs(o: { doCheck = true; }))
|
||||
|
|
@ -73,7 +79,7 @@ fixed output derivation.
|
|||
Example:
|
||||
|
||||
```nix
|
||||
tests.fetchgit = invalidateFetcherByDrvHash fetchgit {
|
||||
tests.fetchgit = testers.invalidateFetcherByDrvHash fetchgit {
|
||||
name = "nix-source";
|
||||
url = "https://github.com/NixOS/nix";
|
||||
rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a";
|
||||
|
|
|
|||
|
|
@ -373,6 +373,12 @@
|
|||
githubId = 10677343;
|
||||
name = "Eugene";
|
||||
};
|
||||
afh = {
|
||||
email = "surryhill+nix@gmail.com";
|
||||
github = "afh";
|
||||
githubId = 16507;
|
||||
name = "Alexis Hildebrandt";
|
||||
};
|
||||
aflatter = {
|
||||
email = "flatter@fastmail.fm";
|
||||
github = "aflatter";
|
||||
|
|
@ -2443,6 +2449,12 @@
|
|||
githubId = 42220376;
|
||||
name = "Charlotte Van Petegem";
|
||||
};
|
||||
ciferkey = {
|
||||
name = "Matthew Brunelle";
|
||||
email = "ciferkey@gmail.com";
|
||||
github = "ciferkey";
|
||||
githubId = 101422;
|
||||
};
|
||||
cigrainger = {
|
||||
name = "Christopher Grainger";
|
||||
email = "chris@amplified.ai";
|
||||
|
|
@ -3739,6 +3751,12 @@
|
|||
github = "edlimerkaj";
|
||||
githubId = 71988351;
|
||||
};
|
||||
ehllie = {
|
||||
email = "me@ehllie.xyz";
|
||||
github = "ehllie";
|
||||
githubId = 20847625;
|
||||
name = "Elizabeth Paź";
|
||||
};
|
||||
elliottslaughter = {
|
||||
name = "Elliott Slaughter";
|
||||
email = "elliottslaughter@gmail.com";
|
||||
|
|
|
|||
|
|
@ -248,6 +248,8 @@ in
|
|||
"-/etc/localtime"
|
||||
"-/etc/kanidm"
|
||||
"-/etc/static/kanidm"
|
||||
"-/etc/ssl"
|
||||
"-/etc/static/ssl"
|
||||
];
|
||||
BindPaths = [
|
||||
# To create the socket
|
||||
|
|
|
|||
|
|
@ -449,6 +449,7 @@ in
|
|||
--dbuser ${cfg.database.user} \
|
||||
${optionalString (cfg.database.passwordFile != null) "--dbpassfile ${cfg.database.passwordFile}"} \
|
||||
--passfile ${cfg.passwordFile} \
|
||||
--dbtype ${cfg.database.type} \
|
||||
${cfg.name} \
|
||||
admin
|
||||
|
||||
|
|
|
|||
|
|
@ -44,6 +44,12 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
|||
enableClient = true;
|
||||
clientSettings = {
|
||||
uri = "https://${serverDomain}";
|
||||
verify_ca = true;
|
||||
verify_hostnames = true;
|
||||
};
|
||||
enablePam = true;
|
||||
unixSettings = {
|
||||
pam_allowed_login_groups = [ "shell" ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -67,9 +73,11 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
|||
start_all()
|
||||
server.wait_for_unit("kanidm.service")
|
||||
server.wait_until_succeeds("curl -sf https://${serverDomain} | grep Kanidm")
|
||||
server.wait_until_succeeds("ldapsearch -H ldap://[::1]:636 -b '${ldapBaseDN}' -x '(name=test)'")
|
||||
client.wait_until_succeeds("kanidm login -D anonymous && kanidm self whoami | grep anonymous@${serverDomain}")
|
||||
server.succeed("ldapsearch -H ldap://[::1]:636 -b '${ldapBaseDN}' -x '(name=test)'")
|
||||
client.succeed("kanidm login -D anonymous && kanidm self whoami | grep anonymous@${serverDomain}")
|
||||
rv, result = server.execute("kanidmd recover_account -c ${serverConfigFile} idm_admin 2>&1 | rg -o '[A-Za-z0-9]{48}'")
|
||||
assert rv == 0
|
||||
client.wait_for_unit("kanidm-unixd.service")
|
||||
client.succeed("kanidm_unixd_status | grep working!")
|
||||
'';
|
||||
})
|
||||
|
|
|
|||
|
|
@ -39,13 +39,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sonic-pi";
|
||||
version = "4.1.0";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sonic-pi-net";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-kEZNVTAWkiqxyPJHSL4Gismpwxd+PnXiH8CgQCV3+PQ=";
|
||||
hash = "sha256-VRuNhS53okKsCHgKEsJgkpIe9yXFY6d2ghd0nsUQLLM=";
|
||||
};
|
||||
|
||||
mixFodDeps = beamPackages.fetchMixDeps {
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fulcrum";
|
||||
version = "1.7.0";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cculianu";
|
||||
repo = "Fulcrum";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FIa6eAE6yyJR5UdlCXB2Gx3DqN528POxb0eYOCpVjJk=";
|
||||
sha256 = "sha256-g80XL7dzq2Ed08zAcgBjrHfL1Qqxhr5sL9koaE4fl/I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config qmake ];
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
trivialBuild {
|
||||
pname = "bqn-mode";
|
||||
version = "0.pre+date=2022-01-07";
|
||||
version = "0.pre+date=2022-09-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "museoa";
|
||||
repo = "bqn-mode";
|
||||
rev = "86ef8b4d32d272b2765cd4a6e6e0b70a4f3e99a2";
|
||||
hash = "sha256-6ygV/iNzzpZ77w+Dh/snHAzUxrbfaU9TxuNOtJK6pNQ=";
|
||||
rev = "3e3d4758c0054b35f047bf6d9e03b1bea425d013";
|
||||
hash = "sha256:0pz3m4jp4dn8bsmc9n51sxwdk6g52mxb6y6f6a4g4hggb35shy2a";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp {
|
|||
++ lib.optionals (stdenv.isLinux && withX) [ m17n_lib libotf ]
|
||||
++ lib.optional (withX && withGTK2) gtk2-x11
|
||||
++ lib.optional (withX && withGTK3) gtk3-x11
|
||||
++ lib.optional withGTK3 gsettings-desktop-schemas
|
||||
++ lib.optional (!stdenv.isDarwin && withGTK3) gsettings-desktop-schemas
|
||||
++ lib.optional withPgtk gtk3
|
||||
++ lib.optional (withX && withMotif) motif
|
||||
++ lib.optional withSQLite3 sqlite
|
||||
|
|
|
|||
|
|
@ -10628,6 +10628,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/kana/vim-niceblock/";
|
||||
};
|
||||
|
||||
vim-nickel = buildVimPluginFrom2Nix {
|
||||
pname = "vim-nickel";
|
||||
version = "2022-03-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nickel-lang";
|
||||
repo = "vim-nickel";
|
||||
rev = "2f0f5f8ce2a8e719a5e39d7210ca914ae403374c";
|
||||
sha256 = "1li3wc5164mcqrvj42dc8zh3j8wml10gpgffapnjilwa5c85kv3q";
|
||||
};
|
||||
meta.homepage = "https://github.com/nickel-lang/vim-nickel/";
|
||||
};
|
||||
|
||||
vim-ninja-feet = buildVimPluginFrom2Nix {
|
||||
pname = "vim-ninja-feet";
|
||||
version = "2021-05-27";
|
||||
|
|
|
|||
|
|
@ -892,6 +892,7 @@ https://github.com/tiagofumo/vim-nerdtree-syntax-highlight/,,
|
|||
https://github.com/jistr/vim-nerdtree-tabs/,,
|
||||
https://github.com/nfnty/vim-nftables/,,
|
||||
https://github.com/kana/vim-niceblock/,,
|
||||
https://github.com/nickel-lang/vim-nickel/,main,
|
||||
https://github.com/tommcdo/vim-ninja-feet/,,
|
||||
https://github.com/LnL7/vim-nix/,,
|
||||
https://github.com/symphorien/vim-nixhash/,,
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "debian-goodies";
|
||||
version = "0.88";
|
||||
version = "0.88.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "salsa.debian.org";
|
||||
owner = "debian";
|
||||
repo = "debian-goodies";
|
||||
rev = "debian/${version}";
|
||||
sha256 = "sha256-SDGWRGwRuryCJSWjuYB+Cg/Pl8q4VP4zcisUOn/GhJY=";
|
||||
sha256 = "sha256-g1xeWhCkC7HEHHOJpcZ6JFA9jmavJE0lUX1Cmp5A0QQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "logseq";
|
||||
version = "0.8.5";
|
||||
version = "0.8.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
|
||||
sha256 = "sha256-1nvkjucMRAwpqg2LI+1UrICMLzSd6t0yGnYdCUNQslU=";
|
||||
sha256 = "sha256-FMGNaA/a1IzF2T0k9LGCOvLK26SlxX2cCOn7dLD/o7c=";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rofi-emoji";
|
||||
version = "3.0.1";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mange";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pYNeAz8MKBM3VSkQfP4hgTbEy9haGmBmPf/nu9tvKts=";
|
||||
sha256 = "sha256-YMQG0XO6zVei6GfBdgI7jtB7px12e+xvOMxZ1QHf5kQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "atmos";
|
||||
version = "1.7.0";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudposse";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-SZ/4QKO8PdbHWZ+urOqZPFUb9lFRP+HWbNff1fmwDqI=";
|
||||
sha256 = "sha256-Jt8/sB6cpxNr0Mcp0+KrwxQAicOHHRGnHXLruBSvZ4M=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-d2Eod1AK6Ei5Az9wPHVqij8K4CVj7Ptewd3dBJ9Wt3o=";
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cloudfoundry-cli";
|
||||
version = "8.4.0";
|
||||
version = "8.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudfoundry";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+UP1abTDYLn+lhMvo9G57X0nlColai7isNswog+3Y40=";
|
||||
sha256 = "sha256-+fQnit2J3WQpir4HldkWKCex6byfp2IqEWCi4oJ5HgU=";
|
||||
};
|
||||
vendorSha256 = "sha256-opVnj6dTtHrPYM1v+EFw39XDMF/fampAn7n+JvlBcJk=";
|
||||
vendorSha256 = "sha256-Wz5OoCrIY/xEXk+eqXtqtgVGD8oGUPmhzT5mOcZRD8w=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "glooctl";
|
||||
version = "1.12.15";
|
||||
version = "1.12.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "solo-io";
|
||||
repo = "gloo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HOWBigwW5JagFG1MfcFIXSzveGAj1BWjLbJL9ESLgAQ=";
|
||||
hash = "sha256-6lwjfJOW1T+pRU9nrZ9Pit0N0je+t829jeKmlDn9TgA=";
|
||||
};
|
||||
|
||||
subPackages = [ "projects/gloo/cli/cmd" ];
|
||||
vendorSha256 = "sha256-6AgsnPrkLtUgvPMcXDZ9qVngnlN/65pwjdtBPdf0Jzw=";
|
||||
vendorSha256 = "sha256-584gGED37p5QycoquFwp3hNR9x70kB1EsO5aoZTEJ1Y=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -21,13 +21,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubernetes";
|
||||
version = "1.23.10";
|
||||
version = "1.23.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes";
|
||||
repo = "kubernetes";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ujSy6akbk4SvMIQdBJkNMwaRNEfFKJmVrN3lNtFudkA=";
|
||||
sha256 = "sha256-fjB5O3kuU09megWGgU7f3otmWD/a31xVV1Dap2+xFkw=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "talosctl";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "siderolabs";
|
||||
repo = "talos";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MdKeczst9t7VOxTx4/cAfbEUFOCIS3jQRYJcCJ8AH0Q=";
|
||||
sha256 = "sha256-XWqyeUBrM/ks6Y7tfVXcynuZp9Ied0B7AdtC/qGCBQA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-rYPkY6dH4DJ6uwckTbohlutXNnlQBMODPKntu5EVVTY=";
|
||||
vendorSha256 = "sha256-BEKo67EgbCnX5B12Dkio0vkawAdCn+fA8eXn90EPm00=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ branch ? "stable", callPackage, fetchurl, lib, stdenv }:
|
||||
let
|
||||
versions = if stdenv.isLinux then {
|
||||
stable = "0.0.19";
|
||||
stable = "0.0.20";
|
||||
ptb = "0.0.29";
|
||||
canary = "0.0.139";
|
||||
} else {
|
||||
|
|
@ -14,7 +14,7 @@ let
|
|||
x86_64-linux = {
|
||||
stable = fetchurl {
|
||||
url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
|
||||
sha256 = "GfSyddbGF8WA6JmHo4tUM27cyHV5kRAyrEiZe1jbA5A=";
|
||||
sha256 = "3f7yuxigEF3e8qhCetCHKBtV4XUHsx/iYiaCCXjspYw=";
|
||||
};
|
||||
ptb = fetchurl {
|
||||
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "1.9.1";
|
||||
version = "1.10.0";
|
||||
pname = "session-desktop";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage";
|
||||
sha256 = "sha256-Zc3btkvN4ic47IGigeFJGx4dwbM+b7iuIOxpmcWmrRQ=";
|
||||
sha256 = "sha256-oqwEXwlxyoYBQpVp9SdV5q+GrM0N9TIfu01HHIm9mUw=";
|
||||
};
|
||||
appimage = appimageTools.wrapType2 {
|
||||
inherit version pname src;
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "signal-desktop";
|
||||
version = "5.58.0"; # Please backport all updates to the stable channel.
|
||||
version = "5.59.0"; # Please backport all updates to the stable channel.
|
||||
# All releases have a limited lifetime and "expire" 90 days after the release.
|
||||
# When releases "expire" the application becomes unusable until an update is
|
||||
# applied. The expiration date for the current release can be extracted with:
|
||||
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
sha256 = "sha256-1UM68aDXM0MseQmOAVmX13yD/GLPCmq6wikt8CwEdgc=";
|
||||
sha256 = "sha256-6im8OH1J+YlWCZ5eeJJbXokQPs6QbIzYIonGy9vbWvE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "qownnotes";
|
||||
version = "22.8.4";
|
||||
version = "22.9.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
|
||||
# Fetch the checksum of current version with curl:
|
||||
# curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256
|
||||
sha256 = "cfb266b3a812b5f87e57d5002cd05000931baad9fefbf353b2caa05407dc79e5";
|
||||
sha256 = "sha256-PTaOExBWx7YTdVpDDSwnPu3vt12Yfh2/FW2xwnhB9WA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake qttools ];
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "limesuite";
|
||||
version = "20.10.0";
|
||||
version = "22.09.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "myriadrf";
|
||||
repo = "LimeSuite";
|
||||
rev = "v${version}";
|
||||
sha256 = "04wzfhzqmxjsa6bgcr4zd518fln9rbwnbabf48kha84d70vzkdlx";
|
||||
sha256 = "sha256-HV0ejx7ImJ7GvAyCi0a7OPB0/2UiLQxxhYR2bc2uYCA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, callPackage
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, llvmPackages_11
|
||||
, clang
|
||||
, llvm
|
||||
, python3
|
||||
, zlib
|
||||
, z3
|
||||
|
|
@ -35,18 +36,14 @@
|
|||
}:
|
||||
|
||||
let
|
||||
|
||||
# Python used for KLEE tests.
|
||||
kleePython = python3.withPackages (ps: with ps; [ tabulate ]);
|
||||
|
||||
# The klee-uclibc derivation.
|
||||
kleeuClibc = callPackage ./klee-uclibc.nix {
|
||||
inherit clang llvmPackages_11 extraKleeuClibcConfig debugRuntime runtimeAsserts;
|
||||
inherit stdenv clang llvm extraKleeuClibcConfig debugRuntime runtimeAsserts;
|
||||
};
|
||||
|
||||
in
|
||||
clang.stdenv.mkDerivation rec {
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "klee";
|
||||
version = "2.3";
|
||||
|
||||
|
|
@ -61,7 +58,7 @@ clang.stdenv.mkDerivation rec {
|
|||
cryptominisat
|
||||
gperftools
|
||||
lit # Configure phase checking for lit
|
||||
llvmPackages_11.llvm
|
||||
llvm
|
||||
sqlite
|
||||
stp
|
||||
z3
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, which
|
||||
, linuxHeaders
|
||||
, clang
|
||||
, llvmPackages_11
|
||||
, llvm
|
||||
, python3
|
||||
, curl
|
||||
, debugRuntime ? true
|
||||
|
|
@ -23,8 +24,7 @@ let
|
|||
"RUNTIME_PREFIX" = "/";
|
||||
"DEVEL_PREFIX" = "/";
|
||||
});
|
||||
in
|
||||
clang.stdenv.mkDerivation rec {
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "klee-uclibc";
|
||||
version = "1.3";
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -37,7 +37,7 @@ clang.stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [
|
||||
clang
|
||||
curl
|
||||
llvmPackages_11.llvm
|
||||
llvm
|
||||
python3
|
||||
which
|
||||
];
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ let configAwkScript = runCommand "why3-conf.awk" { inherit provers; }
|
|||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "${why3.pname}-with-provers";
|
||||
version = why3.version;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ why3 ] ++ provers;
|
||||
|
|
|
|||
|
|
@ -22,9 +22,9 @@ buildGoModule rec {
|
|||
doCheck = false;
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.tests.testVersion = testers.testVersion {
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = ghr;
|
||||
version = "ghr version v${version}";
|
||||
version = "v${version}";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "got";
|
||||
version = "0.75";
|
||||
version = "0.75.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz";
|
||||
sha256 = "sha256-s1MkiTya771r9JYCpsm7nW4gZwr/PJc0/v6tAgW7nLI=";
|
||||
sha256 = "sha256-GlEXB89fZPRZAwvUUHcyKCH3Jj5AOvMSHFodsVKepSQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config bison ];
|
||||
|
|
@ -45,6 +45,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://gameoftrees.org";
|
||||
license = licenses.isc;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ abbe ];
|
||||
maintainers = with maintainers; [ abbe afh ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "ffmpeg-normalize";
|
||||
version = "1.25.1";
|
||||
version = "1.25.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-IIgFnDPgeQrsleIzzFr4Q0Kz8bCzs0gFluFw+9Dub7I=";
|
||||
sha256 = "sha256-a/p4lljxf+9vpd0LlBVXY4y4rfxH5vaoIj0EKaRa2zQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "docker-compose";
|
||||
version = "2.10.2";
|
||||
version = "2.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "compose";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CxwNnSwF3QD86lzDgSlGZiEv2tMOfDTUGHOZVtsmY94=";
|
||||
sha256 = "sha256-BMSLs12fPY8wat0rKys/7OI7F3GGNmQC+XRi6C4kYk4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Yz2lea+ttgNbfP1mL+kwTKmo81Q6GGjJyvDANzeckpo=";
|
||||
vendorSha256 = "sha256-aD0h7vSUkxaGBeN2S2GOEwKpXHKyvnwbOB7pABgBmCY=";
|
||||
|
||||
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
}:
|
||||
let
|
||||
pname = "gamescope";
|
||||
version = "3.11.43";
|
||||
version = "3.11.45-2";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
|
@ -35,7 +35,7 @@ stdenv.mkDerivation {
|
|||
owner = "Plagman";
|
||||
repo = "gamescope";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-XxOVM7xWeE2pF4U34jLvil5+vj+jePHPWHIfw0e/mnM=";
|
||||
hash = "sha256-OLPwUELahqzmOBPvJg8pm556RH+H6TzRD9PHLnM2Ruc=";
|
||||
};
|
||||
|
||||
patches = [ ./use-pkgconfig.patch ];
|
||||
|
|
|
|||
45
pkgs/data/themes/adw-gtk3/default.nix
Normal file
45
pkgs/data/themes/adw-gtk3/default.nix
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
{ stdenvNoCC
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, meson
|
||||
, ninja
|
||||
, sassc
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "adw-gtk3";
|
||||
version = "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lassekongo83";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hHmNRPUJOXa//aKgAYhGBVX6usRsObWbzcfOa1uwbqM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
sassc
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x gtk/src/adw-gtk3-dark/gtk-3.0/install-dark-theme.sh
|
||||
patchShebangs gtk/src/adw-gtk3-dark/gtk-3.0/install-dark-theme.sh
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "The theme from libadwaita ported to GTK-3";
|
||||
homepage = "https://github.com/lassekongo83/adw-gtk3";
|
||||
license = licenses.lgpl21Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ciferkey ];
|
||||
};
|
||||
}
|
||||
53
pkgs/development/compilers/ante/default.nix
Normal file
53
pkgs/development/compilers/ante/default.nix
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
{ fetchFromGitHub
|
||||
, lib
|
||||
, libffi
|
||||
, libxml2
|
||||
, llvmPackages_13
|
||||
, ncurses
|
||||
, rustPlatform
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "ante";
|
||||
version = "unstable-2022-08-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jfecher";
|
||||
repo = "ante";
|
||||
rev = "8b708d549c213c34e4ca62d31cf0dd25bfa7b548";
|
||||
sha256 = "sha256-s8nDuG32lI4pBLsOzgfyUGpc7/r0j4EhzH54ErBK7A0=";
|
||||
};
|
||||
cargoSha256 = "sha256-29D7kPG7vop9lIxWQnaHkCTRY8YsCjERRCOvbU7oemQ=";
|
||||
|
||||
/*
|
||||
https://crates.io/crates/llvm-sys#llvm-compatibility
|
||||
llvm-sys requires a specific version of llvmPackages,
|
||||
that is not the same as the one included by default with rustPlatform.
|
||||
*/
|
||||
nativeBuildInputs = [ llvmPackages_13.llvm ];
|
||||
buildInputs = [ libffi libxml2 ncurses ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace tests/golden_tests.rs --replace \
|
||||
'target/debug' "target/$(rustc -vV | sed -n 's|host: ||p')/release"
|
||||
'';
|
||||
preBuild =
|
||||
let
|
||||
major = lib.versions.major llvmPackages_13.llvm.version;
|
||||
minor = lib.versions.minor llvmPackages_13.llvm.version;
|
||||
llvm-sys-ver = "${major}${builtins.substring 0 1 minor}";
|
||||
in
|
||||
''
|
||||
# On some architectures llvm-sys is not using the package listed inside nativeBuildInputs
|
||||
export LLVM_SYS_${llvm-sys-ver}_PREFIX=${llvmPackages_13.llvm.dev}
|
||||
export ANTE_STDLIB_DIR=$out/lib
|
||||
mkdir -p $ANTE_STDLIB_DIR
|
||||
cp -r $src/stdlib/* $ANTE_STDLIB_DIR
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://antelang.org/";
|
||||
description = "A low-level functional language for exploring refinement types, lifetime inference, and algebraic effects";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ ehllie ];
|
||||
};
|
||||
}
|
||||
|
|
@ -10,15 +10,15 @@ stdenv.mkDerivation rec {
|
|||
# base_version is of the form major.minor.patch
|
||||
# vc_version is of the form YYMMDDCC
|
||||
# version corresponds to the tag on GitHub
|
||||
base_version = "8.0.1";
|
||||
vc_version = "22070801";
|
||||
base_version = "8.0.3";
|
||||
vc_version = "22090809";
|
||||
version = "${base_version}.${vc_version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "renpy";
|
||||
repo = "renpy";
|
||||
rev = version;
|
||||
sha256 = "sha256-rwRykovY8vv+boQiaSjCBoGxGpT1dF3qdEyxkykrKyk=";
|
||||
sha256 = "sha256-0/wkUk7PMPbBSGzDuSd82yxRzvAYxkbEhM5LTVt4bMA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "armadillo";
|
||||
version = "11.2.3";
|
||||
version = "11.2.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
|
||||
sha256 = "sha256-TC6XzmBwf8HzSPRPevDLbSRm0KrQ0OpL9dXcGA5sukE=";
|
||||
sha256 = "sha256-3EyRlUqxFJC/ZNLfzFSoAvFDk8dWqNVFrBVe7v+n/ZM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libwpe";
|
||||
version = "1.12.2";
|
||||
version = "1.12.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-SsT9CotWK3Ib/9D0aunwbCtaMRRAdYGXi+h1qdZRZCo=";
|
||||
sha256 = "sha256-uE/b+8hJzk/fCEuyi1jlRjsbS2zI8gDcd7QfhUXVMp0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, makeWrapper
|
||||
, runCommandCC, runCommand, vapoursynth, writeText, patchelf, buildEnv
|
||||
, zimg, libass, python3, libiconv
|
||||
, zimg, libass, python3, libiconv, testers
|
||||
, ApplicationServices
|
||||
}:
|
||||
|
||||
|
|
@ -38,6 +38,12 @@ stdenv.mkDerivation rec {
|
|||
inherit lib python3 buildEnv writeText runCommandCC stdenv runCommand
|
||||
vapoursynth makeWrapper withPlugins;
|
||||
};
|
||||
|
||||
tests.version = testers.testVersion {
|
||||
package = vapoursynth;
|
||||
# Check Core version to prevent false positive with API version
|
||||
version = "Core R${version}";
|
||||
};
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
|
@ -56,5 +62,6 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.lgpl21;
|
||||
platforms = platforms.x86_64;
|
||||
maintainers = with maintainers; [ rnhmjoj sbruder tadeokondrak ];
|
||||
mainProgram = "vspipe";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@ runCommand "${vapoursynth.name}-with-plugins" {
|
|||
nativeBuildInputs = [ makeWrapper ];
|
||||
passthru = {
|
||||
inherit python3;
|
||||
inherit (vapoursynth) src version;
|
||||
withPlugins = plugins': withPlugins (plugins ++ plugins');
|
||||
};
|
||||
} ''
|
||||
|
|
|
|||
|
|
@ -1,23 +1,21 @@
|
|||
{ lib, fetchurl, buildDunePackage, ounit, cstruct, dune-configurator, eqaf, pkg-config
|
||||
{ lib, fetchurl, buildDunePackage, ounit2, cstruct, dune-configurator, eqaf, pkg-config
|
||||
, withFreestanding ? false
|
||||
, ocaml-freestanding
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
minimumOCamlVersion = "4.08";
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
pname = "mirage-crypto";
|
||||
version = "0.10.5";
|
||||
version = "0.10.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz";
|
||||
sha256 = "sha256-eeKMSRZrBiTzWLv80P5LeouPib24uTigk2HLtORKpJU=";
|
||||
url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-${version}.tbz";
|
||||
sha256 = "sha256-PoGKdgwjXFtoTHtrQ7HN0qfdBOAQW2gNUk+DbrmIppw=";
|
||||
};
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [ ounit ];
|
||||
checkInputs = [ ounit2 ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ dune-configurator ];
|
||||
|
|
|
|||
|
|
@ -21,10 +21,8 @@ buildDunePackage rec {
|
|||
pname = "mirage-crypto-ec";
|
||||
|
||||
inherit (mirage-crypto)
|
||||
minimumOCamlVersion
|
||||
src
|
||||
version
|
||||
useDune2;
|
||||
version;
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{ buildDunePackage, ounit, randomconv, mirage-crypto, mirage-crypto-rng
|
||||
{ buildDunePackage, ounit2, randomconv, mirage-crypto, mirage-crypto-rng
|
||||
, cstruct, sexplib0, zarith, eqaf, gmp }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "mirage-crypto-pk";
|
||||
|
||||
inherit (mirage-crypto) version src useDune2 minimumOCamlVersion;
|
||||
inherit (mirage-crypto) version src;
|
||||
|
||||
buildInputs = [ gmp ];
|
||||
propagatedBuildInputs = [ cstruct mirage-crypto mirage-crypto-rng
|
||||
|
|
@ -13,7 +13,7 @@ buildDunePackage rec {
|
|||
strictDeps = !doCheck;
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [ ounit randomconv ];
|
||||
checkInputs = [ ounit2 randomconv ];
|
||||
|
||||
meta = mirage-crypto.meta // {
|
||||
description = "Simple public-key cryptography for the modern age";
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
buildDunePackage {
|
||||
pname = "mirage-crypto-rng-async";
|
||||
|
||||
inherit (mirage-crypto) useDune2 version minimumOCamlVersion src;
|
||||
inherit (mirage-crypto) version src;
|
||||
|
||||
buildInputs = [
|
||||
dune-configurator
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
buildDunePackage rec {
|
||||
pname = "mirage-crypto-rng-mirage";
|
||||
|
||||
inherit (mirage-crypto-rng) version src useDune2 minimumOCamlVersion;
|
||||
inherit (mirage-crypto-rng) version src;
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [ mirage-unix mirage-clock-unix mirage-time-unix ];
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ buildDunePackage, mirage-crypto, ounit, randomconv, dune-configurator
|
||||
{ buildDunePackage, mirage-crypto, ounit2, randomconv, dune-configurator
|
||||
, cstruct, duration, logs, mtime, ocaml_lwt }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "mirage-crypto-rng";
|
||||
|
||||
inherit (mirage-crypto) version src useDune2 minimumOCamlVersion;
|
||||
inherit (mirage-crypto) version src;
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [ ounit randomconv ];
|
||||
checkInputs = [ ounit2 randomconv ];
|
||||
|
||||
buildInputs = [ dune-configurator ];
|
||||
propagatedBuildInputs = [ cstruct mirage-crypto duration logs mtime ocaml_lwt ];
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
{ lib, buildDunePackage, fetchurl, lwt, duration, mirage-runtime, io-page }:
|
||||
{ lib, buildDunePackage, fetchurl, lwt, duration, mirage-runtime }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "mirage-unix";
|
||||
version = "4.0.1";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
|
||||
sha256 = "sha256-9ymVBb3dkhb+MN97/sXe/oQ36CVx0kruj3sd19LiFZ4=";
|
||||
url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz";
|
||||
sha256 = "sha256-U1oLznUDBcJLcVygfSiyl5qRLDM27cm/WrjT0vSGhPg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ lwt duration mirage-runtime io-page ];
|
||||
propagatedBuildInputs = [ lwt duration mirage-runtime ];
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, fetchurl, docbook_xsl, docbook_xsl_ns, gettext, libxslt, glibcLocales, docbook_xml_dtd_412, docbook_sgml_dtd_41, texlive, opensp
|
||||
{ stdenv, lib, fetchurl, docbook_xsl, docbook_xsl_ns, gettext, libxslt, glibcLocales, docbook_xml_dtd_412, docbook_sgml_dtd_41, texlive, opensp
|
||||
, perl, buildPerlPackage, ModuleBuild, TextWrapI18N, LocaleGettext, TermReadKey, SGMLSpm, UnicodeLineBreak, PodParser, YAMLTiny }:
|
||||
|
||||
buildPerlPackage rec {
|
||||
|
|
@ -9,7 +9,7 @@ buildPerlPackage rec {
|
|||
sha256 = "0eb510a66f59de68cf7a205342036cc9fc08b39334b91f1456421a5f3359e68b";
|
||||
};
|
||||
nativeBuildInputs = [ docbook_xsl docbook_xsl_ns ModuleBuild ];
|
||||
propagatedBuildInputs = [ TextWrapI18N LocaleGettext SGMLSpm UnicodeLineBreak PodParser YAMLTiny ];
|
||||
propagatedBuildInputs = lib.optional (!stdenv.hostPlatform.isMusl) TextWrapI18N ++ [ LocaleGettext SGMLSpm UnicodeLineBreak PodParser YAMLTiny ];
|
||||
# TODO: TermReadKey was temporarily removed from propagatedBuildInputs to unfreeze the build
|
||||
buildInputs = [ gettext libxslt glibcLocales docbook_xml_dtd_412 docbook_sgml_dtd_41 texlive.combined.scheme-basic opensp ];
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
|
|
@ -19,6 +19,14 @@ buildPerlPackage rec {
|
|||
export PERL_MB_OPT="--install_base=$out --prefix=$out"
|
||||
'';
|
||||
buildPhase = "perl Build.PL --install_base=$out --install_path=\"lib=$out/${perl.libPrefix}\"; ./Build build";
|
||||
|
||||
# Disabling tests on musl
|
||||
# Void linux package have investigated the failure and tracked it down to differences in gettext behavior. They decided to disable tests.
|
||||
# https://github.com/void-linux/void-packages/pull/34029#issuecomment-973267880
|
||||
# Alpine packagers have not worried about running the tests until now:
|
||||
# https://git.alpinelinux.org/aports/tree/main/po4a/APKBUILD#n11
|
||||
doCheck = !stdenv.hostPlatform.isMusl;
|
||||
|
||||
checkPhase = ''
|
||||
export SGML_CATALOG_FILES=${docbook_sgml_dtd_41}/sgml/dtd/docbook-4.1/docbook.cat
|
||||
./Build test
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, buildPythonPackage
|
||||
, isPy27
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, pikepdf
|
||||
, pillow
|
||||
, stdenv
|
||||
|
|
@ -26,6 +27,14 @@ buildPythonPackage rec {
|
|||
sha256 = "8ec898a9646523fd3862b154f3f47cd52609c24cc3e2dc1fb5f0168f0cbe793c";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# https://gitlab.mister-muffin.de/josch/img2pdf/issues/148
|
||||
url = "https://gitlab.mister-muffin.de/josch/img2pdf/commit/57d7e07e6badb252c12015388b58fcb5285d3158.patch";
|
||||
hash = "sha256-H/g55spe/oVJRxO2Vh+F+ZgR6aLoRUrNeu5WnuU7k/k=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pikepdf
|
||||
pillow
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ buildPythonPackage rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://www.renpy.org/dl/${renpy_version}/pygame_sdl2-${version}-for-renpy-${renpy_version}.tar.gz";
|
||||
sha256 = "sha256-/PCw2sF3CxiBXV7WZcTl6NAs+v++od4Fs6uYFUhJMH8=";
|
||||
sha256 = "sha256-BpETor1dz8qdMM8iYijlthnsrPF0FS8b1FDvuXxFB9s=";
|
||||
};
|
||||
|
||||
# force rebuild of headers needed for install
|
||||
|
|
|
|||
25
pkgs/development/python-modules/types-colorama/default.nix
Normal file
25
pkgs/development/python-modules/types-colorama/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-colorama";
|
||||
version = "0.4.15";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-/RKLHjLz/s7F8J30Nm0hSY7obqMfz4tOjxrebQu/mDI=";
|
||||
};
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Typing stubs for colorama";
|
||||
homepage = "https://github.com/python/typeshed";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ultraheat-api";
|
||||
version = "0.4.2";
|
||||
version = "0.4.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "ultraheat_api";
|
||||
inherit version;
|
||||
hash = "sha256-UzDGkLvFqqiBuiCgMA0BItmUhrY0b963o05WDHxsS0Q=";
|
||||
hash = "sha256-sdZweq5TDl54UKHqQ0zlFQq0h+piisMKs2P/3E2vqX8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ vapoursynth, cython, buildPythonPackage, unittestCheckHook }:
|
||||
{ vapoursynth, cython, buildPythonPackage, unittestCheckHook, python }:
|
||||
|
||||
buildPythonPackage {
|
||||
pname = "vapoursynth";
|
||||
|
|
@ -19,6 +19,13 @@ buildPythonPackage {
|
|||
|
||||
unittestFlagsArray = [ "-s" "$src/test" "-p" "'*test.py'" ];
|
||||
|
||||
passthru = {
|
||||
withPlugins = plugins:
|
||||
python.pkgs.vapoursynth.override {
|
||||
vapoursynth = vapoursynth.withPlugins plugins;
|
||||
};
|
||||
};
|
||||
|
||||
inherit (vapoursynth) meta;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "vulcan-api";
|
||||
version = "2.2.0";
|
||||
version = "2.2.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "kapi2289";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-decp3wq/O4QTBE40iSkMaCTJYM6XPP7nLlSAEL1bemY=";
|
||||
sha256 = "sha256-0V1skTJdiL04jVKsMb0Kysbw36bQ3EAJG3YT7ik36zQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "winsspi";
|
||||
version = "0.0.10";
|
||||
version = "0.0.11";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-L1qNLEufRZFEQmkJ4mp05VBRLiO2z5r1LCoAADx8P9s=";
|
||||
hash = "sha256-AXC6SJ+iWPGqTmdgoWKEbD8tDUUcg2aD609hO2bdQfM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
49
pkgs/development/tools/beautysh/default.nix
Normal file
49
pkgs/development/tools/beautysh/default.nix
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "beautysh";
|
||||
version = "6.2.1";
|
||||
format = "pyproject";
|
||||
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lovesegfault";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-rPeGRcyNK45Y7OvtzaIH93IIzexBf/jM1SzYP0phQ1o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
colorama
|
||||
setuptools
|
||||
types-colorama
|
||||
types-setuptools
|
||||
];
|
||||
|
||||
checkInputs = with python3.pkgs; [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'types-setuptools = "^57.4.0"' 'types-setuptools = "*"'
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"beautysh"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool for beautifying Bash scripts";
|
||||
homepage = "https://github.com/lovesegfault/beautysh";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,13 +1,13 @@
|
|||
{
|
||||
"version": "0.1.12",
|
||||
"version": "0.1.14",
|
||||
"assets": {
|
||||
"x86_64-darwin": {
|
||||
"asset": "scala-cli-x86_64-apple-darwin.gz",
|
||||
"sha256": "1gg5w676h1dm6rmbjbc8fjrz8q2kpq1062xn0r3gm6jwjgjsbw6v"
|
||||
"sha256": "1h20bd8rabpxgjp6czbn9m5yhmz77vkvpbsxmnf6src942ihb7sn"
|
||||
},
|
||||
"x86_64-linux": {
|
||||
"asset": "scala-cli-x86_64-pc-linux.gz",
|
||||
"sha256": "1ihfkfgfwsvryk2hpiflakmi512m8xjaksny33fymn52cpv8n2gw"
|
||||
"sha256": "1n4f920qpwhnarky1dh79sk1r3ayriinf4ah53704xvscc083c70"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cirrus-cli";
|
||||
version = "0.85.0";
|
||||
version = "0.86.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cirruslabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hFL7ImtaQrNeoxNLE/RL79SHRBHSit1dQ6Wn8gq8dns=";
|
||||
sha256 = "sha256-ilQNwxqi7PMj6zgJ7SbpKfHDiTEjfIey3jV/Owrbddc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-GRCcKIUimPFdeAhnz6RC5arZ0E+z+SpaAC1uDaxpJkI=";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dagger";
|
||||
version = "0.2.33";
|
||||
version = "0.2.34";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dagger";
|
||||
repo = "dagger";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+NpoD6PwTd8s9cABnFApnnqrEb8UkhCxmj3FEE6sP9Q=";
|
||||
sha256 = "sha256-gUdvndL8v+7lX/GuMxHlHxp3j8YTQWEh3c+WX+fDOQU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-t/tYN+Zxj3rxzb9QTTuPyjc4hdl+UjwPs+evAXbAByg=";
|
||||
vendorSha256 = "sha256-yNb5OvsnNAk+K0gepKVuqivS+eeLMOVCqxF/rj+Rpps=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/dagger"
|
||||
|
|
|
|||
|
|
@ -6,16 +6,18 @@
|
|||
buildGoModule
|
||||
rec {
|
||||
pname = "eclint";
|
||||
version = "0.3.4";
|
||||
version = "0.3.6";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "greut";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-inO41C/Ompyfy4CHPK4ksNU19KIcGyPgF/ptZC0GWXg=";
|
||||
sha256 = "sha256-+ZbBmdCl1v4msFFA2kzL/IQTQtR39O5XYgCj7w+QGzE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-imVQnPoKOjed9XlikLWvudmlJklRrLFHKtNZoAmznZg=";
|
||||
vendorSha256 = "sha256-CdvxY3uX6i3Xtg50jqlNr+VXpeOeg8M27huasbzA96M=";
|
||||
|
||||
ldflags = [ "-X main.version=${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://gitlab.com/greut/eclint";
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gomplate";
|
||||
version = "3.11.2";
|
||||
version = "3.11.3";
|
||||
owner = "hairyhenderson";
|
||||
rev = "v${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit owner rev;
|
||||
repo = pname;
|
||||
sha256 = "sha256-NIepoz1JToaX2EJCL/kqkpBJigJVy2Tkz0jGn4ukfvI=";
|
||||
sha256 = "sha256-NvTwiGyBHhHiVHdWeXnJONNkHkrvsc1zmHPK8rSHaQw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-fXbwNX+GoujciZVxxe7Tl21MxWhyAD4cW/p8PCAAElw=";
|
||||
vendorSha256 = "sha256-BIcOErtlcnE70Mo6fjmA/btvSpw95RaKLqNWsgyJgpc=";
|
||||
|
||||
postPatch = ''
|
||||
# some tests require network access
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "jsonnet-language-server";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "jsonnet-language-server";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Qp01JcgDdIK1yqXJCasZkh6rWXujdCHSFVxHSVySj50=";
|
||||
sha256 = "sha256-JNRMV52sSA45lp1UdJ4wBGrhlGIFhYHhgZU0lop1HcI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-tsVevkMHuCv70A9Ohg9L+ghH5+v52X4sToI4bMlDzzo=";
|
||||
|
|
|
|||
|
|
@ -23,8 +23,8 @@ buildGoModule rec {
|
|||
mv $out/bin/circleci-cli $out/bin/circleci
|
||||
|
||||
installShellCompletion --cmd circleci \
|
||||
--bash <($out/bin/circleci completion bash --skip-update-check) \
|
||||
--zsh <($out/bin/circleci completion zsh --skip-update-check)
|
||||
--bash <(HOME=$TMPDIR $out/bin/circleci completion bash --skip-update-check) \
|
||||
--zsh <(HOME=$TMPDIR $out/bin/circleci completion zsh --skip-update-check)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "hound";
|
||||
version = "0.5.1";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hound-search";
|
||||
repo = "hound";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1URhb+ZrtP5eGS2o7lBxvAxQJR/J6oE+pCbJ7sQb0X4=";
|
||||
sha256 = "sha256-M1c4lsD7DQo5+RCCDdyn9FeGuGngMsg1qSrxM2wCzpg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ZgF/PB3VTPx367JUkhOkSEK1uvqENNG0xuNXvCGENnQ=";
|
||||
|
|
|
|||
|
|
@ -5,11 +5,13 @@
|
|||
, lib
|
||||
, patchelf
|
||||
, stdenv
|
||||
, runCommand
|
||||
, expect
|
||||
}:
|
||||
let
|
||||
inherit (dotnetCorePackages) sdk_6_0;
|
||||
in
|
||||
buildDotnetModule rec {
|
||||
let finalPackage = buildDotnetModule rec {
|
||||
pname = "omnisharp-roslyn";
|
||||
version = "1.39.1";
|
||||
|
||||
|
|
@ -72,6 +74,43 @@ buildDotnetModule rec {
|
|||
rm $out/lib/omnisharp-roslyn/System.Configuration.ConfigurationManager.dll
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
no-sdk = runCommand "no-sdk" { nativeBuildInputs = [ finalPackage expect ]; meta.timeout = 60; } ''
|
||||
HOME=$TMPDIR
|
||||
expect <<"EOF"
|
||||
spawn OmniSharp
|
||||
expect_before timeout {
|
||||
send_error "timeout!\n"
|
||||
exit 1
|
||||
}
|
||||
expect "\"ERROR\",\"Name\":\"OmniSharp.MSBuild.Discovery.Providers.SdkInstanceProvider\""
|
||||
expect eof
|
||||
catch wait result
|
||||
if { [lindex $result 3] == 0 } {
|
||||
exit 1
|
||||
}
|
||||
EOF
|
||||
touch $out
|
||||
'';
|
||||
|
||||
with-sdk = runCommand "with-sdk" { nativeBuildInputs = [ finalPackage sdk_6_0 expect ]; meta.timeout = 60; } ''
|
||||
HOME=$TMPDIR
|
||||
expect <<"EOF"
|
||||
spawn OmniSharp
|
||||
expect_before timeout {
|
||||
send_error "timeout!\n"
|
||||
exit 1
|
||||
}
|
||||
expect "{\"Event\":\"started\","
|
||||
send \x03
|
||||
expect eof
|
||||
catch wait result
|
||||
exit [lindex $result 3]
|
||||
EOF
|
||||
touch $out
|
||||
'';
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "OmniSharp based on roslyn workspaces";
|
||||
homepage = "https://github.com/OmniSharp/omnisharp-roslyn";
|
||||
|
|
@ -83,4 +122,4 @@ buildDotnetModule rec {
|
|||
maintainers = with maintainers; [ tesq0 ericdallo corngood mdarocha ];
|
||||
mainProgram = "OmniSharp";
|
||||
};
|
||||
}
|
||||
}; in finalPackage
|
||||
|
|
|
|||
|
|
@ -54,6 +54,7 @@
|
|||
tree-sitter-lua = lib.importJSON ./tree-sitter-lua.json;
|
||||
tree-sitter-make = lib.importJSON ./tree-sitter-make.json;
|
||||
tree-sitter-markdown = lib.importJSON ./tree-sitter-markdown.json;
|
||||
tree-sitter-nickel = lib.importJSON ./tree-sitter-nickel.json;
|
||||
tree-sitter-nix = lib.importJSON ./tree-sitter-nix.json;
|
||||
tree-sitter-norg = lib.importJSON ./tree-sitter-norg.json;
|
||||
tree-sitter-ocaml = lib.importJSON ./tree-sitter-ocaml.json;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
{
|
||||
"url": "https://github.com/nickel-lang/tree-sitter-nickel",
|
||||
"rev": "9d83db400b6c11260b9106f131f93ddda8131933",
|
||||
"date": "2022-07-06T11:43:01+02:00",
|
||||
"path": "/nix/store/i7arz4binnq34j1k0hwlpl4apd9b4j4x-tree-sitter-nickel",
|
||||
"sha256": "0rm63fnxja59zzkm7gz4vbzics8mdf7d6ijazcy9394kdqrcdzi6",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
"leaveDotGit": false
|
||||
}
|
||||
|
|
@ -339,6 +339,10 @@ let
|
|||
orga = "ambroisie";
|
||||
repo = "tree-sitter-tiger";
|
||||
};
|
||||
"tree-sitter-nickel" = {
|
||||
orga = "nickel-lang";
|
||||
repo = "tree-sitter-nickel";
|
||||
};
|
||||
};
|
||||
|
||||
allGrammars =
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-nextest";
|
||||
version = "0.9.35";
|
||||
version = "0.9.36";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nextest-rs";
|
||||
repo = "nextest";
|
||||
rev = "cargo-nextest-${version}";
|
||||
sha256 = "sha256-tNpE0bEnN4eJZ0nTkGFNrUW5Lam+GK6gUqQZBBYSeEI=";
|
||||
sha256 = "sha256-gp/XEhSNdoEs3+KXbbgbjRg29xHyHuAbYLBVvNDIgLw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-p6K3GumMpLlnFsTegnH/ij+VDTjAB/dXYea0cWtCOGw=";
|
||||
cargoSha256 = "sha256-mz2zJwA05Wg6g+u7LfANMt+wwoZIQzb2mH3Y+b4SBr0=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-spellcheck";
|
||||
version = "0.11.2";
|
||||
version = "0.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "drahnr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZiRa4XYnY4fwbMenRLnvFQms66tIyGbm5saK8gN39ag=";
|
||||
sha256 = "sha256-PyNO+kBxTYeqXgZh1XhE18G9ZK7suo/acKSE57zCbcY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-gWQbhFPdBDhPZY1LHxFlWO9xG4AXfyhZp0UnZ3Y86/Y=";
|
||||
cargoSha256 = "sha256-i6AvKF34Gh3QhwvYVd+QTYCPMW9D0/vhz7WoY5d4kHU=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-tally";
|
||||
version = "1.0.12";
|
||||
version = "1.0.13";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-v9nAiV3t/l6B+a7hzq4IYOetrNM5f22+nEIQncLs5tU=";
|
||||
sha256 = "sha256-9w3/zQqcHtZ91WDolAru9aNG9pV8HuXvujvp3NlOcgU=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-/PypVUT6n2pdsWIN+5EGHmj/UlfguvlbufBlHvuROg8=";
|
||||
cargoSha256 = "sha256-CGP3KMJFDIl+MLzI9aQ2OM4tUuOQEtG4nET14zt7PD0=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
DiskArbitration
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vala-lint";
|
||||
version = "unstable-2022-05-20";
|
||||
version = "unstable-2022-09-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vala-lang";
|
||||
repo = "vala-lint";
|
||||
rev = "b5c22b3bce25837565a894ba1a91bc856b60c251";
|
||||
sha256 = "sha256-DzK4CihXUOY3xnVnuCgfFmhN+Q3gUD/v77vA7hS9qWE=";
|
||||
rev = "37660284fd1317a445ecddbaf1acdd6fa6bbbcad";
|
||||
sha256 = "sha256-Tbjw7BXeRuuF7VTo7FLYBR9+6mRp4AO2WhtE0GI3eYc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "grails";
|
||||
version = "5.2.3";
|
||||
version = "5.2.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip";
|
||||
sha256 = "sha256-kFlMC94+g9I7qzyaslU3RJ4jKtDHRZAei/yD1+8q2Hs=";
|
||||
sha256 = "sha256-jtv14Y6TfiIHwbqqaX36j2H/4+UCikbpFhYgNeAP3L4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
|
|
|||
|
|
@ -67,6 +67,12 @@ stdenv.mkDerivation rec {
|
|||
url = "https://raw.githubusercontent.com/openwrt/openwrt/87606e25afac6776d1bbc67ed284434ec5a832b4/toolchain/musl/patches/300-relative.patch";
|
||||
sha256 = "0hfadrycb60sm6hb6by4ycgaqc9sgrhh42k39v8xpmcvdzxrsq2n";
|
||||
})
|
||||
|
||||
# fix parsing lines with optional fields in fstab etc. NOTE: Remove for the next release since it has been merged upstream
|
||||
(fetchurl {
|
||||
url = "https://git.musl-libc.org/cgit/musl/patch/?id=751bee0ee727e8d8b003c87cff77ac76f1dbecd6";
|
||||
sha256 = "sha256-qCw132TCSaZrkISmtDb8Q8ufyt8sAJdwACkvfwuoi/0=";
|
||||
})
|
||||
];
|
||||
CFLAGS = [ "-fstack-protector-strong" ]
|
||||
++ lib.optional stdenv.hostPlatform.isPower "-mlong-double-64";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "etcd";
|
||||
version = "3.4.20";
|
||||
version = "3.4.21";
|
||||
|
||||
vendorSha256 = "sha256-P3EQTraMdZ2fAHDue5cKAxyHbh6nNeFV9ykT0rH7KPs=";
|
||||
|
||||
|
|
@ -12,7 +12,7 @@ buildGoModule rec {
|
|||
owner = "etcd-io";
|
||||
repo = "etcd";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-JfwjkgD57FqSmwgWZ5NbxshmY5JZUUWsk3bdYx15BKo=";
|
||||
sha256 = "sha256-+IU1l23sN9v48ZhJLGncUa3t5kPHBFcqQ/ojaZXzMU4=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "check_ssl_cert";
|
||||
version = "2.43.0";
|
||||
version = "2.44.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matteocorti";
|
||||
repo = "check_ssl_cert";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-swJzMZDBxof8RLMxVZN79zxajMO7kuxZxD8gNpgSksI=";
|
||||
hash = "sha256-/vX7DVZNFuLNNQQDoiggBdp9dsjTAKZbhxD13+VUInU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -21,6 +21,11 @@ stdenv.mkDerivation rec {
|
|||
url = "https://github.com/hydrian/TTRSS-Auth-LDAP/commit/557811efa15bab3b5044c98416f9e37264f11c9a.patch";
|
||||
sha256 = "sha256-KtDY0J1OYNTLwK7834lI+2XL1N1FkOk5zhinGY90/4A=";
|
||||
})
|
||||
# https://github.com/hydrian/TTRSS-Auth-LDAP/pull/34
|
||||
(fetchpatch {
|
||||
url = "https://github.com/hydrian/TTRSS-Auth-LDAP/commit/b1a873f6a7d18231d2ac804d0146d6e048c8382c.patch";
|
||||
sha256 = "sha256-t5bDQM97dGwr7tHSS9cSO7qApf2M8KNaIuIxbAjExrs=";
|
||||
})
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "boulder";
|
||||
version = "2022-09-06";
|
||||
version = "2022-09-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "letsencrypt";
|
||||
|
|
@ -19,7 +19,7 @@ buildGoModule rec {
|
|||
git rev-parse --short=8 HEAD 2>/dev/null >$out/COMMIT
|
||||
find "$out" -name .git -print0 | xargs -0 rm -rf
|
||||
'';
|
||||
hash = "sha256-BteHJAjIMPckbNIxgZCSSZV2iUc/yKVd0Px+S9ZwwUI=";
|
||||
hash = "sha256-AviTVALFI1+0cFohLLdaKR1Lw3b9yURIIlrzweuiN7w=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -1,3 +1,6 @@
|
|||
# This file was automatically generated by passthru.fetch-deps.
|
||||
# Please dont edit it manually, your changes might get overwritten!
|
||||
|
||||
{ fetchNuGet }: [
|
||||
(fetchNuGet { pname = "AdvancedStringBuilder"; version = "0.1.0"; sha256 = "1lpv5sggdxza0bmcqmzf5r4i340f0m7nr5073lac18naj5697q5g"; })
|
||||
(fetchNuGet { pname = "CliFx"; version = "2.3.0"; sha256 = "0dxxd5hm7gnc1lhq7k266nkcl84w0844r3cdxdcksvcc786f43vp"; })
|
||||
|
|
|
|||
36
pkgs/tools/filesystems/juicefs/default.nix
Normal file
36
pkgs/tools/filesystems/juicefs/default.nix
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "juicefs";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juicedata";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-urhm2dnWIbzt1mSFDsmqJe61E6D6FWRUG6CJPy/ExOI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-LvF/6YA/OVO2cyBM1c3YYhEjT26SVXcsepn+vglRKmE=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
doCheck = false; # requires network access
|
||||
|
||||
# we dont need the libjfs binary
|
||||
postFixup = ''
|
||||
rm $out/bin/libjfs
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A distributed POSIX file system built on top of Redis and S3";
|
||||
homepage = "https://www.juicefs.com/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ dit7ya ];
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "atuin";
|
||||
version = "0.10.0";
|
||||
version = "11.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ellie";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tBOJkAQCL2YGEJ3gJPxBC0swMuwOQENnhLXyms8WW6g";
|
||||
sha256 = "sha256-fHqZkFWueC2jr86kR3T1qcFaMMhEqfu2pzt8VfqmBnE=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-P4jcJ6pl3ZGjiwNYfEjEiNVnE6mTDRUGl6gZW65Jn0I";
|
||||
cargoSha256 = "sha256-BkrrVlqEtQWjc+jaKilAtf9xyaENAuvqCxIrxxmglOY=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "barman";
|
||||
version = "3.0.1";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EnterpriseDB";
|
||||
repo = pname;
|
||||
rev = "refs/tags/release/${version}";
|
||||
sha256 = "sha256-e6euOtvJx+xUq5pWmWK6l7nv/twOa+0OABUTYvMd8Ow=";
|
||||
sha256 = "sha256-xRyKCpO2eBe5lI0pQW8wUee/5ZMDEo7/FLORrp3Sduk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fclones";
|
||||
version = "0.27.3";
|
||||
version = "0.28.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pkolaczk";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-IAo7FKHh4oRPEmToEJca6b6E+TZvTeICPRYxol6Ppwo=";
|
||||
sha256 = "sha256-OOFmyTEiaZnCx15gkoMGooC4qlevKMBS7umawiKVZqE=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-S4F/2kf9jbOA3o3kj5Ouo3QvCULbVILh3QbBLXUeOzc=";
|
||||
cargoSha256 = "sha256-jWYiZ6YNeGtmcHgqCgC8A7dEdJ29n3W/RdE0wQbOUOA=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
AppKit
|
||||
|
|
|
|||
|
|
@ -2,26 +2,26 @@
|
|||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, gtk3
|
||||
, pcre
|
||||
, pcre2
|
||||
, glib
|
||||
, desktop-file-utils
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, wrapGAppsHook
|
||||
, unstableGitUpdater
|
||||
, gettext
|
||||
, icu
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fsearch";
|
||||
version = "unstable-2021-06-23";
|
||||
version = "0.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cboxdoerfer";
|
||||
repo = "fsearch";
|
||||
rev = "9300cc03ab2f0cea3a70abb5477bda8b52c4afd1";
|
||||
sha256 = "16qh2si48j113yhay5wawr7dvldks6jb32za41j2sng7n4ryw221";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-1nu6J5eHVpPHGXcFKHSnUhAJccxABBht5H2bpBx42og=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -36,7 +36,8 @@ stdenv.mkDerivation {
|
|||
buildInputs = [
|
||||
glib
|
||||
gtk3
|
||||
pcre
|
||||
pcre2
|
||||
icu
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
|
|
@ -44,10 +45,6 @@ stdenv.mkDerivation {
|
|||
--replace "Exec=fsearch" "Exec=$out/bin/fsearch"
|
||||
'';
|
||||
|
||||
passthru.updateScript = unstableGitUpdater {
|
||||
url = "https://github.com/cboxdoerfer/fsearch.git";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A fast file search utility for Unix-like systems based on GTK+3";
|
||||
homepage = "https://github.com/cboxdoerfer/fsearch.git";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "boundary";
|
||||
version = "0.10.3";
|
||||
version = "0.10.5";
|
||||
|
||||
src =
|
||||
let
|
||||
|
|
@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
|
|||
aarch64-darwin = "darwin_arm64";
|
||||
};
|
||||
sha256 = selectSystem {
|
||||
x86_64-linux = "sha256-MflcfTX0Ap8KEP0NDSZMHKM+fPsCoorUcUHV3WDXmBE=";
|
||||
aarch64-linux = "sha256-WeSmRpi50dfnv5quLPQTYNKQcQlBwno1iwPUyTeJrW4=";
|
||||
x86_64-darwin = "sha256-Ff4mu/g2K1wAeBj2IpOMT80gKcIP/dZjhWA8czokpxc=";
|
||||
aarch64-darwin = "sha256-Ove3Tgj7FnR5ZTzVZlmFDRoUaVlO2xA6CzMqIdobZxQ=";
|
||||
x86_64-linux = "sha256-lVv+mC9pNYzQes9k8KqkrHULuwETSHUCBF0FNw7kR+8=";
|
||||
aarch64-linux = "sha256-0GVANhtzrAJUl4hktgiCdzUMhlhh7jyMAWS7/DyVuiU=";
|
||||
x86_64-darwin = "sha256-N14Lynd/Q/eIGrM6ljAKnZdse/ShkvPaKSz6Q9DtYC0=";
|
||||
aarch64-darwin = "sha256-iScNf6YM5nUjBqWMWb0eM5j9f3WiVvWOtjq7eoABfUM=";
|
||||
};
|
||||
in
|
||||
fetchzip {
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "faraday-cli";
|
||||
version = "2.1.6";
|
||||
version = "2.1.7";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "infobyte";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ofL3tRYV2bwF+RYGoLpg/UQPg9HwrCepWAQxXiJkV2E=";
|
||||
hash = "sha256-kZqJVJ6XrCC3iDSTJP8AmIs4WkxiAFimFIexl0L/HT0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -2,19 +2,20 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gptfdisk";
|
||||
version = "1.0.8";
|
||||
version = "1.0.9";
|
||||
|
||||
src = fetchurl {
|
||||
# https://www.rodsbooks.com/gdisk/${name}.tar.gz also works, but the home
|
||||
# page clearly implies a preference for using SourceForge's bandwidth:
|
||||
url = "mirror://sourceforge/gptfdisk/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-ldGYVvAE2rxLjDQrJhLo0KnuvdUgBClxiDafFS6dxt8=";
|
||||
sha256 = "sha256-2v6tJpP6646Ll4MrI0B/btWzIZvBeE9ILdhVd04tUMI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix build failure against ncurses-6.3 (pending upstream inclusion):
|
||||
# https://sourceforge.net/p/gptfdisk/mailman/message/37392412/
|
||||
./ncurses-6.3.patch
|
||||
# fix UUID generation (from upstream but not yet released):
|
||||
# https://sourceforge.net/p/gptfdisk/code/ci/6a8416cbd12d55f882bb751993b94f72d338d96f/
|
||||
# https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1853985.html
|
||||
./uuid.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,96 +0,0 @@
|
|||
From 9d5032d1487a8fe6ef7229d413418a27e32a28e5 Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Trofimovich <slyich@gmail.com>
|
||||
Date: Mon, 1 Nov 2021 07:51:10 +0000
|
||||
Subject: [PATCH:gptfdisk] gptcurses.cc: always use "%s"-style format for printf()-style
|
||||
functions
|
||||
|
||||
`ncuses-6.3` added printf-style function attributes and now makes
|
||||
it easier to catch cases when user input is used in palce of format
|
||||
string when built with CFLAGS=-Werror=format-security:
|
||||
|
||||
gptcurses.cc:274:10: error:
|
||||
format not a string literal and no format arguments [-Werror=format-security]
|
||||
274 | printw(theLine.c_str());
|
||||
| ~~~~~~^~~~~~~~~~~~~~~~~
|
||||
|
||||
Let's wrap all the missing places with "%s" format.
|
||||
---
|
||||
gptcurses.cc | 24 ++++++++++++------------
|
||||
1 file changed, 12 insertions(+), 12 deletions(-)
|
||||
|
||||
--- a/gptcurses.cc
|
||||
+++ b/gptcurses.cc
|
||||
@@ -239,22 +239,22 @@ Space* GPTDataCurses::ShowSpace(int spaceNum, int lineNum) {
|
||||
ClearLine(lineNum);
|
||||
if (space->partNum == -1) { // space is empty
|
||||
move(lineNum, 12);
|
||||
- printw(BytesToIeee((space->lastLBA - space->firstLBA + 1), blockSize).c_str());
|
||||
+ printw("%s", BytesToIeee((space->lastLBA - space->firstLBA + 1), blockSize).c_str());
|
||||
move(lineNum, 24);
|
||||
printw("free space");
|
||||
} else { // space holds a partition
|
||||
move(lineNum, 3);
|
||||
printw("%d", space->partNum + 1);
|
||||
move(lineNum, 12);
|
||||
- printw(BytesToIeee((space->lastLBA - space->firstLBA + 1), blockSize).c_str());
|
||||
+ printw("%s", BytesToIeee((space->lastLBA - space->firstLBA + 1), blockSize).c_str());
|
||||
move(lineNum, 24);
|
||||
- printw(space->origPart->GetTypeName().c_str());
|
||||
+ printw("%s", space->origPart->GetTypeName().c_str());
|
||||
move(lineNum, 50);
|
||||
#ifdef USE_UTF16
|
||||
space->origPart->GetDescription().extract(0, 39, temp, 39);
|
||||
- printw(temp);
|
||||
+ printw("%s", temp);
|
||||
#else
|
||||
- printw(space->origPart->GetDescription().c_str());
|
||||
+ printw("%s", space->origPart->GetDescription().c_str());
|
||||
#endif
|
||||
} // if/else
|
||||
} // if
|
||||
@@ -271,10 +271,10 @@ int GPTDataCurses::DisplayParts(int selected) {
|
||||
|
||||
move(lineNum++, 0);
|
||||
theLine = "Part. # Size Partition Type Partition Name";
|
||||
- printw(theLine.c_str());
|
||||
+ printw("%s", theLine.c_str());
|
||||
move(lineNum++, 0);
|
||||
theLine = "----------------------------------------------------------------";
|
||||
- printw(theLine.c_str());
|
||||
+ printw("%s", theLine.c_str());
|
||||
numToShow = LINES - RESERVED_TOP - RESERVED_BOTTOM;
|
||||
pageNum = selected / numToShow;
|
||||
for (i = pageNum * numToShow; i <= (pageNum + 1) * numToShow - 1; i++) {
|
||||
@@ -636,7 +636,7 @@ void GPTDataCurses::DisplayOptions(char selectedKey) {
|
||||
} // if/else
|
||||
} // for
|
||||
move(LINES - 1, (COLS - optionDesc.length()) / 2);
|
||||
- printw(optionDesc.c_str());
|
||||
+ printw("%s", optionDesc.c_str());
|
||||
currentKey = selectedKey;
|
||||
} // if
|
||||
} // GPTDataCurses::DisplayOptions()
|
||||
@@ -748,11 +748,11 @@ void GPTDataCurses::DrawMenu(void) {
|
||||
|
||||
clear();
|
||||
move(0, (COLS - title.length()) / 2);
|
||||
- printw(title.c_str());
|
||||
+ printw("%s", title.c_str());
|
||||
move(2, (COLS - drive.length()) / 2);
|
||||
- printw(drive.c_str());
|
||||
+ printw("%s", drive.c_str());
|
||||
move(3, (COLS - size.str().length()) / 2);
|
||||
- printw(size.str().c_str());
|
||||
+ printw("%s", size.str().c_str());
|
||||
DisplayParts(currentSpaceNum);
|
||||
} // DrawMenu
|
||||
|
||||
@@ -802,7 +802,7 @@ void PromptToContinue(void) {
|
||||
void Report(string theText) {
|
||||
clear();
|
||||
move(0, 0);
|
||||
- printw(theText.c_str());
|
||||
+ printw("%s", theText.c_str());
|
||||
move(LINES - 2, (COLS - 29) / 2);
|
||||
printw("Press any key to continue....");
|
||||
cbreak();
|
||||
11
pkgs/tools/system/gptfdisk/uuid.patch
Normal file
11
pkgs/tools/system/gptfdisk/uuid.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- a/guid.cc
|
||||
+++ b/guid.cc
|
||||
@@ -141,7 +141,7 @@ void GUIDData::Zero(void) {
|
||||
void GUIDData::Randomize(void) {
|
||||
int i, uuidGenerated = 0;
|
||||
|
||||
-#ifdef _UUID_UUID_H
|
||||
+#if defined (_UUID_UUID_H) || defined (_UL_LIBUUID_UUID_H)
|
||||
uuid_generate(uuidData);
|
||||
ReverseBytes(&uuidData[0], 4);
|
||||
ReverseBytes(&uuidData[4], 2);
|
||||
|
|
@ -14,11 +14,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crowdin-cli";
|
||||
version = "3.7.10";
|
||||
version = "3.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip";
|
||||
sha256 = "sha256-beU4hLW5Dp4xbY0kaxuxLD2XmMXdxWEBbAH/G+B5dHU=";
|
||||
sha256 = "sha256-ONkdtp7aXP7dTxqIQ4IZ8c4zwzXVpEMMoXYnQQSU5x0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper unzip ];
|
||||
|
|
|
|||
|
|
@ -2953,6 +2953,8 @@ with pkgs;
|
|||
inherit (plasma5Packages) breeze-icons;
|
||||
};
|
||||
|
||||
beautysh = callPackage ../development/tools/beautysh { };
|
||||
|
||||
bc = callPackage ../tools/misc/bc { };
|
||||
|
||||
bdf2psf = callPackage ../tools/misc/bdf2psf { };
|
||||
|
|
@ -7870,6 +7872,8 @@ with pkgs;
|
|||
|
||||
jmespath = callPackage ../development/tools/jmespath { };
|
||||
|
||||
juicefs = callPackage ../tools/filesystems/juicefs { };
|
||||
|
||||
jmtpfs = callPackage ../tools/filesystems/jmtpfs { };
|
||||
|
||||
jnettop = callPackage ../tools/networking/jnettop { };
|
||||
|
|
@ -13065,6 +13069,8 @@ with pkgs;
|
|||
|
||||
algol68g = callPackage ../development/compilers/algol68g { };
|
||||
|
||||
ante = callPackage ../development/compilers/ante { };
|
||||
|
||||
armips = callPackage ../development/compilers/armips {
|
||||
stdenv = gcc10Stdenv;
|
||||
};
|
||||
|
|
@ -25301,6 +25307,8 @@ with pkgs;
|
|||
|
||||
adwaita-qt = libsForQt5.callPackage ../data/themes/adwaita-qt { };
|
||||
|
||||
adw-gtk3 = callPackage ../data/themes/adw-gtk3 { };
|
||||
|
||||
agave = callPackage ../data/fonts/agave { };
|
||||
|
||||
aileron = callPackage ../data/fonts/aileron { };
|
||||
|
|
@ -28995,7 +29003,11 @@ with pkgs;
|
|||
|
||||
klayout = libsForQt5.callPackage ../applications/misc/klayout { };
|
||||
|
||||
klee = callPackage ../applications/science/logic/klee { };
|
||||
klee = callPackage ../applications/science/logic/klee (with llvmPackages_11; {
|
||||
clang = clang;
|
||||
llvm = llvm;
|
||||
stdenv = stdenv;
|
||||
});
|
||||
|
||||
kmetronome = libsForQt5.callPackage ../applications/audio/kmetronome { };
|
||||
|
||||
|
|
|
|||
|
|
@ -11217,6 +11217,8 @@ in {
|
|||
|
||||
typer = callPackage ../development/python-modules/typer { };
|
||||
|
||||
types-colorama = callPackage ../development/python-modules/types-colorama { };
|
||||
|
||||
types-dateutil = callPackage ../development/python-modules/types-dateutil { };
|
||||
|
||||
types-decorator = callPackage ../development/python-modules/types-decorator { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue