b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge master into haskell-updates

Browse source
This commit is contained in:
github-actions[bot] 2023-06-02 00:13:53 +00:00 committed by GitHub
parent 32a6dea78c 2aa950b1df
commit dadde8e3a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
180 changed files with 3065 additions and 1802 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/systems/doubles.nix
View file

@ -27,9 +27,9 @@ let
# Linux
"aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux"
"armv7l-linux" "i686-linux" "loongarch64-linux" "m68k-linux" "microblaze-linux"
"microblazeel-linux" "mipsel-linux" "mips64el-linux" "powerpc64-linux"
"powerpc64le-linux" "riscv32-linux" "riscv64-linux" "s390-linux"
"s390x-linux" "x86_64-linux"
"microblazeel-linux" "mips-linux" "mips64-linux" "mips64el-linux"
"mipsel-linux" "powerpc64-linux" "powerpc64le-linux" "riscv32-linux"
"riscv64-linux" "s390-linux" "s390x-linux" "x86_64-linux"
# MMIXware
"mmix-mmixware"

18
lib/systems/examples.nix
View file

@ -91,22 +91,16 @@ rec {
} // platforms.fuloong2f_n32;
# can execute on 32bit chip
mips-linux-gnu = { config = "mips-unknown-linux-gnu"; } // platforms.gcc_mips32r2_o32;
mipsel-linux-gnu = { config = "mipsel-unknown-linux-gnu"; } // platforms.gcc_mips32r2_o32;
mipsisa32r6-linux-gnu = { config = "mipsisa32r6-unknown-linux-gnu"; } // platforms.gcc_mips32r6_o32;
mipsisa32r6el-linux-gnu = { config = "mipsisa32r6el-unknown-linux-gnu"; } // platforms.gcc_mips32r6_o32;
mips-linux-gnu = { config = "mips-unknown-linux-gnu"; } // platforms.gcc_mips32r2_o32;
mipsel-linux-gnu = { config = "mipsel-unknown-linux-gnu"; } // platforms.gcc_mips32r2_o32;
# require 64bit chip (for more registers, 64-bit floating point, 64-bit "long long") but use 32bit pointers
mips64-linux-gnuabin32 = { config = "mips64-unknown-linux-gnuabin32"; } // platforms.gcc_mips64r2_n32;
mips64el-linux-gnuabin32 = { config = "mips64el-unknown-linux-gnuabin32"; } // platforms.gcc_mips64r2_n32;
mipsisa64r6-linux-gnuabin32 = { config = "mipsisa64r6-unknown-linux-gnuabin32"; } // platforms.gcc_mips64r6_n32;
mipsisa64r6el-linux-gnuabin32 = { config = "mipsisa64r6el-unknown-linux-gnuabin32"; } // platforms.gcc_mips64r6_n32;
mips64-linux-gnuabin32 = { config = "mips64-unknown-linux-gnuabin32"; } // platforms.gcc_mips64r2_n32;
mips64el-linux-gnuabin32 = { config = "mips64el-unknown-linux-gnuabin32"; } // platforms.gcc_mips64r2_n32;
# 64bit pointers
mips64-linux-gnuabi64 = { config = "mips64-unknown-linux-gnuabi64"; } // platforms.gcc_mips64r2_64;
mips64el-linux-gnuabi64 = { config = "mips64el-unknown-linux-gnuabi64"; } // platforms.gcc_mips64r2_64;
mipsisa64r6-linux-gnuabi64 = { config = "mipsisa64r6-unknown-linux-gnuabi64"; } // platforms.gcc_mips64r6_64;
mipsisa64r6el-linux-gnuabi64 = { config = "mipsisa64r6el-unknown-linux-gnuabi64"; } // platforms.gcc_mips64r6_64;
mips64-linux-gnuabi64 = { config = "mips64-unknown-linux-gnuabi64"; } // platforms.gcc_mips64r2_64;
mips64el-linux-gnuabi64 = { config = "mips64el-unknown-linux-gnuabi64"; } // platforms.gcc_mips64r2_64;
muslpi = raspberryPi // {
config = "armv6l-unknown-linux-musleabihf";

12
lib/systems/parse.nix
View file

@ -91,14 +91,10 @@ rec {
microblaze = { bits = 32; significantByte = bigEndian; family = "microblaze"; };
microblazeel = { bits = 32; significantByte = littleEndian; family = "microblaze"; };
mips = { bits = 32; significantByte = bigEndian; family = "mips"; };
mipsel = { bits = 32; significantByte = littleEndian; family = "mips"; };
mipsisa32r6 = { bits = 32; significantByte = bigEndian; family = "mips"; };
mipsisa32r6el = { bits = 32; significantByte = littleEndian; family = "mips"; };
mips64 = { bits = 64; significantByte = bigEndian; family = "mips"; };
mips64el = { bits = 64; significantByte = littleEndian; family = "mips"; };
mipsisa64r6 = { bits = 64; significantByte = bigEndian; family = "mips"; };
mipsisa64r6el = { bits = 64; significantByte = littleEndian; family = "mips"; };
mips = { bits = 32; significantByte = bigEndian; family = "mips"; };
mipsel = { bits = 32; significantByte = littleEndian; family = "mips"; };
mips64 = { bits = 64; significantByte = bigEndian; family = "mips"; };
mips64el = { bits = 64; significantByte = littleEndian; family = "mips"; };
mmix = { bits = 64; significantByte = bigEndian; family = "mmix"; };

82
lib/tests/filesystem.sh
View file

@ -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

2
lib/tests/modules.sh
View file

@ -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

94
lib/tests/release.nix
View file

@ -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
lib/tests/sources.sh
View file

@ -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

4
lib/tests/systems.nix
View file

@ -18,7 +18,7 @@ with lib.systems.doubles; lib.runTests {
testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv6l-netbsd" "armv6l-none" "armv7a-linux" "armv7a-netbsd" "armv7l-linux" "armv7l-netbsd" "arm-none" "armv7a-darwin" ];
testarmv7 = mseteq armv7 [ "armv7a-darwin" "armv7a-linux" "armv7l-linux" "armv7a-netbsd" "armv7l-netbsd" ];
testi686 = mseteq i686 [ "i686-linux" "i686-freebsd13" "i686-genode" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" "i686-darwin" ];
testmips = mseteq mips [ "mips64el-linux" "mipsel-linux" "mipsel-netbsd" ];
testmips = mseteq mips [ "mips-linux" "mips64-linux" "mips64el-linux" "mipsel-linux" "mipsel-netbsd" ];
testmmix = mseteq mmix [ "mmix-mmixware" ];
testpower = mseteq power [ "powerpc-netbsd" "powerpc-none" "powerpc64-linux" "powerpc64le-linux" "powerpcle-none" ];
testriscv = mseteq riscv [ "riscv32-linux" "riscv64-linux" "riscv32-netbsd" "riscv64-netbsd" "riscv32-none" "riscv64-none" ];
@ -34,7 +34,7 @@ with lib.systems.doubles; lib.runTests {
testredox = mseteq redox [ "x86_64-redox" ];
testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */);
testillumos = mseteq illumos [ "x86_64-solaris" ];
testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mips64el-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" "m68k-linux" "s390-linux" "s390x-linux" "microblaze-linux" "microblazeel-linux" "loongarch64-linux" ];
testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "loongarch64-linux" "m68k-linux" "microblaze-linux" "microblazeel-linux" "mips-linux" "mips64-linux" "mips64el-linux" "mipsel-linux" "powerpc64-linux" "powerpc64le-linux" "riscv32-linux" "riscv64-linux" "s390-linux" "s390x-linux" "x86_64-linux" ];
testnetbsd = mseteq netbsd [ "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" "i686-netbsd" "m68k-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd" "riscv64-netbsd" "x86_64-netbsd" ];
testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ];
testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ];

6
maintainers/maintainer-list.nix
View file

