Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
8985306cfd
|
|
@ -35,58 +35,50 @@ touch regular
|
|||
ln -s target symlink
|
||||
mkfifo fifo
|
||||
|
||||
checkPathType() {
|
||||
local path=$1
|
||||
local expectedPathType=$2
|
||||
local actualPathType=$(nix-instantiate --eval --strict --json 2>&1 \
|
||||
-E '{ path }: let lib = import <nixpkgs/lib>; in lib.filesystem.pathType path' \
|
||||
--argstr path "$path")
|
||||
if [[ "$actualPathType" != "$expectedPathType" ]]; then
|
||||
die "lib.filesystem.pathType \"$path\" == $actualPathType, but $expectedPathType was expected"
|
||||
expectSuccess() {
|
||||
local expr=$1
|
||||
local expectedResultRegex=$2
|
||||
if ! result=$(nix-instantiate --eval --strict --json \
|
||||
--expr "with (import <nixpkgs/lib>).filesystem; $expr"); then
|
||||
die "$expr failed to evaluate, but it was expected to succeed"
|
||||
fi
|
||||
if [[ ! "$result" =~ $expectedResultRegex ]]; then
|
||||
die "$expr == $result, but $expectedResultRegex was expected"
|
||||
fi
|
||||
}
|
||||
|
||||
checkPathType "/" '"directory"'
|
||||
checkPathType "$PWD/directory" '"directory"'
|
||||
checkPathType "$PWD/regular" '"regular"'
|
||||
checkPathType "$PWD/symlink" '"symlink"'
|
||||
checkPathType "$PWD/fifo" '"unknown"'
|
||||
checkPathType "$PWD/non-existent" "error: evaluation aborted with the following error message: 'lib.filesystem.pathType: Path $PWD/non-existent does not exist.'"
|
||||
|
||||
checkPathIsDirectory() {
|
||||
local path=$1
|
||||
local expectedIsDirectory=$2
|
||||
local actualIsDirectory=$(nix-instantiate --eval --strict --json 2>&1 \
|
||||
-E '{ path }: let lib = import <nixpkgs/lib>; in lib.filesystem.pathIsDirectory path' \
|
||||
--argstr path "$path")
|
||||
if [[ "$actualIsDirectory" != "$expectedIsDirectory" ]]; then
|
||||
die "lib.filesystem.pathIsDirectory \"$path\" == $actualIsDirectory, but $expectedIsDirectory was expected"
|
||||
expectFailure() {
|
||||
local expr=$1
|
||||
local expectedErrorRegex=$2
|
||||
if result=$(nix-instantiate --eval --strict --json 2>"$work/stderr" \
|
||||
--expr "with (import <nixpkgs/lib>).filesystem; $expr"); then
|
||||
die "$expr evaluated successfully to $result, but it was expected to fail"
|
||||
fi
|
||||
if [[ ! "$(<"$work/stderr")" =~ $expectedErrorRegex ]]; then
|
||||
die "Error was $(<"$work/stderr"), but $expectedErrorRegex was expected"
|
||||
fi
|
||||
}
|
||||
|
||||
checkPathIsDirectory "/" "true"
|
||||
checkPathIsDirectory "$PWD/directory" "true"
|
||||
checkPathIsDirectory "$PWD/regular" "false"
|
||||
checkPathIsDirectory "$PWD/symlink" "false"
|
||||
checkPathIsDirectory "$PWD/fifo" "false"
|
||||
checkPathIsDirectory "$PWD/non-existent" "false"
|
||||
expectSuccess "pathType /." '"directory"'
|
||||
expectSuccess "pathType $PWD/directory" '"directory"'
|
||||
expectSuccess "pathType $PWD/regular" '"regular"'
|
||||
expectSuccess "pathType $PWD/symlink" '"symlink"'
|
||||
expectSuccess "pathType $PWD/fifo" '"unknown"'
|
||||
# Different errors depending on whether the builtins.readFilePath primop is available or not
|
||||
expectFailure "pathType $PWD/non-existent" "error: (evaluation aborted with the following error message: 'lib.filesystem.pathType: Path $PWD/non-existent does not exist.'|getting status of '$PWD/non-existent': No such file or directory)"
|
||||
|
||||
checkPathIsRegularFile() {
|
||||
local path=$1
|
||||
local expectedIsRegularFile=$2
|
||||
local actualIsRegularFile=$(nix-instantiate --eval --strict --json 2>&1 \
|
||||
-E '{ path }: let lib = import <nixpkgs/lib>; in lib.filesystem.pathIsRegularFile path' \
|
||||
--argstr path "$path")
|
||||
if [[ "$actualIsRegularFile" != "$expectedIsRegularFile" ]]; then
|
||||
die "lib.filesystem.pathIsRegularFile \"$path\" == $actualIsRegularFile, but $expectedIsRegularFile was expected"
|
||||
fi
|
||||
}
|
||||
expectSuccess "pathIsDirectory /." "true"
|
||||
expectSuccess "pathIsDirectory $PWD/directory" "true"
|
||||
expectSuccess "pathIsDirectory $PWD/regular" "false"
|
||||
expectSuccess "pathIsDirectory $PWD/symlink" "false"
|
||||
expectSuccess "pathIsDirectory $PWD/fifo" "false"
|
||||
expectSuccess "pathIsDirectory $PWD/non-existent" "false"
|
||||
|
||||
checkPathIsRegularFile "/" "false"
|
||||
checkPathIsRegularFile "$PWD/directory" "false"
|
||||
checkPathIsRegularFile "$PWD/regular" "true"
|
||||
checkPathIsRegularFile "$PWD/symlink" "false"
|
||||
checkPathIsRegularFile "$PWD/fifo" "false"
|
||||
checkPathIsRegularFile "$PWD/non-existent" "false"
|
||||
expectSuccess "pathIsRegularFile /." "false"
|
||||
expectSuccess "pathIsRegularFile $PWD/directory" "false"
|
||||
expectSuccess "pathIsRegularFile $PWD/regular" "true"
|
||||
expectSuccess "pathIsRegularFile $PWD/symlink" "false"
|
||||
expectSuccess "pathIsRegularFile $PWD/fifo" "false"
|
||||
expectSuccess "pathIsRegularFile $PWD/non-existent" "false"
|
||||
|
||||
echo >&2 tests ok
|
||||
|
|
|
|||
|
|
@ -378,7 +378,7 @@ checkConfigOutput '^{ }$' config.sub.nixosOk ./class-check.nix
|
|||
checkConfigError 'The module .*/module-class-is-darwin.nix was imported into nixos instead of darwin.' config.sub.nixosFail.config ./class-check.nix
|
||||
|
||||
# submoduleWith type merge with different class
|
||||
checkConfigError 'error: A submoduleWith option is declared multiple times with conflicting class values "darwin" and "nixos".' config.sub.mergeFail.config ./class-check.nix
|
||||
checkConfigError 'A submoduleWith option is declared multiple times with conflicting class values "darwin" and "nixos".' config.sub.mergeFail.config ./class-check.nix
|
||||
|
||||
# _type check
|
||||
checkConfigError 'Could not load a value as a module, because it is of type "flake", in file .*/module-imports-_type-check.nix' config.ok.config ./module-imports-_type-check.nix
|
||||
|
|
|
|||
|
|
@ -2,53 +2,63 @@
|
|||
# Don't test properties of pkgs.lib, but rather the lib in the parent directory
|
||||
pkgs ? import ../.. {} // { lib = throw "pkgs.lib accessed, but the lib tests should use nixpkgs' lib path directly!"; },
|
||||
nix ? pkgs.nix,
|
||||
nixVersions ? [ pkgs.nixVersions.minimum nix pkgs.nixVersions.unstable ],
|
||||
}:
|
||||
|
||||
pkgs.runCommand "nixpkgs-lib-tests" {
|
||||
buildInputs = [
|
||||
(import ./check-eval.nix)
|
||||
(import ./maintainers.nix {
|
||||
inherit pkgs;
|
||||
lib = import ../.;
|
||||
})
|
||||
(import ./teams.nix {
|
||||
inherit pkgs;
|
||||
lib = import ../.;
|
||||
})
|
||||
(import ../path/tests {
|
||||
inherit pkgs;
|
||||
})
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
nix
|
||||
];
|
||||
strictDeps = true;
|
||||
} ''
|
||||
datadir="${nix}/share"
|
||||
export TEST_ROOT=$(pwd)/test-tmp
|
||||
export NIX_BUILD_HOOK=
|
||||
export NIX_CONF_DIR=$TEST_ROOT/etc
|
||||
export NIX_LOCALSTATE_DIR=$TEST_ROOT/var
|
||||
export NIX_LOG_DIR=$TEST_ROOT/var/log/nix
|
||||
export NIX_STATE_DIR=$TEST_ROOT/var/nix
|
||||
export NIX_STORE_DIR=$TEST_ROOT/store
|
||||
export PAGER=cat
|
||||
cacheDir=$TEST_ROOT/binary-cache
|
||||
let
|
||||
testWithNix = nix:
|
||||
pkgs.runCommand "nixpkgs-lib-tests-nix-${nix.version}" {
|
||||
buildInputs = [
|
||||
(import ./check-eval.nix)
|
||||
(import ./maintainers.nix {
|
||||
inherit pkgs;
|
||||
lib = import ../.;
|
||||
})
|
||||
(import ./teams.nix {
|
||||
inherit pkgs;
|
||||
lib = import ../.;
|
||||
})
|
||||
(import ../path/tests {
|
||||
inherit pkgs;
|
||||
})
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
nix
|
||||
];
|
||||
strictDeps = true;
|
||||
} ''
|
||||
datadir="${nix}/share"
|
||||
export TEST_ROOT=$(pwd)/test-tmp
|
||||
export NIX_BUILD_HOOK=
|
||||
export NIX_CONF_DIR=$TEST_ROOT/etc
|
||||
export NIX_LOCALSTATE_DIR=$TEST_ROOT/var
|
||||
export NIX_LOG_DIR=$TEST_ROOT/var/log/nix
|
||||
export NIX_STATE_DIR=$TEST_ROOT/var/nix
|
||||
export NIX_STORE_DIR=$TEST_ROOT/store
|
||||
export PAGER=cat
|
||||
cacheDir=$TEST_ROOT/binary-cache
|
||||
|
||||
mkdir -p $NIX_CONF_DIR
|
||||
echo "experimental-features = nix-command" >> $NIX_CONF_DIR/nix.conf
|
||||
mkdir -p $NIX_CONF_DIR
|
||||
echo "experimental-features = nix-command" >> $NIX_CONF_DIR/nix.conf
|
||||
|
||||
nix-store --init
|
||||
nix-store --init
|
||||
|
||||
cp -r ${../.} lib
|
||||
echo "Running lib/tests/modules.sh"
|
||||
bash lib/tests/modules.sh
|
||||
cp -r ${../.} lib
|
||||
echo "Running lib/tests/modules.sh"
|
||||
bash lib/tests/modules.sh
|
||||
|
||||
echo "Running lib/tests/filesystem.sh"
|
||||
TEST_LIB=$PWD/lib bash lib/tests/filesystem.sh
|
||||
echo "Running lib/tests/filesystem.sh"
|
||||
TEST_LIB=$PWD/lib bash lib/tests/filesystem.sh
|
||||
|
||||
echo "Running lib/tests/sources.sh"
|
||||
TEST_LIB=$PWD/lib bash lib/tests/sources.sh
|
||||
echo "Running lib/tests/sources.sh"
|
||||
TEST_LIB=$PWD/lib bash lib/tests/sources.sh
|
||||
|
||||
touch $out
|
||||
''
|
||||
mkdir $out
|
||||
echo success > $out/${nix.version}
|
||||
'';
|
||||
|
||||
in
|
||||
pkgs.symlinkJoin {
|
||||
name = "nixpkgs-lib-tests";
|
||||
paths = map testWithNix nixVersions;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,14 +23,19 @@ clean_up() {
|
|||
trap clean_up EXIT
|
||||
cd "$work"
|
||||
|
||||
# Crudely unquotes a JSON string by just taking everything between the first and the second quote.
|
||||
# We're only using this for resulting /nix/store paths, which can't contain " anyways,
|
||||
# nor can they contain any other characters that would need to be escaped specially in JSON
|
||||
# This way we don't need to add a dependency on e.g. jq
|
||||
crudeUnquoteJSON() {
|
||||
cut -d \" -f2
|
||||
}
|
||||
|
||||
touch {README.md,module.o,foo.bar}
|
||||
|
||||
# nix-instantiate doesn't write out the source, only computing the hash, so
|
||||
# this uses the experimental nix command instead.
|
||||
|
||||
dir="$(nix eval --impure --raw --expr '(with import <nixpkgs/lib>; "${
|
||||
dir="$(nix-instantiate --eval --strict --read-write-mode --json --expr '(with import <nixpkgs/lib>; "${
|
||||
cleanSource ./.
|
||||
}")')"
|
||||
}")' | crudeUnquoteJSON)"
|
||||
(cd "$dir"; find) | sort -f | diff -U10 - <(cat <<EOF
|
||||
.
|
||||
./foo.bar
|
||||
|
|
@ -39,9 +44,9 @@ EOF
|
|||
) || die "cleanSource 1"
|
||||
|
||||
|
||||
dir="$(nix eval --impure --raw --expr '(with import <nixpkgs/lib>; "${
|
||||
dir="$(nix-instantiate --eval --strict --read-write-mode --json --expr '(with import <nixpkgs/lib>; "${
|
||||
cleanSourceWith { src = '"$work"'; filter = path: type: ! hasSuffix ".bar" path; }
|
||||
}")')"
|
||||
}")' | crudeUnquoteJSON)"
|
||||
(cd "$dir"; find) | sort -f | diff -U10 - <(cat <<EOF
|
||||
.
|
||||
./module.o
|
||||
|
|
@ -49,9 +54,9 @@ dir="$(nix eval --impure --raw --expr '(with import <nixpkgs/lib>; "${
|
|||
EOF
|
||||
) || die "cleanSourceWith 1"
|
||||
|
||||
dir="$(nix eval --impure --raw --expr '(with import <nixpkgs/lib>; "${
|
||||
dir="$(nix-instantiate --eval --strict --read-write-mode --json --expr '(with import <nixpkgs/lib>; "${
|
||||
cleanSourceWith { src = cleanSource '"$work"'; filter = path: type: ! hasSuffix ".bar" path; }
|
||||
}")')"
|
||||
}")' | crudeUnquoteJSON)"
|
||||
(cd "$dir"; find) | sort -f | diff -U10 - <(cat <<EOF
|
||||
.
|
||||
./README.md
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@
|
|||
|
||||
- The latest version of `clonehero` now stores custom content in `~/.clonehero`. See the [migration instructions](https://clonehero.net/2022/11/29/v23-to-v1-migration-instructions.html). Typically, these content files would exist along side the binary, but the previous build used a wrapper script that would store them in `~/.config/unity3d/srylain Inc_/Clone Hero`.
|
||||
|
||||
- `python3.pkgs.fetchPypi` (and `python3Packages.fetchPypi`) has been deprecated in favor of top-level `fetchPypi`.
|
||||
|
||||
- `etcd` has been updated to 3.5, you will want to read the [3.3 to 3.4](https://etcd.io/docs/v3.5/upgrades/upgrade_3_4/) and [3.4 to 3.5](https://etcd.io/docs/v3.5/upgrades/upgrade_3_5/) upgrade guides
|
||||
|
||||
## Other Notable Changes {#sec-release-23.11-notable-changes}
|
||||
|
|
|
|||
|
|
@ -63,12 +63,27 @@ 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.succeed("ldapsearch -H ldaps://${serverDomain}: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!")
|
||||
|
||||
with subtest("Test HTTP interface"):
|
||||
server.wait_until_succeeds("curl -sf https://${serverDomain} | grep Kanidm")
|
||||
|
||||
with subtest("Test LDAP interface"):
|
||||
server.succeed("ldapsearch -H ldaps://${serverDomain}:636 -b '${ldapBaseDN}' -x '(name=test)'")
|
||||
|
||||
with subtest("Test CLI login"):
|
||||
client.succeed("kanidm login -D anonymous")
|
||||
client.succeed("kanidm self whoami | grep anonymous@${serverDomain}")
|
||||
|
||||
with subtest("Recover idm_admin account"):
|
||||
# Must stop the server for account recovery or else kanidmd fails with
|
||||
# "unable to lock kanidm exclusive lock at /var/lib/kanidm/kanidm.db.klock".
|
||||
server.succeed("systemctl stop kanidm")
|
||||
server.succeed("su - kanidm -c 'kanidmd recover-account -c ${serverConfigFile} idm_admin 2>&1 | rg -o \'[A-Za-z0-9]{48}\' '")
|
||||
server.succeed("systemctl start kanidm")
|
||||
|
||||
with subtest("Test unixd connection"):
|
||||
client.wait_for_unit("kanidm-unixd.service")
|
||||
# TODO: client.wait_for_file("/run/kanidm-unixd/sock")
|
||||
client.wait_until_succeeds("kanidm-unix status | grep working!")
|
||||
'';
|
||||
})
|
||||
|
|
|
|||
|
|
@ -486,12 +486,12 @@ final: prev:
|
|||
|
||||
aerial-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "aerial.nvim";
|
||||
version = "2023-05-27";
|
||||
version = "2023-06-01";
|
||||
src = fetchFromGitHub {
|
||||
owner = "stevearc";
|
||||
repo = "aerial.nvim";
|
||||
rev = "01d63e5599811ddf86c8769180c3fbf6dd2ef224";
|
||||
sha256 = "0m8ywp1mhfii4rbrgpf54hfmp9m7s2ckn434ccvn5dzcgcdb749p";
|
||||
rev = "2abd49152215395cee5e7aa2c49451c459a2dbb3";
|
||||
sha256 = "1f6fwv7w443r3yy7fjfciikgnxy6icx9xq91vc1jr7iqfrd3vb3q";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/stevearc/aerial.nvim/";
|
||||
|
|
@ -2901,12 +2901,12 @@ final: prev:
|
|||
|
||||
dracula-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "dracula.nvim";
|
||||
version = "2023-04-20";
|
||||
version = "2023-06-01";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mofiqul";
|
||||
repo = "dracula.nvim";
|
||||
rev = "26d04c8ced02f02207e7aec1d5730c3a9ebadeeb";
|
||||
sha256 = "16z6rzay9sn011pl1ljjqs2f2k7igzzyqg9k6dyzzxjb3k1037rl";
|
||||
rev = "9128f2893767cf0fa5f57e6041770ee6cf1c4fdb";
|
||||
sha256 = "0lwrb65p62wq0mialc9igxghrq8lhckw4q0qy4ha124scx05gz4j";
|
||||
};
|
||||
meta.homepage = "https://github.com/Mofiqul/dracula.nvim/";
|
||||
};
|
||||
|
|
@ -3312,12 +3312,12 @@ final: prev:
|
|||
|
||||
friendly-snippets = buildVimPluginFrom2Nix {
|
||||
pname = "friendly-snippets";
|
||||
version = "2023-05-30";
|
||||
version = "2023-05-31";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rafamadriz";
|
||||
repo = "friendly-snippets";
|
||||
rev = "7006e69b60a559837ff6cdb7fe610af4f6ca823c";
|
||||
sha256 = "1l10kspc7p0cxxlgddycnlwb4pkkfwmjari5a8wgjskdikw611gv";
|
||||
rev = "0dd6114bea08276d9111d58c5dce5e256bbc8921";
|
||||
sha256 = "0fvxrc3c2a4qnkzqgrginisvrcyblxgcy34l6pr9m7wb5jl48b9y";
|
||||
};
|
||||
meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
|
||||
};
|
||||
|
|
@ -3420,12 +3420,12 @@ final: prev:
|
|||
|
||||
fzf-lua = buildVimPluginFrom2Nix {
|
||||
pname = "fzf-lua";
|
||||
version = "2023-05-25";
|
||||
version = "2023-05-31";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ibhagwan";
|
||||
repo = "fzf-lua";
|
||||
rev = "bc5110738d44c16655cf1b23534343aaade855a2";
|
||||
sha256 = "10hf25dg1ipih576ypmq1lhp6kvm9qb37g9hb3kzh2f26x6r827d";
|
||||
rev = "0f953fd7a35d22e1409d5ce77bbacef9cf07e2cb";
|
||||
sha256 = "1r2xld09a7jjzmj46raw9m04wzz2pdqxn9hj3pixrhgwshwq4cz5";
|
||||
};
|
||||
meta.homepage = "https://github.com/ibhagwan/fzf-lua/";
|
||||
};
|
||||
|
|
@ -4882,12 +4882,12 @@ final: prev:
|
|||
|
||||
lsp_signature-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lsp_signature.nvim";
|
||||
version = "2023-05-31";
|
||||
version = "2023-06-01";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ray-x";
|
||||
repo = "lsp_signature.nvim";
|
||||
rev = "c6826d2c3f4bc4a37b41b6a140061ccb0e9cdc4a";
|
||||
sha256 = "0774rbzdsl5bqaipq35n26qrx2xawlnxa62x1fksj7ihxzfpl0in";
|
||||
rev = "17ff7a405fea8376b015b8ea7910d2e59958bf68";
|
||||
sha256 = "1qgl3j9a0b3wf381q859xjw0pcfbfxxm0fsdhj7bgfdq11v2q60p";
|
||||
};
|
||||
meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
|
||||
};
|
||||
|
|
@ -5231,12 +5231,12 @@ final: prev:
|
|||
|
||||
monokai-pro-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "monokai-pro.nvim";
|
||||
version = "2023-05-31";
|
||||
version = "2023-06-01";
|
||||
src = fetchFromGitHub {
|
||||
owner = "loctvl842";
|
||||
repo = "monokai-pro.nvim";
|
||||
rev = "048026f7a76c0668b9afbf33e74bd8db6007b1c3";
|
||||
sha256 = "0vimfjqljikzbk1hwkmd16r67kvnfs6h9wvscad68wg12x4001mq";
|
||||
rev = "25b7c5ea92f2a5d6417acb6cbf1a4885ec39a0de";
|
||||
sha256 = "19q5b2axmhqv53aqfcszrfpj95da8a1fzx4wk5d8198xmmgrxnhl";
|
||||
};
|
||||
meta.homepage = "https://github.com/loctvl842/monokai-pro.nvim/";
|
||||
};
|
||||
|
|
@ -5531,12 +5531,12 @@ final: prev:
|
|||
|
||||
neoconf-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "neoconf.nvim";
|
||||
version = "2023-05-31";
|
||||
version = "2023-06-01";
|
||||
src = fetchFromGitHub {
|
||||
owner = "folke";
|
||||
repo = "neoconf.nvim";
|
||||
rev = "ee205ffd079f96d32c837dcf29af259e0dde8557";
|
||||
sha256 = "1q9d8y5nlaj46bx48j17zmcfldc4hn20bhac3c4az8nfcs6xij2c";
|
||||
rev = "27714f819bb1030f00d437c0341d420b649e0021";
|
||||
sha256 = "138pl6a9q3cj3ld5wc6z0jj5zszi40xvfh1gfnn51g7jgd2sfamk";
|
||||
};
|
||||
meta.homepage = "https://github.com/folke/neoconf.nvim/";
|
||||
};
|
||||
|
|
@ -5655,8 +5655,8 @@ final: prev:
|
|||
src = fetchFromGitHub {
|
||||
owner = "nvim-neorg";
|
||||
repo = "neorg";
|
||||
rev = "3f78a7d87d502c854d6cfea9f9932d2488aa02f9";
|
||||
sha256 = "0mwzy9bcygszqgh228chpb6cdfhz9j4mqmpd4jnhy3m1rnk5ji24";
|
||||
rev = "e0fcf254fbdb95fa0918692aee1c93b938e883f8";
|
||||
sha256 = "08db5lj5ikj3pl63gdksarjv133gjlsvsgmfmsv1hj6yakl8sdza";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-neorg/neorg/";
|
||||
};
|
||||
|
|
@ -6359,12 +6359,12 @@ final: prev:
|
|||
|
||||
nvim-cokeline = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-cokeline";
|
||||
version = "2023-03-28";
|
||||
version = "2023-06-01";
|
||||
src = fetchFromGitHub {
|
||||
owner = "willothy";
|
||||
repo = "nvim-cokeline";
|
||||
rev = "28b9ed6ef2afe8632557953be920543403965546";
|
||||
sha256 = "1vcbj8wvil4sfnkmgi8h4mq6zb9034431673xn1jp72n9nvjc8kn";
|
||||
rev = "caba2d133fdd9cdcfb3ebafc27c20d1dd3271561";
|
||||
sha256 = "1jjkf6cvv92q437qxbx4i2f00jl7zvzkxsl50mkvpy9q9njyf5cc";
|
||||
};
|
||||
meta.homepage = "https://github.com/willothy/nvim-cokeline/";
|
||||
};
|
||||
|
|
@ -6579,8 +6579,8 @@ final: prev:
|
|||
src = fetchFromGitHub {
|
||||
owner = "Iron-E";
|
||||
repo = "nvim-highlite";
|
||||
rev = "23b0c806f660b321f9b903f0613fc948d4f8ec4c";
|
||||
sha256 = "0xbnhbknimlmd1x3cwzq75sj4gifa8mhzrv9wkzak29pl1g5vkys";
|
||||
rev = "eea19a837c770f177377b4d2e7eaaebce0ec528d";
|
||||
sha256 = "0i5phqicji2pkk0dbw3bnmx5a98q7anfrj7rb1nhpx83rx29swvf";
|
||||
};
|
||||
meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
|
||||
};
|
||||
|
|
@ -6887,12 +6887,12 @@ final: prev:
|
|||
|
||||
nvim-scrollview = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-scrollview";
|
||||
version = "2023-05-31";
|
||||
version = "2023-06-01";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dstein64";
|
||||
repo = "nvim-scrollview";
|
||||
rev = "93fe5a96637a164f5b114b4a4cb45629cccf89ac";
|
||||
sha256 = "0klxs8jrgv6k2zcf2cqw3d5cvpll5b493zkx1kvbs89ynjiaqyz3";
|
||||
rev = "e64fb82b4e1c2b314d1d5d4511f7a9e73b9dc59d";
|
||||
sha256 = "00kh7jzh719ag22ym0vll3a3nnzbvdrany6vz4018iiccx8mggr2";
|
||||
};
|
||||
meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
|
||||
};
|
||||
|
|
@ -6995,12 +6995,12 @@ final: prev:
|
|||
|
||||
nvim-treesitter = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-treesitter";
|
||||
version = "2023-05-31";
|
||||
version = "2023-06-01";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-treesitter";
|
||||
repo = "nvim-treesitter";
|
||||
rev = "62146fe415193879290c523b54cb5072e1f5dbbc";
|
||||
sha256 = "0zqkhdcc8vr0kp4f1jr8m0zp02f694ba5z7a5s7ypik2jdfqhv3w";
|
||||
rev = "a6063b22c9e6d8660b82255d251c19d150725d9f";
|
||||
sha256 = "1jhzypbsps5ckgbykgii8x2zcawfnp6v0ibz6kgckjngi9pxc97z";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
|
||||
};
|
||||
|
|
@ -7319,12 +7319,12 @@ final: prev:
|
|||
|
||||
onenord-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "onenord.nvim";
|
||||
version = "2023-05-13";
|
||||
version = "2023-06-01";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rmehri01";
|
||||
repo = "onenord.nvim";
|
||||
rev = "7b2b23e6af16430be3d0364c7ced34522ce88124";
|
||||
sha256 = "02zv2kppvfi44acfag4489404mnspygpkrrnw3rqhk9rn1za2i5a";
|
||||
rev = "acd97c26d253884f8b58e68c89d8340c5e0f4456";
|
||||
sha256 = "113lv721w4xh46cf0czv0vy6vybrx33m1srqrr6czmh7axd514qs";
|
||||
};
|
||||
meta.homepage = "https://github.com/rmehri01/onenord.nvim/";
|
||||
};
|
||||
|
|
@ -7921,12 +7921,12 @@ final: prev:
|
|||
|
||||
rnvimr = buildVimPluginFrom2Nix {
|
||||
pname = "rnvimr";
|
||||
version = "2023-05-31";
|
||||
version = "2023-06-01";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kevinhwang91";
|
||||
repo = "rnvimr";
|
||||
rev = "0abde05b7b1b1104222e8ccc11b25c1ebe4ee991";
|
||||
sha256 = "1sc4qfwkfrs3c8qgfrc9vz72l08r4k54ych8q4xf6c2wabzampk7";
|
||||
rev = "50a36ff2e7cda1f727cb8607f8e791cebd4fa7b1";
|
||||
sha256 = "06cvmmpb8kn7iffnkhh1c6bzyh8kn4w29ab5gv0bx3hk8qylk55q";
|
||||
};
|
||||
meta.homepage = "https://github.com/kevinhwang91/rnvimr/";
|
||||
};
|
||||
|
|
@ -9576,8 +9576,8 @@ final: prev:
|
|||
src = fetchFromGitHub {
|
||||
owner = "unisonweb";
|
||||
repo = "unison";
|
||||
rev = "2a3a54add6b7c2aa5a24a20d6284643d641e985e";
|
||||
sha256 = "1bf0ijlq0g7xxijmvcyh8vwwfn0nq02fy4fwy6sagk2vfa2bwi3l";
|
||||
rev = "53270a472badda2d96b3fb4305f3cca244d3bd1f";
|
||||
sha256 = "0jn3683vc80b76mdfmj45sd2ml2h5f7333dqy0lygkdhszbc1b96";
|
||||
};
|
||||
meta.homepage = "https://github.com/unisonweb/unison/";
|
||||
};
|
||||
|
|
@ -11364,8 +11364,8 @@ final: prev:
|
|||
src = fetchFromGitHub {
|
||||
owner = "fatih";
|
||||
repo = "vim-go";
|
||||
rev = "f8448bf71c0116e70db05e3bd4ac14918777b493";
|
||||
sha256 = "09lmx56vg9x6rpyirjnhdg5rg6mr92smqs3nmazij134xz1462xc";
|
||||
rev = "3289077b08b210aa88a890cb65e9538bd52364b6";
|
||||
sha256 = "1v5v23nz3209syjwwpm8447367lrm87jc7z7frx3k40m8mbj3bmp";
|
||||
};
|
||||
meta.homepage = "https://github.com/fatih/vim-go/";
|
||||
};
|
||||
|
|
@ -11924,6 +11924,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/peitalin/vim-jsx-typescript/";
|
||||
};
|
||||
|
||||
vim-julia-cell = buildVimPluginFrom2Nix {
|
||||
pname = "vim-julia-cell";
|
||||
version = "2020-08-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mroavi";
|
||||
repo = "vim-julia-cell";
|
||||
rev = "f15961441cb55934fb0d6b15004b48e72decf720";
|
||||
sha256 = "13s6dg2k4qmchzjx7fcwch3ccclhkf238aidfa18k3qywqr6fcz2";
|
||||
};
|
||||
meta.homepage = "https://github.com/mroavi/vim-julia-cell/";
|
||||
};
|
||||
|
||||
vim-kitty-navigator = buildVimPluginFrom2Nix {
|
||||
pname = "vim-kitty-navigator";
|
||||
version = "2023-05-25";
|
||||
|
|
@ -12058,12 +12070,12 @@ final: prev:
|
|||
|
||||
vim-llvm = buildVimPluginFrom2Nix {
|
||||
pname = "vim-llvm";
|
||||
version = "2023-02-27";
|
||||
version = "2023-05-31";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rhysd";
|
||||
repo = "vim-llvm";
|
||||
rev = "fcf5358f55ccc93202e496772f49f70b94230268";
|
||||
sha256 = "03fx1v6wq00zspg635c5km75ylidm7j93lipns8s3gsa3h1vs76a";
|
||||
rev = "c5d6c6a9ef21df2a32aad0f3b5ca5389f92d06d1";
|
||||
sha256 = "1gnamw4whrvw3qbs8bkr45akzwkzinnkyhjpwgzza90w8a99nds6";
|
||||
};
|
||||
meta.homepage = "https://github.com/rhysd/vim-llvm/";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1231,24 +1231,24 @@
|
|||
};
|
||||
ocaml = buildGrammar {
|
||||
language = "ocaml";
|
||||
version = "0.0.0+rev=1155941";
|
||||
version = "0.0.0+rev=2da4930";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-ocaml";
|
||||
rev = "11559418d8de82a2313504dc5bec9983d17ea4e9";
|
||||
hash = "sha256-QLZ+ukkYDZGi+hEzaoP98mQRZPXpAbVXt1RlQREafiw=";
|
||||
rev = "2da49308381b91e19e5d270ec5117616d0e4b135";
|
||||
hash = "sha256-seyVqMGRLM1aD+863AvGaDFAhFYLCbQx4eitBcohbWQ=";
|
||||
};
|
||||
location = "ocaml";
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml";
|
||||
};
|
||||
ocaml_interface = buildGrammar {
|
||||
language = "ocaml_interface";
|
||||
version = "0.0.0+rev=1155941";
|
||||
version = "0.0.0+rev=2da4930";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-ocaml";
|
||||
rev = "11559418d8de82a2313504dc5bec9983d17ea4e9";
|
||||
hash = "sha256-QLZ+ukkYDZGi+hEzaoP98mQRZPXpAbVXt1RlQREafiw=";
|
||||
rev = "2da49308381b91e19e5d270ec5117616d0e4b135";
|
||||
hash = "sha256-seyVqMGRLM1aD+863AvGaDFAhFYLCbQx4eitBcohbWQ=";
|
||||
};
|
||||
location = "interface";
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml";
|
||||
|
|
|
|||
|
|
@ -1005,6 +1005,7 @@ https://github.com/google/vim-jsonnet/,,
|
|||
https://github.com/mogelbrod/vim-jsonpath/,HEAD,
|
||||
https://github.com/MaxMEllon/vim-jsx-pretty/,,
|
||||
https://github.com/peitalin/vim-jsx-typescript/,,
|
||||
https://github.com/mroavi/vim-julia-cell/,HEAD,
|
||||
https://github.com/knubie/vim-kitty-navigator/,,
|
||||
https://github.com/farmergreg/vim-lastplace/,,
|
||||
https://github.com/xuhdev/vim-latex-live-preview/,,
|
||||
|
|
|
|||
|
|
@ -2278,6 +2278,21 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
ms-vscode.live-server = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "live-server";
|
||||
publisher = "ms-vscode";
|
||||
version = "0.4.8";
|
||||
sha256 = "sha256-/IrLq+nNxwQB1S1NIGYkv24DOY7Mc25eQ+orUfh42pg=";
|
||||
};
|
||||
meta = {
|
||||
description = "Launch a development local Server with live reload feature for static & dynamic pages";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode.live-server";
|
||||
homepage = "https://github.com/microsoft/vscode-livepreview";
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
ms-vscode.makefile-tools = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "makefile-tools";
|
||||
|
|
|
|||
|
|
@ -32,11 +32,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "calibre";
|
||||
version = "6.17.0";
|
||||
version = "6.19.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-HKSruKXYUMH1lj43CA3Rp3lXNlONXE1P9gFLaH16No4=";
|
||||
hash = "sha256-Fm2484ztsSc80waJBvy7rHGnNBFxCvbbrsHDBCZ2kxA=";
|
||||
};
|
||||
|
||||
# https://sources.debian.org/patches/calibre/${finalAttrs.version}+dfsg-1
|
||||
|
|
@ -49,8 +49,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
})
|
||||
(fetchpatch {
|
||||
name = "0007-Hardening-Qt-code.patch";
|
||||
url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}-1/debian/patches/0007-Hardening-Qt-code.patch";
|
||||
hash = "sha256-9P1kGrQbWAWDzu5EUiQr7TiCPHRWUA8hxPpEvFpK20k=";
|
||||
url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}-1/debian/patches/hardening/0007-Hardening-Qt-code.patch";
|
||||
hash = "sha256-WBm0dWDXoPT6alEdK5dVMrVTOxG7Z8bq1s0iO2HTy/Q=";
|
||||
})
|
||||
]
|
||||
++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "hugo";
|
||||
version = "0.112.5";
|
||||
version = "0.112.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gohugoio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-phtiYh5+xSc4eeK2hM6bHFg4/Owm1EkInRE+NhuQAUA=";
|
||||
hash = "sha256-FrZwblAxXtGduCZc37269iygflft32G0ICrJLd9ssBU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-A4mWrTSkE1NcLj8ozGXQJIrFMvqeoBC7y7eOTeh3ktw=";
|
||||
vendorHash = "sha256-ZPgGR1NPVn/LF/nvCXP4S08MYvWp3Dtq/I9kom9HP9c=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mako";
|
||||
version = "1.7.1";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emersion";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/+XYf8FiH4lk7f7/pMt43hm13mRK+UqvaNOpf1TI6m4=";
|
||||
sha256 = "sha256-sUFMcCrc5iNPeAmRbqDaT/n8OIlFJEwJTzY1HMx94RU=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
|
|
|
|||
32
pkgs/applications/misc/tailscale-systray/default.nix
Normal file
32
pkgs/applications/misc/tailscale-systray/default.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, gtk3
|
||||
, libayatana-appindicator
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "tailscale-systray";
|
||||
version = "2022-10-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattn";
|
||||
repo = pname;
|
||||
rev = "e7f8893684e7b8779f34045ca90e5abe6df6056d";
|
||||
sha256 = "sha256-3kozp6jq0xGllxoK2lGCNUahy/FvXyq11vNSxfDehKE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-YJ74SeZAMS+dXyoPhPTJ3L+5uL5bF8gumhMOqfvmlms=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ gtk3 libayatana-appindicator ];
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tailscale systray";
|
||||
homepage = "https://github.com/mattn/tailscale-systray";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ qbit ];
|
||||
};
|
||||
}
|
||||
|
|
@ -16,6 +16,7 @@
|
|||
, howard-hinnant-date
|
||||
, libinotify-kqueue
|
||||
, libxkbcommon
|
||||
, cavaSupport ? true, alsa-lib, fftw, iniparser, ncurses, pipewire, portaudio, SDL2
|
||||
, evdevSupport ? true, libevdev
|
||||
, inputSupport ? true, libinput
|
||||
, jackSupport ? true, libjack2
|
||||
|
|
@ -33,18 +34,37 @@
|
|||
, wireplumberSupport ? true, wireplumber
|
||||
, withMediaPlayer ? mprisSupport && false, glib, gobject-introspection, python3
|
||||
}:
|
||||
|
||||
let
|
||||
# Derived from subprojects/cava.wrap
|
||||
libcava = rec {
|
||||
version = "0.8.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "LukashonakV";
|
||||
repo = "cava";
|
||||
rev = version;
|
||||
hash = "sha256-66uc0CEriV9XOjSjFTt+bxghEXY1OGrpjd+7d6piJUI=";
|
||||
};
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "waybar";
|
||||
version = "0.9.17";
|
||||
version = "0.9.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alexays";
|
||||
repo = "Waybar";
|
||||
rev = version;
|
||||
hash = "sha256-sdNenmzI/yvN9w4Z83ojDJi+2QBx2hxhJQCFkc5kCZw=";
|
||||
hash = "sha256-bnaYNa1jb7kZ1mtMzeOQqz4tmBG1w5YXlQWoop1Q0Yc=";
|
||||
};
|
||||
|
||||
postUnpack = lib.optional cavaSupport ''
|
||||
(
|
||||
cd "$sourceRoot"
|
||||
cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.8.4
|
||||
patchShebangs .
|
||||
)
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson ninja pkg-config scdoc wrapGAppsHook
|
||||
] ++ lib.optional withMediaPlayer gobject-introspection;
|
||||
|
|
@ -60,6 +80,13 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = with lib;
|
||||
[ wayland wlroots gtkmm3 libsigcxx jsoncpp spdlog gtk-layer-shell howard-hinnant-date libxkbcommon ]
|
||||
++ optional (!stdenv.isLinux) libinotify-kqueue
|
||||
++ optional cavaSupport alsa-lib
|
||||
++ optional cavaSupport iniparser
|
||||
++ optional cavaSupport fftw
|
||||
++ optional cavaSupport ncurses
|
||||
++ optional cavaSupport pipewire
|
||||
++ optional cavaSupport portaudio
|
||||
++ optional cavaSupport SDL2
|
||||
++ optional evdevSupport libevdev
|
||||
++ optional inputSupport libinput
|
||||
++ optional jackSupport libjack2
|
||||
|
|
@ -80,6 +107,7 @@ stdenv.mkDerivation rec {
|
|||
mesonFlags = (lib.mapAttrsToList
|
||||
(option: enable: "-D${option}=${if enable then "enabled" else "disabled"}")
|
||||
{
|
||||
cava = cavaSupport;
|
||||
dbusmenu-gtk = traySupport;
|
||||
jack = jackSupport;
|
||||
libinput = inputSupport;
|
||||
|
|
|
|||
31
pkgs/applications/networking/adguardian/default.nix
Normal file
31
pkgs/applications/networking/adguardian/default.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "adguardian";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Lissy93";
|
||||
repo = "AdGuardian-Term";
|
||||
rev = version;
|
||||
hash = "sha256-UZIwVvBBBj82IxGuZPKaNc/UZI1DAh5/5ni3fjiRF4o=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-MnhikzQNeCjK5bCjePw8k7pf7RR63k1eZjobENlQd94=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Terminal-based, real-time traffic monitoring and statistics for your AdGuard Home instance";
|
||||
homepage = "https://github.com/Lissy93/AdGuardian-Term";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ GaetanLepage ];
|
||||
};
|
||||
}
|
||||
|
|
@ -15,16 +15,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "i3status-rust";
|
||||
version = "0.31.5";
|
||||
version = "0.31.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "greshake";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-4oYj88km7EWxz1DSQt96qcISwZmsNbQMFlxGIJI4FvA=";
|
||||
hash = "sha256-sQF8POmDEUv3nY9+7Kr0Dcc3q/kpOLwCarexbCQ1zSg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-5k95wApVKd0KwQ/LTcqRn12Qx4mL7NialQ6Ne9/pm6I=";
|
||||
cargoHash = "sha256-+wrZG7jzK8ksTpm6g25O/09sAnMYwmY5DYKqmUMuCFU=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,12 @@
|
|||
{ lib, stdenv, fetchurl
|
||||
, meson, ninja, pkg-config, python3, wayland-scanner
|
||||
, cairo, dbus, lcms2, libdrm, libevdev, libinput, libjpeg, libxkbcommon, mesa
|
||||
, seatd, wayland, wayland-protocols, xcbutilcursor
|
||||
, cairo, dbus, libdrm, libevdev, libinput, libxkbcommon, mesa, seatd, wayland
|
||||
, wayland-protocols, xcbutilcursor
|
||||
|
||||
, demoSupport ? true
|
||||
, hdrSupport ? true, libdisplay-info
|
||||
, jpegSupport ? true, libjpeg
|
||||
, lcmsSupport ? true, lcms2
|
||||
, pangoSupport ? true, pango
|
||||
, pipewireSupport ? true, pipewire
|
||||
, rdpSupport ? true, freerdp
|
||||
|
|
@ -27,9 +29,11 @@ stdenv.mkDerivation rec {
|
|||
depsBuildBuild = [ pkg-config ];
|
||||
nativeBuildInputs = [ meson ninja pkg-config python3 wayland-scanner ];
|
||||
buildInputs = [
|
||||
cairo lcms2 libdrm libevdev libinput libjpeg libxkbcommon mesa seatd
|
||||
wayland wayland-protocols
|
||||
cairo libdrm libevdev libinput libxkbcommon mesa seatd wayland
|
||||
wayland-protocols
|
||||
] ++ lib.optional hdrSupport libdisplay-info
|
||||
++ lib.optional jpegSupport libjpeg
|
||||
++ lib.optional lcmsSupport lcms2
|
||||
++ lib.optional pangoSupport pango
|
||||
++ lib.optional pipewireSupport pipewire
|
||||
++ lib.optional rdpSupport freerdp
|
||||
|
|
@ -44,7 +48,9 @@ stdenv.mkDerivation rec {
|
|||
(lib.mesonBool "backend-pipewire" pipewireSupport)
|
||||
(lib.mesonBool "backend-rdp" rdpSupport)
|
||||
(lib.mesonBool "backend-vnc" vncSupport)
|
||||
(lib.mesonBool "color-management-lcms" lcmsSupport)
|
||||
(lib.mesonBool "demo-clients" demoSupport)
|
||||
(lib.mesonBool "image-jpeg" jpegSupport)
|
||||
(lib.mesonBool "image-webp" webpSupport)
|
||||
(lib.mesonBool "pipewire" pipewireSupport)
|
||||
(lib.mesonBool "remoting" remotingSupport)
|
||||
|
|
|
|||
|
|
@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null;
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = if set != null then "iosevka-${set}" else "iosevka";
|
||||
version = "23.0.0";
|
||||
version = "24.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "be5invis";
|
||||
repo = "iosevka";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-j7JE9UHG4xho0a4TqG5rpCJkYyVxgoLxBuRtNMGfkrw=";
|
||||
hash = "sha256-Th4+SUP1gqusGA680Ddh1YHUYJFJIe9zUSNE+NIDl40=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-/zutJ4kwGqBe3snMxyvReJdvlcsm+02ZZyFMdNN6gmc=";
|
||||
npmDepsHash = "sha256-ChK3fUqPX1F8CljJGNiquS+5ZTlpeBEuYRPGoxSsyuI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
remarshal
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "papirus-icon-theme";
|
||||
version = "20230301";
|
||||
version = "20230601";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PapirusDevelopmentTeam";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-iIvynt8Qg9PmR2q7JsLtRlYxfHGaShMD8kbbPL89DzE=";
|
||||
sha256 = "sha256-p47Vt1nR94bXtpWjNaIWJNKbdgFFMc0qCBeh2V98CJg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 papirus-folders ];
|
||||
|
|
|
|||
|
|
@ -16,8 +16,8 @@
|
|||
mkXfceDerivation {
|
||||
category = "panel-plugins";
|
||||
pname = "xfce4-pulseaudio-plugin";
|
||||
version = "0.4.6";
|
||||
sha256 = "sha256-P1ln0cBskRAPsIygKAZeQLvt51xgMOnm0WZoR5sRvsM=";
|
||||
version = "0.4.7";
|
||||
sha256 = "sha256-9fumaX4M6NTXHM1gGa4wB/Uq+CZIUnvm9kC+pJNbWXU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
automakeAddFlags
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ let
|
|||
, nixosTests
|
||||
, tests
|
||||
, fetchurl
|
||||
, makeWrapper
|
||||
, makeBinaryWrapper
|
||||
, symlinkJoin
|
||||
, writeText
|
||||
, autoconf
|
||||
|
|
@ -141,7 +141,7 @@ let
|
|||
phpWithExtensions = symlinkJoin {
|
||||
name = "php-with-extensions-${version}";
|
||||
inherit (php) version;
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
passthru = php.passthru // {
|
||||
buildEnv = mkBuildEnv allArgs allExtensionFunctions;
|
||||
withExtensions = mkWithExtensions allArgs allExtensionFunctions;
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ self:
|
|||
|
||||
let
|
||||
inherit (self) callPackage;
|
||||
inherit (python.passthru) isPy27 isPy37 isPy38 isPy39 isPy310 isPy311 isPy3k isPyPy pythonAtLeast pythonOlder;
|
||||
|
||||
namePrefix = python.libPrefix + "-";
|
||||
|
||||
|
|
@ -92,7 +91,6 @@ in {
|
|||
inherit lib pkgs stdenv;
|
||||
inherit (python.passthru) isPy27 isPy37 isPy38 isPy39 isPy310 isPy311 isPy3k isPyPy pythonAtLeast pythonOlder;
|
||||
inherit buildPythonPackage buildPythonApplication;
|
||||
inherit (pkgs) fetchPypi;
|
||||
inherit hasPythonModule requiredPythonModules makePythonPath disabled disabledIf;
|
||||
inherit toPythonModule toPythonApplication;
|
||||
inherit buildSetupcfg;
|
||||
|
|
|
|||
67
pkgs/development/libraries/podofo/0.10.x.nix
Normal file
67
pkgs/development/libraries/podofo/0.10.x.nix
Normal file
|
|
@ -0,0 +1,67 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, expat
|
||||
, fontconfig
|
||||
, freetype
|
||||
, libidn
|
||||
, libjpeg
|
||||
, libpng
|
||||
, libtiff
|
||||
, libxml2
|
||||
, lua5
|
||||
, openssl
|
||||
, pkg-config
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "podofo";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "podofo";
|
||||
repo = "podofo";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-Z9mVAo2dITEtTdqA2sftaLZSCiTbGS02RYxfNcEwd1c=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "lib" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
expat
|
||||
fontconfig
|
||||
freetype
|
||||
libidn
|
||||
libjpeg
|
||||
libpng
|
||||
libtiff
|
||||
libxml2
|
||||
lua5
|
||||
openssl
|
||||
zlib
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DPODOFO_BUILD_STATIC=${if stdenv.hostPlatform.isStatic then "ON" else "OFF"}"
|
||||
"-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
moveToOutput lib "$lib"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/podofo/podofo";
|
||||
description = "A library to work with the PDF file format";
|
||||
platforms = lib.platforms.all;
|
||||
license = with lib.licenses; [ gpl2Plus lgpl2Plus ];
|
||||
maintainers = [];
|
||||
};
|
||||
})
|
||||
|
|
@ -1,21 +1,31 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, qtbase
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qxlsx";
|
||||
version = "1.4.5";
|
||||
version = "1.4.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "QtExcel";
|
||||
repo = "QXlsx";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-T+PUeml4O6uwY6DCAsBer4gDo+nrSGGus+yQv02CJcE=";
|
||||
hash = "sha256-8plnvyb4sQRfEac1TVWgr2yrtAVAPKucgAnsybdUd3U=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix header include path
|
||||
# https://github.com/QtExcel/QXlsx/pull/279
|
||||
(fetchpatch {
|
||||
url = "https://github.com/QtExcel/QXlsx/commit/9d6db9efb92b93c3663ccfef3aec05267ba43723.patch";
|
||||
hash = "sha256-EbE5CNACAcgENCQh81lBZJ52hCIcBsFhNnYOS0Wr25I=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ qtbase ];
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "rq";
|
||||
version = "1.14.1";
|
||||
version = "1.15";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "rq";
|
||||
repo = "rq";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-8X7l59YAO4T0JA3saLzEwirHZniXsp/9Z8q+Tr2HDv0=";
|
||||
hash = "sha256-QTQ90ZJQU6UWPjNCjmR4ez6av+B9M8gDof2Gq+R86aY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "konstraint";
|
||||
version = "0.28.0";
|
||||
version = "0.29.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "plexsystems";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-d5PmWhWRBch+q+4CrYMFBf/IRoEdy7CH8kEnJ0sl+AQ=";
|
||||
sha256 = "sha256-j1pvTA3XrmQTgnyyrTAOmcgIJPBcj54YGCPqBjzNIog=";
|
||||
};
|
||||
vendorHash = "sha256-juhMRSAgvt83jF8LRefJuyPwKD392IINLOj13dBhZdQ=";
|
||||
vendorHash = "sha256-75XFFJtVhVLpZaPDQghlqols54ZuXzpzUx1dw4vSlRg=";
|
||||
|
||||
# Exclude go within .github folder
|
||||
excludedPackages = ".github";
|
||||
|
|
|
|||
|
|
@ -1,17 +1,31 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, flex, bison }:
|
||||
stdenv.mkDerivation rec {
|
||||
{ lib, stdenv, fetchFromGitHub, callPackage, jq, cmake, flex, bison, gecode, mpfr, cbc, zlib }:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "minizinc";
|
||||
version = "2.7.4";
|
||||
|
||||
nativeBuildInputs = [ cmake flex bison ];
|
||||
nativeBuildInputs = [ cmake flex bison gecode mpfr cbc zlib ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MiniZinc";
|
||||
repo = "libminizinc";
|
||||
rev = version;
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-Zq5gAwe9IQmknSDilFyHhSk5ZCQ8EfBOiM6Oef2WxYg=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/minizinc/solvers/
|
||||
${jq}/bin/jq \
|
||||
'.version = "${gecode.version}"
|
||||
| .mznlib = "${gecode}/share/gecode/mznlib"
|
||||
| .executable = "${gecode}/bin/fzn-gecode"' \
|
||||
${./gecode.msc} \
|
||||
>$out/share/minizinc/solvers/gecode.msc
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
simple = callPackage ./simple-test { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.minizinc.org/";
|
||||
description = "A medium-level constraint modelling language";
|
||||
|
|
@ -28,4 +42,4 @@ stdenv.mkDerivation rec {
|
|||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.sheenobu ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
16
pkgs/development/tools/minizinc/gecode.msc
Normal file
16
pkgs/development/tools/minizinc/gecode.msc
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
{
|
||||
"id": "org.gecode.gecode",
|
||||
"name": "Gecode",
|
||||
"description": "Gecode FlatZinc executable",
|
||||
"version": "VERSION-WILL-BE-REPLACED-BY-JQ",
|
||||
"mznlib": "MZNLIB-WILL-BE-REPLACED-BY-JQ",
|
||||
"executable": "FZN_GECODE-WILL-BE-REPLACED-BY-JQ",
|
||||
"tags": ["cp","int", "float", "set", "restart"],
|
||||
"stdFlags": ["-a","-f","-n","-p","-r","-s","-t"],
|
||||
"supportsMzn": false,
|
||||
"supportsFzn": true,
|
||||
"needsSolns2Out": true,
|
||||
"needsMznExecutable": false,
|
||||
"needsStdlibDir": false,
|
||||
"isGUIApplication": false
|
||||
}
|
||||
20
pkgs/development/tools/minizinc/simple-test/aust.mzn
Normal file
20
pkgs/development/tools/minizinc/simple-test/aust.mzn
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
% Taken from https://www.minizinc.org/doc-2.7.3/en/modelling.html
|
||||
int: nc = 3;
|
||||
|
||||
var 1..nc: wa; var 1..nc: nt; var 1..nc: sa; var 1..nc: q;
|
||||
var 1..nc: nsw; var 1..nc: v; var 1..nc: t;
|
||||
|
||||
constraint wa != nt;
|
||||
constraint wa != sa;
|
||||
constraint nt != sa;
|
||||
constraint nt != q;
|
||||
constraint sa != q;
|
||||
constraint sa != nsw;
|
||||
constraint sa != v;
|
||||
constraint q != nsw;
|
||||
constraint nsw != v;
|
||||
solve satisfy;
|
||||
|
||||
output ["wa=\(wa)\t nt=\(nt)\t sa=\(sa)\n",
|
||||
"q=\(q)\t nsw=\(nsw)\t v=\(v)\n",
|
||||
"t=", show(t), "\n"];
|
||||
16
pkgs/development/tools/minizinc/simple-test/default.nix
Normal file
16
pkgs/development/tools/minizinc/simple-test/default.nix
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
# These tests show that the minizinc build is capable of running the
|
||||
# examples in the official tutorial:
|
||||
# https://www.minizinc.org/doc-2.7.3/en/modelling.html
|
||||
|
||||
{ stdenv, minizinc }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "minizinc-simple-test";
|
||||
meta.timeout = 10;
|
||||
dontInstall = true;
|
||||
buildCommand = ''
|
||||
${minizinc}/bin/minizinc --solver gecode ${./aust.mzn}
|
||||
${minizinc}/bin/minizinc --solver cbc ${./loan.mzn} ${./loan1.dzn}
|
||||
touch $out
|
||||
'';
|
||||
}
|
||||
24
pkgs/development/tools/minizinc/simple-test/loan.mzn
Normal file
24
pkgs/development/tools/minizinc/simple-test/loan.mzn
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
% Taken from https://www.minizinc.org/doc-2.7.3/en/modelling.html
|
||||
% variables
|
||||
var float: R; % quarterly repayment
|
||||
var float: P; % principal initially borrowed
|
||||
var 0.0 .. 10.0: I; % interest rate (per quarter)
|
||||
|
||||
% intermediate variables
|
||||
var float: B1; % balance after one quarter
|
||||
var float: B2; % balance after two quarters
|
||||
var float: B3; % balance after three quarters
|
||||
var float: B4; % balance owing at end
|
||||
|
||||
constraint B1 = P * (1.0 + I) - R;
|
||||
constraint B2 = B1 * (1.0 + I) - R;
|
||||
constraint B3 = B2 * (1.0 + I) - R;
|
||||
constraint B4 = B3 * (1.0 + I) - R;
|
||||
|
||||
solve satisfy;
|
||||
|
||||
output [
|
||||
"Borrowing ", show_float(0, 2, P), " at ", show(I*100.0),
|
||||
"% interest, and repaying ", show_float(0, 2, R),
|
||||
"\nper quarter for 1 year leaves ", show_float(0, 2, B4), " owing\n"
|
||||
];
|
||||
3
pkgs/development/tools/minizinc/simple-test/loan1.dzn
Normal file
3
pkgs/development/tools/minizinc/simple-test/loan1.dzn
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
I = 0.04;
|
||||
P = 1000.0;
|
||||
R = 260.0;
|
||||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "flyctl";
|
||||
version = "0.1.20";
|
||||
version = "0.1.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "superfly";
|
||||
repo = "flyctl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-S0jYNNbXTR1Vr6YHoUXxhTM+MKuokI0Tyc5svh31DM8=";
|
||||
hash = "sha256-ekVqY5rM/CeewZ0wnlSjWusPEQzdeVwIGdfnicMe3k8";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-UCP73yAeT3JO7fhpshTpbhmB2wLGc26GiLY/DkBAgTg=";
|
||||
vendorHash = "sha256-7KLEfK2eZLEtOHqQxhpdQCeKVfn+rUu3i699Zk06J/U=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -124,6 +124,10 @@ installPhase() {
|
|||
if [ -e nvngx.dll ] && [ -e _nvngx.dll ]; then
|
||||
install -Dm644 -t $i/lib/nvidia/wine/ nvngx.dll _nvngx.dll
|
||||
fi
|
||||
|
||||
if [ -e nvoptix.bin ]; then
|
||||
install -Dm444 -t $i/share/nvidia/ nvoptix.bin
|
||||
fi
|
||||
done
|
||||
|
||||
if [ -n "$bin" ]; then
|
||||
|
|
|
|||
|
|
@ -54,12 +54,12 @@ rec {
|
|||
});
|
||||
|
||||
beta = selectHighestVersion latest (generic {
|
||||
version = "530.30.02";
|
||||
sha256_64bit = "sha256-R/3bvXoiumYZI9vObn9R7sVN9oBQxAbMBJDDv77eeWM=";
|
||||
sha256_aarch64 = "sha256-/b5Jdow+O7ExXjtXTzDX38qgmBDUYDUl+5zxXvbi1ts=";
|
||||
openSha256 = "sha256-LCtTyuJ8s8isTBt9HetItLqSjL1GOn0tPUarjuxHpMk=";
|
||||
settingsSha256 = "sha256-6mynLNSaWeiB52HdwZ0EQNyPg+tuat0oEqpZGSb2yQo=";
|
||||
persistencedSha256 = "sha256-h6iq0iD9F41a7s6jWKPTI+oVzgDRIr1Kk97LNH9rg7E=";
|
||||
version = "535.43.02";
|
||||
sha256_64bit = "sha256-4KTdk4kGDmBGyHntMIzWRivUpEpzmra+p7RBsTL8mYM=";
|
||||
sha256_aarch64 = "sha256-0blD8R+xpOVlitWefIbtw1d3KAnmWHBy7hkxGZHBrE4=";
|
||||
openSha256 = "sha256-W1fwbbEEM7Z/S3J0djxGTtVTewbSALqX1G1OSpdajCM=";
|
||||
settingsSha256 = "sha256-j0sSEbtF2fapv4GSthVTkmJga+ycmrGc1OnGpV6jEkc=";
|
||||
persistencedSha256 = "sha256-M0ovNaJo8SZwLW4CQz9accNK79Z5JtTJ9kKwOzicRZ4=";
|
||||
});
|
||||
|
||||
# Vulkan developer beta driver
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ let
|
|||
libPathFor = pkgs: lib.makeLibraryPath (with pkgs; [
|
||||
libdrm xorg.libXext xorg.libX11
|
||||
xorg.libXv xorg.libXrandr xorg.libxcb zlib stdenv.cc.cc
|
||||
wayland mesa libGL
|
||||
wayland mesa libGL openssl
|
||||
]);
|
||||
|
||||
self = stdenv.mkDerivation {
|
||||
|
|
|
|||
1274
pkgs/servers/kanidm/Cargo.lock
generated
1274
pkgs/servers/kanidm/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -4,6 +4,7 @@
|
|||
, nixosTests
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, installShellFiles
|
||||
, pkg-config
|
||||
, udev
|
||||
|
|
@ -17,35 +18,44 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kanidm";
|
||||
version = "1.1.0-alpha.11";
|
||||
version = "1.1.0-alpha.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-TVGLL1Ir/Nld0kdhWmcYYmChrW42ctJPY/U7wtuEwCo=";
|
||||
hash = "sha256-ZlUn7m5xgMWWIr9y/dkM/yZ2KF2LdkaxqtHsMcxAT/M=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"tracing-forest-0.1.4" = "sha256-ofBLxSzZ5SYy8cbViVUa6VXKbOgd8lt7QUYhL0BW6I4=";
|
||||
"tracing-forest-0.1.5" = "sha256-L6auSKB4DCnZBZpx7spiikhSOD6i1W3erc3zjn+26Ao=";
|
||||
};
|
||||
};
|
||||
|
||||
KANIDM_BUILD_PROFILE = "release_nixos_${arch}";
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Bring back x86_64-v1 microarchitecture level
|
||||
name = "cpu-opt-level.patch";
|
||||
url = "https://github.com/kanidm/kanidm/commit/59c6723f7dfb2266eae45c3b2ddd377872a7a113.patch";
|
||||
hash = "sha256-8rVEYitxvdVduQ/+AD/UG3v+mgT/VxkLoxNIXczUfCQ=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch =
|
||||
let
|
||||
format = (formats.toml { }).generate "${KANIDM_BUILD_PROFILE}.toml";
|
||||
profile = {
|
||||
web_ui_pkg_path = "@web_ui_pkg_path@";
|
||||
cpu_flags = if stdenv.isx86_64 then "x86_64_v1" else "none";
|
||||
cpu_flags = if stdenv.isx86_64 then "x86_64_legacy" else "none";
|
||||
};
|
||||
in
|
||||
''
|
||||
cp ${format profile} profiles/${KANIDM_BUILD_PROFILE}.toml
|
||||
substituteInPlace profiles/${KANIDM_BUILD_PROFILE}.toml \
|
||||
cp ${format profile} libs/profiles/${KANIDM_BUILD_PROFILE}.toml
|
||||
substituteInPlace libs/profiles/${KANIDM_BUILD_PROFILE}.toml \
|
||||
--replace '@web_ui_pkg_path@' "$out/ui"
|
||||
'';
|
||||
|
||||
|
|
@ -66,7 +76,7 @@ rustPlatform.buildRustPackage rec {
|
|||
# We don't compile the wasm-part form source, as there isn't a rustc for
|
||||
# wasm32-unknown-unknown in nixpkgs yet.
|
||||
mkdir $out
|
||||
cp -r kanidmd_web_ui/pkg $out/ui
|
||||
cp -r server/web_ui/pkg $out/ui
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "netplan";
|
||||
version = "0.106";
|
||||
version = "0.106.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "canonical";
|
||||
repo = "netplan";
|
||||
rev = version;
|
||||
hash = "sha256-oKHnhUEYdWutkkL8hbSX43+6qzlts1vqxrr/L42VztY=";
|
||||
hash = "sha256-wQ4gd9+9YU92WGRMjSiF/zLCGxhaSl8s22pH1jr+Mm0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,17 +12,20 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "atuin";
|
||||
version = "14.0.1";
|
||||
version = "15.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ellie";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mfeHgUCnt/DkdKxFlYx/t2LLjiqDX5mBMHto9A4mj78=";
|
||||
hash = "sha256-BX1WpvJMcfpepsRX0U6FJBL5/+mpUyTZxm65BbbZLJA=";
|
||||
};
|
||||
|
||||
# TODO: unify this to one hash because updater do not support this
|
||||
cargoHash = if stdenv.isLinux then "sha256-oaBTj+ZSJ36AFwIrB6d0cZppoAzV4QDr3+EylYqY7cw=" else "sha256-UNuoW/EOGtuNROm1qZJ4afDfMlecziVsem1m3Z1ZsOU=";
|
||||
cargoHash =
|
||||
if stdenv.isLinux
|
||||
then "sha256-EnIR+BXw8oYlv3dpYy4gAkN/zckRI8KEAbbR9wPmMq4="
|
||||
else "sha256-hHcahzrIuXIgOv+sx0HbC9f5guTcTr6L4eeLoiQsAzA=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
26
pkgs/tools/misc/dotacat/default.nix
Normal file
26
pkgs/tools/misc/dotacat/default.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitLab
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "dotacat";
|
||||
version = "v0.3.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.scd31.com";
|
||||
owner = "stephen";
|
||||
repo = "dotacat";
|
||||
rev = "f3b7e7816bed6b84123e066c57cf4003d77a85f1";
|
||||
hash = "sha256-y+u9PO01W+IzBatGHZpgOD7cRKjdeuy4/VX7/V9cu3Q=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ilvsqwvfQejo453veSZ5VMP8XhL7NryrDh+rYJkXk30=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Like lolcat, but fast";
|
||||
homepage = "https://gitlab.scd31.com/stephen/dotacat";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ traxys ];
|
||||
};
|
||||
}
|
||||
33
pkgs/tools/misc/rustypaste-cli/default.nix
Normal file
33
pkgs/tools/misc/rustypaste-cli/default.nix
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rustypaste-cli";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "orhun";
|
||||
repo = "rustypaste-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Jl7fytDIW6MLY6VX7rDuX9PcZaIqENQbUTMUJKCa8Mg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-hICwrgzNpyYmNW1gEKgTsSjWyqCaOHc4X37O0R2oSzY=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A CLI tool for rustypaste";
|
||||
homepage = "https://github.com/orhun/rustypaste-cli";
|
||||
changelog = "https://github.com/orhun/rustypaste-cli/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
mainProgram = "rpaste";
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "steampipe";
|
||||
version = "0.20.2";
|
||||
version = "0.20.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "turbot";
|
||||
repo = "steampipe";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-enjInsu1gaztdUr8z7GgBnL1pKnHoAtST4qGzQeBAhs=";
|
||||
sha256 = "sha256-hpI667LNXwLhA/MgnlfLc/jk88ec94faV8hLnlAJ6ew=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-FWLEuSdhXSQJMd4PiiPTFC8aXkIlQ9LhL6/Dq7LkPPc=";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, perl
|
||||
, openssl, db, cyrus_sasl, zlib
|
||||
, Security
|
||||
, withCyrusSaslXoauth2 ? true, cyrus-sasl-xoauth2, makeWrapper
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -20,10 +21,16 @@ stdenv.mkDerivation rec {
|
|||
./work-around-unexpected-EOF-error-messages-at-end-of-SSL-connections.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config perl ];
|
||||
nativeBuildInputs = [ pkg-config perl ]
|
||||
++ lib.optionals withCyrusSaslXoauth2 [ makeWrapper ];
|
||||
buildInputs = [ openssl db cyrus_sasl zlib ]
|
||||
++ lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
postInstall = lib.optionalString withCyrusSaslXoauth2 ''
|
||||
wrapProgram "$out/bin/mbsync" \
|
||||
--prefix SASL_PATH : "${lib.makeSearchPath "lib/sasl2" [ cyrus-sasl-xoauth2 ]}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://isync.sourceforge.net/";
|
||||
# https://sourceforge.net/projects/isync/
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ lib, fetchFromGitHub
|
||||
, version
|
||||
, suffix ? ""
|
||||
, sha256 ? null
|
||||
, src ? fetchFromGitHub { owner = "NixOS"; repo = "nix"; rev = version; inherit sha256; }
|
||||
, hash ? null
|
||||
, src ? fetchFromGitHub { owner = "NixOS"; repo = "nix"; rev = version; inherit hash; }
|
||||
, patches ? [ ]
|
||||
}:
|
||||
assert (sha256 == null) -> (src != null);
|
||||
assert (hash == null) -> (src != null);
|
||||
let
|
||||
atLeast24 = lib.versionAtLeast version "2.4pre";
|
||||
atLeast25 = lib.versionAtLeast version "2.5pre";
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ let
|
|||
owner = "aws";
|
||||
repo = "aws-sdk-cpp";
|
||||
rev = version;
|
||||
sha256 = "sha256-Z1eRKW+8nVD53GkNyYlZjCcT74MqFqqRMeMc33eIQ9g=";
|
||||
hash = "sha256-Z1eRKW+8nVD53GkNyYlZjCcT74MqFqqRMeMc33eIQ9g=";
|
||||
};
|
||||
postPatch = ''
|
||||
# Avoid blanket -Werror to evade build failures on less
|
||||
|
|
@ -94,21 +94,21 @@ let
|
|||
patch-monitorfdhup = fetchpatch2 {
|
||||
name = "nix-7585-monitor-fd-hup.patch";
|
||||
url = "https://github.com/NixOS/nix/commit/1df3d62c769dc68c279e89f68fdd3723ed3bcb5a.patch";
|
||||
sha256 = "sha256-f+F0fUO+bqyPXjt+IXJtISVr589hdc3y+Cdrxznb+Nk=";
|
||||
hash = "sha256-f+F0fUO+bqyPXjt+IXJtISVr589hdc3y+Cdrxznb+Nk=";
|
||||
};
|
||||
|
||||
# https://github.com/NixOS/nix/pull/7473
|
||||
patch-sqlite-exception = fetchpatch2 {
|
||||
name = "nix-7473-sqlite-exception-add-message.patch";
|
||||
url = "https://github.com/hercules-ci/nix/commit/c965f35de71cc9d88f912f6b90fd7213601e6eb8.patch";
|
||||
sha256 = "sha256-tI5nKU7SZgsJrxiskJ5nHZyfrWf5aZyKYExM0792N80=";
|
||||
hash = "sha256-tI5nKU7SZgsJrxiskJ5nHZyfrWf5aZyKYExM0792N80=";
|
||||
};
|
||||
|
||||
patch-non-existing-output = fetchpatch {
|
||||
# https://github.com/NixOS/nix/pull/7283
|
||||
name = "fix-requires-non-existing-output.patch";
|
||||
url = "https://github.com/NixOS/nix/commit/3ade5f5d6026b825a80bdcc221058c4f14e10a27.patch";
|
||||
sha256 = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0=";
|
||||
hash = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0=";
|
||||
};
|
||||
|
||||
in lib.makeExtensible (self: {
|
||||
|
|
@ -116,7 +116,7 @@ in lib.makeExtensible (self: {
|
|||
version = "2.3.16";
|
||||
src = fetchurl {
|
||||
url = "https://nixos.org/releases/nix/nix-${version}/nix-${version}.tar.xz";
|
||||
sha256 = "sha256-fuaBtp8FtSVJLSAsO+3Nne4ZYLuBj2JpD2xEk7fCqrw=";
|
||||
hash = "sha256-fuaBtp8FtSVJLSAsO+3Nne4ZYLuBj2JpD2xEk7fCqrw=";
|
||||
};
|
||||
patches = [
|
||||
patch-monitorfdhup
|
||||
|
|
@ -137,7 +137,7 @@ in lib.makeExtensible (self: {
|
|||
|
||||
nix_2_10 = common {
|
||||
version = "2.10.3";
|
||||
sha256 = "sha256-B9EyDUz/9tlcWwf24lwxCFmkxuPTVW7HFYvp0C4xGbc=";
|
||||
hash = "sha256-B9EyDUz/9tlcWwf24lwxCFmkxuPTVW7HFYvp0C4xGbc=";
|
||||
patches = [
|
||||
./patches/flaky-tests.patch
|
||||
patch-non-existing-output
|
||||
|
|
@ -148,7 +148,7 @@ in lib.makeExtensible (self: {
|
|||
|
||||
nix_2_11 = common {
|
||||
version = "2.11.1";
|
||||
sha256 = "sha256-qCV65kw09AG+EkdchDPq7RoeBznX0Q6Qa4yzPqobdOk=";
|
||||
hash = "sha256-qCV65kw09AG+EkdchDPq7RoeBznX0Q6Qa4yzPqobdOk=";
|
||||
patches = [
|
||||
./patches/flaky-tests.patch
|
||||
patch-non-existing-output
|
||||
|
|
@ -159,7 +159,7 @@ in lib.makeExtensible (self: {
|
|||
|
||||
nix_2_12 = common {
|
||||
version = "2.12.1";
|
||||
sha256 = "sha256-GmHKhq0uFtdOiJnuBwj2YwlZjvh6YTkfQZgeu4e0dLU=";
|
||||
hash = "sha256-GmHKhq0uFtdOiJnuBwj2YwlZjvh6YTkfQZgeu4e0dLU=";
|
||||
patches = [
|
||||
./patches/flaky-tests.patch
|
||||
patch-monitorfdhup
|
||||
|
|
@ -169,20 +169,42 @@ in lib.makeExtensible (self: {
|
|||
|
||||
nix_2_13 = common {
|
||||
version = "2.13.3";
|
||||
sha256 = "sha256-jUc2ccTR8f6MGY2pUKgujm+lxSPNGm/ZAP+toX+nMNc=";
|
||||
hash = "sha256-jUc2ccTR8f6MGY2pUKgujm+lxSPNGm/ZAP+toX+nMNc=";
|
||||
};
|
||||
|
||||
nix_2_14 = common {
|
||||
version = "2.14.1";
|
||||
sha256 = "sha256-5aCmGZbsFcLIckCDfvnPD4clGPQI7qYAqHYlttN/Wkg=";
|
||||
hash = "sha256-5aCmGZbsFcLIckCDfvnPD4clGPQI7qYAqHYlttN/Wkg=";
|
||||
};
|
||||
|
||||
nix_2_15 = common {
|
||||
version = "2.15.1";
|
||||
sha256 = "sha256-o7bxsNeq2LF6/dTl+lT2k50bSItkID80/uoZYVtlxro=";
|
||||
hash = "sha256-o7bxsNeq2LF6/dTl+lT2k50bSItkID80/uoZYVtlxro=";
|
||||
};
|
||||
|
||||
nix_2_16 = common {
|
||||
version = "2.16.0";
|
||||
hash = "sha256-KjcQkI2HgbP7KOlHxb2DvyHISQXo2OExvvjqTyK7P0o=";
|
||||
};
|
||||
|
||||
# The minimum Nix version supported by Nixpkgs
|
||||
# Note that some functionality *might* have been backported into this Nix version,
|
||||
# making this package an inaccurate representation of what features are available
|
||||
# in the actual lowest minver.nix *patch* version.
|
||||
minimum =
|
||||
let
|
||||
minver = import ../../../../lib/minver.nix;
|
||||
major = lib.versions.major minver;
|
||||
minor = lib.versions.minor minver;
|
||||
attribute = "nix_${major}_${minor}";
|
||||
nix = self.${attribute};
|
||||
in
|
||||
if ! self ? ${attribute} then
|
||||
throw "The minimum supported Nix version is ${minver} (declared in lib/minver.nix), but pkgs.nixVersions.${attribute} does not exist."
|
||||
else
|
||||
nix;
|
||||
|
||||
stable = self.nix_2_13;
|
||||
|
||||
unstable = self.nix_2_15;
|
||||
unstable = self.nix_2_16;
|
||||
})
|
||||
|
|
|
|||
37
pkgs/tools/security/certsync/default.nix
Normal file
37
pkgs/tools/security/certsync/default.nix
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "certsync";
|
||||
version = "unstable-2023-04-14";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zblurx";
|
||||
repo = "certsync";
|
||||
rev = "f3c8b61f0967a6403d4c592dcbfa8921682452a6";
|
||||
hash = "sha256-7Pzss83jf3zKmgQZki18R47OWn5VniZZ/d4N8JgZs+0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
certipy-ad
|
||||
tqdm
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"certsync"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Dump NTDS with golden certificates and UnPAC the hash";
|
||||
homepage = "https://github.com/zblurx/certsync";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gdu";
|
||||
version = "5.23.0";
|
||||
version = "5.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dundee";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Uv5wPEGmd2+LVZoSw/K24F3czyjGi6ysQsNtq87p4fg=";
|
||||
hash = "sha256-1BXOH1gdUnNhDVfEnz44oM0L4P2ekw6JKCG9yZoMSG8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-BQOlp2mjycOSB0qjLuVNo3+n0xqb77IMizUY6Sz94PM=";
|
||||
vendorHash = "sha256-DkH1H2XvVlDMFuFSbCmhPMC709upPvXhpzlEgNq5zoA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
46
pkgs/tools/text/repgrep/default.nix
Normal file
46
pkgs/tools/text/repgrep/default.nix
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, asciidoctor
|
||||
, installShellFiles
|
||||
, makeWrapper
|
||||
, ripgrep
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "repgrep";
|
||||
version = "0.12.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "acheronfail";
|
||||
repo = "repgrep";
|
||||
rev = version;
|
||||
hash = "sha256-tMv0MdFlDEYx8lNINfnhX6WgcpVLm1fTlaUddej5KRc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-NjPFoVPHjwG74ZNStYaNMzwdX488xDjGJu92+UWC2z8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
asciidoctor
|
||||
installShellFiles
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/rgr \
|
||||
--prefix PATH : ${lib.makeBinPath [ ripgrep ]}
|
||||
|
||||
pushd "$(dirname "$(find -path '**/repgrep-stamp' | head -n 1)")"
|
||||
installManPage rgr.1
|
||||
installShellCompletion rgr.{bash,fish} _rgr
|
||||
popd
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "An interactive replacer for ripgrep that makes it easy to find and replace across files on the command line";
|
||||
homepage = "https://github.com/acheronfail/repgrep";
|
||||
changelog = "https://github.com/acheronfail/repgrep/blob/${src.rev}/CHANGELOG.md";
|
||||
license = with licenses; [ mit asl20 unlicense ];
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
|
|
@ -417,6 +417,8 @@ with pkgs;
|
|||
|
||||
certgraph = callPackage ../tools/security/certgraph { };
|
||||
|
||||
certsync = callPackage ../tools/security/certsync { };
|
||||
|
||||
cewl = callPackage ../tools/security/cewl { };
|
||||
|
||||
chatgpt-cli = callPackage ../tools/misc/chatgpt-cli { };
|
||||
|
|
@ -6878,6 +6880,8 @@ with pkgs;
|
|||
|
||||
dhcping = callPackage ../tools/networking/dhcping { };
|
||||
|
||||
dotacat = callPackage ../tools/misc/dotacat { };
|
||||
|
||||
di = callPackage ../tools/system/di { };
|
||||
|
||||
diction = callPackage ../tools/text/diction { };
|
||||
|
|
@ -11922,6 +11926,8 @@ with pkgs;
|
|||
|
||||
renderdoc = libsForQt5.callPackage ../development/tools/renderdoc { };
|
||||
|
||||
repgrep = callPackage ../tools/text/repgrep { };
|
||||
|
||||
replace = callPackage ../tools/text/replace { };
|
||||
|
||||
resvg = callPackage ../tools/graphics/resvg { };
|
||||
|
|
@ -12106,6 +12112,8 @@ with pkgs;
|
|||
|
||||
rustypaste = callPackage ../servers/rustypaste { };
|
||||
|
||||
rustypaste-cli = callPackage ../tools/misc/rustypaste-cli { };
|
||||
|
||||
rw = callPackage ../tools/misc/rw { };
|
||||
|
||||
rwc = callPackage ../tools/system/rwc { };
|
||||
|
|
@ -23566,6 +23574,8 @@ with pkgs;
|
|||
|
||||
podofo = callPackage ../development/libraries/podofo { };
|
||||
|
||||
podofo010 = callPackage ../development/libraries/podofo/0.10.x.nix { };
|
||||
|
||||
polkit = callPackage ../development/libraries/polkit { };
|
||||
|
||||
poppler = callPackage ../development/libraries/poppler { lcms = lcms2; };
|
||||
|
|
@ -26370,6 +26380,8 @@ with pkgs;
|
|||
buildGoModule = buildGo120Module;
|
||||
};
|
||||
|
||||
tailscale-systray = callPackage ../applications/misc/tailscale-systray { };
|
||||
|
||||
tailspin = callPackage ../tools/misc/tailspin { };
|
||||
|
||||
thanos = callPackage ../servers/monitoring/thanos {
|
||||
|
|
@ -29269,6 +29281,8 @@ with pkgs;
|
|||
|
||||
abaddon = callPackage ../applications/networking/instant-messengers/abaddon { };
|
||||
|
||||
adguardian = callPackage ../applications/networking/adguardian { };
|
||||
|
||||
aeolus = callPackage ../applications/audio/aeolus { };
|
||||
aeolus-stops = callPackage ../applications/audio/aeolus/stops.nix { };
|
||||
|
||||
|
|
@ -29705,7 +29719,9 @@ with pkgs;
|
|||
|
||||
calculix = callPackage ../applications/science/math/calculix { };
|
||||
|
||||
calibre = qt6Packages.callPackage ../applications/misc/calibre { };
|
||||
calibre = qt6Packages.callPackage ../applications/misc/calibre {
|
||||
podofo = podofo010;
|
||||
};
|
||||
|
||||
calibre-web = callPackage ../servers/calibre-web { };
|
||||
|
||||
|
|
@ -35255,6 +35271,8 @@ with pkgs;
|
|||
westonLite = weston.override {
|
||||
demoSupport = false;
|
||||
hdrSupport = false;
|
||||
jpegSupport = false;
|
||||
lcmsSupport = false;
|
||||
pangoSupport = false;
|
||||
pipewireSupport = false;
|
||||
rdpSupport = false;
|
||||
|
|
|
|||
|
|
@ -104,6 +104,7 @@ mapAliases ({
|
|||
face_recognition_models = face-recognition-models; # added 2022-10-15
|
||||
fake_factory = throw "fake_factory has been removed because it is unused and deprecated by upstream since 2016."; # added 2022-05-30
|
||||
faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12
|
||||
inherit (super.pkgs) fetchPypi; # added 2023-05-25
|
||||
filemagic = throw "inactive since 2014, so use python-magic instead"; # added 2022-11-19
|
||||
flaskbabel = flask-babel; # added 2023-01-19
|
||||
flask_login = flask-login; # added 2022-10-17
|
||||
|
|
|
|||
Loading…
Reference in a new issue