Merge master into haskell-updates

This commit is contained in:
github-actions[bot] 2023-11-02 00:11:58 +00:00 committed by GitHub
commit 9d1ed665f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
182 changed files with 6687 additions and 4391 deletions

View File

@ -38,6 +38,24 @@ Since release 15.09 there is a new TeX Live packaging that lives entirely under
- Note that the wrapper assumes that the result has a chance to be useful. For example, the core executables should be present, as well as some core data files. The supported way of ensuring this is by including some scheme, for example `scheme-basic`, into the combination.
- TeX Live packages are also available under `texlive.pkgs` as derivations with outputs `out`, `tex`, `texdoc`, `texsource`, `tlpkg`, `man`, `info`. They cannot be installed outside of `texlive.combine` but are available for other uses. To repackage a font, for instance, use
```nix
stdenvNoCC.mkDerivation rec {
src = texlive.pkgs.iwona;
inherit (src) pname version;
installPhase = ''
runHook preInstall
install -Dm644 fonts/opentype/nowacki/iwona/*.otf -t $out/share/fonts/opentype
runHook postInstall
'';
}
```
See `biber`, `iwona` for complete examples.
## Custom packages {#sec-language-texlive-custom-packages}
You may find that you need to use an external TeX package. A derivation for such package has to provide the contents of the "texmf" directory in its output and provide the appropriate `tlType` attribute (one of `"run"`, `"bin"`, `"doc"`, `"source"`). Dependencies on other TeX packages can be listed in the attribute `tlDeps`.

View File