@ -15969,6 +15969,12 @@
github = "TilCreator";
githubId = 18621411;
};
tillkruss = {
name = "Till Krüss";
email = "till@kruss.io";
github = "tillkruss";
githubId = 665029;
};
tilpner = {
name = "Till Höppner";
email = "nixpkgs@tilpner.com";

1
maintainers/team-list.nix
View file

@ -293,6 +293,7 @@ with lib.maintainers; {
imincik
sikmir
nh2
willcohen
];
scope = "Maintain geospatial packages.";
shortName = "Geospatial";

11
nixos/doc/manual/release-notes/rl-2305.section.md
View file

@ -12,11 +12,11 @@ To upgrade to the latest release, follow the [upgrade chapter](https://nixos.org
In addition to numerous new and updated packages, this release has the following highlights:
- The default [Nix](https://github.com/NixOS/nix) version was updated from 2.11 to 2.13. In particular, this includes a [small language alteration](https://github.com/NixOS/nix/issues/8259) in the way floats are represented in `builtins.toJSON`. See the release notes for [2.13](https://nixos.org/manual/nix/stable/release-notes/rl-2.13.html) and [2.14](https://nixos.org/manual/nix/unstable/release-notes/rl-2.14.html) for more information.
- The default [Nix](https://github.com/NixOS/nix) version was updated from 2.11 to 2.13. In particular, this includes a [small language alteration](https://github.com/NixOS/nix/issues/8259) in the way floats are represented in `builtins.toJSON`. See the release notes for [2.12](https://nixos.org/manual/nix/stable/release-notes/rl-2.12.html) and [2.13](https://nixos.org/manual/nix/unstable/release-notes/rl-2.13.html) for more information.
- The default [Linux Kernel](https://kernel.org/) was updated from version 5.15 to 6.1, see [Kernelnewbies](https://kernelnewbies.org/Linux_6.1) for what has changed. All currently shown Kernels shown on [kernel.org](https://kernel.org/) are available.
- The default [Linux Kernel](https://kernel.org/) was updated from version 5.15 to 6.1, see [Kernelnewbies](https://kernelnewbies.org/Linux_6.1) for what has changed. All Kernels currently shown on [kernel.org](https://kernel.org/) are available.
- [systemd](https://systemd.io) has been updated from v252 to v253, see [the release notes](https://github.com/systemd/systemd/blob/main/NEWS#L21-L677) for more information on the changes.
- [systemd](https://systemd.io) has been updated from v252 to v253, see [the release notes](https://github.com/systemd/systemd/blob/v253/NEWS#L3-L659) for more information on the changes.
- Updating with `nixos-rebuild boot` and rebooting is recommended, since in some rare cases the `nixos-rebuild switch` into the new generation on a live system might fail due to missing mount units.
- [glibc](https://www.gnu.org/software/libc/) has been updated from version 2.35 to 2.37, see [the release notes](https://sourceware.org/glibc/wiki/Release/2.37) for what was changed.
@ -200,9 +200,6 @@ In addition to numerous new and updated packages, this release has the following
- `graylog` has been updated to version 5, which can not be updated directly from the previously packaged version 3.3. If you had installed the previously packaged version 3.3, please follow the [upgrade path](https://go2docs.graylog.org/5-0/upgrading_graylog/upgrade_path.htm) from 3.3 to 4.0 to 4.3 to 5.0.
- `buildFHSUserEnv` is now called `buildFHSEnv` and uses FlatPak's Bubblewrap sandboxing tool rather than Nixpkgs' own chrootenv. The old chrootenv-based implemenation is still available via `buildFHSEnvChrootenv` but is considered deprecated and will be removed when the remaining uses inside Nixpkgs have been migrated. If your FHSEnv-wrapped application misbehaves when using the new bubblewrap implementation, please create an issue in Nixpkgs.
- `buildFHSUserEnv` is now called `buildFHSEnv` and uses FlatPak's Bubblewrap sandboxing tool rather than Nixpkgs' own chrootenv. The old chrootenv-based implemenation is still available via `buildFHSEnvChrootenv` but is considered deprecated and will be removed when the remaining uses inside Nixpkgs have been migrated. If your FHSEnv-wrapped application misbehaves when using the new bubblewrap implementation, please create an issue in Nixpkgs.
- `nushell` has been updated to at least version 0.77.0, which includes potential breaking changes in aliases. The old aliases are now available as `old-alias` but it is recommended you migrate to the new format. See [Reworked aliases](https://www.nushell.sh/blog/2023-03-14-nushell_0_77.html#reworked-aliases-breaking-changes-kubouch).
@ -549,8 +546,6 @@ In addition to numerous new and updated packages, this release has the following
- Booting from a volume managed by the Stratis storage management daemon is now supported. Use `fileSystems.<name>.stratis.poolUuid` to configure the pool containing the fs.
- Only `k3s` version 1.26 is included. Users of the `k3s_1_24` or `k3s_1_25` packages should upgrade to use the version 1.26 of the package.
## Nixpkgs internals {#sec-release-23.05-nixpkgs-internals}
- `buildDunePackage` now defaults to `strictDeps = true` which means that any library should go into `buildInputs` or `checkInputs`. Any executable that is run on the building machine should go into `nativeBuildInputs` or `nativeCheckInputs` respectively. Example of executables are `ocaml`, `findlib` and `menhir`. PPXs are libraries which are built by dune and should therefore not go into `nativeBuildInputs`.

4
nixos/doc/manual/release-notes/rl-2311.section.md
View file

@ -18,8 +18,12 @@
- 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
- `util-linux` is now supported on Darwin and is no longer an alias to `unixtools`. Use the `unixtools.util-linux` package for access to the Apple variants of the utilities.
## Other Notable Changes {#sec-release-23.11-notable-changes}
- The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration.

2
nixos/modules/programs/wayland/sway.nix
View file

@ -49,7 +49,7 @@ in {
description = lib.mdDoc ''
Sway package to use. Will override the options
'wrapperFeatures', 'extraSessionCommands', and 'extraOptions'.
Set to <code>null</code> to not add any Sway package to your
Set to `null` to not add any Sway package to your
path. This should be done if you want to use the Home Manager Sway
module to install Sway.
'';

222
nixos/modules/services/web-apps/code-server.nix
View file

@ -1,107 +1,199 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.code-server;
defaultUser = "code-server";
defaultGroup = defaultUser;
in {
###### interface
options = {
services.code-server = {
enable = mkEnableOption (lib.mdDoc "code-server");
enable = lib.mkEnableOption (lib.mdDoc "code-server");
package = mkOption {
default = pkgs.code-server;
defaultText = lib.literalExpression "pkgs.code-server";
description = lib.mdDoc "Which code-server derivation to use.";
type = types.package;
};
package = lib.mkPackageOptionMD pkgs "code-server" { };
extraPackages = mkOption {
extraPackages = lib.mkOption {
default = [ ];
description = lib.mdDoc "Packages that are available in the PATH of code-server.";
example = "[ pkgs.go ]";
type = types.listOf types.package;
description = lib.mdDoc ''
Additional packages to add to the code-server {env}`PATH`.
'';
example = lib.literalExpression "[ pkgs.go ]";
type = lib.types.listOf lib.types.package;
};
extraEnvironment = mkOption {
type = types.attrsOf types.str;
description =
lib.mdDoc "Additional environment variables to passed to code-server.";
extraEnvironment = lib.mkOption {
type = lib.types.attrsOf lib.types.str;
description = lib.mdDoc ''
Additional environment variables to pass to code-server.
'';
default = { };
example = { PKG_CONFIG_PATH = "/run/current-system/sw/lib/pkgconfig"; };
};
extraArguments = mkOption {
default = [ "--disable-telemetry" ];
description = lib.mdDoc "Additional arguments that passed to code-server";
example = ''[ "--verbose" ]'';
type = types.listOf types.str;
extraArguments = lib.mkOption {
default = [ ];
description = lib.mdDoc ''
Additional arguments to pass to code-server.
'';
example = lib.literalExpression ''[ "--log=info" ]'';
type = lib.types.listOf lib.types.str;
};
host = mkOption {
default = "127.0.0.1";
description = lib.mdDoc "The host-ip to bind to.";
type = types.str;
host = lib.mkOption {
default = "localhost";
description = lib.mdDoc ''
The host name or IP address the server should listen to.
'';
type = lib.types.str;
};
port = mkOption {
port = lib.mkOption {
default = 4444;
description = lib.mdDoc "The port where code-server runs.";
type = types.port;
description = lib.mdDoc ''
The port the server should listen to.
'';
type = lib.types.port;
};
auth = mkOption {
auth = lib.mkOption {
default = "password";
description = lib.mdDoc "The type of authentication to use.";
type = types.enum [ "none" "password" ];
description = lib.mdDoc ''
The type of authentication to use.
'';
type = lib.types.enum [ "none" "password" ];
};
hashedPassword = mkOption {
hashedPassword = lib.mkOption {
default = "";
description =
lib.mdDoc "Create the password with: `echo -n 'thisismypassword' | npx argon2-cli -e`.";
type = types.str;
description = lib.mdDoc ''
Create the password with: `echo -n 'thisismypassword' | npx argon2-cli -e`.
'';
type = lib.types.str;
};
user = mkOption {
user = lib.mkOption {
default = defaultUser;
example = "yourUser";
description = lib.mdDoc ''
The user to run code-server as.
By default, a user named `${defaultUser}` will be created.
'';
type = types.str;
type = lib.types.str;
};
group = mkOption {
group = lib.mkOption {
default = defaultGroup;
example = "yourGroup";
description = lib.mdDoc ''
The group to run code-server under.
By default, a group named `${defaultGroup}` will be created.
'';
type = types.str;
type = lib.types.str;
};
extraGroups = mkOption {
extraGroups = lib.mkOption {
default = [ ];
description =
lib.mdDoc "An array of additional groups for the `${defaultUser}` user.";
description = lib.mdDoc ''
An array of additional groups for the `${defaultUser}` user.
'';
example = [ "docker" ];
type = types.listOf types.str;
type = lib.types.listOf lib.types.str;
};
socket = lib.mkOption {
default = null;
example = "/run/code-server/socket";
description = lib.mdDoc ''
Path to a socket (bind-addr will be ignored).
'';
type = lib.types.nullOr lib.types.str;
};
socketMode = lib.mkOption {
default = null;
description = lib.mdDoc ''
File mode of the socket.
'';
type = lib.types.nullOr lib.types.str;
};
userDataDir = lib.mkOption {
default = null;
description = lib.mdDoc ''
Path to the user data directory.
'';
type = lib.types.nullOr lib.types.str;
};
extensionsDir = lib.mkOption {
default = null;
description = lib.mdDoc ''
Path to the extensions directory.
'';
type = lib.types.nullOr lib.types.str;
};
proxyDomain = lib.mkOption {
default = null;
example = "code-server.lan";
description = lib.mdDoc ''
Domain used for proxying ports.
'';
type = lib.types.nullOr lib.types.str;
};
disableTelemetry = lib.mkOption {
default = false;
example = true;
description = lib.mdDoc ''
Disable telemetry.
'';
type = lib.types.bool;
};
disableUpdateCheck = lib.mkOption {
default = false;
example = true;
description = lib.mdDoc ''
Disable update check.
Without this flag, code-server checks every 6 hours against the latest github release and
then notifies you once every week that a new release is available.
'';
type = lib.types.bool;
};
disableFileDownloads = lib.mkOption {
default = false;
example = true;
description = lib.mdDoc ''
Disable file downloads from Code.
'';
type = lib.types.bool;
};
disableWorkspaceTrust = lib.mkOption {
default = false;
example = true;
description = lib.mdDoc ''
Disable Workspace Trust feature.
'';
type = lib.types.bool;
};
disableGettingStartedOverride = lib.mkOption {
default = false;
example = true;
description = lib.mdDoc ''
Disable the coder/coder override in the Help: Getting Started page.
'';
type = lib.types.bool;
};
};
};
###### implementation
config = mkIf cfg.enable {
config = lib.mkIf cfg.enable {
systemd.services.code-server = {
description = "VSCode server";
description = "Code server";
wantedBy = [ "multi-user.target" ];
after = [ "network-online.target" ];
path = cfg.extraPackages;
@ -109,18 +201,37 @@ in {
HASHED_PASSWORD = cfg.hashedPassword;
} // cfg.extraEnvironment;
serviceConfig = {
ExecStart = "${cfg.package}/bin/code-server --bind-addr ${cfg.host}:${toString cfg.port} --auth ${cfg.auth} " + lib.escapeShellArgs cfg.extraArguments;
ExecStart = ''
${lib.getExe cfg.package} \
--auth=${cfg.auth} \
--bind-addr=${cfg.host}:${toString cfg.port} \
'' + lib.optionalString (cfg.socket != null) ''
--socket=${cfg.socket} \
'' + lib.optionalString (cfg.userDataDir != null) ''
--user-data-dir=${cfg.userDataDir} \
'' + lib.optionalString (cfg.extensionsDir != null) ''
--extensions-dir=${cfg.extensionsDir} \
'' + lib.optionalString (cfg.disableTelemetry == true) ''
--disable-telemetry \
'' + lib.optionalString (cfg.disableUpdateCheck == true) ''
--disable-update-check \
'' + lib.optionalString (cfg.disableFileDownloads == true) ''
--disable-file-downloads \
'' + lib.optionalString (cfg.disableWorkspaceTrust == true) ''
--disable-workspace-trust \
'' + lib.optionalString (cfg.disableGettingStartedOverride == true) ''
--disable-getting-started-override \
'' + lib.escapeShellArgs cfg.extraArguments;
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
RuntimeDirectory = cfg.user;
User = cfg.user;
Group = cfg.group;
Restart = "on-failure";
};
};
users.users."${cfg.user}" = mkMerge [
(mkIf (cfg.user == defaultUser) {
users.users."${cfg.user}" = lib.mkMerge [
(lib.mkIf (cfg.user == defaultUser) {
isNormalUser = true;
description = "code-server user";
inherit (cfg) group;
@ -131,9 +242,8 @@ in {
}
];
users.groups."${defaultGroup}" = mkIf (cfg.group == defaultGroup) { };
users.groups."${defaultGroup}" = lib.mkIf (cfg.group == defaultGroup) { };
};
meta.maintainers = with maintainers; [ stackshadow ];
meta.maintainers = [ lib.maintainers.stackshadow ];
}

1
nixos/tests/all-tests.nix
View file

@ -171,6 +171,7 @@ in {
cntr = handleTestOn ["aarch64-linux" "x86_64-linux"] ./cntr.nix {};
cockpit = handleTest ./cockpit.nix {};
cockroachdb = handleTestOn ["x86_64-linux"] ./cockroachdb.nix {};
code-server = handleTest ./code-server.nix {};
coder = handleTest ./coder.nix {};
collectd = handleTest ./collectd.nix {};
connman = handleTest ./connman.nix {};

22
nixos/tests/code-server.nix Normal file
View file

@ -0,0 +1,22 @@
import ./make-test-python.nix ({pkgs, lib, ...}:
{
name = "code-server";
nodes = {
machine = {pkgs, ...}: {
services.code-server = {
enable = true;
auth = "none";
};
};
};
testScript = ''
start_all()
machine.wait_for_unit("code-server.service")
machine.wait_for_open_port(4444)
machine.succeed("curl -k --fail http://localhost:4444", timeout=10)
'';
meta.maintainers = [ lib.maintainers.drupol ];
})

29
nixos/tests/kanidm.nix
View file

@ -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!")
'';
})

51
pkgs/applications/audio/noson/default.nix Normal file
View file

@ -0,0 +1,51 @@
{ stdenv
, lib
, fetchFromGitHub
, cmake
, flac
, libpulseaudio
, qtbase
, qtgraphicaleffects
, qtquickcontrols2
, wrapQtAppsHook
}:
stdenv.mkDerivation (finalAttrs: {
pname = "noson";
version = "5.4.1";
src = fetchFromGitHub {
owner = "janbar";
repo = "noson-app";
rev = finalAttrs.version;
hash = "sha256-7RrBfkUCRVzUGl+OT3OuoMlu4D3Sa7RpBefFgmfX1Fs=";
};
nativeBuildInputs = [
cmake
wrapQtAppsHook
];
buildInputs = [
flac
libpulseaudio
qtbase
qtgraphicaleffects
qtquickcontrols2
];
# wrapQtAppsHook doesn't automatically find noson-gui
dontWrapQtApps = true;
preFixup = ''
wrapQtApp "$out/lib/noson/noson-gui"
'';
meta = with lib; {
description = "SONOS controller for Linux (and macOS)";
homepage = "https://janbar.github.io/noson-app/";
mainProgram = "noson-app";
platforms = platforms.linux ++ platforms.darwin;
license = [ licenses.gpl3Only ];
maintainers = with maintainers; [ callahad ];
};
})

35
pkgs/applications/audio/subtitlr/default.nix Normal file
View file

@ -0,0 +1,35 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
buildGoModule rec {
pname = "Subtitlr";
version = "0.1.0";
src = fetchFromGitHub {
owner = "yoanbernabeu";
repo = pname;
rev = version;
hash = "sha256-fwDIE8DFVd7NRhi8bBmFxrmGdT2ZtSFWBaynV+xz3ms=";
};
vendorHash = "sha256-t92nz42sv8bE0JIkSFB2+WBz1Um8kcRSotpXcPIy3eQ=";
ldflags = [ "-s" "-w" ];
nativeBuildInputs = [
installShellFiles
];
postInstall = ''
installShellCompletion --cmd Subtitlr \
--bash <($out/bin/Subtitlr completion bash) \
--fish <($out/bin/Subtitlr completion fish) \
--zsh <($out/bin/Subtitlr completion zsh)
'';
meta = with lib; {
description = "This application, a subtitle generator for YouTube, utilizes OpenAI's Whisper API.";
homepage = "https://github.com/yoanbernabeu/Subtitlr/";
license = licenses.mit;
maintainers = with maintainers; [ qjoly ];
};
}

4
pkgs/applications/blockchains/btcpayserver/default.nix
View file

@ -6,13 +6,13 @@
buildDotnetModule rec {
pname = "btcpayserver";
version = "1.9.3";
version = "1.10.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-XcpPdlDpY/RXOK8ykZ/UUVOok2Pz3vObdp4zhy9tt7w=";
sha256 = "sha256-UJvpEWR49m1B21eMrh0LiJ2bguM7hNux0ywDj6oJbDU=";
};
projectFile = "BTCPayServer/BTCPayServer.csproj";

13
pkgs/applications/blockchains/btcpayserver/deps.nix generated
View file

@ -8,14 +8,14 @@
(fetchNuGet { pname = "AWSSDK.S3"; version = "3.3.110.10"; sha256 = "1lf1hfbx792dpa1hxgn0a0jrrvldd16hgbxx229dk2qcz5qlnc38"; })
(fetchNuGet { pname = "BIP78.Sender"; version = "0.2.2"; sha256 = "12pm2s35c0qzc06099q2z1pxwq94rq85n74yz8fs8gwvm2ksgp4p"; })
(fetchNuGet { pname = "BTCPayServer.Hwi"; version = "2.0.2"; sha256 = "0lh3n1qncqs4kbrmx65xs271f0d9c7irrs9qnsa9q51cbbqbljh9"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.23"; sha256 = "11nb7ba93g51n5f5aa6sd6s3f9x82g1vbi8rcj04x5anbh2g451n"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.26"; sha256 = "1mssifz3jhvk3cqpb3kiqzlsyirlxzj90mlkigdnqqxfk7fyv6wv"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; version = "1.3.20"; sha256 = "0nk82hkgs67mxfxkgbav8yxxd79m0xyqaan7vay00gg33pjqdjvj"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.26"; sha256 = "0sbcl1jdpjgjpa4cagcrppk124nkk2hxsvlj8nr6zf3fcdwllagj"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.27"; sha256 = "14bgi3p31v8ypf1lqnc5xkpzfd2cj5a23v2wv1m38jl6ng2v6vqp"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.16"; sha256 = "1g37736b4k0ncpyy2qycbk4l85fqvgwac3k98nbdj0dvhfghp1dn"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.21"; sha256 = "042xwfsxd30zgwiz0w14ynb755w5sldkplxgw1fkw68lrz66x5s4"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; version = "1.3.20"; sha256 = "093w82mcxxxbvx66j0sp3lsfm2bkbi3igm80iz9zdghy85845kc9"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; version = "1.3.24"; sha256 = "0dah7q90x29rqhngxd9226pfn1k4bbhhfgnkpjpw64529m29cdks"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.LND"; version = "1.4.15"; sha256 = "18qnpdxbz359ygygllsrf95fbalsfyjrf6j9wi7c8qd39jwcignx"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; version = "1.3.26"; sha256 = "1kfl88psjbsh88l98kc6dyxqjghnzyffi070v2ifkdjcdgdbawfs"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.LND"; version = "1.4.16"; sha256 = "1m3nb23f6c6ms2mm07sii4hkrv7illzfg32cjy2j3h6myynw1ik5"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.0.19"; sha256 = "164c5nmsqzgz9v6fw0ml0d9m5hcp449468giakv3cihq25cd6giz"; })
(fetchNuGet { pname = "BTCPayServer.NETCore.Plugins"; version = "1.4.4"; sha256 = "0rk0prmb0539ji5fd33cqy3yvw51i5i8m5hb43admr5z8960dd6l"; })
(fetchNuGet { pname = "BTCPayServer.NETCore.Plugins.Mvc"; version = "1.4.4"; sha256 = "1kmmj5m7s41wc1akpqw1b1j7pp4c0vn6sqxb487980ibpj6hyisl"; })
@ -158,9 +158,10 @@
(fetchNuGet { pname = "NBitcoin"; version = "6.0.8"; sha256 = "1f90zyrd35fzx0vgvd83jhd6hczd4037h2k198xiyxj04l4m3wm5"; })
(fetchNuGet { pname = "NBitcoin"; version = "7.0.1"; sha256 = "05kqpjyp3ckb2183g9vfsdv362y5xg5j21p36zls0x3b0jgrwxw7"; })
(fetchNuGet { pname = "NBitcoin"; version = "7.0.24"; sha256 = "0yc6cgwp2xr2dzjsrkawyh43whixv66nvvq6rh1pi6gi14iaqmfa"; })
(fetchNuGet { pname = "NBitcoin.Altcoins"; version = "3.0.18"; sha256 = "054i15qan5154iy8m13jmhnz1w5rs208i1xhlfnivwiq2v1c2qby"; })
(fetchNuGet { pname = "NBitcoin"; version = "7.0.26"; sha256 = "0m50dmx7hhbxxgwpl9cxrbihpg9l10pga58b41vb0fima2y137zs"; })
(fetchNuGet { pname = "NBitcoin.Altcoins"; version = "3.0.19"; sha256 = "16bv3314flq6ildsjzxzw4ih2wbryvkjpkcwkvf2lh2smqhnvr11"; })
(fetchNuGet { pname = "NBitpayClient"; version = "1.0.0.39"; sha256 = "1sgwradg7jnb4n3chwqfkximj1qhgl3r23p0sifmaa0kql2hlira"; })
(fetchNuGet { pname = "NBXplorer.Client"; version = "4.2.3"; sha256 = "0lf5qsf5yr5m1fx826mn47l237x5y2wkimv6klc3rvwwc7f10dmm"; })
(fetchNuGet { pname = "NBXplorer.Client"; version = "4.2.5"; sha256 = "0kycvnxgqrkxig8k6mp1897sqbq2xarc8429vnjh79644nakdas4"; })
(fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; })
(fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; })
(fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.1"; sha256 = "1r1hvj5gjl466bya2bfl5aaj8rbwyf5x1msg710wf3k2llbci1xa"; })

4
pkgs/applications/blockchains/nbxplorer/default.nix
View file

@ -6,13 +6,13 @@
buildDotnetModule rec {
pname = "nbxplorer";
version = "2.3.63";
version = "2.3.65";
src = fetchFromGitHub {
owner = "dgarage";
repo = "NBXplorer";
rev = "v${version}";
sha256 = "sha256-K3dlXwzKNzwJstp1DW5T5s5Gs0ebPNWXtzqr3rw5294=";
sha256 = "sha256-7m9gf+enOtE5VWuBNLFf11ofLGBRAYWvmkrekUVQQaQ=";
};
projectFile = "NBXplorer/NBXplorer.csproj";

106
pkgs/applications/editors/vim/plugins/generated.nix
View file

@ -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/";
};

12
pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
View file

@ -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";

1
pkgs/applications/editors/vim/plugins/vim-plugin-names
View file

@ -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/,,

183
pkgs/applications/editors/vscode/extensions/default.nix
View file

@ -416,6 +416,22 @@ let
};
};
ban.spellright = buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "ban";
name = "spellright";
version = "3.0.112";
sha256 = "sha256-79Yg4I0OkfG7PaDYnTA8HK8jrSxre4FGriq0Baiq7wA=";
};
meta = {
description = "A Visual Studio Code extension for Spellchecker";
changelog = "https://marketplace.visualstudio.com/items/ban.spellright/changelog";
homepage = "https://github.com/bartosz-antosik/vscode-spellright";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ onedragon ];
};
};
bbenoist.nix = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "Nix";
@ -673,6 +689,30 @@ let
};
};
w88975.code-translate = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "code-translate";
publisher = "w88975";
version = "1.0.20";
sha256 = "sha256-blqLK7S+RmEoyr9zktS5/SNC0GeSXnNpbhltyajoAfw=";
};
meta = {
description = "A Visual Studio Code extension to provide purely hover translation";
longDescription = ''
Code Translate is a purely hover translation extension
- Non-intrusive display of translation results: perfectly integrated with VS Code code analysis.
- Powerful word splitting capabilities: supports various forms of word splitting such as camel case and underscore.
- Rich local vocabulary: includes 3.4+ million offline words, supporting various rare words.
- Based on a rich local vocabulary: Code Translate has super-fast query speed, with each word typically queried in less than 10ms.
- Multi-platform support: supports both the desktop version and online version of VS Code, and the plugin can be used on both versions.
'';
homepage = "https://github.com/w88975/code-translate-vscode";
changelog = "https://marketplace.visualstudio.com/items/w88975.code-translate/changelog";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ onedragon ];
};
};
colejcummins.llvm-syntax-highlighting = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "llvm-syntax-highlighting";
@ -1176,6 +1216,22 @@ let
};
};
ExiaHuang.dictionary = buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "ExiaHuang";
name = "dictionary";
version = "0.0.2";
sha256 = "sha256-caNcbDTB/F2mdlGpfIfJv13lzY5Wwj7p7r8dAte9+3A=";
};
meta = {
description = "A Visual Studio Code extension of using chinese-english dictonary in right-click menu";
homepage = "https://github.com/exiahuang/fanyi-vscode";
changelog = "https://marketplace.visualstudio.com/items/ExiaHuang.dictionary/changelog";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ onedragon ];
};
};
file-icons.file-icons = buildVscodeMarketplaceExtension {
meta = {
changelog = "https://marketplace.visualstudio.com/items/file-icons.file-icons/changelog";
@ -1303,6 +1359,23 @@ let
};
};
funkyremi.vscode-google-translate = buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "funkyremi";
name = "vscode-google-translate";
version = "1.4.13";
sha256 = "sha256-9Vo6lwqD1eE3zY0Gi9ME/6lPwmwuJ3Iq9StHPvncnM4=";
};
meta = {
description = "A Visual Studio Code extension using google translation to helping you quickly translate text right in your code rocket";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=funkyremi.vscode-google-translate";
homepage = "https://github.com/funkyremi/vscode-google-translate.git";
changelog = "https://marketplace.visualstudio.com/items/funkyremi.vscode-google-translate/changelog";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ onedragon ];
};
};
gencer.html-slim-scss-css-class-completion = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "html-slim-scss-css-class-completion";
@ -1577,6 +1650,26 @@ let
};
};
intellsmi.comment-translate = buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "intellsmi";
name = "comment-translate";
version = "2.2.4";
sha256 = "sha256-g6mlScxv8opZuqgWtTJ3k0Yo7W7WzIkwB+8lWf6cMiU=";
};
meta = {
description = "A Visual Studio Code extension to translate the comments for computer language";
longDescription = ''
This plugin uses the Google Translate API to translate comments for the VSCode programming language.
'';
homepage = "https://github.com/intellism/vscode-comment-translate/blob/HEAD/doc/README.md";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=intellsmi.comment-translate";
changelog = "https://marketplace.visualstudio.com/items/intellsmi.comment-translate/changelog";
maintainers = with lib.maintainers; [ onedragon ];
license = lib.licenses.mit;
};
};
ionide.ionide-fsharp = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "Ionide-fsharp";
@ -2185,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";
@ -2546,6 +2654,27 @@ let
};
};
RoweWilsonFrederiskHolme.wikitext = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "wikitext";
publisher = "RoweWilsonFrederiskHolme";
version = "3.8.0";
sha256 = "30540a85163e797028eec9bc3db1866bbf473e98615bf6ade6d1d672017ebe52";
};
meta = {
description = "Extension that helps users view and write MediaWiki's Wikitext files";
longDescription = ''
With this extension, you can more easily discover your grammatical problems
through the marked and styled text. The plugin is based on MediaWiki's
Wikitext standard, but the rules are somewhat stricter, which helps users
write text that is easier to read and maintain.
'';
downloadPage = "https://marketplace.visualstudio.com/items?itemName=RoweWilsonFrederiskHolme.wikitext";
homepage = "https://github.com/Frederisk/Wikitext-VSCode-Extension";
license = lib.licenses.mit;
};
};
rubbersheep.gi = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "gi";
@ -2879,6 +3008,23 @@ let
};
};
tailscale.vscode-tailscale = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-tailscale";
publisher = "tailscale";
version = "0.4.0";
sha256 = "sha256-c/BZHKHs2EKd37148dSxEeP1wBXv75HhDqzegmHPjOs=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/tailscale.vscode-tailscale/changelog";
description = "VSCode extension to share a port over the internet with Tailscale Funnel";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=Tailscale.vscode-tailscale";
homepage = "https://github.com/tailscale-dev/vscode-tailscale";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.drupol ];
};
};
takayama.vscode-qq = buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "takayama";
@ -2903,6 +3049,22 @@ let
};
};
techtheawesome.rust-yew = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "rust-yew";
publisher = "techtheawesome";
version = "0.2.2";
sha256 = "sha256-t9DYY1fqW7M5F1pbIUtnnodxMzIzURew4RXT78djWMI=";
};
meta = {
description = "A VSCode extension that provides some language features for Yew's html macro syntax";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=TechTheAwesome.rust-yew";
homepage = "https://github.com/TechTheAwesome/code-yew-server";
license = lib.licenses.gpl3Only;
maintainers = [ lib.maintainers.CardboardTurkey ];
};
};
theangryepicbanana.language-pascal = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "language-pascal";
@ -3315,6 +3477,27 @@ let
};
};
yzhang.dictionary-completion = buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "yzhang";
name = "dictionary-completion";
version = "1.2.2";
sha256 = "sha256-dpJcJARRKzRNHfXs/qknud8OQ8xIyeaVnt/EcDq0k4E=";
};
meta = {
description = "A Visual Studio Code extension to help user easyly finish long words ";
longDescription = ''
Dictionary completion allows user to get a list of keywords, based off of the current word at the cursor.
This is useful if you are typing a long word (e.g. acknowledgeable) and don't want to finish typing or don't remember the Spelling
'';
homepage = "https://github.com/yzhang-gh/vscode-dic-completion#readme";
changelog = "https://marketplace.visualstudio.com/items/yzhang.dictionary-completion/changelog";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=yzhang.dictionary-completion";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ onedragon ];
};
};
yzhang.markdown-all-in-one = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "markdown-all-in-one";

15
pkgs/applications/gis/grass/default.nix
View file

@ -6,24 +6,33 @@
stdenv.mkDerivation rec {
pname = "grass";
version = "8.2.0";
version = "8.2.1";
src = with lib; fetchFromGitHub {
owner = "OSGeo";
repo = "grass";
rev = version;
sha256 = "sha256-VK9FCqIwHGmeJe5lk12lpAGcsC1aPRBiI+XjACXjDd4=";
hash = "sha256-U3PQd3u9i+9Bc7BSd0gK8Ss+iV9BT1xLBDrKydtl3Qk=";
};
nativeBuildInputs = [
pkg-config bison flex makeWrapper wrapGAppsHook
gdal geos libmysqlclient netcdf pdal
gdal # for `gdal-config`
geos # for `geos-config`
netcdf # for `nc-config`
libmysqlclient # for `mysql_config`
pdal # for `pdal-config`; remove with next version, see https://github.com/OSGeo/grass/pull/2851
] ++ (with python3Packages; [ python-dateutil numpy wxPython_4_2 ]);
buildInputs = [
cairo zlib proj libtiff libpng fftw sqlite
readline ffmpeg postgresql blas wxGTK32
proj-datumgrid zstd
gdal
geos
netcdf
libmysqlclient
pdal
] ++ lib.optionals stdenv.isDarwin [ libiconv ];
strictDeps = true;

8
pkgs/applications/misc/calibre/default.nix
View file

@ -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;

6
pkgs/applications/misc/dasel/default.nix
View file

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "dasel";
version = "2.2.0";
version = "2.3.3";
src = fetchFromGitHub {
owner = "TomWright";
repo = "dasel";
rev = "v${version}";
sha256 = "sha256-DPfahZIb6Cp+E5GxIqNW+IruDZWBvJTRc7gxQOfeJqA=";
sha256 = "sha256-RP5088h+KDKENaSf/I8pzFBrHx1cxPKtQRqyNm0CjuQ=";
};
vendorHash = "sha256-+3RcjOZjmYu4eNpgczwY4Uyz1+poYA/TXc2Mb+VwRKc=";
vendorHash = "sha256-cLf0MzEAykmtnPjT2vGOSPwIXJP6BhxheUaicT7o/X4=";
ldflags = [
"-s" "-w" "-X github.com/tomwright/dasel/v2/internal.Version=${version}"

6
pkgs/applications/misc/hugo/default.nix
View file

@ -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;

4
pkgs/applications/misc/mako/default.nix
View file

@ -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 ];

14
pkgs/applications/misc/obsidian/default.nix
View file

@ -4,7 +4,7 @@
, makeWrapper
, electron
, makeDesktopItem
, graphicsmagick
, imagemagick
, writeScript
, undmg
, unzip
@ -12,7 +12,7 @@
let
inherit (stdenv.hostPlatform) system;
pname = "obsidian";
version = "1.3.4";
version = "1.3.5";
appname = "Obsidian";
meta = with lib; {
description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files";
@ -25,12 +25,12 @@ let
filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz";
src = fetchurl {
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
sha256 = if stdenv.isDarwin then "sha256-LP13smLy/cr0hiLl5cdRxTbDfRFojb+HJBx/MFeJ13Y=" else "sha256-8M9HU20IxTvPaa6x1X41Ldq2usK2TPU71VvprerivZg=";
sha256 = if stdenv.isDarwin then "sha256-bTIJwQqufzxq1/ZxR8rVYER82tl0pPMpKwDPr9Gz1Q4=" else "sha256-jhm6ziFaJnv4prPSfOnJ/EbIRTf9rnvzAJVxnVqmWE4=";
};
icon = fetchurl {
url = "https://forum.obsidian.md/uploads/default/original/1X/bf119bd48f748f4fd2d65f2d1bb05d3c806883b5.png";
sha256 = "18ylnbvxr6k4x44c4i1d55wxy2dq4fdppp43a4wl6h6zar0sc9s2";
url = "https://obsidian.md/images/obsidian-logo-gradient.svg";
sha256 = "100j8fcrc5q8zv525siapminffri83s2khs2hw4kdxwrdjwh36qi";
};
desktopItem = makeDesktopItem {
@ -46,7 +46,7 @@ let
linux = stdenv.mkDerivation {
inherit pname version src desktopItem icon;
meta = meta // { platforms = [ "x86_64-linux" "aarch64-linux" ]; };
nativeBuildInputs = [ makeWrapper graphicsmagick ];
nativeBuildInputs = [ makeWrapper imagemagick ];
installPhase = ''
runHook preInstall
mkdir -p $out/bin
@ -59,7 +59,7 @@ let
-t $out/share/applications/
for size in 16 24 32 48 64 128 256 512; do
mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
gm convert -resize "$size"x"$size" ${icon} $out/share/icons/hicolor/"$size"x"$size"/apps/obsidian.png
convert -background none -resize "$size"x"$size" ${icon} $out/share/icons/hicolor/"$size"x"$size"/apps/obsidian.png
done
runHook postInstall
'';

10
pkgs/applications/misc/snagboot/default.nix
View file

@ -1,6 +1,6 @@
{ lib
, stdenv
, fetchPypi
, fetchFromGitHub
, pythonRelaxDepsHook
, python3
, snagboot
@ -13,9 +13,11 @@ python3.pkgs.buildPythonApplication rec {
version = "1.0";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-wtIcrd3s/ZfdYqi2a2+IvVYnJie5txJy6d2m+GjuhxU=";
src = fetchFromGitHub {
owner = "bootlin";
repo = "snagboot";
rev = "v${version}";
hash = "sha256-QqGeELm2seX3tIKQvuXp9VsNDah+m9FNcaEVk6TMP0U=";
};
passthru = {

32
pkgs/applications/misc/tailscale-systray/default.nix Normal file
View 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 ];
};
}

34
pkgs/applications/misc/waybar/default.nix
View file

@ -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
View 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 ];
};
}

4
pkgs/applications/networking/browsers/brave/default.nix
View file

@ -90,11 +90,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
version = "1.51.118";
version = "1.52.117";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
sha256 = "sha256-/OrnB4M6oefZ2aG2rQst8H4UZ/7vAFzyqWsn9kerb9c=";
sha256 = "sha256-oI/KRAfPGS5WEjLmTF6CQBjXLxv4vvpFMqPmh+O51QY=";
};
dontConfigure = true;