@ -9,6 +9,7 @@ let
_fileFilter
_printFileset
_intersection
_difference
;
inherit (builtins)
@ -368,6 +369,58 @@ If a directory does not recursively contain any file, it is omitted from the sto
(elemAt filesets 0)
(elemAt filesets 1);
/*
The file set containing all files from the first file set that are not in the second file set.
See also [Difference (set theory)](https://en.wikipedia.org/wiki/Complement_(set_theory)#Relative_complement).
The given file sets are evaluated as lazily as possible,
with the first argument being evaluated first if needed.
Type:
union :: FileSet -> FileSet -> FileSet
Example:
# Create a file set containing all files from the current directory,
# except ones under ./tests
difference ./. ./tests
let
# A set of Nix-related files
nixFiles = unions [ ./default.nix ./nix ./tests/default.nix ];
in
# Create a file set containing all files under ./tests, except ones in `nixFiles`,
# meaning only without ./tests/default.nix
difference ./tests nixFiles
*/
difference =
# The positive file set.
# The result can only contain files that are also in this file set.
#
# This argument can also be a path,
# which gets [implicitly coerced to a file set](#sec-fileset-path-coercion).
positive:
# The negative file set.
# The result will never contain files that are also in this file set.
#
# This argument can also be a path,
# which gets [implicitly coerced to a file set](#sec-fileset-path-coercion).
negative:
let
filesets = _coerceMany "lib.fileset.difference" [
{
context = "first argument (positive set)";
value = positive;
}
{
context = "second argument (negative set)";
value = negative;
}
];
in
_difference
(elemAt filesets 0)
(elemAt filesets 1);
/*
Incrementally evaluate and trace a file set in a pretty way.
This function is only intended for debugging purposes.

View File

@ -651,6 +651,86 @@ rec {
# In all other cases it's the rhs
rhs;
# Compute the set difference between two file sets.
# The filesets must already be coerced and validated to be in the same filesystem root.
# Type: Fileset -> Fileset -> Fileset
_difference = positive: negative:
let
# The common base components prefix, e.g.
# (/foo/bar, /foo/bar/baz) -> /foo/bar
# (/foo/bar, /foo/baz) -> /foo
commonBaseComponentsLength =
# TODO: Have a `lib.lists.commonPrefixLength` function such that we don't need the list allocation from commonPrefix here
length (
commonPrefix
positive._internalBaseComponents
negative._internalBaseComponents
);
# We need filesetTree's with the same base to be able to compute the difference between them
# This here is the filesetTree from the negative file set, but for a base path that matches the positive file set.
# Examples:
# For `difference /foo /foo/bar`, `negativeTreeWithPositiveBase = { bar = "directory"; }`
# because under the base path of `/foo`, only `bar` from the negative file set is included
# For `difference /foo/bar /foo`, `negativeTreeWithPositiveBase = "directory"`
# because under the base path of `/foo/bar`, everything from the negative file set is included
# For `difference /foo /bar`, `negativeTreeWithPositiveBase = null`
# because under the base path of `/foo`, nothing from the negative file set is included
negativeTreeWithPositiveBase =
if commonBaseComponentsLength == length positive._internalBaseComponents then
# The common prefix is the same as the positive base path, so the second path is equal or longer.
# We need to _shorten_ the negative filesetTree to the same base path as the positive one
# E.g. for `difference /foo /foo/bar` the common prefix is /foo, equal to the positive file set's base
# So we need to shorten the base of the tree for the negative argument from /foo/bar to just /foo
_shortenTreeBase positive._internalBaseComponents negative
else if commonBaseComponentsLength == length negative._internalBaseComponents then
# The common prefix is the same as the negative base path, so the first path is longer.
# We need to lengthen the negative filesetTree to the same base path as the positive one.
# E.g. for `difference /foo/bar /foo` the common prefix is /foo, equal to the negative file set's base
# So we need to lengthen the base of the tree for the negative argument from /foo to /foo/bar
_lengthenTreeBase positive._internalBaseComponents negative
else
# The common prefix is neither the first nor the second path.
# This means there's no overlap between the two file sets,
# and nothing from the negative argument should get removed from the positive one
# E.g for `difference /foo /bar`, we remove nothing to get the same as `/foo`
null;
resultingTree =
_differenceTree
positive._internalBase
positive._internalTree
negativeTreeWithPositiveBase;
in
# If the first file set is empty, we can never have any files in the result
if positive._internalIsEmptyWithoutBase then
_emptyWithoutBase
# If the second file set is empty, nothing gets removed, so the result is just the first file set
else if negative._internalIsEmptyWithoutBase then
positive
else
# We use the positive file set base for the result,
# because only files from the positive side may be included,
# which is what base path is for
_create positive._internalBase resultingTree;
# Computes the set difference of two filesetTree's
# Type: Path -> filesetTree -> filesetTree
_differenceTree = path: lhs: rhs:
# If the lhs doesn't have any files, or the right hand side includes all files
if lhs == null || isString rhs then
# The result will always be empty
null
# If the right hand side has no files
else if rhs == null then
# The result is always the left hand side, because nothing gets removed
lhs
else
# Otherwise we always have two attribute sets to recurse into
mapAttrs (name: lhsValue:
_differenceTree (path + "/${name}") lhsValue (rhs.${name} or null)
) (_directoryEntries path lhs);
_fileFilter = predicate: fileset:
let
recurse = path: tree:

View File

@ -684,6 +684,104 @@ tree=(
)
checkFileset 'intersection (unions [ ./a/b ./c/d ./c/e ]) (unions [ ./a ./c/d/f ./c/e ])'
## Difference
# Subtracting something from itself results in nothing
tree=(
[a]=0
)
checkFileset 'difference ./. ./.'
# The tree of the second argument should not be evaluated if not needed
checkFileset 'difference _emptyWithoutBase (_create ./. (abort "This should not be used!"))'
checkFileset 'difference (_create ./. null) (_create ./. (abort "This should not be used!"))'
# Subtracting nothing gives the same thing back
tree=(
[a]=1
)
checkFileset 'difference ./. _emptyWithoutBase'
checkFileset 'difference ./. (_create ./. null)'
# Subtracting doesn't influence the base path
mkdir a b
touch {a,b}/x
expectEqual 'toSource { root = ./a; fileset = difference ./a ./b; }' 'toSource { root = ./a; fileset = ./a; }'
rm -rf -- *
# Also not the other way around
mkdir a
expectFailure 'toSource { root = ./a; fileset = difference ./. ./a; }' 'lib.fileset.toSource: `fileset` could contain files in '"$work"', which is not under the `root` \('"$work"'/a\). Potential solutions:
\s*- Set `root` to '"$work"' or any directory higher up. This changes the layout of the resulting store path.
\s*- Set `fileset` to a file set that cannot contain files outside the `root` \('"$work"'/a\). This could change the files included in the result.'
rm -rf -- *
# Difference actually works
# We test all combinations of ./., ./a, ./a/x and ./b
tree=(
[a/x]=0
[a/y]=0
[b]=0
[c]=0
)
checkFileset 'difference ./. ./.'
checkFileset 'difference ./a ./.'
checkFileset 'difference ./a/x ./.'
checkFileset 'difference ./b ./.'
checkFileset 'difference ./a ./a'
checkFileset 'difference ./a/x ./a'
checkFileset 'difference ./a/x ./a/x'
checkFileset 'difference ./b ./b'
tree=(
[a/x]=0
[a/y]=0
[b]=1
[c]=1
)
checkFileset 'difference ./. ./a'
tree=(
[a/x]=1
[a/y]=1
[b]=0
[c]=0
)
checkFileset 'difference ./a ./b'
tree=(
[a/x]=1
[a/y]=0
[b]=0
[c]=0
)
checkFileset 'difference ./a/x ./b'
tree=(
[a/x]=0
[a/y]=1
[b]=0
[c]=0
)
checkFileset 'difference ./a ./a/x'
tree=(
[a/x]=0
[a/y]=0
[b]=1
[c]=0
)
checkFileset 'difference ./b ./a'
checkFileset 'difference ./b ./a/x'
tree=(
[a/x]=0
[a/y]=1
[b]=1
[c]=1
)
checkFileset 'difference ./. ./a/x'
tree=(
[a/x]=1
[a/y]=1
[b]=0
[c]=1
)
checkFileset 'difference ./. ./b'
## File filter

View File

@ -64,8 +64,14 @@ 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)"
# Only check error message when a Nixpkgs-specified error is thrown,
# which is only the case when `readFileType` is not available
# and the fallback implementation needs to be used.
if [[ "$(nix-instantiate --eval --expr 'builtins ? readFileType')" == false ]]; then
expectFailure "pathType $PWD/non-existent" \
"error: evaluation aborted with the following error message: 'lib.filesystem.pathType: Path $PWD/non-existent does not exist.'"
fi
expectSuccess "pathIsDirectory /." "true"
expectSuccess "pathIsDirectory $PWD/directory" "true"

View File

@ -446,6 +446,13 @@
githubId = 25236206;
name = "Adrian Dole";
};
adriangl = {
email = "adrian@lauterer.it";
matrix = "@adriangl:pvv.ntnu.no";
github = "adrlau";
githubId = 25004152;
name = "Adrian Gunnar Lauterer";
};
AdsonCicilioti = {
name = "Adson Cicilioti";
email = "adson.cicilioti@live.com";
@ -3048,6 +3055,9 @@
email = "chayleaf-nix@pavluk.org";
github = "chayleaf";
githubId = 9590981;
keys = [{
fingerprint = "4314 3701 154D 9E5F 7051 7ECF 7817 1AD4 6227 E68E";
}];
matrix = "@chayleaf:matrix.pavluk.org";
name = "Anna Pavlyuk";
};
@ -12116,6 +12126,14 @@
github = "MrTarantoga";
githubId = 53876219;
};
mrtnvgr = {
name = "Egor Martynov";
github = "mrtnvgr";
githubId = 48406064;
keys = [{
fingerprint = "6FAD DB43 D5A5 FE52 6835 0943 5B33 79E9 81EF 48B1";
}];
};
mrVanDalo = {
email = "contact@ingolf-wagner.de";
github = "mrVanDalo";
@ -17149,6 +17167,12 @@
githubId = 7075751;
name = "Patrick Hilhorst";
};
sysedwinistrator = {
email = "edwin.mowen@gmail.com";
github = "sysedwinistrator";
githubId = 71331875;
name = "Edwin Mackenzie-Owen";
};
szczyp = {
email = "qb@szczyp.com";
github = "Szczyp";

View File

@ -98,8 +98,7 @@ in
nix.settings.nix-path = mkIf (! cfg.channel.enable) (mkDefault "");
systemd.tmpfiles.rules = lib.mkIf cfg.channel.enable [
"f /root/.nix-channels -"
''w+ "/root/.nix-channels" - - - - ${config.system.defaultChannel} nixos\n''
''f /root/.nix-channels - - - - ${config.system.defaultChannel} nixos\n''
];
};
}

View File

@ -332,12 +332,28 @@ in
# during migrations
bindsTo = [ "paperless-scheduler.service" ];
after = [ "paperless-scheduler.service" ];
# Setup PAPERLESS_SECRET_KEY.
# If this environment variable is left unset, paperless-ngx defaults
# to a well-known value, which is insecure.
script = let
secretKeyFile = "${cfg.dataDir}/nixos-paperless-secret-key";
in ''
if [[ ! -f '${secretKeyFile}' ]]; then
(
umask 0377
tr -dc A-Za-z0-9 < /dev/urandom | head -c64 | ${pkgs.moreutils}/bin/sponge '${secretKeyFile}'
)
fi
export PAPERLESS_SECRET_KEY=$(cat '${secretKeyFile}')
if [[ ! $PAPERLESS_SECRET_KEY ]]; then
echo "PAPERLESS_SECRET_KEY is empty, refusing to start."
exit 1
fi
exec ${pkg.python.pkgs.gunicorn}/bin/gunicorn \
-c ${pkg}/lib/paperless-ngx/gunicorn.conf.py paperless.asgi:application
'';
serviceConfig = defaultServiceConfig // {
User = cfg.user;
ExecStart = ''
${pkg.python.pkgs.gunicorn}/bin/gunicorn \
-c ${pkg}/lib/paperless-ngx/gunicorn.conf.py paperless.asgi:application
'';
Restart = "on-failure";
# gunicorn needs setuid, liblapack needs mbind
@ -349,7 +365,6 @@ in
CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
};
environment = env // {
PATH = mkForce pkg.path;
PYTHONPATH = "${pkg.python.pkgs.makePythonPath pkg.propagatedBuildInputs}:${pkg}/lib/paperless-ngx/src";
};
# Allow the web interface to access the private /tmp directory of the server.

View File

@ -11,7 +11,16 @@
};
testScript = { nodes, ... }: ''
machine.start(allow_reboot=True)
assert machine.succeed("cat /root/.nix-channels") == "${nodes.machine.system.defaultChannel} nixos\n"
nixpkgs_unstable_channel = "https://nixos.org/channels/nixpkgs-unstable nixpkgs"
machine.succeed(f"echo '{nixpkgs_unstable_channel}' > /root/.nix-channels")
machine.reboot()
assert machine.succeed("cat /root/.nix-channels") == f"{nixpkgs_unstable_channel}\n"
'';
}

View File

@ -14,27 +14,13 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
testScript = { nodes, ... }:
let
user = nodes.machine.users.users.alice;
uid = toString user.uid;
bus = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${uid}/bus";
display = "DISPLAY=:0.0";
env = "${bus} ${display}";
gdbus = "${env} gdbus";
env = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${toString user.uid}/bus DISPLAY=:0";
su = command: "su - ${user.name} -c '${env} ${command}'";
# Call javascript in cinnamon (the shell), returns a tuple (success, output),
# where `success` is true if the dbus call was successful and `output` is what
# the javascript evaluates to.
eval = "call --session -d org.Cinnamon -o /org/Cinnamon -m org.Cinnamon.Eval";
# Should be 2 (RunState.RUNNING) when startup is done.
# https://github.com/linuxmint/cinnamon/blob/5.4.0/js/ui/main.js#L183-L187
getRunState = su "${gdbus} ${eval} Main.runState";
# Start gnome-terminal.
gnomeTerminalCommand = su "gnome-terminal";
# Hopefully gnome-terminal's wm class.
wmClass = su "${gdbus} ${eval} global.display.focus_window.wm_class";
eval = name: su "gdbus call --session -d org.Cinnamon -o /org/Cinnamon -m org.Cinnamon.Eval ${name}";
in
''
machine.wait_for_unit("display-manager.service")
@ -54,13 +40,43 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
with subtest("Wait for the Cinnamon shell"):
# Correct output should be (true, '2')
machine.wait_until_succeeds("${getRunState} | grep -q 'true,..2'")
# https://github.com/linuxmint/cinnamon/blob/5.4.0/js/ui/main.js#L183-L187
machine.wait_until_succeeds("${eval "Main.runState"} | grep -q 'true,..2'")
with subtest("Check if Cinnamon components actually start"):
for i in ["csd-media-keys", "cinnamon-killer-daemon", "xapp-sn-watcher", "nemo-desktop"]:
machine.wait_until_succeeds(f"pgrep -f {i}")
machine.wait_until_succeeds("journalctl -b --grep 'Loaded applet menu@cinnamon.org'")
machine.wait_until_succeeds("journalctl -b --grep 'calendar@cinnamon.org: Calendar events supported'")
with subtest("Open Cinnamon Settings"):
machine.succeed("${su "cinnamon-settings themes >&2 &"}")
machine.wait_until_succeeds("${eval "global.display.focus_window.wm_class"} | grep -i 'cinnamon-settings'")
machine.wait_for_text('(Style|Appearance|Color)')
machine.sleep(2)
machine.screenshot("cinnamon_settings")
with subtest("Lock the screen"):
machine.succeed("${su "cinnamon-screensaver-command -l >&2 &"}")
machine.wait_until_succeeds("${su "cinnamon-screensaver-command -q"} | grep 'The screensaver is active'")
machine.sleep(2)
machine.screenshot("cinnamon_screensaver")
machine.send_chars("${user.password}\n", delay=0.2)
machine.wait_until_succeeds("${su "cinnamon-screensaver-command -q"} | grep 'The screensaver is inactive'")
machine.sleep(2)
with subtest("Open GNOME Terminal"):
machine.succeed("${gnomeTerminalCommand}")
# Correct output should be (true, '"Gnome-terminal"')
machine.wait_until_succeeds("${wmClass} | grep -q 'true,...Gnome-terminal'")
machine.sleep(20)
machine.screenshot("screen")
machine.succeed("${su "gnome-terminal"}")
machine.wait_until_succeeds("${eval "global.display.focus_window.wm_class"} | grep -i 'gnome-terminal'")
machine.sleep(2)
with subtest("Open virtual keyboard"):
machine.succeed("${su "dbus-send --print-reply --dest=org.Cinnamon /org/Cinnamon org.Cinnamon.ToggleKeyboard"}")
machine.wait_for_text('(Ctrl|Alt)')
machine.sleep(2)
machine.screenshot("cinnamon_virtual_keyboard")
with subtest("Check if Cinnamon has ever coredumped"):
machine.fail("coredumpctl --json=short | grep -E 'cinnamon|nemo'")
'';
})

View File

@ -36,7 +36,7 @@ in pkgs.lib.listToAttrs (builtins.map ({ predictable, withNetworkd, systemdStage
networking.useDHCP = !withNetworkd;
# Check if predictable interface names are working in stage-1
boot.initrd.postDeviceCommands = script;
boot.initrd.postDeviceCommands = lib.mkIf (!systemdStage1) script;
boot.initrd.systemd = lib.mkIf systemdStage1 {
enable = true;

View File

@ -27,11 +27,11 @@
stdenv.mkDerivation rec {
pname = "cardinal";
version = "23.09";
version = "23.10";
src = fetchurl {
url = "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal+deps-${version}.tar.xz";
hash = "sha256-q42ry47y4tTkUbejv6iN5jXcadXSSTPQ3omhMUevfqU=";
hash = "sha256-6Wt2sC7vdrz2Fkl08bNLfnGu+pAV7b5lZUmsx1wtJRE=";
};
prePatch = ''

View File

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "ft2-clone";
version = "1.72.1";
version = "1.73";
src = fetchFromGitHub {
owner = "8bitbubsy";
repo = "ft2-clone";
rev = "v${version}";
hash = "sha256-dGoldr0JvXri4XfSn/DKeJw/wsBaj+AKoKWdbEgo8lg=";
hash = "sha256-f5deXMSyZIDKPO7hsNONes/kTFLFodx4nuEjZzkR5Aw=";
};
nativeBuildInputs = [ cmake ];

View File

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "pt2-clone";
version = "1.64";
version = "1.65.1";
src = fetchFromGitHub {
owner = "8bitbubsy";
repo = "pt2-clone";
rev = "v${version}";
sha256 = "sha256-b/1YksgXKXi6Tyntd03yWKZAAjvmG4HxsVYLVXoiMaA=";
sha256 = "sha256-0bZGiulLeAZ8bR0lj0Bm7te3T3YhxSOBFgMgWADRkIY=";
};
nativeBuildInputs = [ cmake ];

View File

@ -1,9 +1,17 @@
{ lib, mkDerivation, fetchFromGitLab
, cmake, pkg-config
, alsa-lib, pipewire
{ lib
, stdenv
, fetchFromGitLab
, cmake
, pkg-config
, wrapQtAppsHook
, qtbase
, qtsvg
, qtwayland
, alsa-lib
, pipewire
}:
mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "qpwgraph";
version = "0.5.3";
@ -11,13 +19,13 @@ mkDerivation rec {
domain = "gitlab.freedesktop.org";
owner = "rncbc";
repo = "qpwgraph";
rev = "v${version}";
rev = "v${finalAttrs.version}";
sha256 = "sha256-50KaVpNB5/CTLs2bRbXEinYM23AZxZO/ForrVPFDN8U=";
};
nativeBuildInputs = [ cmake pkg-config ];
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
buildInputs = [ alsa-lib pipewire ];
buildInputs = [ qtbase qtsvg qtwayland alsa-lib pipewire ];
cmakeFlags = [ "-DCONFIG_WAYLAND=ON" ];
@ -32,5 +40,6 @@ mkDerivation rec {
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ kanashimia exi Scrumplex ];
mainProgram = "qpwgraph";
};
}
})

View File

@ -25,13 +25,13 @@ let
in
stdenv.mkDerivation rec {
pname = "reaper";
version = "7.0";
version = "7.02";
src = fetchurl {
url = url_for_platform version stdenv.hostPlatform.qemuArch;
hash = {
x86_64-linux = "sha256-lHXy1xSwhNht6dt30e35nE1ZpOm8oTMMpoZJI7ELsjg=";
aarch64-linux = "sha256-a/e8DQ9NvbLyZHqg7pUxm+kV7i5vKCjeq9EOO0/5TJk=";
x86_64-linux = "sha256-86BGWaZ+zkxgC1Tz14lkBniwhs26G4EPpG2LjsSe9io=";
aarch64-linux = "sha256-kJfy4ji5YBv5ztilkAIuPswu3O9pwBL0coD6wU1gU5c=";
}.${stdenv.hostPlatform.system};
};

View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "tetraproc";
version = "0.8.6";
version = "0.9.2";
src = fetchurl {
url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
sha256 = "02155ljfwgvfgq9z258fb4z7jrz7qx022d054fj5gr0v007cv0r7";
sha256 = "sha256-kRak33RuYusG6U5FOf9b9vOJUjNK3zqoLL0V/bWBJqs=";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -1229,8 +1229,8 @@ let
mktplcRef = {
name = "elixir-ls";
publisher = "JakeBecker";
version = "0.17.1";
sha256 = "sha256-WBtIdz+8zsyTl43ovU3Dz+8p154ZGvHp6BA3AQtXN/U=";
version = "0.17.5";
sha256 = "sha256-2iOyLNLMQ6Snm0gvv7Yl6von/A9UTfLYrH5l1PoJwUc=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog";

View File

@ -1,23 +1,24 @@
{
"name": "rust-analyzer",
"version": "0.3.1607",
"version": "0.3.1697",
"dependencies": {
"@hpcc-js/wasm": "^2.13.0",
"anser": "^2.1.1",
"d3": "^7.6.1",
"d3": "^7.8.5",
"d3-graphviz": "^5.0.2",
"vscode-languageclient": "^8.0.2",
"vscode-languageclient": "^8.1.0",
"@tsconfig/strictest": "^2.0.1",
"@types/node": "~16.11.7",
"@types/vscode": "~1.66.0",
"@typescript-eslint/eslint-plugin": "^5.30.5",
"@typescript-eslint/parser": "^5.30.5",
"@vscode/test-electron": "^2.1.5",
"cross-env": "^7.0.3",
"eslint": "^8.19.0",
"eslint-config-prettier": "^8.5.0",
"ovsx": "^0.5.2",
"prettier": "^2.7.1",
"tslib": "^2.4.0",
"typescript": "^4.7.4",
"vsce": "^2.9.2"
"@types/vscode": "~1.75",
"@typescript-eslint/eslint-plugin": "^6.0.0",
"@typescript-eslint/parser": "^6.0.0",
"@vscode/test-electron": "^2.3.3",
"@vscode/vsce": "^2.19.0",
"eslint": "^8.44.0",
"eslint-config-prettier": "^8.8.0",
"ovsx": "^0.8.2",
"prettier": "^3.0.0",
"tslib": "^2.6.0",
"typescript": "^5.1.6"
}
}

View File

@ -20,7 +20,7 @@ let
# Use the plugin version as in vscode marketplace, updated by update script.
inherit (vsix) version;
releaseTag = "2023-07-31";
releaseTag = "2023-10-16";
src = fetchFromGitHub {
owner = "rust-lang";

View File

@ -1,29 +1,39 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, gitUpdater
, cmake
, python3
, withDynarec ? stdenv.hostPlatform.isAarch64
, withDynarec ? (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV64)
, runCommand
, hello-x86_64
, box64
}:
# Currently only supported on ARM
assert withDynarec -> stdenv.hostPlatform.isAarch64;
# Currently only supported on ARM & RISC-V
assert withDynarec -> (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV64);
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "box64";
version = "0.2.4";
src = fetchFromGitHub {
owner = "ptitSeb";
repo = pname;
rev = "v${version}";
repo = "box64";
rev = "v${finalAttrs.version}";
hash = "sha256-iCZv/WvqZkH6i23fSLA/p0nG5/CgzjyU5glVgje4c3w=";
};
patches = [
# Fix crash due to regression in SDL1 AudioCallback signature in 0.2.4
# Remove when version > 0.2.4
(fetchpatch {
name = "0001-box64-Fixed_signature_of_SDL1_AudioCallback.patch";
url = "https://github.com/ptitSeb/box64/commit/5fabd602aea1937e3c5ce58843504c2492b8c0ec.patch";
hash = "sha256-dBdKijTljCFtSJ2smHrbjH/ok0puGw4YEy/kluLl4AQ=";
})
];
nativeBuildInputs = [
cmake
python3
@ -31,12 +41,20 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DNOGIT=ON"
"-DARM_DYNAREC=${if withDynarec then "ON" else "OFF"}"
"-DRV64=${if stdenv.hostPlatform.isRiscV64 then "ON" else "OFF"}"
"-DPPC64LE=${if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then "ON" else "OFF"}"
# Arch mega-option
"-DARM64=${lib.boolToString stdenv.hostPlatform.isAarch64}"
"-DRV64=${lib.boolToString stdenv.hostPlatform.isRiscV64}"
"-DPPC64LE=${lib.boolToString (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian)}"
"-DLARCH64=${lib.boolToString stdenv.hostPlatform.isLoongArch64}"
] ++ lib.optionals stdenv.hostPlatform.isx86_64 [
# x86_64 has no arch-specific mega-option, manually enable the options that apply to it
"-DLD80BITS=ON"
"-DNOALIGN=ON"
] ++ [
# Arch dynarec
"-DARM_DYNAREC=${lib.boolToString (withDynarec && stdenv.hostPlatform.isAarch64)}"
"-DRV64_DYNAREC=${lib.boolToString (withDynarec && stdenv.hostPlatform.isRiscV64)}"
];
installPhase = ''
@ -47,9 +65,9 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
doCheck = true;
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
doInstallCheck = true;
doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
installCheckPhase = ''
runHook preInstallCheck
@ -68,7 +86,7 @@ stdenv.mkDerivation rec {
rev-prefix = "v";
};
tests.hello = runCommand "box64-test-hello" {
nativeBuildInputs = [ box64 hello-x86_64 ];
nativeBuildInputs = [ finalAttrs.finalPackage ];
} ''
# There is no actual "Hello, world!" with any of the logging enabled, and with all logging disabled it's hard to
# tell what problems the emulator has run into.
@ -81,6 +99,7 @@ stdenv.mkDerivation rec {
description = "Lets you run x86_64 Linux programs on non-x86_64 Linux systems";
license = licenses.mit;
maintainers = with maintainers; [ gador OPNA2608 ];
platforms = [ "x86_64-linux" "aarch64-linux" "riscv64-linux" "powerpc64le-linux" ];
mainProgram = "box64";
platforms = [ "x86_64-linux" "aarch64-linux" "riscv64-linux" "powerpc64le-linux" "loongarch64-linux" "mips64el-linux" ];
};
}
})

View File

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "hugo";
version = "0.119.0";
version = "0.120.2";
src = fetchFromGitHub {
owner = "gohugoio";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-QumHL3S57Xm6N3u4VakNzRGmUi0RT8lVXG1K5/Dsq4A=";
hash = "sha256-hCcutRfx0GtnYJYoQ/2S8Y+OmxLCtHWzTCdozWUatXY=";
};
vendorHash = "sha256-KbGZ7MSioP82UNgmeKFdgCBkTIqL0fV5QhzrcxYyl4k=";
vendorHash = "sha256-59Q7IN7VK7tQv5w7qyxSz16G+Kmsrslu8we9S3aJeAg=";
doCheck = false;

View File

@ -2,38 +2,41 @@
, rustPlatform
, fetchFromGitHub
, installShellFiles
, nix-update-script
}:
rustPlatform.buildRustPackage rec {
pname = "hyprnome";
version = "0.1.0";
version = "0.2.0";
src = fetchFromGitHub {
owner = "donovanglover";
repo = "hyprnome";
rev = version;
hash = "sha256-jb21hnPSzrCTuW7Yhs6jFzS2WUVQjkn6nCCi6LvoTGA=";
hash = "sha256-zlXiT2EOIdgIDI4NQuU3C903SSq5bylBAFJXyv7mdJ4=";
};
cargoHash = "sha256-QM5v2hKP3E9W3Aek6kFyFFNAp9s0oTFb4CEtxEHyny0=";
cargoHash = "sha256-DpbRs97sr5wpJSrYF99ZiQ0SZOZdoQjfaLhKIAU95HA=";
nativeBuildInputs = [
installShellFiles
];
postInstall = ''
installManPage man/hyprnome.1
installManPage target/man/hyprnome.1
installShellCompletion --cmd hyprnome \
--bash <(cat completions/hyprnome.bash) \
--fish <(cat completions/hyprnome.fish) \
--zsh <(cat completions/_hyprnome)
--bash <(cat target/completions/hyprnome.bash) \
--fish <(cat target/completions/hyprnome.fish) \
--zsh <(cat target/completions/_hyprnome)
'';
passthru.updateScript = nix-update-script { };
meta = with lib; {
description = "GNOME-like workspace switching in Hyprland";
homepage = "https://github.com/donovanglover/hyprnome";
license = licenses.mit;
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ donovanglover ];
mainProgram = "hyprnome";

View File

@ -4,7 +4,7 @@
, appimageTools
, makeWrapper
# graphs will not sync without matching upstream's major electron version
, electron_24
, electron_25
, git
, nix-update-script
}:
@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: let
in {
pname = "logseq";
version = "0.9.19";
version = "0.9.20";
src = fetchurl {
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
hash = "sha256-Y3AeeJc+PYJdckpOma5ZDbVtBbjBTfNNDqTip4l02/E=";
hash = "sha256-iT0Gc/ePx1tUNTPoE2Ol+dHUmbS4CkneZbyraRBx5Ak=";
name = "${pname}-${version}.AppImage";
};
@ -57,7 +57,7 @@ in {
postFixup = ''
# set the env "LOCAL_GIT_DIRECTORY" for dugite so that we can use the git in nixpkgs
makeWrapper ${electron_24}/bin/electron $out/bin/${pname} \
makeWrapper ${electron_25}/bin/electron $out/bin/${pname} \
--set "LOCAL_GIT_DIRECTORY" ${git} \
--add-flags $out/share/${pname}/resources/app \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \

View File

@ -45,13 +45,13 @@
}:
buildPythonApplication rec {
pname = "visidata";
version = "2.11";
version = "2.11.1";
src = fetchFromGitHub {
owner = "saulpw";
repo = "visidata";
rev = "v${version}";
hash = "sha256-G/9paJFJsRfIxMJ2hbuVS7pxCfSUCK69DNV2DHi60qA=";
hash = "sha256-A8iYFdW30Em5pjGn3DRpaV0A7ixwfSzmIp8AgtPkBCI=";
};
propagatedBuildInputs = [

View File

@ -7,26 +7,26 @@
, scdoc
, wayland
, wayland-protocols
, zig_0_10
, zig_0_11
}:
stdenv.mkDerivation (finalAttrs: {
pname = "waylock";
version = "0.6.2";
version = "0.6.3";
src = fetchFromGitHub {
owner = "ifreund";
repo = "waylock";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-jl4jSDWvJB6OfBbVXfVQ7gv/aDkN6bBy+/yK+AQDQL0=";
hash = "sha256-Q1FlahawsnJ77gP6QVs9AR058rhMU92iueRPudPf+sE=";
};
nativeBuildInputs = [
pkg-config
scdoc
wayland
zig_0_10.hook
zig_0_11.hook
];
buildInputs = [

View File

@ -2,20 +2,21 @@
buildNpmPackage rec {
pname = "vieb";
version = "10.3.0";
version = "10.4.0";
src = fetchFromGitHub {
owner = "Jelmerro";
repo = pname;
rev = version;
hash = "sha256-eopsDwgyWshZOppkODGKT8UGnj4vvc7ssEzVAhZeDTA=";
hash = "sha256-SQQDlOSP1MZeN6BHdahpxpZ0e60lgA4ph0r2jkmTdP8=";
};
postPatch = ''
sed -i '/"electron"/d' package.json
'';
npmDepsHash = "sha256-9tnLlKzOy8ze4m2beS/pI34IiEa5TdNNr+Rmm2TFgfk=";
npmDepsHash = "sha256-yCWSEuhiP6DfcFns6uyUrLBJeQbOK7yJ9QfGhHkTlHI=";
makeCacheWritable = true;
dontNpmBuild = true;
nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isAarch64 python3;

View File

@ -14,11 +14,11 @@
stdenv.mkDerivation rec {
pname = "clash-verge";
version = "1.3.7";
version = "1.3.8";
src = fetchurl {
url = "https://github.com/zzzgydi/clash-verge/releases/download/v${version}/clash-verge_${version}_amd64.deb";
hash = "sha256-+RYfGLa4d5JkLWnlYfhjCOSREVJ4ad/R36eSiNj3GIA=";
hash = "sha256-kOju4yaa+EKzFWDrk0iSJVoWkQMBjQG3hKLfAsqlsy8=";
};
nativeBuildInputs = [

View File

@ -13,16 +13,16 @@
buildGoModule rec {
pname = "chart-testing";
version = "3.9.0";
version = "3.10.0";
src = fetchFromGitHub {
owner = "helm";
repo = pname;
rev = "v${version}";
hash = "sha256-H9Pw4HPffFmRJXGh+e2hcddYfhgmvnUOxezQ6Zc8NwY=";
hash = "sha256-2h1Pc313JZ/2NkFOOQnIrhe1Pm8FJ/BvxjAQhs/eSK0=";
};
vendorHash = "sha256-9XdLSTr9FKuatJzpWM8AwrPtYDS+LC14bpz6evvJRuQ=";
vendorHash = "sha256-E+7ndvXWzsU896/eWyupbvqkLed2ly91osptZKT79fk=";
postPatch = ''
substituteInPlace pkg/config/config.go \

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kubevpn";
version = "2.0.0";
version = "2.0.1";
src = fetchFromGitHub {
owner = "KubeNetworks";
repo = "kubevpn";
rev = "v${version}";
sha256 = "sha256-fXRzo68d65FISW+m/BTmwOXlJiCmMm9Az1qsGGsbPIA=";
sha256 = "sha256-vlUR/fr/PFUBzvxebssrcUgfgnDpFuLuJOl5SBEMKR8=";
};
vendorHash = "sha256-EcHHSOAr93M2kPhEaZSpvpZCq4pi1NCedo9hw1Mn0a4=";

View File

@ -167,9 +167,9 @@ rec {
mkTerraform = attrs: pluggable (generic attrs);
terraform_1 = mkTerraform {
version = "1.6.2";
hash = "sha256-24B8YlorL00OqmYYVM1xg5dM9hZ4enDWJ1XIGmeEAiM=";
vendorHash = "sha256-fIirGWt4Os2uZHo4ui7wmZEp+DRUHu/0p+cQCbUbzjc=";
version = "1.6.3";
hash = "sha256-2ai0WAknz4rt33BuBoqnTCsfPNHmet9+PdgYeeJKQkQ=";
vendorHash = "sha256-ZtaXUX0PgL1nwXgohcfCyj/fLPAodx8amHEsQnlOQrc=";
patches = [ ./provider-path-0_15.patch ];
passthru = {
inherit plugins;

View File

@ -1,9 +1,9 @@
{
"version" = "1.11.46";
"version" = "1.11.47";
"hashes" = {
"desktopSrcHash" = "sha256-sgdvdTi3fi/vZohh/JPW3I24cQS0i84eM1dUgmEafWs=";
"desktopSrcHash" = "sha256-Ea3LJt+3HAOX2PTREMojtuPVTeA6u7VJtysd8bbTbwU=";
"desktopYarnHash" = "1nssv92yk1a53v7mvijkrb3gzif5xrz2j6lxvg7p340z42rm7f9v";
"webSrcHash" = "sha256-3ucitVtYnOc5UUn4y3u+L0sKWJLt+NNrd5T6mn0wNBg=";
"webYarnHash" = "19396p654zzzh6d18rpyckjd67lncch3r9a0zmjb7znsi7d78k63";
"webSrcHash" = "sha256-DPBMZMjDnwjdNsePcUBBU0KRGOpOmNHgQZn9/ad/Qss=";
"webYarnHash" = "0rzipmaq0jarzdawl7lmxnapwzl52kklxadm859hgx9b1hd5vwj7";
};
}

View File

@ -13,16 +13,16 @@
buildNpmPackage rec {
pname = "webcord";
version = "4.5.0";
version = "4.5.1";
src = fetchFromGitHub {
owner = "SpacingBat3";
repo = "WebCord";
rev = "v${version}";
hash = "sha256-SIGV/Hl5O+xs1DbA25TGasXJVYgCzAP/GCtsDmxKDvI=";
hash = "sha256-isrExJeONhIxJUXOsMMq8l9xF9amInBGnb5D+DKuzHw=";
};
npmDepsHash = "sha256-ClPcLHO4+CzOswQaItbFYHVlb0W6Y5NZF140jGpoSJ8=";
npmDepsHash = "sha256-RTYPxS6uLLCIu4JfQqMQP8y8+S5uwe3KXWNlbe7/A7Q=";
nativeBuildInputs = [
copyDesktopItems

View File

@ -7,13 +7,12 @@
, pkg-config
, wrapGAppsHook4
, cairo
, dbus
, gdk-pixbuf
, glib
, graphene
, gtk3
, gtk4
, libadwaita
, libappindicator-gtk3
, librclone
, pango
, rclone
@ -21,16 +20,16 @@
rustPlatform.buildRustPackage rec {
pname = "celeste";
version = "0.7.0";
version = "0.8.0";
src = fetchFromGitHub {
owner = "hwittenborn";
repo = "celeste";
rev = "v${version}";
hash = "sha256-fqPAQCbuPnFyn3wioWDETmcXu53808nvnlEzcdUevI4=";
hash = "sha256-U+2imF4hUDJAwwf/RFZXfOgTxA+O8c6C+CzQoEQreJw=";
};
cargoHash = "sha256-mVl7CsCX7HMlGC2EIKEfHnPNjmrexjsrpDK/Uq/GwpY=";
cargoHash = "sha256-9DrJoXT/uD8y7y2r58DMuURSaic+TtlnPPbw/gq9jPA=";
postPatch = ''
pushd $cargoDepsCopy/librclone-sys
@ -64,10 +63,10 @@ rustPlatform.buildRustPackage rec {
buildInputs = [
cairo
dbus
gdk-pixbuf
glib
graphene
gtk3
gtk4
libadwaita
librclone
@ -76,7 +75,6 @@ rustPlatform.buildRustPackage rec {
preFixup = ''
gappsWrapperArgs+=(
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libappindicator-gtk3 ]}"
--prefix PATH : "${lib.makeBinPath [ rclone ]}"
)
'';

View File

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "mmseqs2";
version = "14-7e284";
version = "15-6f452";
src = fetchFromGitHub {
owner = "soedinglab";
repo = pname;
rev = version;
sha256 = "sha256-pVryZGblgMEqJl5M20CHxav269yGY6Y4ci+Gxt6SHOU=";
sha256 = "sha256-L+zOWrGkCLz/wqpBuji8H4/93sDFpcfnDOE8FHq1j84=";
};
nativeBuildInputs = [ cmake xxd perl installShellFiles ];

View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "roxterm";
version = "3.14.1";
version = "3.14.2";
src = fetchFromGitHub {
owner = "realh";
repo = "roxterm";
rev = version;
sha256 = "sha256-IHJ30qXNVv9tUdePskHl1hd5kPivBb2kH1oOstBr/9s=";
sha256 = "sha256-LBxVZ5Az0vGalbQd437of5a3aoZH51v6OKTfndHkkiM=";
};
nativeBuildInputs = [ cmake pkg-config wrapGAppsHook libxslt ];

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gh";
version = "2.37.0";
version = "2.38.0";
src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "v${version}";
hash = "sha256-EAvBPUm2U31gzpfyjEPClT1lbBYiITXpdc+T3nUMOeg=";
hash = "sha256-t+JpCxJM2PO9nT9nYn/Rsz/s2lQQviggbjuEy0OQV88=";
};
vendorHash = "sha256-G3cpR5S+upk3js5anZHXxcRayTEGMqnBpmtp4HO0pjQ=";
vendorHash = "sha256-XZhZDYdbjA/1g7/mPxm5u1b+z/TmwoH60/sJZ63LQMg=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -46,13 +46,13 @@ let
in
stdenv.mkDerivation rec {
pname = "mkvtoolnix";
version = "79.0";
version = "80.0";
src = fetchFromGitLab {
owner = "mbunkus";
repo = "mkvtoolnix";
rev = "release-${version}";
sha256 = "sha256-M+CST7A/obfuGH4lyV68vrhmzEIFCa7DRgApKbPh/uQ=";
hash = "sha256-/RqTfnxivghViFryCvj5RXSBziztb1Drb7tT89cGZ3o=";
};
nativeBuildInputs = [

View File

@ -6,12 +6,12 @@
python3Packages.buildPythonApplication rec {
pname = "streamlink";
version = "6.2.1";
version = "6.3.1";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-64Jmkva7L0oaik1UcCTQlUricL2us+O5CEc6pVsgnRI=";
hash = "sha256-k8Dfrl0Xie5zF/GhVdP/RKGajDyGblAwu49UekX1WEQ=";
};
nativeCheckInputs = with python3Packages; [
@ -23,10 +23,6 @@ python3Packages.buildPythonApplication rec {
pytest-trio
];
nativeBuildInputs = with python3Packages; [
versioningit
];
propagatedBuildInputs = (with python3Packages; [
certifi
isodate

View File

@ -39,13 +39,13 @@ let
in
stdenv.mkDerivation rec {
pname = "crun";
version = "1.11";
version = "1.11.1";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = version;
hash = "sha256-38IqVt/XZeZQRXjiPNz4qDibBHMBVZwzAcxrobzEWdI=";
hash = "sha256-D4Y+n/6R2v3U/BhYQitsHd6ckda1vfAzciFbTM/1J80=";
fetchSubmodules = true;
};

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "docker-compose";
version = "2.21.0";
version = "2.23.0";
src = fetchFromGitHub {
owner = "docker";
repo = "compose";
rev = "v${version}";
hash = "sha256-JekWw5YI6O+CLXc7oNIxPJsRzYimGFDGL6ACyM4D04k=";
hash = "sha256-17TlUQNv/L+LZYF8vub2nI5TVF66OqTA8PrjEYjkz5o=";
};
postPatch = ''
@ -16,7 +16,7 @@ buildGoModule rec {
rm -rf e2e/
'';
vendorHash = "sha256-vVnaZLvPbhJNFn/ACuYDbXCKPKNlYoGCm+liTlPMcjs=";
vendorHash = "sha256-zBogjMaVkLum1rQVEd+Rw8lRCNC/Dhi7cuz4YH3eCcg=";
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "imgcrypt";
version = "1.1.8";
version = "1.1.9";
src = fetchFromGitHub {
owner = "containerd";
repo = pname;
rev = "v${version}";
hash = "sha256-FLqFzEEfgsKcjAevhF6+8mR3zOUjfXyfWwWsxVOcdJU=";
hash = "sha256-EStyi6RDK1G6kuaDGumZaHB4OrSrhhx/F5GsLe0amyA=";
};
vendorHash = null;

View File

@ -14,13 +14,13 @@
buildGoModule rec {
pname = "runc";
version = "1.1.9";
version = "1.1.10";
src = fetchFromGitHub {
owner = "opencontainers";
repo = "runc";
rev = "v${version}";
hash = "sha256-9vNzKoG+0Ze4+dhluNM6QtsUjV8/bpkuvEF8ASBfBRo=";
hash = "sha256-YoRwr5imolblix1st/YeVTrAUdQXTqrx1BdNMdYlt/0=";
};
vendorHash = null;

View File

@ -11,6 +11,7 @@
, libselinux
, libsepol
, libthai
, libxkbcommon
, pango
, pcre
, util-linux
@ -23,13 +24,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "hyprpicker" + lib.optionalString debug "-debug";
version = "0.1.1";
version = "0.2.0";
src = fetchFromGitHub {
owner = "hyprwm";
repo = finalAttrs.pname;
rev = "v${finalAttrs.version}";
hash = "sha256-k+rG5AZjz47Q6bpVcTK7r4s7Avg3O+1iw+skK+cn0rk=";
hash = "sha256-bys8S7wuY9FJRLD5WriktWED5Hi7nCKSiNbs1Rvfk4s=";
};
cmakeBuildType = if debug then "Debug" else "Release";
@ -48,6 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
libselinux
libsepol
libthai
libxkbcommon
pango
pcre
wayland

View File

@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "i3";
version = "4.22";
version = "4.23";
src = fetchurl {
url = "https://i3wm.org/downloads/${pname}-${version}.tar.xz";
sha256 = "sha256-KGOZEeWdlWOfCSZCqYL14d6lkiUMK1zpjtoQCDNRPks=";
sha256 = "sha256-YQJqcZbJE50POq3ScZfosyDFduOkUOAddMGspIQETEY=";
};
nativeBuildInputs = [

View File

@ -0,0 +1,39 @@
{ lib
, rustPlatform
, fetchFromGitHub
, pkg-config
, openssl
}:
let
pname = "asm-lsp";
version = "0.4.2";
in
rustPlatform.buildRustPackage {
inherit pname version;
src = fetchFromGitHub {
owner = "bergercookie";
repo = "asm-lsp";
rev = "v${version}";
hash = "sha256-EGgYOU6y23ULjnMGNjYhgF0JMPgvRuQ4UOWqwJxhBpU=";
};
nativeBuildInputs = [
pkg-config
];
buildInputs = [
openssl
];
cargoHash = "sha256-x8Cj39Wki+pdoNIO8QPGK29KFJrHtDMoZJIXFEldno0=";
meta = {
description = "Language server for NASM/GAS/GO Assembly";
homepage = "https://github.com/bergercookie/asm-lsp";
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [ NotAShelf ];
mainProgram = pname;
platforms = lib.platforms.linux;
};
}

View File

@ -0,0 +1,49 @@
{ lib
, stdenvNoCC
, fetchzip
, autoPatchelfHook
, SDL2
, practiceMod ? false
}:
let
directory = if practiceMod then "CELESTE*Practice*" else "CELESTE";
srcbin = if practiceMod then "celeste_practice_mod" else "celeste";
outbin = if practiceMod then "celeste-classic-pm" else "celeste-classic";
in
stdenvNoCC.mkDerivation {
pname = outbin;
version = "unstable-2020-12-08";
# From https://www.speedrun.com/celestep8/resources
src = fetchzip {
url = "https://www.speedrun.com/static/resource/174ye.zip?v=f3dc98f";
hash = "sha256-GANHqKB0N905QJOLaePKWkUuPl9UlL1iqvkMMvw/CC8=";
extension = "zip";
};
nativeBuildInputs = [
autoPatchelfHook
];
buildInputs = [ SDL2 ];
installPhase = ''
runHook preInstall
install -Dsm755 ${directory}/${srcbin} $out/lib/${outbin}/${outbin}
install -Dm444 ${directory}/data.pod $out/lib/${outbin}/data.pod
mkdir -p $out/bin
ln -s $out/lib/${outbin}/${outbin} $out/bin/
runHook postInstall
'';
meta = with lib; {
description = "A PICO-8 platformer about climbing a mountain, made in four days${lib.optionalString practiceMod " (Practice Mod)"}";
homepage = "https://celesteclassic.github.io/";
license = licenses.unfree;
platforms = platforms.linux;
mainProgram = outbin;
maintainers = with maintainers; [ mrtnvgr ];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
};
}

View File

@ -0,0 +1,27 @@
{ lib
, rustPlatform
, fetchFromGitHub
}:
rustPlatform.buildRustPackage rec {
pname = "circom";
version = "2.1.6";
src = fetchFromGitHub {
owner = "iden3";
repo = "circom";
rev = "v${version}";
hash = "sha256-2YusBWAYDrTvFHYIjKpALphhmtsec7jjKHb1sc9lt3Q=";
};
cargoHash = "sha256-G6z+DxIhmm1Kzv8EQCqvfGAhQn5Vrx9LXrl+bWBVKaM=";
doCheck = false;
meta = with lib; {
description = "zkSnark circuit compiler";
homepage = "https://github.com/iden3/circom";
changelog = "https://github.com/iden3/circom/blob/${src.rev}/RELEASES.md";
license = licenses.gpl3Only;
maintainers = with maintainers; [ raitobezarius ];
};
}

View File

@ -0,0 +1,42 @@
{ lib
, stdenvNoCC
, fetchFromGitHub
, just
, pop-icon-theme
, hicolor-icon-theme
}:
stdenvNoCC.mkDerivation rec {
pname = "cosmic-icons";
version = "unstable-2023-08-30";
src = fetchFromGitHub {
owner = "pop-os";
repo = pname;
rev = "14d8e2048087be1ad444f9b3ebb75885509f72c6";
sha256 = "sha256-WbdgHmTn403x95x9wEYL0T9ksbN+YLzEB2yE0UrF9T0=";
};
nativeBuildInputs = [ just ];
justFlags = [
"--set"
"prefix"
(placeholder "out")
];
propagatedBuildInputs = [
pop-icon-theme
hicolor-icon-theme
];
dontDropIconThemeCache = true;
meta = with lib; {
description = "System76 Cosmic icon theme for Linux";
homepage = "https://github.com/pop-os/cosmic-icons";
license = with licenses; [
cc-by-sa-40
];
maintainers = with maintainers; [ a-kenji ];
};
}

View File

@ -0,0 +1,39 @@
{ lib
, stdenv
, fetchFromGitLab
, autoreconfHook
, guile
, pkg-config
}:
stdenv.mkDerivation (finalAttrs: {
pname = "guile-sjson";
version = "0.2.2";
src = fetchFromGitLab {
owner = "dustyweb";
repo = "guile-sjson";
rev = "v${finalAttrs.version}";
hash = "sha256-MmnEZhJTbZDIO8vWVCoTt4rGbOjfPZQ3bqAGv4ei69o=";
};
strictDeps = true;
nativeBuildInputs = [
autoreconfHook
guile
pkg-config
];
buildInputs = [
guile
];
meta = with lib; {
description = "S-expression based json reader/writer for Guile";
homepage = "https://gitlab.com/dustyweb/guile-sjson";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ galaxy ];
platforms = guile.meta.platforms;
};
})

View File

@ -0,0 +1,48 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, fontconfig
, freetype
, ApplicationServices
, CoreFoundation
, CoreGraphics
, CoreText
}:
stdenv.mkDerivation rec {
pname = "libaribcaption";
version = "1.1.1";
src = fetchFromGitHub {
owner = "xqq";
repo = "libaribcaption";
rev = "v${version}";
hash = "sha256-x6l0ZrTktSsqfDLVRXpQtUOruhfc8RF3yT991UVZiKA=";
};
nativeBuildInputs = [ cmake ];
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
buildInputs = lib.optionals (!stdenv.isDarwin) [
fontconfig
freetype
] ++ lib.optionals stdenv.isDarwin [
ApplicationServices
CoreFoundation
CoreGraphics
CoreText
];
meta = with lib; {
description = "Portable ARIB STD-B24 Caption Decoder/Renderer";
homepage = "https://github.com/xqq/libaribcaption";
changelog = "https://github.com/xqq/libaribcaption/releases/tag/${src.rev}";
license = licenses.mit;
maintainers = with maintainers; [ chayleaf ];
platforms = platforms.all;
};
}

View File

@ -5,17 +5,22 @@
php.buildComposerProject (finalAttrs: {
pname = "phel";
version = "0.11.0-dev";
version = "0.12.0";
src = fetchFromGitHub {
owner = "phel-lang";
repo = "phel-lang";
rev = "83d9d81b6c7daae361c0f1f68462083027b81581";
hash = "sha256-B2IozL/nJE4C1Gq54/64TJEySC1STroG1poCBzd3j3I=";
rev = "v${finalAttrs.version}";
hash = "sha256-5PMd87Xp7i3Q1ryKQWJBmNbU5TGo2LQ6uvIFP3T36vk=";
};
vendorHash = "sha256-83GX/dxHa6w1E34wnJshg7yxlVyRkDT5jmAPCCqPdtA=";
doInstallCheck = true;
postCheckInstall = ''
$out/bin/phel --version
'';
meta = {
changelog = "https://github.com/phel-lang/phel-lang/releases/tag/v${finalAttrs.version}";
description = "Phel is a functional programming language that compiles to PHP. A Lisp dialect inspired by Clojure and Janet.";

View File

@ -0,0 +1,61 @@
{ lib
, buildGoModule
, fetchFromGitHub
, makeWrapper
, go
, testers
, terraform-plugin-docs
, nix-update-script
}:
buildGoModule rec {
pname = "terraform-plugin-docs";
version = "0.16.0";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "terraform-plugin-docs";
rev = "refs/tags/v${version}";
sha256 = "sha256-5vbi69GMgkzvN3aEQbNTbk99rg+kfvAvUrdDsuyIm9s=";
};
vendorHash = "sha256-AjW6BokLVDkIWXToJ7wNq/g19xKTAfpQ/gVlKCV5qw0=";
nativeBuildInputs = [ makeWrapper ];
subPackages = [
"cmd/tfplugindocs"
];
allowGoReference = true;
CGO_ENABLED = 0;
ldflags = [
"-s"
"-w"
"-X main.version=${version}"
"-X main.commit=${src.rev}"
];
postInstall = ''
wrapProgram $out/bin/tfplugindocs --prefix PATH : ${lib.makeBinPath [ go ]}
'';
passthru = {
tests.version = testers.testVersion {
command = "tfplugindocs --version";
package = terraform-plugin-docs;
};
updateScript = nix-update-script { };
};
meta = with lib; {
description = "Generate and validate Terraform plugin/provider documentation";
homepage = "https://github.com/hashicorp/terraform-plugin-docs";
changelog = "https://github.com/hashicorp/terraform-plugin-docs/releases/tag/v${version}";
license = licenses.mpl20;
mainProgram = "tfplugindocs";
maintainers = with maintainers; [ lewo ];
};
}

View File

@ -0,0 +1,4 @@
_uuu_autocomplete() {
COMPREPLY=($(uuu $1 $2 $3))
}
complete -o nospace -F _uuu_autocomplete uuu

64
pkgs/by-name/uu/uuu/package.nix Executable file
View File

@ -0,0 +1,64 @@
{ lib
, stdenv
, fetchFromGitHub
, nix-update-script
, cmake
, installShellFiles
, pkg-config
, bzip2
, libusb1
, openssl
, zlib
, zstd
}:
stdenv.mkDerivation (finalAttrs: {
pname = "uuu";
version = "1.5.125";
src = fetchFromGitHub {
owner = "nxp-imx";
repo = "mfgtools";
rev = "uuu_${finalAttrs.version}";
hash = "sha256-f9Nt303xXZzLSu3GtOEpyaL91WVFUmKO7mxi8UNX3go=";
};
passthru.updateScript = nix-update-script { };
nativeBuildInputs = [
cmake
installShellFiles
pkg-config
];
buildInputs = [
bzip2
libusb1
openssl
zlib
zstd
];
postPatch = ''
# Avoid the need of calling Git during the build.
echo "uuu_${finalAttrs.version}" > .tarball-version
'';
postInstall = ''
installShellCompletion --bash --name uuu.bash ${./completion.bash}
mkdir -p $out/lib/udev/rules.d
cat <($out/bin/uuu -udev) > $out/lib/udev/rules.d/70-uuu.rules
'';
meta = with lib; {
description = "Freescale/NXP I.MX Chip image deploy tools";
homepage = "https://github.com/nxp-imx/mfgtools";
license = licenses.bsd3;
maintainers = with maintainers; [ otavio ];
mainProgram = "uuu";
platforms = platforms.all;
};
})

View File

@ -0,0 +1,40 @@
{ lib
, stdenvNoCC
, fetchurl
}:
stdenvNoCC.mkDerivation rec {
pname = "zpix-pixel-font";
version = "3.1.8";
srcs = [
(fetchurl {
name = "zpix-pixel-font.bdf";
url = "https://github.com/SolidZORO/zpix-pixel-font/releases/download/v${version}/zpix.bdf";
hash = "sha256-qE6YPKuk1FRRrTvmy4YIDuxRfslma264piUDj1FWtk4=";
})
(fetchurl {
name = "zpix-pixel-font.ttf";
url = "https://github.com/SolidZORO/zpix-pixel-font/releases/download/v${version}/zpix.ttf";
hash = "sha256-UIgLGsVTbyhYMKfTYiA+MZmV4dFT9HX3sxTdrcc4vE0=";
})
];
dontUnpack = true;
__structuredAttrs = true;
installPhase = ''
runHook preInstall
install -Dm444 ''${srcs[0]} $out/share/fonts/misc/zpix.bdf
install -Dm444 ''${srcs[1]} $out/share/fonts/truetype/zpix.ttf
runHook postInstall
'';
meta = with lib; {
description = "A pixel font supporting multiple languages like English, Chinese and Japanese";
homepage = "https://github.com/SolidZORO/zpix-pixel-font/";
changelog = "https://github.com/SolidZORO/zpix-pixel-font/blob/master/CHANGELOG.md";
license = licenses.unfree;
maintainers = [ maintainers.adriangl ];
platforms = platforms.all;
};
}

View File

@ -1,10 +1,9 @@
{ lib, stdenvNoCC, texlive }:
stdenvNoCC.mkDerivation {
pname = "iwona";
version = "0.995b";
stdenvNoCC.mkDerivation rec {
inherit (src) pname version;
src = lib.head (builtins.filter (p: p.tlType == "run") texlive.iwona.pkgs);
src = texlive.pkgs.iwona;
installPhase = ''
runHook preInstall
@ -20,7 +19,7 @@ stdenvNoCC.mkDerivation {
# "[...] GUST Font License (GFL), which is a free license, legally
# equivalent to the LaTeX Project Public # License (LPPL), version 1.3c or
# later." - GUST website
license = licenses.lppl13c;
license = src.meta.license;
maintainers = with maintainers; [ siddharthist ];
platforms = platforms.all;
};

View File

@ -10,17 +10,18 @@
, libpng
, ncurses
, readline
, unstableGitUpdater
}:
stdenv.mkDerivation rec {
pname = "c0";
version = "unstable-2022-10-25";
version = "unstable-2023-09-05";
src = fetchFromBitbucket {
owner = "c0-lang";
repo = "c0";
rev = "7ef3bc9ca232ec41936e93ec8957051e48cacfba";
sha256 = "sha256-uahF8fOp2ZJE8EhZke46sbPmN0MNHzsLkU4EXkV710U=";
rev = "608f97eef5d81bb85963d66f955730dd93996f67";
hash = "sha256-lRIEtclx+NKxAO72nsvnxVeEGCEe6glC6w8MXh1HEwY=";
};
patches = [
@ -67,6 +68,10 @@ stdenv.mkDerivation rec {
mv $out/c0-mode/ $out/share/emacs/site-lisp/
'';
passthru.updateScript = unstableGitUpdater {
url = "https://bitbucket.org/c0-lang/c0.git";
};
meta = with lib; {
description = "A small safe subset of the C programming language, augmented with contracts";
homepage = "https://c0.cs.cmu.edu/";

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "fstar";
version = "2023.04.25";
version = "2023.09.03";
src = fetchFromGitHub {
owner = "FStarLang";
repo = "FStar";
rev = "v${version}";
hash = "sha256-LF8eXi/es337QJ2fs5u9pLqegJkh1kDLjK8p4CcSGGc=";
hash = "sha256-ymoP5DvaLdrdwJcnhZnLEvwNxUFzhkICajPyK4lvacc=";
};
strictDeps = true;
@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
stdint
yojson
fileutils
memtrace
menhirLib
pprint
sedlex

View File

@ -2,6 +2,7 @@
, stdenv
, llvm_meta
, fetch
, fetchpatch
, cmake
, llvm
, targetLlvm
@ -15,6 +16,16 @@ stdenv.mkDerivation rec {
src = fetch pname "14dh0r6h2xh747ffgnsl4z08h0ri04azi9vf79cbz7ma1r27kzk0";
patches = [
# Fix cross.
(fetchpatch {
url = "https://github.com/llvm/llvm-project/commit/5e2358c781b85a18d1463fd924d2741d4ae5e42e.patch";
hash = "sha256-UxIlAifXnexF/MaraPW0Ut6q+sf3e7y1fMdEv1q103A=";
})
];
patchFlags = [ "-p2" ];
nativeBuildInputs = [ cmake perl ];
buildInputs = [
(if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm)

View File

@ -2,6 +2,7 @@
, stdenv
, llvm_meta
, src
, fetchpatch
, cmake
, llvm
, targetLlvm
@ -16,6 +17,16 @@ stdenv.mkDerivation rec {
inherit src;
sourceRoot = "${src.name}/${pname}";
patches = [
# Fix cross.
(fetchpatch {
url = "https://github.com/llvm/llvm-project/commit/5e2358c781b85a18d1463fd924d2741d4ae5e42e.patch";
hash = "sha256-UxIlAifXnexF/MaraPW0Ut6q+sf3e7y1fMdEv1q103A=";
})
];
patchFlags = [ "-p2" ];
nativeBuildInputs = [ cmake perl ];
buildInputs = [
(if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm)

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "owl-lisp";
version = "0.2.1";
version = "0.2.2";
src = fetchFromGitLab {
owner = "owl-lisp";
repo = "owl";
rev = "v${version}";
sha256 = "sha256-TQOj3DYmzFT4ClZ/sBAOs5XJWRgGTaVQjH+8JotSb1A=";
sha256 = "sha256-GfvOkYLo8fgAvGuUa59hDy+sWJSwyntwqMO8TAK/lUo=";
};
nativeBuildInputs = [ which ];

View File

@ -23,11 +23,12 @@ mkCoqDerivation {
repo = "VST";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.15" "8.16"; out = "2.11.1"; }
{ case = range "8.15" "8.17"; out = "2.12"; }
{ case = range "8.14" "8.16"; out = "2.10"; }
{ case = range "8.13" "8.15"; out = "2.9"; }
{ case = range "8.12" "8.13"; out = "2.8"; }
] null;
release."2.12".sha256 = "sha256-4HL0U4HA5/usKNXC0Dis1UZY/Hb/LRd2IGOrqrvdWkw=";
release."2.11.1".sha256 = "sha256-unpNstZBnRT4dIqAYOv9n1J0tWJMeRuaaa2RG1U0Xs0=";
release."2.10".sha256 = "sha256-RIxfPWoHnV1CFkpxCusoGY/LIk07TgC7wWGRP4BSq8w=";
release."2.9".sha256 = "sha256:1adwzbl1pprrrwrm7cm493098fizxanxpv7nyfbvwdhgbhcnv6qf";
@ -39,7 +40,7 @@ mkCoqDerivation {
preConfigure = ''
patchShebangs util
substituteInPlace Makefile \
--replace 'COQVERSION= ' 'COQVERSION= 8.16.1 or-else 8.16.0 or-else 8.15.2 or-else 8.15.1 or-else '\
--replace 'COQVERSION= ' 'COQVERSION= 8.17.1 or-else 8.16.1 or-else 8.16.0 or-else 8.15.2 or-else 8.15.1 or-else '\
--replace 'FLOYD_FILES=' 'FLOYD_FILES= ${toString extra_floyd_files}'
'';

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "armadillo";
version = "12.6.4";
version = "12.6.5";
src = fetchurl {
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
hash = "sha256-638kP/wy8YMkvH+peNA1hjfnNXyng2vsVbTrVul0k4A=";
hash = "sha256-9vHJh/m8K1LpcYg1zEFqUlz1im1XWoUdIZwMarW4xWM=";
};
nativeBuildInputs = [ cmake ];

View File

@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "drogon";
version = "1.8.7";
version = "1.9.0";
src = fetchFromGitHub {
owner = "drogonframework";
repo = "drogon";
rev = "v${finalAttrs.version}";
sha256 = "sha256-lKV4dRIIkCn/qW8DyqDRHADh0tW0/ocf/29ox9aC0Yo=";
sha256 = "sha256-KZRW/ra84RegCCT6J0k+N7XqZF+xW+Ecq2TVdPZnM7M=";
fetchSubmodules = true;
};

View File

@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk3
icu
vala # for share/vala/Makefile.vapigen (PKG_CONFIG_VAPIGEN_VAPIGEN)
];
propagatedBuildInputs = [
@ -56,6 +57,9 @@ stdenv.mkDerivation rec {
configureFlags = [
"GLIB_COMPILE_RESOURCES=${lib.getDev buildPackages.glib}/bin/glib-compile-resources"
"GLIB_MKENUMS=${lib.getDev buildPackages.glib}/bin/glib-mkenums"
"PKG_CONFIG_VAPIGEN_VAPIGEN=${lib.getBin buildPackages.vala}/bin/vapigen"
"--enable-introspection=yes"
"--enable-vala=yes"
];
passthru = {

View File

@ -5,6 +5,7 @@
, meson
, ninja
, pkg-config
, substituteAll
, gettext
, dbus
, glib
@ -53,12 +54,9 @@ stdenv.mkDerivation rec {
};
patches = [
# Hardcode the ssh path again.
# https://gitlab.gnome.org/GNOME/gvfs/-/issues/465
(fetchpatch2 {
url = "https://gitlab.gnome.org/GNOME/gvfs/-/commit/8327383e262e1e7f32750a8a2d3dd708195b0f53.patch";
hash = "sha256-ReD7qkezGeiJHyo9jTqEQNBjECqGhV9nSD+dYYGZWJ8=";
revert = true;
(substituteAll {
src = ./hardcode-ssh-path.patch;
ssh_program = "${lib.getBin openssh}/bin/ssh";
})
];
@ -76,7 +74,6 @@ stdenv.mkDerivation rec {
pkg-config
gettext
wrapGAppsHook
libxml2
libxslt
docbook_xsl
docbook_xml_dtd_42
@ -92,7 +89,7 @@ stdenv.mkDerivation rec {
libimobiledevice
libbluray
libnfs
openssh
libxml2
gsettings-desktop-schemas
libsoup_3
] ++ lib.optionals udevSupport [

View File

@ -0,0 +1,13 @@
diff --git a/daemon/meson.build b/daemon/meson.build
index 72a16890..718944e1 100644
--- a/daemon/meson.build
+++ b/daemon/meson.build
@@ -256,7 +256,7 @@ if enable_sftp
'-DDEFAULT_BACKEND_TYPE=sftp',
'-DBACKEND_TYPES="sftp", G_VFS_TYPE_BACKEND_SFTP,',
'-DMAX_JOB_THREADS=1',
- '-DSSH_PROGRAM="ssh"',
+ '-DSSH_PROGRAM="@ssh_program@"',
]
programs += {'gvfsd-sftp': {'sources': sources, 'dependencies': deps, 'c_args': cflags}}

View File

@ -33,14 +33,16 @@ stdenv.mkDerivation rec {
python
];
env.CXXFLAGS = toString (lib.optional stdenv.isDarwin [ "-faligned-allocation" "-fno-aligned-new" "-fvisibility=hidden" ]);
postBuild = ''
pushd /build/source/api/python
pushd ../api/python
${pyEnv.interpreter} setup.py build --parallel=$NIX_BUILD_CORES
popd
'';
postInstall = ''
pushd /build/source/api/python
pushd ../api/python
${pyEnv.interpreter} setup.py install --skip-build --root=/ --prefix=$py
popd
'';

View File

@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
"FFLAGS=-fallow-argument-mismatch" # fix build with gfortran 10
] ++ optional useSlurm "--with-pm=slurm"
++ optional (network == "ethernet") "--with-device=ch3:sock"
++ optionals (network == "infiniband") [ "--with-device=ch3:mrail" "--with-rdma=gen2" ]
++ optionals (network == "infiniband") [ "--with-device=ch3:mrail" "--with-rdma=gen2" "--disable-ibv-dlopen" ]
++ optionals (network == "omnipath") ["--with-device=ch3:psm" "--with-psm2=${libpsm2}"];
doCheck = true;
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
# /tmp/nix-build... ends up in the RPATH, fix it manually
for entry in $out/bin/mpichversion $out/bin/mpivars; do
echo "fix rpath: $entry"
patchelf --set-rpath "$out/lib" $entry
patchelf --allowed-rpath-prefixes ${builtins.storeDir} --shrink-rpath $entry
done
# Ensure the default compilers are the ones mvapich was built with

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation {
pname = "parson";
version = "1.5.2";
version = "1.5.3";
src = fetchFromGitHub {
owner = "kgabis";
repo = "parson";
rev = "60c37844d7a1c97547812cac3423d458c73e60f9"; # upstream doesn't use tags
hash = "sha256-SbM0kqRtdcz1s+pUTW7VPMY1O6zdql3bao19Rk4t470=";
rev = "ba29f4eda9ea7703a9f6a9cf2b0532a2605723c3"; # upstream doesn't use tags
hash = "sha256-IEmCa0nauUzG+zcLpr++ySD7i21zVJh/35r9RaQkok0=";
};
nativeBuildInputs = [ meson ninja ];

View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "brev-cli";
version = "0.6.262";
version = "0.6.264";
src = fetchFromGitHub {
owner = "brevdev";
repo = pname;
rev = "v${version}";
sha256 = "sha256-JzAhoeEwSqeZOVXZCVw/MmpUMh/ufEa8CdOYc1mvReY=";
sha256 = "sha256-bE1tQgFg01FsR/rYgKZCDkhor0NZrHN3ACDbXHcpO6Q=";
};
vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8=";

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "maestro";
version = "1.33.1";
version = "1.34.0";
src = fetchurl {
url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip";
sha256 = "142h53qwmibi9bpdwla9ard771vcri8yibnynvgj5nvfgapj2p4z";
sha256 = "1qbva38lcy1rm5k6r207hk3nqrr07h7x9sdppz4w5f37q0ll986r";
};
dontUnpack = true;

File diff suppressed because it is too large Load Diff

View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "ailment";
version = "9.2.74";
version = "9.2.75";
pyproject = true;
disabled = pythonOlder "3.11";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-lZJLYIZ44FXGavDCrO90DYSl4yaNDpAYeIIihk5Bk14=";
hash = "sha256-k3CX0ntqbKBL9xLTPifwjTqwYEDLlNdEHlIPiokkkPA=";
};
nativeBuildInputs = [

View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "aioelectricitymaps";
version = "0.1.3";
version = "0.1.4";
pyproject = true;
disabled = pythonOlder "3.10";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "jpbede";
repo = "aioelectricitymaps";
rev = "refs/tags/v${version}";
hash = "sha256-2Ou3obpGRJ/iUPuaoBGlmDTJLx6+S8ivK9PbrbSvYyg=";
hash = "sha256-Whg3F4Oyfqn2Lod44e15Pxc3m0dEB2F+MK0bvEM7c7w=";
};
nativeBuildInputs = [

View File

@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "aioesphomeapi";
version = "18.2.0";
version = "18.2.1";
pyproject = true;
disabled = pythonOlder "3.9";
@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "esphome";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-uOF9VSASzGA4pVW3puQtGrr2dy7sRESa1a6DPUsMmL4=";
hash = "sha256-PW3/V4PTm+UxTsfSSvOEX+FGcuF4m+mDOz6Z/AzB2qk=";
};
nativeBuildInputs = [

View File

@ -32,7 +32,7 @@
buildPythonPackage rec {
pname = "angr";
version = "9.2.74";
version = "9.2.75";
pyproject = true;
disabled = pythonOlder "3.11";
@ -41,7 +41,7 @@ buildPythonPackage rec {
owner = "angr";
repo = "angr";
rev = "refs/tags/v${version}";
hash = "sha256-8t7S+VR9AqYpaAP772Wn1foVy/XN9MiEUZb5+u47G+k=";
hash = "sha256-tDOO0wn5gYxK1CuMWhu/i4Xk3CfcuhPvxsG0LI7BlA4=";
};
propagatedBuildInputs = [

View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "archinfo";
version = "9.2.74";
version = "9.2.75";
pyproject = true;
disabled = pythonOlder "3.8";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-n/51N1D5UI2FTKv7GBN/iPYE/+/o/2JnFTRee+1FVWg=";
hash = "sha256-t8kxGwLEVVp1WMFA+yFLMAPJBT46m0ZFG2lhWMxoolw=";
};
nativeBuildInputs = [

View File

@ -6,6 +6,7 @@
, requests
, requests-oauthlib
, responses
, six
}:
buildPythonPackage rec {
@ -25,6 +26,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
requests
requests-oauthlib
six
];
nativeCheckInputs = [

View File

@ -0,0 +1,50 @@
{ lib
, fetchFromGitHub
, buildPythonPackage
, pytestCheckHook
, pythonOlder
, setuptools
, base58
, coincurve
}:
buildPythonPackage rec {
pname = "bip32";
version = "3.4";
pyproject = true;
disabled = pythonOlder "3.9";
# the PyPi source distribution ships a broken setup.py, so use github instead
src = fetchFromGitHub {
owner = "darosior";
repo = "python-bip32";
rev = version;
hash = "sha256-o8UKR17XDWp1wTWYeDL0DJY+D11YI4mg0UuGEAPkHxE=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
base58
coincurve
];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"bip32"
];
meta = with lib; {
description = "Minimalistic implementation of the BIP32 key derivation scheme";
homepage = "https://github.com/darosior/python-bip32";
changelog = "https://github.com/darosior/python-bip32/blob/${version}/CHANGELOG.md";
license = with licenses; [ bsd3 ];
maintainers = with maintainers; [ arcnmx ];
};
}

View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "claripy";
version = "9.2.74";
version = "9.2.75";
pyproject = true;
disabled = pythonOlder "3.11";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "angr";
repo = "claripy";
rev = "refs/tags/v${version}";
hash = "sha256-TNnv2V8QtSA5oiCHVqIuvbgGNTjfIw4WS1K2MxXfJIw=";
hash = "sha256-ErPk93hDKV1QyGOjxYNaLzNuq6Od374G8qOxWiJwpuo=";
};
nativeBuildInputs = [

View File

@ -16,14 +16,14 @@
let
# The binaries are following the argr projects release cycle
version = "9.2.74";
version = "9.2.75";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
owner = "angr";
repo = "binaries";
rev = "refs/tags/v${version}";
hash = "sha256-KaHAgGPspFGFPNULfXcVwXpl5RdkKHAQV/coJeMSGLQ=";
hash = "sha256-xiYkXC3/JPgXJ23ISl0LVrdm368hDPCG5NqQM6lDXf4=";
};
in
@ -38,7 +38,7 @@ buildPythonPackage rec {
owner = "angr";
repo = "cle";
rev = "refs/tags/v${version}";
hash = "sha256-e13tsrLAZu67eyUvBYtfkBASEsxdcVwJmKCHBiU78Dg=";
hash = "sha256-F2kgEffFWK7i1BgU5ulsNJitGcGcEziYRU+y86wKgXU=";
};
nativeBuildInputs = [

View File

@ -9,18 +9,19 @@
, fastavro
, importlib-metadata
, requests
, urllib3
}:
buildPythonPackage rec {
pname = "cohere";
version = "4.26.1";
version = "4.32";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-kiU5VooOWhqnjdhSHAIGV+D4pm9Qupz2oo0TZz9ASY8=";
hash = "sha256-OAd0e+mE8hHc6RHBM1vXE68qwrcPcpZ4OB5v9uRQ5oE=";
};
patches = [
@ -42,6 +43,7 @@ buildPythonPackage rec {
fastavro
importlib-metadata
requests
urllib3
];
# tests require CO_API_KEY

View File

@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, numpy
, packaging
, pandas
@ -23,6 +24,21 @@ buildPythonPackage rec {
hash = "sha256-OAVHx/a4uupVGXSWN2/3uem9/4i+TUkzTX4kp0uLY44=";
};
patches = [
# on master branch, to be released as 1.1.2
(fetchpatch {
name = "xfail-tests-that-are-known-to-fail.patch";
url = "https://github.com/googleapis/python-db-dtypes-pandas/commit/4a56b766b0ccba900a555167863f1081a76c4c0d.patch";
hash = "sha256-ra1d8Vewvwhkr7PBHc3KM6IUCWsHxE+B7UP2duTgjew=";
})
# on master branch, to be released as 1.1.2
(fetchpatch {
name = "add-import-and-object-reference-due-to-upstream-changes.patch";
url = "https://github.com/googleapis/python-db-dtypes-pandas/commit/8a7b25f3e708df5cd32afcb702fe16130846b165.patch";
hash = "sha256-JVbhiOIr5gKMSQpIQ+DgIRqq8V5x5ClQhkQzAmIYqEU=";
})
];
propagatedBuildInputs = [
numpy
packaging

View File

@ -3,7 +3,7 @@
, chardet
, fetchPypi
, jinja2
, jinja2_pluralize
, jinja2-pluralize
, pluggy
, pycodestyle
, pyflakes
@ -32,7 +32,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
chardet
jinja2
jinja2_pluralize
jinja2-pluralize
pluggy
pygments
tomli

View File

@ -62,7 +62,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-0XuljGj+gvYGhYD4CqGgZlESNuXG0V896mztEbJErb8=";
hash = "sha256-oCNszhLGNXNGiQtp91wT4GfuNzDhbZrVR55K41Ykhdg=";
};
pythonRelaxDeps = [

View File

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "enlighten";
version = "1.12.0";
version = "1.12.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-a4r20HG13gUBOjjoDhaHJtxv+yhY3oF/d+QV+Fss6Bk=";
hash = "sha256-jAn2VxEZdGzuZ3bL9OfASkjoiPTMrm2zd6WHZ0HwiZ8=";
};
propagatedBuildInputs = [

View File

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "google-cloud-translate";
version = "3.12.0";
version = "3.12.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-l0I8HDv2FBAvHUJ4F1oDxSPltKzWSLAKNAfQIwKqzNk=";
hash = "sha256-Zhy4h5qjxjovclo+po+QGZvTVMlcoWnMLoOlEFmH0p4=";
};
propagatedBuildInputs = [

View File

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "gtts";
version = "2.3.2";
version = "2.4.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "pndurette";
repo = "gTTS";
rev = "refs/tags/v${version}";
hash = "sha256-Z5dM/PzIA8qtw0RepTKmHpqBwYMRwNLhWuEC0aBGL3U=";
hash = "sha256-M/RbNw5SJb1R78MDTqBHNWE0I/9PlqikrrJAy1r02f8=";
};
propagatedBuildInputs = [

View File

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "hahomematic";
version = "2023.10.13";
version = "2023.10.14";
format = "pyproject";
disabled = pythonOlder "3.11";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-7zJhdFgEP/QSX78XMt+dxt0x7gUj011LHGi/+grPux0=";
hash = "sha256-P3JDXoxDfolgHN4dgHJqojWbWb88vbvgYhYv2B/myKY=";
};
postPatch = ''

View File

@ -1,12 +1,19 @@
{ lib, buildPythonPackage, fetchPypi, jinja2, inflect }:
{ lib
, buildPythonPackage
, fetchPypi
, jinja2
, inflect
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "jinja2_pluralize";
pname = "jinja2-pluralize";
version = "0.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "071wnzzz20wjb0iw7grxgj1lb2f0kz50qyfbcq54rddr2x82sp6z";
pname = "jinja2_pluralize";
inherit version;
hash = "sha256-31wtUBe5tUwKZst5DMqfwIlFg3w9v8MjWJID8f+3PBw=";
};
propagatedBuildInputs = [
@ -14,6 +21,14 @@ buildPythonPackage rec {
inflect
];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"jinja2_pluralize"
];
meta = with lib; {
description = "Jinja2 pluralize filters";
homepage = "https://github.com/audreyr/jinja2_pluralize";

View File

@ -4,6 +4,8 @@
, setuptools
, ledgercomm
, packaging
, bip32
, coincurve
, typing-extensions
}:
@ -25,6 +27,8 @@ buildPythonPackage rec {
propagatedBuildInputs = [
ledgercomm
packaging
bip32
coincurve
typing-extensions
];

View File

@ -20,13 +20,13 @@
buildPythonPackage rec {
pname = "localstack";
version = "2.3.0";
version = "2.3.2";
src = fetchFromGitHub {
owner = "localstack";
repo = "localstack";
rev = "refs/tags/v${version}";
hash = "sha256-Sdyl/ccyhKRP5eb866ly1ZJrrFSQMLdX22R7UNRfDCA=";
hash = "sha256-8HrPnMmzoxgAhu3Qm18FBJ3kNoGOD7bGmI1t7tcETwM=";
};
postPatch = ''

View File

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "lxmf";
version = "0.3.6";
version = "0.3.7";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "markqvist";
repo = "lxmf";
rev = "refs/tags/${version}";
hash = "sha256-s5+hfn/NfuL7B5c1LElZ10B+O5xr98D0eBYfLhPt6uU=";
hash = "sha256-iiGxAIHZcq3VaSSmGrB16IutJf8JEAeFkvZsEuIbR3g=";
};
propagatedBuildInputs = [

View File

@ -14,25 +14,24 @@
, pytest-mock
, pytest-vcr
, requests-mock
, setuptools
, pytest-cov
}:
buildPythonPackage rec {
pname = "mastodon-py";
version = "1.8.1";
# tests are broken on last release, check after next release (> 1.8.1)
version = "unstable-2023-06-24";
format = "setuptools";
format = "pyproject";
src = fetchFromGitHub {
owner = "halcy";
repo = "Mastodon.py";
rev = "refs/tags/${version}";
hash = "sha256-r0AAUjd2MBfZANEpyztMNyaQTlGWvWoUVjJNO1eL218=";
rev = "cd86887d88bbc07de462d1e00a8fbc3d956c0151";
hash = "sha256-rJocFvtBPrSSny3lwENuRsQdAzi3u8b+SfDNGloniWI=";
};
postPatch = ''
sed -i '/^addopts/d' setup.cfg
'';
propagatedBuildInputs = [
blurhash
cryptography
@ -49,7 +48,9 @@ buildPythonPackage rec {
pytestCheckHook
pytest-mock
pytest-vcr
pytest-cov
requests-mock
setuptools
];
pythonImportsCheck = [ "mastodon" ];

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "nomadnet";
version = "0.4.0";
version = "0.4.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "markqvist";
repo = "NomadNet";
rev = "refs/tags/${version}";
hash = "sha256-xXVur2ibctRCfQ1zKnPeLrNoukTmFT8exTbm2ukByYY=";
hash = "sha256-+UWHYhPX54Jc9gnrb2Az5Nc3/kt42/wa+zhUnCWdVU4=";
};
propagatedBuildInputs = [

View File

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "opencensus-ext-azure";
version = "1.1.9";
version = "1.1.11";
format = "setuptools";
disabled = pythonOlder "3.4";
src = fetchPypi {
inherit pname version;
hash = "sha256-UHYIt36djqq2/9X/EbfOuH9U5KapQMS4FDMbTRsDQVE=";
hash = "sha256-IdTU0FGdSCOdBBQskLalH17MBDaE64DPoKcBqiM0YHM=";
};
propagatedBuildInputs = [

View File

@ -227,6 +227,9 @@ buildPythonPackage rec {
"test_binops"
# These tests are unreliable on aarch64-darwin. See https://github.com/pandas-dev/pandas/issues/38921.
"test_rolling"
] ++ lib.optional stdenv.is32bit [
# https://github.com/pandas-dev/pandas/issues/37398
"test_rolling_var_numerical_issues"
];
# Tests have relative paths, and need to reference compiled C extensions
@ -251,9 +254,8 @@ buildPythonPackage rec {
];
meta = with lib; {
# https://github.com/pandas-dev/pandas/issues/14866
# pandas devs are no longer testing i686 so safer to assume it's broken
broken = stdenv.isi686;
# pandas devs no longer test i686, it's commonly broken
# broken = stdenv.isi686;
changelog = "https://pandas.pydata.org/docs/whatsnew/index.html";
description = "Powerful data structures for data analysis, time series, and statistics";
downloadPage = "https://github.com/pandas-dev/pandas";

View File

@ -42,6 +42,11 @@ buildPythonPackage rec {
requests-toolbelt
];
disabledTestPaths = [
# tests requiring network
"tests/integration"
];
pythonImportsCheck = [
"praw"
];

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