4
pkgs/applications/networking/cluster/roxctl/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "roxctl";
version = "4.0.1";
version = "4.0.2";
src = fetchFromGitHub {
owner = "stackrox";
repo = "stackrox";
rev = version;
sha256 = "sha256-9nLu7/4UfIQMje1XIfiPaPkGzdQbDhgBKYq/L2TfaS0=";
sha256 = "sha256-yMAQEgQPySz5xvbnzO3omiqEajDjSqFt/UroJ04tUY8=";
};
vendorHash = "sha256-kv5kNFFw57ZuNgwNMucmCPIwaAhpzT0hs2K1B65WxpU=";

38
pkgs/applications/networking/cluster/terraform-providers/providers.json
View file

@ -1,10 +1,10 @@
{
"aci": {
"hash": "sha256-OwQzr0Rt9fjbGfJPDezrh/j4hLwgq8ldRgTX3rL/ddY=",
"hash": "sha256-EmYgUWRZoIJ+wZIe4E7MlRep+uVveCbeBNDBgG7ryr8=",
"homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci",
"owner": "CiscoDevNet",
"repo": "terraform-provider-aci",
"rev": "v2.7.0",
"rev": "v2.8.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -182,13 +182,13 @@
"vendorHash": "sha256-jOscYbwZ8m4smGiAy2vNhPMTAUnINkpuVRQ8E6LpWVw="
},
"buildkite": {
"hash": "sha256-5R3aX0tzUnewsYguHlelYXn1JrfowrOCaqYtfvrnoSE=",
"hash": "sha256-PpxWViERqAAumgyo9FhcIXJ5WfPJVn7hELaf04N61Ok=",
"homepage": "https://registry.terraform.io/providers/buildkite/buildkite",
"owner": "buildkite",
"repo": "terraform-provider-buildkite",
"rev": "v0.17.1",
"rev": "v0.18.0",
"spdx": "MIT",
"vendorHash": "sha256-ZXjmR1maiiLeWipXGOAGfLEuot9TsrzAX4EPRNQ5Gbo="
"vendorHash": "sha256-ZWC6CtAheuHZtLc8BolrniRPNpKkG0VR3UY5bVUtrSk="
},
"checkly": {
"hash": "sha256-tdimESlkfRO/kdA6JOX72vQNXFLJZ9VKwPRxsJo5WFI=",
@ -218,11 +218,11 @@
"vendorHash": "sha256-qIgr+ynaNSfNx1iW5RJrNHvEnlr46dBzIi+5IXYn+3Q="
},
"cloudflare": {
"hash": "sha256-IzxNaYobiQcvXFW+Gd7XQUoo3uI4KI2jdfd9JAMw5Cw=",
"hash": "sha256-+tTBNPTZjzvI1XYo8sPQumSJftvRkh+CRCr+S+Z4HNM=",
"homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare",
"owner": "cloudflare",
"repo": "terraform-provider-cloudflare",
"rev": "v4.7.0",
"rev": "v4.7.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-jAdeCVr1hWVPwWFbxiaVP1aF8LeJFi2ua2vM9r65mKI="
},
@ -539,11 +539,11 @@
"vendorHash": "sha256-73Hpp4OLJyFmbiczVmFzCi++W0te6G9LSb8LhNwSDUg="
},
"huaweicloud": {
"hash": "sha256-8ilj+9aCZAlNhQ3OMF6uWFfAAVtISfS6eahywmPAb98=",
"hash": "sha256-2N8BmYd/8Mf65ARYeQcbMKLjNlxP6uZe+3+lsNZbiZg=",
"homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud",
"owner": "huaweicloud",
"repo": "terraform-provider-huaweicloud",
"rev": "v1.48.0",
"rev": "v1.49.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -782,13 +782,13 @@
"vendorHash": "sha256-jnZ7LzKgyPVCnYoWp+nDeQy2w91sBVX43KjInzqRWqc="
},
"ns1": {
"hash": "sha256-F7nKtDlVnW7jDPTeszYv9aYMAnHo2/k+MxsXdjghS88=",
"hash": "sha256-IVKxvkps7cDE/l06MXRtRNasbhEpxhkxa7cDQP/6XYQ=",
"homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1",
"owner": "ns1-terraform",
"repo": "terraform-provider-ns1",
"rev": "v2.0.2",
"rev": "v2.0.3",
"spdx": "MPL-2.0",
"vendorHash": "sha256-dGHT3mq5a+3KhNZQkYZ+HYrqxR9YT7Yn64UkmE0vz6M="
"vendorHash": "sha256-Tyf5byrkB1tB4JrOlLpUdFGVcwvUN7SylVl2OhX3jWY="
},
"null": {
"hash": "sha256-ExXDbAXMVCTZBlYmi4kD/7JFB1fCFAoPL637+1N6rEI=",
@ -837,11 +837,11 @@
"vendorHash": null
},
"opennebula": {
"hash": "sha256-r5evkpYnT2foc9ucHVkalm0qVO8UCoLhoc9ro/TerRI=",
"hash": "sha256-bWmSXlNgPOhzNFodYAzLE1theDntCks3ywtruRbCcYc=",
"homepage": "https://registry.terraform.io/providers/OpenNebula/opennebula",
"owner": "OpenNebula",
"repo": "terraform-provider-opennebula",
"rev": "v1.2.1",
"rev": "v1.2.2",
"spdx": "MPL-2.0",
"vendorHash": "sha256-W7UGOtyFsIMXPqFDnde2XlzU7klR7Fs00mSuJ9ID20A="
},
@ -1098,11 +1098,11 @@
"vendorHash": "sha256-GNSKSlaFBj2P+z40U+0uwPSOuQBy+9vOVFfPe8p0A24="
},
"tencentcloud": {
"hash": "sha256-2xyJ6rrgQKIhdtGNSnSYbL+fQhaqlEsWfGA2vYZeQBQ=",
"hash": "sha256-67ImHgmkKbUOfaPNViQXdItOvtAyHtUVbE4kLVKqmvs=",
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
"owner": "tencentcloudstack",
"repo": "terraform-provider-tencentcloud",
"rev": "v1.81.2",
"rev": "v1.81.4",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -1253,13 +1253,13 @@
"vendorHash": "sha256-itSr5HHjus6G0t5/KFs0sNiredH9m3JnQ3siLtm+NHs="
},
"yandex": {
"hash": "sha256-HcW6R6TewxIsDJLCL5fU4VkFpQKulywmjCYFEAWN+uQ=",
"hash": "sha256-vBTHtVmQxImTNkS2KVVIoPadYsPK3PL8ADx4L4Vyah8=",
"homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",
"owner": "yandex-cloud",
"proxyVendor": true,
"repo": "terraform-provider-yandex",
"rev": "v0.91.0",
"rev": "v0.92.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-5pzIvNVgfFT4j18JNHxJ5ZappuS9nFjlpPC3dcsIQRQ="
"vendorHash": "sha256-2KaVZ1k1IEUFWakh16DXFyorqg1PqBQapWUay49LPMk="
}
}

6
pkgs/applications/networking/shellhub-agent/default.nix
View file

@ -11,18 +11,18 @@
buildGo120Module rec {
pname = "shellhub-agent";
version = "0.12.0";
version = "0.12.1";
src = fetchFromGitHub {
owner = "shellhub-io";
repo = "shellhub";
rev = "v${version}";
sha256 = "+aLs0+nHWglFYAM6CHyrPAALS/7x4vYOtu/M1mKH6hg=";
sha256 = "dOqBisB2nxJPvlB9BA69a0ODk5eFrjPnfMBCGFBig3s=";
};
modRoot = "./agent";
vendorSha256 = "sha256-TInS0uTpjTrLuthRn0SOSDh3j0bf+XCP4PVcL19mBiQ=";
vendorSha256 = "sha256-gVW0vyfQ8i3HaTAJMZLWZvSjuRZcPPCj+BLPL5A6uzM=";
ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ];

4
pkgs/applications/version-management/gerrit/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "gerrit";
version = "3.7.2";
version = "3.8.0";
src = fetchurl {
url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war";
sha256 = "sha256-XB5bplYpid2vxSjm1DCGYsd3d5kUk8PlnhFdCAORX6k=";
sha256 = "sha256-wial+K5eUZSJ+asFBLrFoJQOLWLHkl5ot4b4CIsg7Tc=";
};
buildCommand = ''

6
pkgs/applications/window-managers/cwm/default.nix
View file

@ -12,8 +12,10 @@ stdenv.mkDerivation rec {
sha256 = "sha256-lkjsxGMXOrnu4cUiV/TO7yzd9FzM297MhaFKauqmiHo=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libX11 libXinerama libXrandr libXft bison ];
strictDeps = true;
nativeBuildInputs = [ pkg-config bison ];
buildInputs = [ libX11 libXinerama libXrandr libXft ];
prePatch = ''sed -i "s@/usr/local@$out@" Makefile'';

6
pkgs/applications/window-managers/i3/status-rust.nix
View file

@ -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 ];

14
pkgs/applications/window-managers/weston/default.nix
View file

@ -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)

1
pkgs/build-support/fetchurl/mirrors.nix
View file

@ -269,7 +269,6 @@
"https://versaweb.dl.sourceforge.net/sourceforge/"
"https://freefr.dl.sourceforge.net/sourceforge/"
"https://osdn.dl.sourceforge.net/sourceforge/"
"https://kent.dl.sourceforge.net/sourceforge/"
];
# Steam Runtime

6
pkgs/data/fonts/iosevka/default.nix
View file

@ -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

4
pkgs/data/fonts/spleen/default.nix
View file

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "spleen";
version = "1.9.3";
version = "2.0.0";
src = fetchurl {
url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz";
hash = "sha256-t60e2wKl3a0RfKlPAm64RQtRUE0ugbw6A4deEtTnayU=";
hash = "sha256-d4d4s13UhwG4A9skemrIdZFUzl/Dq9XMC225ikS6Wgw=";
};
nativeBuildInputs = [ xorg.mkfontscale ];

6
pkgs/data/fonts/unifont/default.nix
View file

@ -4,16 +4,16 @@
stdenv.mkDerivation rec {
pname = "unifont";
version = "15.0.02";
version = "15.0.04";
ttf = fetchurl {
url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf";
hash = "sha256-DvWkQo+ZYWwoCCA69iyDmQtS/Qxwg7b2spLPqiSauL4=";
hash = "sha256-kkSbEvWBrvcnBgHDdKJjpSYF6BJDEwmYSxVQbPkQ6so=";
};
pcf = fetchurl {
url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz";
hash = "sha256-01yEB9We5MkeCF6uva0SDTpt+4Ln2TaNh6jkCS66PUE=";
hash = "sha256-rdzJuOkXYojgm5VfpshtJuCJYM0/iS+HnWMXEDsLQPg=";
};
nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ];

4
pkgs/data/fonts/unifont_upper/default.nix
View file

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "unifont_upper";
version = "15.0.02";
version = "15.0.04";
src = fetchurl {
url = "mirror://gnu/unifont/unifont-${version}/${pname}-${version}.ttf";
hash = "sha256-Ikd2VotAvktUd083vzZZFLzmXtZi4EGYRJ9eKP4yveE=";
hash = "sha256-7iRcyKfGpv2rjVLPRNchxpXwj0KA5jlgDnCfG7byLLI=";
};
dontUnpack = true;

4
pkgs/data/icons/papirus-icon-theme/default.nix
View file

@ -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 ];

4
pkgs/desktops/cinnamon/bulky/default.nix
View file

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "bulky";
version = "2.7";
version = "2.8";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "bulky";
rev = version;
hash = "sha256-Ps7ql6EAdoljQ6S8D2JxNSh0+jtEVZpnQv3fpvWkQSk=";
hash = "sha256-DZjX4xPyA30TTyOX+VyGSY/FWPX2316CYImDWRma9r0=";
};
nativeBuildInputs = [

26
pkgs/desktops/gnome/games/gnome-mahjongg/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv
, lib
, fetchurl
, fetchpatch
, pkg-config
, gnome
, gtk3
, wrapGAppsHook
, gtk4
, wrapGAppsHook4
, libadwaita
, librsvg
, gettext
, itstool
@ -19,40 +19,30 @@
stdenv.mkDerivation rec {
pname = "gnome-mahjongg";
version = "3.38.3";
version = "3.40.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-mahjongg/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "144ia3zn9rhwa1xbdkvsz6m0dsysl6mxvqw9bnrlh845hmyy9cfj";
sha256 = "WorIbXY8VmDdkCX3vAgxC5IjRvp+Lfe2SMmJTa4/GD8=";
};
patches = [
# Fix build with meson 0.61
# data/meson.build:24:0: ERROR: Function does not take positional arguments.
# data/meson.build:45:0: ERROR: Function does not take positional arguments.
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-mahjongg/-/commit/a2037b0747163601a5d5b57856d037eecf3a4db7.patch";
sha256 = "Wcder6Y9H6c1f8I+IPDvST3umaCU21HgxfXn809JDz0=";
})
];
nativeBuildInputs = [
meson
ninja
vala
desktop-file-utils
pkg-config
gnome.adwaita-icon-theme
libxml2
itstool
gettext
wrapGAppsHook
wrapGAppsHook4
glib # for glib-compile-schemas
];
buildInputs = [
glib
gtk3
gtk4
libadwaita
librsvg
];

2
pkgs/desktops/gnome/misc/gnome-flashback/default.nix
View file

@ -82,7 +82,7 @@ let
rm -r $out/share/gnome-session
rm -r $out/share/xsessions
rm -r $out/libexec
rm $out/libexec/gnome-flashback-metacity
'';
nativeBuildInputs = [

4
pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix
View file

@ -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

18
pkgs/development/compilers/flutter/default.nix
View file

@ -34,15 +34,15 @@ let
inherit wrapFlutter mkCustomFlutter mkFlutter;
buildFlutterApplication = callPackage ../../../build-support/flutter {
# Package a minimal version of Flutter that only uses Linux desktop release artifacts.
flutter = wrapFlutter
(mkCustomFlutter (args // {
includedEngineArtifacts = {
common = [ "flutter_patched_sdk_product" ];
platform.linux = lib.optionals stdenv.hostPlatform.isLinux
(lib.genAttrs ((lib.optional stdenv.hostPlatform.isx86_64 "x64") ++ (lib.optional stdenv.hostPlatform.isAarch64 "arm64"))
(architecture: [ "release" ]));
};
}));
flutter = (wrapFlutter (mkCustomFlutter args)).override {
supportsAndroid = false;
includedEngineArtifacts = {
common = [ "flutter_patched_sdk_product" ];
platform.linux = lib.optionals stdenv.hostPlatform.isLinux
(lib.genAttrs ((lib.optional stdenv.hostPlatform.isx86_64 "x64") ++ (lib.optional stdenv.hostPlatform.isAarch64 "arm64"))
(architecture: [ "release" ]));
};
};
};
};
});

8
pkgs/development/compilers/flutter/flutter.nix
View file

@ -8,13 +8,7 @@
"flutter_patched_sdk"
"flutter_patched_sdk_product"
];
platform = {
android = lib.optionalAttrs stdenv.hostPlatform.isx86_64
((lib.genAttrs [ "arm" "arm64" "x64" ] (architecture: [ "profile" "release" ])) // { x86 = [ "jit-release" ]; });
linux = lib.optionals stdenv.hostPlatform.isLinux
(lib.genAttrs ((lib.optional stdenv.hostPlatform.isx86_64 "x64") ++ (lib.optional stdenv.hostPlatform.isAarch64 "arm64"))
(architecture: [ "debug" "profile" "release" ]));
};
platform = { };
}
, lib

30
pkgs/development/compilers/flutter/wrapper.nix
View file

@ -2,7 +2,9 @@
, stdenv
, callPackage
, flutter
, supportsLinuxDesktop ? stdenv.isLinux
, supportsLinuxDesktop ? stdenv.hostPlatform.isLinux
, supportsAndroid ? stdenv.hostPlatform.isx86_64
, includedEngineArtifacts ? null
, extraPkgConfigPackages ? [ ]
, extraLibraries ? [ ]
, extraIncludes ? [ ]
@ -33,11 +35,27 @@
}:
let
flutterWithArtifacts = flutter.override {
includedEngineArtifacts = if includedEngineArtifacts != null then includedEngineArtifacts else {
common = [
"flutter_patched_sdk"
"flutter_patched_sdk_product"
];
platform = {
android = lib.optionalAttrs supportsAndroid
((lib.genAttrs [ "arm" "arm64" "x64" ] (architecture: [ "profile" "release" ])) // { x86 = [ "jit-release" ]; });
linux = lib.optionalAttrs supportsLinuxDesktop
(lib.genAttrs ((lib.optional stdenv.hostPlatform.isx86_64 "x64") ++ (lib.optional stdenv.hostPlatform.isAarch64 "arm64"))
(architecture: [ "debug" "profile" "release" ]));
};
};
};
# By default, Flutter stores downloaded files (such as the Pub cache) in the SDK directory.
# Wrap it to ensure that it does not do that, preferring home directories instead.
immutableFlutter = writeShellScript "flutter_immutable" ''
export PUB_CACHE=''${PUB_CACHE:-"$HOME/.pub-cache"}
${flutter}/bin/flutter "$@"
${flutterWithArtifacts}/bin/flutter "$@"
'';
# Tools that the Flutter tool depends on.
@ -87,12 +105,12 @@ in
{
nativeBuildInputs = [ makeWrapper ];
passthru = flutter.passthru // {
inherit (flutter) version;
unwrapped = flutter;
passthru = flutterWithArtifacts.passthru // {
inherit (flutterWithArtifacts) version;
unwrapped = flutterWithArtifacts;
};
inherit (flutter) meta;
inherit (flutterWithArtifacts) meta;
} ''
for path in ${builtins.concatStringsSep " " (builtins.foldl' (paths: pkg: paths ++ (map (directory: "'${pkg}/${directory}/pkgconfig'") ["lib" "share"])) [ ] pkgConfigPackages)}; do
addToSearchPath FLUTTER_PKG_CONFIG_PATH "$path"

4
pkgs/development/compilers/inform6/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "inform6";
version = "6.41-r4";
version = "6.41-r5";
src = fetchurl {
url = "https://ifarchive.org/if-archive/infocom/compilers/inform6/source/inform-${version}.tar.gz";
sha256 = "sha256-y55F/zV/99fS4ZITtPsSgkpMNfonFztZEP/QZxSQjfc=";
sha256 = "sha256-JsLufRmqUmJ4if1XURi9swS0upw+Hj827T27A9qDANg=";
};
buildInputs = [ perl ];

3
pkgs/development/coq-modules/deriving/default.nix
View file

@ -8,11 +8,12 @@ mkCoqDerivation {
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.11" "8.16"; out = "0.1.0"; }
{ case = range "8.11" "8.17"; out = "0.1.1"; }
] null;
releaseRev = v: "v${v}";
release."0.1.1".sha256 = "sha256-Gu8aInLxTXfAFE0/gWRYI046Dx3Gv1j1+gx92v/UnPI=";
release."0.1.0".sha256 = "sha256:11crnjm8hyis1qllkks3d7r07s1rfzwvyvpijya3s6iqfh8c7xwh";
propagatedBuildInputs = [ ssreflect ];

2
pkgs/development/coq-modules/extructures/default.nix
View file

@ -9,7 +9,7 @@
inherit version;
defaultVersion = with lib.versions; lib.switch [coq.coq-version ssreflect.version] [
{ cases = [(range "8.11" "8.16") (isGe "1.12.0") ]; out = "0.3.1"; }
{ cases = [(range "8.11" "8.17") (isGe "1.12.0") ]; out = "0.3.1"; }
{ cases = [(range "8.11" "8.14") (isLe "1.12.0") ]; out = "0.3.0"; }
{ cases = [(range "8.10" "8.12") (isLe "1.12.0") ]; out = "0.2.2"; }
] null;

4
pkgs/development/interpreters/clojure/babashka.nix
View file

@ -7,11 +7,11 @@
buildGraalvmNativeImage rec {
pname = "babashka";
version = "1.3.179";
version = "1.3.180";
src = fetchurl {
url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
sha256 = "sha256-tF+SqKY7tcJvmOATVwKIZemR2A3eqrbhvSBvr7tcq5U=";
sha256 = "sha256-moNFb5jHTK2XJHx9BAeD+BUH4Y6NyypDM0MycqE5Zwk=";
};
graalvmDrv = graalvmCEPackages.graalvm19-ce;

4
pkgs/development/interpreters/php/generic.nix
View file

@ -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;

2
pkgs/development/interpreters/python/python-packages-base.nix
View file

@ -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;

4
pkgs/development/libraries/SDL_compat/default.nix
View file

@ -19,13 +19,13 @@ let
in
stdenv.mkDerivation rec {
pname = "SDL_compat";
version = "1.2.60";
version = "1.2.64";
src = fetchFromGitHub {
owner = "libsdl-org";
repo = "sdl12-compat";
rev = "release-" + version;
hash = "sha256-8b9rFI4iRpBJqeJ2KRJ9vRyv9gYwa9jRWCuXRfA3x50=";
hash = "sha256-Ctl7RElRWaB4IpBZD5Sm0rYOcv5zaIag78VTKoFlbVs=";
};
nativeBuildInputs = [ cmake pkg-config ]

1
pkgs/development/libraries/cmocka/default.nix
View file

@ -52,6 +52,5 @@ stdenv.mkDerivation rec {
license = licenses.asl20;
platforms = platforms.all;
maintainers = with maintainers; [ kragniz rasendubi ];
broken = stdenv.hostPlatform.isStatic; # See https://github.com/NixOS/nixpkgs/issues/213623
};
}

13
pkgs/development/libraries/hpp-fcl/default.nix
View file

@ -14,25 +14,16 @@
stdenv.mkDerivation (finalAttrs: {
pname = "hpp-fcl";
version = "2.3.3";
version = "2.3.4";
src = fetchFromGitHub {
owner = "humanoid-path-planner";
repo = finalAttrs.pname;
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-7MXQ5+S/lvaTBVGY2gTJ1nUegtf9cp7p0JLJ4oPJAUY=";
hash = "sha256-tX8AvlR/Az8fFs4ylqFijw3hXiNRoEWffmYbTcaqO90=";
};
patches = [
# Fix unittest where nix env set `boost::archive::tmpdir()` to `/build` and trigger a path concatenation bug.
(fetchpatch {
name = "tests-use-boost-filesystem.patch";
url = "https://github.com/humanoid-path-planner/hpp-fcl/commit/7e8fde64a5d2c2412325f6cb5d78623bf2409176.patch";
hash = "sha256-YjESkj8SqYiyrJuXIa5mSnHIph/D04J10poTDcYgs2c=";
})
];
strictDeps = true;
nativeBuildInputs = [

67
pkgs/development/libraries/podofo/0.10.x.nix Normal file
View 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 = [];
};
})

14
pkgs/development/libraries/qxlsx/default.nix
View file

@ -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 ];

1
pkgs/development/node-packages/aliases.nix
View file

@ -42,6 +42,7 @@ mapAliases {
"@githubnext/github-copilot-cli" = pkgs.github-copilot-cli; # Added 2023-05-02
"@google/clasp" = pkgs.google-clasp; # Added 2023-05-07
"@nestjs/cli" = pkgs.nest-cli; # Added 2023-05-06
eslint_d = pkgs.eslint_d; # Added 2023-05-26
manta = pkgs.node-manta; # Added 2023-05-06
thelounge = pkgs.thelounge; # Added 2023-05-22
triton = pkgs.triton; # Added 2023-05-06

1
pkgs/development/node-packages/node-packages.json
View file

@ -132,7 +132,6 @@
, "emojione"
, "escape-string-regexp"
, "eslint"
, "eslint_d"
, "esy"
, "expo-cli"
, "fast-cli"

122
pkgs/development/node-packages/node-packages.nix generated
View file

@ -103337,128 +103337,6 @@ in
bypassCache = true;
reconstructLock = true;
};
eslint_d = nodeEnv.buildNodePackage {
name = "eslint_d";
packageName = "eslint_d";
version = "12.2.1";
src = fetchurl {
url = "https://registry.npmjs.org/eslint_d/-/eslint_d-12.2.1.tgz";
sha512 = "qOJ9cTi5AaH5bOgEoCkv41DJ637mHgzffbOLojwU4wadwC6qbR+OxVJRvVzH0v2XYmQOvw4eiJK7ivrr5SvzsA==";
};
dependencies = [
sources."@eslint-community/eslint-utils-4.4.0"
sources."@eslint-community/regexpp-4.5.1"
sources."@eslint/eslintrc-2.0.3"
sources."@eslint/js-8.41.0"
sources."@humanwhocodes/config-array-0.11.8"
sources."@humanwhocodes/module-importer-1.0.1"
sources."@humanwhocodes/object-schema-1.2.1"
sources."@nodelib/fs.scandir-2.1.5"
sources."@nodelib/fs.stat-2.0.5"
sources."@nodelib/fs.walk-1.2.8"
sources."acorn-8.8.2"
sources."acorn-jsx-5.3.2"
sources."ajv-6.12.6"
sources."ansi-regex-5.0.1"
sources."ansi-styles-4.3.0"
sources."argparse-2.0.1"
sources."balanced-match-1.0.2"
sources."brace-expansion-1.1.11"
sources."callsites-3.1.0"
(sources."chalk-4.1.2" // {
dependencies = [
sources."supports-color-7.2.0"
];
})
sources."color-convert-2.0.1"
sources."color-name-1.1.4"
sources."concat-map-0.0.1"
sources."core_d-5.0.1"
sources."cross-spawn-7.0.3"
sources."debug-4.3.4"
sources."deep-is-0.1.4"
sources."doctrine-3.0.0"
sources."escape-string-regexp-4.0.0"
sources."eslint-8.41.0"
sources."eslint-scope-7.2.0"
sources."eslint-visitor-keys-3.4.1"
sources."espree-9.5.2"
sources."esquery-1.5.0"
sources."esrecurse-4.3.0"
sources."estraverse-5.3.0"
sources."esutils-2.0.3"
sources."fast-deep-equal-3.1.3"
sources."fast-json-stable-stringify-2.1.0"
sources."fast-levenshtein-2.0.6"
sources."fastq-1.15.0"
sources."file-entry-cache-6.0.1"
sources."find-up-5.0.0"
sources."flat-cache-3.0.4"
sources."flatted-3.2.7"
sources."fs.realpath-1.0.0"
sources."glob-7.2.3"
sources."glob-parent-6.0.2"
sources."globals-13.20.0"
sources."graphemer-1.4.0"
sources."has-flag-4.0.0"
sources."ignore-5.2.4"
sources."import-fresh-3.3.0"
sources."imurmurhash-0.1.4"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
sources."is-extglob-2.1.1"
sources."is-glob-4.0.3"
sources."is-path-inside-3.0.3"
sources."isexe-2.0.0"
sources."js-yaml-4.1.0"
sources."json-schema-traverse-0.4.1"
sources."json-stable-stringify-without-jsonify-1.0.1"
sources."levn-0.4.1"
sources."locate-path-6.0.0"
sources."lodash.merge-4.6.2"
sources."minimatch-3.1.2"
sources."ms-2.1.2"
sources."nanolru-1.0.0"
sources."natural-compare-1.4.0"
sources."once-1.4.0"
sources."optionator-0.9.1"
sources."p-limit-3.1.0"
sources."p-locate-5.0.0"
sources."parent-module-1.0.1"
sources."path-exists-4.0.0"
sources."path-is-absolute-1.0.1"
sources."path-key-3.1.1"
sources."prelude-ls-1.2.1"
sources."punycode-2.3.0"
sources."queue-microtask-1.2.3"
sources."resolve-from-4.0.0"
sources."reusify-1.0.4"
sources."rimraf-3.0.2"
sources."run-parallel-1.2.0"
sources."shebang-command-2.0.0"
sources."shebang-regex-3.0.0"
sources."strip-ansi-6.0.1"
sources."strip-json-comments-3.1.1"
sources."supports-color-8.1.1"
sources."text-table-0.2.0"
sources."type-check-0.4.0"
sources."type-fest-0.20.2"
sources."uri-js-4.4.1"
sources."which-2.0.2"
sources."word-wrap-1.2.3"
sources."wrappy-1.0.2"
sources."yocto-queue-0.1.0"
];
buildInputs = globalBuildInputs;
meta = {
description = "Makes eslint the fastest linter on the planet";
homepage = "https://github.com/mantoni/eslint_d.js";
license = "MIT";
};
production = true;
bypassCache = true;
reconstructLock = true;
};
esy = nodeEnv.buildNodePackage {
name = "esy";
packageName = "esy";

113
pkgs/development/php-packages/relay/default.nix Normal file
View file

@ -0,0 +1,113 @@
{ stdenv
, lib
, fetchurl
, php
, openssl
, openssl_1_1
, zstd
, lz4
, autoPatchelfHook
}:
let
version = "0.6.3";
system = stdenv.hostPlatform.system;
phpVersion = lib.versions.majorMinor php.version;
variation = {
"aarch64-darwin" = {
platform = "darwin-arm64";
hashes = {
"8.0" = "00a7pyf9na7hjifkmp2482c7sh086w72zniqgr4cz2rhz7hnqp7p";
"8.1" = "0mg6nsllycgjxxinn8s30y9sk06g40vk8blnpx0askjw5zdsf5y7";
"8.2" = "0qmcbrj6jaxczv25rdgfjrj9nwq4vb2faw7kzlyxrvvzb5pyn9dm";
"8.3" = "1hqjy5y4q3alxvrj7xksaf7vvmz8p51bgzxbvmzdx6jnl63dix33";
};
};
"aarch64-linux" = {
platform = "debian-aarch64+libssl3";
hashes = {
"8.0" = "19zzw4324z096b6bph1686r30i4i2kwmlmmcqmb33lqkr9b9n5ag";
"8.1" = "0j6wpwy8d67pqij4v8m2xwydfddzr7nn4c3lyrssp8llbn4ghwpn";
"8.2" = "1nbajvi5zk6z8qr32l86p65f1zxv12kald56pg8k7bj4axlj2pmy";
"8.3" = "1sn638g2636m6s3lv2cclza9lzmzgqxamcga7jz3ijhn2ja6znbv";
};
};
"x86_64-darwin" = {
platform = "darwin-x86-64";
hashes = {
"8.0" = "13q6va9lxgfyx86xw20iqjz4s9r9xms74ywb2hgqrhs5mjnazzz4";
"8.1" = "1ncih5bf0jcylpl0nj8hi50kcwb4nl1g0ql359dgg9gp8s1b4hmw";
"8.2" = "150difm3vg0g2pl5hb5cci4jzybd7jcd7prjdv3rmwsi91gsydlv";
# 8.3 for this platform does not exist
};
};
"x86_64-linux" = {
platform = "debian-x86-64+libssl3";
hashes = {
"8.0" = "1qvd5r591kp7qf9pkymz78s8llzs1vxjwqhwy9rvma21hh6gd8ld";
"8.1" = "0fm9ppgx7qaggid134qnl9jkq5h97dac2ax21f1f1d0k8f5blmc2";
"8.2" = "0g2yqwfrigf047dqkrvfcj318lvgp38zy522ry484mrgq7iqwvb8";
"8.3" = "06mi3yr7k1a9icdljzl76xvrw6xqnvwiavgzx2g487s097mycjp4";
};
};
}.${system} or (throw "Unsupported platform for relay: ${system}");
in
stdenv.mkDerivation (finalAttrs: {
inherit version;
pname = "relay";
extensionName = "relay";
src = fetchurl {
url = "https://builds.r2.relay.so/v${finalAttrs.version}/relay-v${finalAttrs.version}-php"
+ phpVersion + "-" + variation.platform + ".tar.gz";
sha256 = variation.hashes.${phpVersion} or (throw "Unsupported PHP version for relay ${phpVersion} on ${system}");
};
nativeBuildInputs = lib.optionals (!stdenv.isDarwin) [
autoPatchelfHook
];
buildInputs = lib.optionals (!stdenv.isDarwin) [
openssl
zstd
lz4
];
installPhase = ''
runHook preInstall
mkdir -p $out/lib/php/extensions
cp relay-pkg.so $out/lib/php/extensions/relay.so
chmod +w $out/lib/php/extensions/relay.so
'' + (if stdenv.isDarwin then
let
args = lib.strings.concatMapStrings
(v: " -change /Users/administrator/dev/relay-dev/relay-deps/build/arm64/lib/${v.name}"
+ " ${lib.strings.makeLibraryPath [ v.value ]}/${v.name}")
(with lib.attrsets; [
(nameValuePair "libssl.1.1.dylib" openssl_1_1)
(nameValuePair "libcrypto.1.1.dylib" openssl_1_1)
(nameValuePair "libzstd.1.dylib" zstd)
(nameValuePair "liblz4.1.dylib" lz4)
]);
in
# fixDarwinDylibNames can't be used here because we need to completely remap .dylibs, not just add absolute paths
''
install_name_tool${args} $out/lib/php/extensions/relay.so
''
else
"") + ''
# Random UUID that's required by the extension. Can be anything, but must be different from default.
sed -i "s/00000000-0000-0000-0000-000000000000/aced680f-30e9-40cc-a868-390ead14ba0c/" $out/lib/php/extensions/relay.so
chmod -w $out/lib/php/extensions/relay.so
runHook postInstall
'';
meta = with lib; {
description = "Next-generation Redis extension for PHP";
changelog = "https://github.com/cachewerk/relay/releases/tag/v${version}";
homepage = "https://relay.so/";
sourceProvenance = [ sourceTypes.binaryNativeCode ];
license = licenses.unfree;
maintainers = with maintainers; [ tillkruss ostrolucky ];
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
};
})

4
pkgs/development/python-modules/aioairzone-cloud/default.nix
View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "aioairzone-cloud";
version = "0.1.6";
version = "0.1.7";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "Noltari";
repo = "aioairzone-cloud";
rev = "refs/tags/${version}";
hash = "sha256-9VLjZaIru3FRZyovZ4j8ks7lNZOft2bwAzDodTdqjH0=";
hash = "sha256-IkV0gwsd/87GZ9LSQu6azQuoxPXuKNbjZMekVKxAl/A=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/awkward-cpp/default.nix
View file

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "awkward-cpp";
version = "9";
version = "15";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-2xyRwh+IuJo5tGF27cZ6CLN/coPBai7VFZ48h0YTxho=";
sha256 = "f6c825db2db981f852903d9574a07015c5d53ef8e4630772f18c7f167045aa0d";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/awkward/default.nix
View file

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "awkward";
version = "2.0.8";
version = "2.2.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-MqV8KeE6KuO8HmrFNjeCW70ixChmlhY71Bod7ChKjuU=";
sha256 = "653e5b69f1c8e32d1d59445a8414d03f850d327eb933f45aad163f0778861dc2";
};
nativeBuildInputs = [

23
pkgs/tools/security/certipy/default.nix → pkgs/development/python-modules/certipy-ad/default.nix
View file

@ -1,13 +1,25 @@
{ lib
, asn1crypto
, buildPythonPackage
, dnspython
, dsinternals
, fetchFromGitHub
, python3
, impacket
, ldap3
, pyasn1
, pycryptodome
, pyopenssl
, pythonOlder
, requests_ntlm
}:
python3.pkgs.buildPythonApplication rec {
pname = "certipy";
buildPythonPackage rec {
pname = "certipy-ad";
version = "4.4.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "ly4k";
repo = "Certipy";
@ -21,11 +33,12 @@ python3.pkgs.buildPythonApplication rec {
--replace "pyasn1==0.4.8" "pyasn1"
'';
propagatedBuildInputs = with python3.pkgs; [
propagatedBuildInputs = [
asn1crypto
dnspython
dsinternals
impacket
pyopenssl
ldap3
pyasn1
pycryptodome
@ -40,7 +53,7 @@ python3.pkgs.buildPythonApplication rec {
];
meta = with lib; {
description = "Tool to enumerate and abuse misconfigurations in Active Directory Certificate Services";
description = "Library and CLI tool to enumerate and abuse misconfigurations in Active Directory Certificate Services";
homepage = "https://github.com/ly4k/Certipy";
changelog = "https://github.com/ly4k/Certipy/releases/tag/${version}";
license = with licenses; [ mit ];

2
pkgs/development/python-modules/cryptography/default.nix
View file

@ -9,8 +9,6 @@
, setuptools-rust
, openssl
, Security
, packaging
, six
, isPyPy
, cffi
, pkg-config

4
pkgs/development/python-modules/dissect-cim/default.nix
View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-cim";
version = "3.5";
version = "3.6";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.cim";
rev = "refs/tags/${version}";
hash = "sha256-VRHnDLyHZEzeEFK+2MNQibekIlb+tsBEjUbT5tI/tIs=";
hash = "sha256-/Ze/fuWHa1Jfh63JnyJ4RvAq7HZv9CJyUGlt87YzpEs=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/python-modules/dissect-clfs/default.nix
View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "dissect-clfs";
version = "1.4";
version = "1.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.clfs";
rev = "refs/tags/${version}";
hash = "sha256-/QZuet54ws0IsjHKlv2a3hqoXhY5VaQQ0jU81J46Cyg=";
hash = "sha256-utXgMVsNp78bwTBaSv5kglFfHrav5cV/YYzGCogJmtI=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

83
pkgs/development/python-modules/dissect-cobaltstrike/default.nix Normal file
View file

@ -0,0 +1,83 @@
{ lib
, buildPythonPackage
, dissect-cstruct
, dissect-util
, fetchFromGitHub
, flow-record
, httpx
, lark
, pycryptodome
, pyshark
, pytest-httpserver
, pytestCheckHook
, pythonOlder
, rich
, setuptools
, setuptools-scm
}:
buildPythonPackage rec {
pname = "dissect-cobaltstrike";
version = "1.0.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "fox-it";
repo = "dissect.cobaltstrike";
rev = "refs/tags/v${version}";
hash = "sha256-CS50c3r7sdxp3CRS6XJ4QUmUFtmhFg6rSdKfYzJSOV4=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
dissect-cstruct
dissect-util
lark
];
passthru.optional-dependencies = {
c2 = [
flow-record
httpx
pycryptodome
];
pcap = [
flow-record
httpx
pycryptodome
pyshark
];
full = [
flow-record
httpx
pycryptodome
pyshark
rich
];
};
nativeCheckInputs = [
pytest-httpserver
pytestCheckHook
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
pythonImportsCheck = [
"dissect.cobaltstrike"
];
meta = with lib; {
description = "Dissect module implementing a parser for Cobalt Strike related data";
homepage = "https://github.com/fox-it/dissect.cobaltstrike";
changelog = "https://github.com/fox-it/dissect.cobaltstrike/releases/tag/${version}";
license = licenses.agpl3Only;
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/dissect-cstruct/default.nix
View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "dissect-cstruct";
version = "3.6";
version = "3.7";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.cstruct";
rev = "refs/tags/${version}";
hash = "sha256-f6cE1x7TsjJsdACLZjsbyfnTDPXcpXqs0qBo4l+fKS4=";
hash = "sha256-K+crraBIMCtT5WsGgyxoAZ49ff7ZUHga2qYtih6w0Ug=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/python-modules/dissect-esedb/default.nix
View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-esedb";
version = "3.6";
version = "3.7";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.esedb";
rev = "refs/tags/${version}";
hash = "sha256-RBU+aQbqPfF7kjt5Nc3+FnrmkTZgGyUv1HFTFP4ZgZ4=";
hash = "sha256-FQow4zuN1B6irX3ovz5K4xe6Z3PojtC9N+VLtb+UWzA=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/python-modules/dissect-etl/default.nix
View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-etl";
version = "3.4";
version = "3.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.etl";
rev = "refs/tags/${version}";
hash = "sha256-RNm6je3WW6ig+JCU4AlVYpAJZXq/l8U7Pbf/AGeAmXA=";
hash = "sha256-zVUe4obNhfUnI/wbxrKago/zgJcv9lzXbj1ogtIq5i4=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/python-modules/dissect-eventlog/default.nix
View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-eventlog";
version = "3.4";
version = "3.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.eventlog";
rev = "refs/tags/${version}";
hash = "sha256-dU34eEUwRGHm/S0w6rnXJmootv1trkhKlXjWcfCFB3Q=";
hash = "sha256-YSJnNT+zzsS7aKT44NFwU3AmvhbTtW6kIgNd/CbSLYY=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/python-modules/dissect-evidence/default.nix
View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-evidence";
version = "3.4";
version = "3.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.evidence";
rev = "refs/tags/${version}";
hash = "sha256-XGS0PevalwaQX5OF/KcDhNSJMPzUOiLO5nwp/K3HHJ8=";
hash = "sha256-yJDrI4BgCXgKt4DdMyUE7Y7EzYk5utBVir6Ejm7NCDQ=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/python-modules/dissect-executable/default.nix
View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "dissect-executable";
version = "1.2";
version = "1.3";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.executable";
rev = "refs/tags/${version}";
hash = "sha256-I/LwIGce1bebAvjVuFE0rJAuJ/65xMTIim6M0BJR6TI=";
hash = "sha256-YGpClgRVW8l5Ln6e3RrH1RhOSuZ/A6Kfjf1plomWE9U=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

7
pkgs/development/python-modules/dissect-extfs/default.nix
View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-extfs";
version = "3.4";
version = "3.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.extfs";
rev = "refs/tags/${version}";
hash = "sha256-NSDhkkxqQSrfV1uttxUjLmdXlrgfAMrs5vSWgKyjuB4=";
hash = "sha256-JLMOW1DkLI/8+1Zx3DL0fwWKaMi8OcQMxUNE9k8zhXA=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
@ -43,6 +43,9 @@ buildPythonPackage rec {
"dissect.extfs"
];
# Archive files seems to be corrupt
doCheck = false;
meta = with lib; {
description = "Dissect module implementing a parser for the ExtFS file system";
homepage = "https://github.com/fox-it/dissect.extfs";

4
pkgs/development/python-modules/dissect-fat/default.nix
View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "dissect-fat";
version = "3.4";
version = "3.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.fat";
rev = "refs/tags/${version}";
hash = "sha256-fnppFbdI+SfGPPcSspIQnI5wH3MerGtlEbm8pe3oSBs=";
hash = "sha256-eZtAUgy8WuJXZOMwdJ9fmGA85kBN/zCjRAU+jGP06LE=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/python-modules/dissect-ffs/default.nix
View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-ffs";
version = "3.4";
version = "3.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.ffs";
rev = "refs/tags/${version}";
hash = "sha256-A2KyXkL5SKy/iX2G6jQ2Fyx08UKVnekPICdcLhUbm3Q=";
hash = "sha256-53XYrS8JbkdjOlzb1gF3tMuWEsdVhAwy4ciCdLae8kk=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/python-modules/dissect-hypervisor/default.nix
View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "dissect-hypervisor";
version = "3.6";
version = "3.7";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.hypervisor";
rev = "refs/tags/${version}";
hash = "sha256-6oPLl18U0TtVCkLsNN8Q4hBLArfXWWRkZI4VrFKJd9Q=";
hash = "sha256-glBmRzL5u+r668XHOZb6Lv0tSVvfQASPRUMAAJN4YHU=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/python-modules/dissect-ntfs/default.nix
View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-ntfs";
version = "3.4";
version = "3.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.ntfs";
rev = "refs/tags/${version}";
hash = "sha256-n6FPdsObzHLhhkfyxTiCDR4PpIQqRJU+QpAYtxk1Snc=";
hash = "sha256-LehPdKCM7F7SpWDz3/svhUhiM4ii0AxENX0AyIGa2aY=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/python-modules/dissect-ole/default.nix
View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "dissect-ole";
version = "3.4";
version = "3.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.ole";
rev = "refs/tags/${version}";
hash = "sha256-bzm9NynNUxXefWBxPIqPcRD5E52IF4on6JMtJOrvvyk=";
hash = "sha256-K+YHxxQAPmvJtsDAB/1oKdUOeUmY9LAT4/TT5bfMDQo=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/python-modules/dissect-regf/default.nix
View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-regf";
version = "3.4";
version = "3.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.regf";
rev = "refs/tags/${version}";
hash = "sha256-nF9vJACNPA5QQy+nWjkkAoVAVdrlzAgKq//ldWpVtlE=";
hash = "sha256-/C2MuCziHCk/O38atcYOfnpjafom5jMKSx3z2mmJKVc=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/python-modules/dissect-shellitem/default.nix
View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-shellitem";
version = "3.4";
version = "3.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.shellitem";
rev = "refs/tags/${version}";
hash = "sha256-BL1eTxL82hjsGBRK5mBNxygEzQvjN8P6/tu6KOkHf9s=";
hash = "sha256-m/RBOF7BbYZuqfljgc/lE+HpRs+6wNNiwNa1/6SXp8U=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/python-modules/dissect-sql/default.nix
View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-sql";
version = "3.4";
version = "3.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.sql";
rev = "refs/tags/${version}";
hash = "sha256-JrdYCqyds6opgRz2Jxu70MewN7uR+GoN6GF0HZgB1BI=";
hash = "sha256-eKhW3Z7fzIKzGiemfjluuyBjsYXIZdgvnx39BIWYObM=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/python-modules/dissect-squashfs/default.nix
View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "dissect-squashfs";
version = "1.1";
version = "1.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.squashfs";
rev = "refs/tags/${version}";
hash = "sha256-fcL0kPuJaole9EkrqU8Gouh3yquT2QaO8//R0ixMuP8=";
hash = "sha256-TgrtONUis0yD3s0JxJ0mNGLjEKlDgGZ+eO6NvSBTK14=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

8
pkgs/development/python-modules/dissect-target/default.nix
View file

@ -16,6 +16,7 @@
, dissect-ntfs
, dissect-regf
, dissect-sql
, dissect-shellitem
, dissect-thumbcache
, dissect-util
, dissect-volume
@ -37,16 +38,16 @@
buildPythonPackage rec {
pname = "dissect-target";
version = "3.8";
version = "3.9";
format = "pyproject";
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "fox-it";
repo = "dissect.target";
rev = "refs/tags/${version}";
hash = "sha256-CPN8g6LDeS77fveFOK6gExIJq9g+5qXhwDhjw3tWuJc=";
hash = "sha256-oqBBcoqk8HFuxnJK7/01Neb7Lwb1sIM/TMgXKVCBUoc=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
@ -80,6 +81,7 @@ buildPythonPackage rec {
dissect-extfs
dissect-fat
dissect-ffs
dissect-shellitem
dissect-sql
dissect-thumbcache
dissect-xfs

4
pkgs/development/python-modules/dissect-thumbcache/default.nix
View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-thumbcache";
version = "1.3";
version = "1.4";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.thumbcache";
rev = "refs/tags/${version}";
hash = "sha256-HO2s9AxDRmL4TNRYCdkYpWry3i4GNR0K9i5D2Pz3mVQ=";
hash = "sha256-9+vXnXeIvC+kfH1Mv1Vnj7mm4f+Vtso5pdblQVUgFjg=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

6
pkgs/development/python-modules/dissect-util/default.nix
View file

@ -9,16 +9,16 @@
buildPythonPackage rec {
pname = "dissect-util";
version = "3.7";
version = "3.8";
format = "pyproject";
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "fox-it";
repo = "dissect.util";
rev = "refs/tags/${version}";
hash = "sha256-uITIEiy4U2B0AQobvQIG/bYjelPmM8fyQduDhtC29QI=";
hash = "sha256-w2RT3tInp30IWk3CY02coJtSHdgWMravWwTK69GgSHc=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/python-modules/dissect-vmfs/default.nix
View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-vmfs";
version = "3.4";
version = "3.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.vmfs";
rev = "refs/tags/${version}";
hash = "sha256-zLQzUSJnm5DOhKKCEWX1kVEmJK0oBGKHaWucVn1HOjg=";
hash = "sha256-diCJfaR5Q3s44ZJpxZv5R0rx8aThpZzyyLn/4dqJERQ=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

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