Merge master into haskell-updates

This commit is contained in:
github-actions[bot] 2023-04-25 00:12:16 +00:00 committed by GitHub
commit 6b4c504b91
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
117 changed files with 3481 additions and 3197 deletions

View file

@ -43,6 +43,7 @@ Below is a short excerpt of some points in there:
* Not start with the package name. * Not start with the package name.
* More generally, it should not refer to the package name. * More generally, it should not refer to the package name.
* Not end with a period (or any punctuation for that matter). * Not end with a period (or any punctuation for that matter).
* Aim to inform while avoiding subjective language.
* `meta.license` must be set and fit the upstream license. * `meta.license` must be set and fit the upstream license.
* If there is no upstream license, `meta.license` should default to `lib.licenses.unfree`. * If there is no upstream license, `meta.license` should default to `lib.licenses.unfree`.
* If in doubt, try to contact the upstream developers for clarification. * If in doubt, try to contact the upstream developers for clarification.

View file

@ -86,6 +86,23 @@ meta.platforms = lib.platforms.linux;
Attribute Set `lib.platforms` defines [various common lists](https://github.com/NixOS/nixpkgs/blob/master/lib/systems/doubles.nix) of platforms types. Attribute Set `lib.platforms` defines [various common lists](https://github.com/NixOS/nixpkgs/blob/master/lib/systems/doubles.nix) of platforms types.
### `badPlatforms` {#var-meta-badPlatforms}
The list of Nix [platform types](https://github.com/NixOS/nixpkgs/blob/b03ac42b0734da3e7be9bf8d94433a5195734b19/lib/meta.nix#L75-L81) on which the package is known not to be buildable.
Hydra will never create prebuilt binaries for these platform types, even if they are in [`meta.platforms`](#var-meta-platforms).
In general it is preferable to set `meta.platforms = lib.platforms.all` and then exclude any platforms on which the package is known not to build.
For example, a package which requires dynamic linking and cannot be linked statically could use this:
```nix
meta.platforms = lib.platforms.all;
meta.badPlatforms = [ lib.systems.inspect.patterns.isStatic ];
```
The [`lib.meta.availableOn`](https://github.com/NixOS/nixpkgs/blob/b03ac42b0734da3e7be9bf8d94433a5195734b19/lib/meta.nix#L95-L106) function can be used to test whether or not a package is available (i.e. buildable) on a given platform.
Some packages use this to automatically detect the maximum set of features with which they can be built.
For example, `systemd` [requires dynamic linking](https://github.com/systemd/systemd/issues/20600#issuecomment-912338965), and [has a `meta.badPlatforms` setting](https://github.com/NixOS/nixpkgs/blob/b03ac42b0734da3e7be9bf8d94433a5195734b19/pkgs/os-specific/linux/systemd/default.nix#L752) similar to the one above.
Packages which can be built with or without `systemd` support will use `lib.meta.availableOn` to detect whether or not `systemd` is available on the [`hostPlatform`](#ssec-cross-platform-parameters) for which they are being built; if it is not available (e.g. due to a statically-linked host platform like `pkgsStatic`) this support will be disabled by default.
### `tests` {#var-meta-tests} ### `tests` {#var-meta-tests}
::: {.warning} ::: {.warning}
@ -173,7 +190,7 @@ To be effective, it must be presented directly to an evaluation process that han
### `hydraPlatforms` {#var-meta-hydraPlatforms} ### `hydraPlatforms` {#var-meta-hydraPlatforms}
The list of Nix platform types for which the Hydra instance at `hydra.nixos.org` will build the package. (Hydra is the Nix-based continuous build system.) It defaults to the value of `meta.platforms`. Thus, the only reason to set `meta.hydraPlatforms` is if you want `hydra.nixos.org` to build the package on a subset of `meta.platforms`, or not at all, e.g. The list of Nix platform types for which the [Hydra](https://github.com/nixos/hydra) [instance at `hydra.nixos.org`](https://nixos.org/hydra) will build the package. (Hydra is the Nix-based continuous build system.) It defaults to the value of `meta.platforms`. Thus, the only reason to set `meta.hydraPlatforms` is if you want `hydra.nixos.org` to build the package on a subset of `meta.platforms`, or not at all, e.g.
```nix ```nix
meta.platforms = lib.platforms.linux; meta.platforms = lib.platforms.linux;
@ -182,7 +199,26 @@ meta.hydraPlatforms = [];
### `broken` {#var-meta-broken} ### `broken` {#var-meta-broken}
If set to `true`, the package is marked as "broken", meaning that it wont show up in `nix-env -qa`, and cannot be built or installed. Such packages should be removed from Nixpkgs eventually unless they are fixed. If set to `true`, the package is marked as "broken", meaning that it wont show up in [search.nixos.org](https://search.nixos.org/packages), and cannot be built or installed unless the environment variable [`NIXPKGS_ALLOW_BROKEN`](#opt-allowBroken) is set.
Such unconditionally-broken packages should be removed from Nixpkgs eventually unless they are fixed.
The value of this attribute can depend on a package's arguments, including `stdenv`.
This means that `broken` can be used to express constraints, for example:
- Does not cross compile
```nix
meta.broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)
```
- Broken if all of a certain set of its dependencies are broken
```nix
meta.broken = lib.all (map (p: p.meta.broken) [ glibc musl ])
```
This makes `broken` strictly more powerful than `meta.badPlatforms`.
However `meta.availableOn` currently examines only `meta.platforms` and `meta.badPlatforms`, so `meta.broken` does not influence the default values for optional dependencies.
## Licenses {#sec-meta-license} ## Licenses {#sec-meta-license}

View file

@ -9,6 +9,14 @@ let abis = lib.mapAttrs (_: abi: builtins.removeAttrs abi [ "assertions" ]) abis
rec { rec {
# these patterns are to be matched against {host,build,target}Platform.parsed # these patterns are to be matched against {host,build,target}Platform.parsed
patterns = rec { patterns = rec {
# The patterns below are lists in sum-of-products form.
#
# Each attribute is list of product conditions; non-list values are treated
# as a singleton list. If *any* product condition in the list matches then
# the predicate matches. Each product condition is tested by
# `lib.attrsets.matchAttrs`, which requires a match on *all* attributes of
# the product.
isi686 = { cpu = cpuTypes.i686; }; isi686 = { cpu = cpuTypes.i686; };
isx86_32 = { cpu = { family = "x86"; bits = 32; }; }; isx86_32 = { cpu = { family = "x86"; bits = 32; }; };
isx86_64 = { cpu = { family = "x86"; bits = 64; }; }; isx86_64 = { cpu = { family = "x86"; bits = 64; }; };

View file

@ -5592,6 +5592,12 @@
fingerprint = "D0CF 440A A703 E0F9 73CB A078 82BB 70D5 41AE 2DB4"; fingerprint = "D0CF 440A A703 E0F9 73CB A078 82BB 70D5 41AE 2DB4";
}]; }];
}; };
geri1701 = {
email = "geri@sdf.org";
github = "geri1701";
githubId = 67984144;
name = "Gerhard Schwanzer";
};
gerschtli = { gerschtli = {
email = "tobias.happ@gmx.de"; email = "tobias.happ@gmx.de";
github = "Gerschtli"; github = "Gerschtli";
@ -6118,6 +6124,12 @@
githubId = 2405974; githubId = 2405974;
name = "Sébastian Méric de Bellefon"; name = "Sébastian Méric de Bellefon";
}; };
hellwolf = {
email = "zhicheng.miao@gmail.com";
github = "hellwolf";
githubId = 186660;
name = "Miao, ZhiCheng";
};
henkery = { henkery = {
email = "jim@reupload.nl"; email = "jim@reupload.nl";
github = "henkery"; github = "henkery";
@ -11795,6 +11807,12 @@
githubId = 11016164; githubId = 11016164;
name = "Fedor Pakhomov"; name = "Fedor Pakhomov";
}; };
pallix = {
email = "pierre.allix.work@gmail.com";
github = "pallix";
githubId = 676838;
name = "Pierre Allix";
};
paluh = { paluh = {
email = "paluho@gmail.com"; email = "paluho@gmail.com";
github = "paluh"; github = "paluh";
@ -11983,6 +12001,12 @@
githubId = 920910; githubId = 920910;
name = "peelz"; name = "peelz";
}; };
pelme = {
email = "andreas@pelme.se";
github = "pelme";
githubId = 20529;
name = "Andreas Pelme";
};
penalty1083 = { penalty1083 = {
email = "penalty1083@outlook.com"; email = "penalty1083@outlook.com";
github = "penalty1083"; github = "penalty1083";

View file

@ -487,7 +487,7 @@ let
}; };
email = mkOption { email = mkOption {
type = types.str; type = types.nullOr types.str;
inherit (defaultAndText "email" null) default defaultText; inherit (defaultAndText "email" null) default defaultText;
description = lib.mdDoc '' description = lib.mdDoc ''
Email address for account creation and correspondence from the CA. Email address for account creation and correspondence from the CA.
@ -555,7 +555,7 @@ let
}; };
credentialsFile = mkOption { credentialsFile = mkOption {
type = types.path; type = types.nullOr types.path;
inherit (defaultAndText "credentialsFile" null) default defaultText; inherit (defaultAndText "credentialsFile" null) default defaultText;
description = lib.mdDoc '' description = lib.mdDoc ''
Path to an EnvironmentFile for the cert's service containing any required and Path to an EnvironmentFile for the cert's service containing any required and

View file

@ -70,7 +70,12 @@ in
}; };
passwordFile = mkOption { passwordFile = mkOption {
type = types.str; type = types.str;
description = lib.mdDoc "Password file for the postgresql connection. Must be readable by user `nginx`. Ignored if `database.host` is set to `localhost`, as peer authentication will be used."; description = lib.mdDoc ''
Password file for the postgresql connection.
Must be formated according to PostgreSQL .pgpass standard (see https://www.postgresql.org/docs/current/libpq-pgpass.html)
but only one line, no comments and readable by user `nginx`.
Ignored if `database.host` is set to `localhost`, as peer authentication will be used.
'';
}; };
dbname = mkOption { dbname = mkOption {
type = types.str; type = types.str;
@ -123,7 +128,13 @@ in
environment.etc."roundcube/config.inc.php".text = '' environment.etc."roundcube/config.inc.php".text = ''
<?php <?php
${lib.optionalString (!localDB) "$password = file_get_contents('${cfg.database.passwordFile}');"} ${lib.optionalString (!localDB) ''
$password = file('${cfg.database.passwordFile}')[0];
$password = preg_split('~\\\\.(*SKIP)(*FAIL)|\:~s', $password);
$password = end($password);
$password = str_replace("\\:", ":", $password);
$password = str_replace("\\\\", "\\", $password);
''}
$config = array(); $config = array();
$config['db_dsnw'] = 'pgsql://${cfg.database.username}${lib.optionalString (!localDB) ":' . $password . '"}@${if localDB then "unix(/run/postgresql)" else cfg.database.host}/${cfg.database.dbname}'; $config['db_dsnw'] = 'pgsql://${cfg.database.username}${lib.optionalString (!localDB) ":' . $password . '"}@${if localDB then "unix(/run/postgresql)" else cfg.database.host}/${cfg.database.dbname}';
@ -223,6 +234,7 @@ in
path = [ config.services.postgresql.package ]; path = [ config.services.postgresql.package ];
}) })
{ {
after = [ "network-online.target" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
script = let script = let
psql = "${lib.optionalString (!localDB) "PGPASSFILE=${cfg.database.passwordFile}"} ${pkgs.postgresql}/bin/psql ${lib.optionalString (!localDB) "-h ${cfg.database.host} -U ${cfg.database.username} "} ${cfg.database.dbname}"; psql = "${lib.optionalString (!localDB) "PGPASSFILE=${cfg.database.passwordFile}"} ${pkgs.postgresql}/bin/psql ${lib.optionalString (!localDB) "-h ${cfg.database.host} -U ${cfg.database.username} "} ${cfg.database.dbname}";

View file

@ -574,12 +574,15 @@ in
virtualisation.writableStore = virtualisation.writableStore =
mkOption { mkOption {
type = types.bool; type = types.bool;
default = true; # FIXME default = cfg.mountHostNixStore;
defaultText = literalExpression "cfg.mountHostNixStore";
description = description =
lib.mdDoc '' lib.mdDoc ''
If enabled, the Nix store in the VM is made writable by If enabled, the Nix store in the VM is made writable by
layering an overlay filesystem on top of the host's Nix layering an overlay filesystem on top of the host's Nix
store. store.
By default, this is enabled if you mount a host Nix store.
''; '';
}; };
@ -713,6 +716,21 @@ in
For applications which do a lot of reads from the store, For applications which do a lot of reads from the store,
this can drastically improve performance, but at the cost of this can drastically improve performance, but at the cost of
disk space and image build time. disk space and image build time.
As an alternative, you can use a bootloader which will provide you
with a full NixOS system image containing a Nix store and
avoid mounting the host nix store through
{option}`virtualisation.mountHostNixStore`.
'';
};
virtualisation.mountHostNixStore =
mkOption {
type = types.bool;
default = !cfg.useNixStoreImage && !cfg.useBootLoader;
defaultText = literalExpression "!cfg.useNixStoreImage && !cfg.useBootLoader";
description = lib.mdDoc ''
Mount the host Nix store as a 9p mount.
''; '';
}; };
@ -933,7 +951,7 @@ in
virtualisation.additionalPaths = [ config.system.build.toplevel ]; virtualisation.additionalPaths = [ config.system.build.toplevel ];
virtualisation.sharedDirectories = { virtualisation.sharedDirectories = {
nix-store = mkIf (!cfg.useNixStoreImage) { nix-store = mkIf cfg.mountHostNixStore {
source = builtins.storeDir; source = builtins.storeDir;
target = "/nix/store"; target = "/nix/store";
}; };

View file

@ -28,6 +28,7 @@
# output plugins # output plugins
, alsaSupport ? true, alsa-lib , alsaSupport ? true, alsa-lib
, pulseSupport ? config.pulseaudio or true, libpulseaudio , pulseSupport ? config.pulseaudio or true, libpulseaudio
, pipewireSupport ? true, pipewire
# effect plugins # effect plugins
, resamplerSupport ? true, libsamplerate , resamplerSupport ? true, libsamplerate
, overloadSupport ? true, zlib , overloadSupport ? true, zlib
@ -40,7 +41,7 @@ assert gtk2Support || gtk3Support;
let let
inherit (lib) optionals; inherit (lib) optionals;
version = "1.9.4"; version = "1.9.5";
in clangStdenv.mkDerivation { in clangStdenv.mkDerivation {
pname = "deadbeef"; pname = "deadbeef";
inherit version; inherit version;
@ -50,7 +51,7 @@ in clangStdenv.mkDerivation {
repo = "deadbeef"; repo = "deadbeef";
fetchSubmodules = true; fetchSubmodules = true;
rev = version; rev = version;
sha256 = "sha256-ow+Aw/lp+oe9GhbOWM7XcX/tJjfAAu7KOUY1us7+f84="; hash = "sha256-dSSIaJxHYUVOmuJN2t5UZSC3ZP5732/qVXSZAuWYr0Q=";
}; };
buildInputs = [ buildInputs = [
@ -92,6 +93,8 @@ in clangStdenv.mkDerivation {
alsa-lib alsa-lib
] ++ optionals pulseSupport [ ] ++ optionals pulseSupport [
libpulseaudio libpulseaudio
] ++ optionals pipewireSupport [
pipewire
] ++ optionals resamplerSupport [ ] ++ optionals resamplerSupport [
libsamplerate libsamplerate
] ++ optionals overloadSupport [ ] ++ optionals overloadSupport [
@ -121,6 +124,7 @@ in clangStdenv.mkDerivation {
meta = with lib; { meta = with lib; {
description = "Ultimate Music Player for GNU/Linux"; description = "Ultimate Music Player for GNU/Linux";
homepage = "http://deadbeef.sourceforge.net/"; homepage = "http://deadbeef.sourceforge.net/";
downloadPage = "https://github.com/DeaDBeeF-Player/deadbeef";
license = licenses.gpl2; license = licenses.gpl2;
platforms = [ "x86_64-linux" "i686-linux" ]; platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = [ maintainers.abbradar ]; maintainers = [ maintainers.abbradar ];

View file

@ -9,7 +9,7 @@
let let
pname = "deadbeef-mpris2-plugin"; pname = "deadbeef-mpris2-plugin";
version = "1.14"; version = "1.16";
in stdenv.mkDerivation { in stdenv.mkDerivation {
inherit pname version; inherit pname version;
@ -17,7 +17,7 @@ in stdenv.mkDerivation {
owner = "DeaDBeeF-Player"; owner = "DeaDBeeF-Player";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-w7ccIhcPjbjs18kb3ZdM9JtSail9ik3uyAc40T8lHho="; hash = "sha256-f6iHgwLdzQJJEquyuUQGWFfOfpjH/Hxh9IqQ5HkYrog=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -2,17 +2,15 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "mopidy-somafm"; pname = "mopidy-somafm";
version = "2.0.0"; version = "2.0.2";
src = python3Packages.fetchPypi { src = python3Packages.fetchPypi {
inherit version; inherit version;
pname = "Mopidy-SomaFM"; pname = "Mopidy-SomaFM";
sha256 = "1j88rrliys8hqvnb35k1xqw88bvrllcb4rb53lgh82byhscsxlf3"; sha256 = "DC0emxkoWfjGHih2C8nINBFByf521Xf+3Ks4JRxNPLM=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [ mopidy ];
mopidy
];
doCheck = false; doCheck = false;

View file

@ -2,7 +2,7 @@
, glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify , glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify
, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curlWithGnuTls, zlib, gnome , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curlWithGnuTls, zlib, gnome
, at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon , at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon
, pname, meta , pname, meta, harfbuzz
# High-DPI support: Spotify's --force-device-scale-factor argument # High-DPI support: Spotify's --force-device-scale-factor argument
# not added if `null`, otherwise, should be a number. # not added if `null`, otherwise, should be a number.
, deviceScaleFactor ? null , deviceScaleFactor ? null
@ -14,14 +14,14 @@ let
# If an update breaks things, one of those might have valuable info: # If an update breaks things, one of those might have valuable info:
# https://aur.archlinux.org/packages/spotify/ # https://aur.archlinux.org/packages/spotify/
# https://community.spotify.com/t5/Desktop-Linux # https://community.spotify.com/t5/Desktop-Linux
version = "1.1.99.878.g1e4ccc6e"; version = "1.2.9.743.g85d9593d";
# To get the latest stable revision: # To get the latest stable revision:
# curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
# To get general information: # To get general information:
# curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
# More examples of api usage: # More examples of api usage:
# https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
rev = "62"; rev = "64";
deps = [ deps = [
alsa-lib alsa-lib
@ -39,6 +39,7 @@ let
gdk-pixbuf gdk-pixbuf
glib glib
gtk3 gtk3
harfbuzz
libdrm libdrm
libgcrypt libgcrypt
libnotify libnotify
@ -83,7 +84,7 @@ stdenv.mkDerivation {
# https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334 # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334
src = fetchurl { src = fetchurl {
url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap"; url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
sha512 = "339r2q13nnpwi7gjd1axc6z2gycfm9gwz3x9dnqyaqd1g3rw7nk6nfbp6bmpkr68lfq1jfgvqwnimcgs84rsi7nmgsiabv3cz0673wv"; sha512 = "5e8f4a1901c26e9bb5986e048226d8a15f5bc4c2acf16b20a404f228ef142e4d21c6a88a4a54c8d9e654ba5b15cb1fea1cdc50c21fbe8e3c374e241a44adf12d";
}; };
nativeBuildInputs = [ wrapGAppsHook makeShellWrapper squashfsTools ]; nativeBuildInputs = [ wrapGAppsHook makeShellWrapper squashfsTools ];

View file

@ -2,10 +2,10 @@
let let
pname = "framesh"; pname = "framesh";
version = "0.5.0-beta.22"; version = "0.6.2";
src = fetchurl { src = fetchurl {
url = "https://github.com/floating/frame/releases/download/v${version}/Frame-${version}.AppImage"; url = "https://github.com/floating/frame/releases/download/v${version}/Frame-${version}.AppImage";
sha256 = "sha256-/y7Pf1ADtz0CBeKKCHtSPOYvU7HCpq7hM/J4Ddq1XiA="; sha256 = "sha256-nN5+6SwfHcwhePlbsXjT3qNd/d6Xqnd85NVC8vw3ehk=";
}; };
appimageContents = appimageTools.extractType2 { appimageContents = appimageTools.extractType2 {

View file

@ -16,7 +16,7 @@
}: }:
let let
rev = "c5dc02f6bd47039c320083b3befac0e569c0efa4"; rev = "7e1e6a4c349e720d75c892cd7230b29c35148342";
python = python3.withPackages (ps: with ps; [ python = python3.withPackages (ps: with ps; [
epc epc
orjson orjson
@ -26,13 +26,13 @@ let
in in
melpaBuild { melpaBuild {
pname = "lsp-bridge"; pname = "lsp-bridge";
version = "20230311.1648"; # 16:48 UTC version = "20230424.1642"; # 16:42 UTC
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "manateelazycat"; owner = "manateelazycat";
repo = "lsp-bridge"; repo = "lsp-bridge";
inherit rev; inherit rev;
sha256 = "sha256-vbSVGPFBjAp4VRbJc6a2W0d2IqOusNa+rk4X6jRcjRI="; sha256 = "sha256-e0XVQpsyjy8HeZN6kLRjnoTpyEefTqstsgydEKlEQ1c=";
}; };
commit = rev; commit = rev;

View file

@ -31,13 +31,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cemu"; pname = "cemu";
version = "2.0-32"; version = "2.0-36";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cemu-project"; owner = "cemu-project";
repo = "Cemu"; repo = "Cemu";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-47uCGN1wFVx3ph/q3+BG+pwJ7nisbmRPUEatOIq0i9M="; hash = "sha256-RO8c9gLK00LLwDzcD8UOS3kh3kwTwFyrpuRlIXcInPo=";
}; };
patches = [ patches = [
@ -86,9 +86,12 @@ stdenv.mkDerivation rec {
"-DPORTABLE=OFF" "-DPORTABLE=OFF"
]; ];
preConfigure = '' preConfigure = with lib; let
tag = last (splitString "-" version);
in ''
rm -rf dependencies/imgui rm -rf dependencies/imgui
ln -s ${imgui}/include/imgui dependencies/imgui ln -s ${imgui}/include/imgui dependencies/imgui
sed 's/\(EMULATOR_VERSION_SUFFIX\).*experimental.*/\1 "-${tag} (experimental)"/' -i src/Common/version.h
''; '';
installPhase = '' installPhase = ''

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cen64"; pname = "cen64";
version = "unstable-2021-03-12"; version = "unstable-2022-10-02";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "n64dev"; owner = "n64dev";
repo = "cen64"; repo = "cen64";
rev = "1b31ca9b3c3bb783391ab9773bd26c50db2056a8"; rev = "ee6db7d803a77b474e73992fdc25d76b9723d806";
sha256 = "0x1fz3z4ffl5xssiyxnmbhpjlf0k0fxsqn4f2ikrn17742dx4c0z"; sha256 = "sha256-/CraSu/leNA0dl8NVgFjvKdOWrC9/namAz5NSxtPr+I=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

View file

@ -371,7 +371,7 @@ checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
[[package]] [[package]]
name = "felix" name = "felix"
version = "2.2.5" version = "2.2.6"
dependencies = [ dependencies = [
"chrono", "chrono",
"content_inspector", "content_inspector",

View file

@ -9,13 +9,13 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "felix"; pname = "felix";
version = "2.2.5"; version = "2.2.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kyoheiu"; owner = "kyoheiu";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-qN/aOOiSj+HrjZQaDUkps0NORIdCBIevVjTYQm2G2Fg="; sha256 = "sha256-t/BCRKqCCXZ76bFYyblNnKHB9y0oJ6ajqsbdIGq/YVM=";
}; };
cargoLock = { cargoLock = {

View file

@ -2,23 +2,28 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "xplr"; pname = "xplr";
version = "0.20.2"; version = "0.21.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sayanarijit"; owner = "sayanarijit";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-iPcxDNtwWnvFljZw052aw/ekCahyFBNt/zbUAdaWJA8="; sha256 = "sha256-WUv0F7etmJFNRnHXkQ5G3p/5BWL30kfSYnxXYpAdo+I=";
}; };
buildInputs = lib.optional stdenv.isDarwin libiconv; buildInputs = lib.optional stdenv.isDarwin libiconv;
cargoSha256 = "sha256-Sn7ZcNdmMDQJHn99iTJX9c3uVhaGpRvEgdoJFmIUgeU="; cargoSha256 = "sha256-0JJpGSOwayPB3cn7OpBjsOiK4WQNbil3gYrfkqG2cS8=";
checkFlags = [
# failure: path::tests::test_relative_to_parent
"--skip=path::tests::test_relative_to_parent"
];
meta = with lib; { meta = with lib; {
description = "A hackable, minimal, fast TUI file explorer"; description = "A hackable, minimal, fast TUI file explorer";
homepage = "https://xplr.dev"; homepage = "https://xplr.dev";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ sayanarijit suryasr007 thehedgeh0g ]; maintainers = with maintainers; [ sayanarijit suryasr007 thehedgeh0g mimame ];
}; };
} }

View file

@ -47,13 +47,13 @@ in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "imagemagick"; pname = "imagemagick";
version = "7.1.1-7"; version = "7.1.1-8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ImageMagick"; owner = "ImageMagick";
repo = "ImageMagick"; repo = "ImageMagick";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-PeXWtD8AX9VEJruZu/TO1Bpaoa1XNKIFGfGK+TpQEMs="; hash = "sha256-2wAm2y8YQwhgsPNqxGGJ65emL/kMYoVvF2phZMXTpZc=";
}; };
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

View file

@ -19,7 +19,7 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "komikku"; pname = "komikku";
version = "1.18.0"; version = "1.19.0";
format = "other"; format = "other";
@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "valos"; owner = "valos";
repo = "Komikku"; repo = "Komikku";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-suqoYV+YsbCB7sUNzds6OoEMH9KO3bt2udok6oXXyls="; hash = "sha256-4XhcmK9Dgk82ExzugY4SGRfWYC+IgCAxWS+cBURgT2o=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

File diff suppressed because it is too large Load diff

View file

@ -1,7 +1,6 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, alsa-lib , alsa-lib
, appstream-glib , appstream-glib
, cmake , cmake
@ -24,32 +23,24 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rnote"; pname = "rnote";
version = "0.5.18"; version = "0.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "flxzt"; owner = "flxzt";
repo = "rnote"; repo = "rnote";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-N07Y9kmGvMFS0Kq4i2CltJvNTuqbXausZZGjAQRDmNU="; hash = "sha256-47mWlUXp62fMh5c13enFjmuMxzrmEZlwJFsZhYCB1Vs=";
}; };
cargoDeps = rustPlatform.importCargoLock { cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock; lockFile = ./Cargo.lock;
outputHashes = { outputHashes = {
"ink-stroke-modeler-rs-0.1.0" = "sha256-+R3T/9Ty+F6YxxtA0Un6UhFyKbGOvqBKwHt4WSHWhsk="; "ink-stroke-modeler-rs-0.1.0" = "sha256-DrbFolHGL3ywk2p6Ly3x0vbjqxy1mXld+5CPrNlJfQM=";
"librsvg-2.55.92" = "sha256-WVwxjjWR/TloSmyzH8Jo1mTjLHVifBw1Xn965wuoEDs="; "librsvg-2.56.0" = "sha256-4poP7xsoylmnKaUWuJ0tnlgEMpw9iJrM3dvt4IaFi7w=";
"piet-0.6.2" = "sha256-76yeX0yQMC0hh6u2xT/kS/2fjs+GO+nCks2fnOImf0c="; "piet-0.6.2" = "sha256-If0qiZkgXeLvsrECItV9/HmhTk1H52xmVO7cUsD9dcU=";
}; };
}; };
patches = [
# https://github.com/flxzt/rnote/pull/569
(fetchpatch {
url = "https://github.com/flxzt/rnote/commit/8585b446c08b246f3d55359026415cb3d242d44e.patch";
hash = "sha256-ePpTQ/3mzZTNjU9P4vTu9CM0vX8+r8b6njuj7hDgFCg=";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
appstream-glib # For appstream-util appstream-glib # For appstream-util
cmake cmake
@ -85,7 +76,6 @@ stdenv.mkDerivation rec {
pushd build-aux pushd build-aux
chmod +x cargo_build.py meson_post_install.py chmod +x cargo_build.py meson_post_install.py
patchShebangs cargo_build.py meson_post_install.py patchShebangs cargo_build.py meson_post_install.py
substituteInPlace meson_post_install.py --replace "gtk-update-icon-cache" "gtk4-update-icon-cache"
popd popd
''; '';

View file

@ -11,7 +11,7 @@
}: }:
let let
version = "4.3.4"; version = "4.4.0";
libsecp256k1_name = libsecp256k1_name =
if stdenv.isLinux then "libsecp256k1.so.0" if stdenv.isLinux then "libsecp256k1.so.0"
@ -28,7 +28,7 @@ let
owner = "spesmilo"; owner = "spesmilo";
repo = "electrum"; repo = "electrum";
rev = version; rev = version;
sha256 = "sha256-0xYGTCk+Sk7LP+E9r2Y7UJZsfbobLe6Yb+x5ZRCN40Y="; sha256 = "sha256-lXMz0U7zgtCApBCGZcpOHvLcyOeGG0yJE/gr7Gv+yBQ=";
postFetch = '' postFetch = ''
mv $out ./all mv $out ./all
@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication {
src = fetchurl { src = fetchurl {
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
sha256 = "sha256-+Z4NZK/unFN6mxCuMleHBxAoD+U1PzVk3/ZnZRmOOxo="; sha256 = "sha256-SHV+fCDhfgIh7s8L7eDbKj8bkHSVm7J2PPQ4CQpp6cI=";
}; };
postUnpack = '' postUnpack = ''
@ -72,6 +72,7 @@ python3.pkgs.buildPythonApplication {
tlslite-ng tlslite-ng
# plugins # plugins
btchip-python btchip-python
ledger-bitcoin
ckcc-protocol ckcc-protocol
keepkey keepkey
trezor trezor
@ -83,7 +84,7 @@ python3.pkgs.buildPythonApplication {
postPatch = '' postPatch = ''
# make compatible with protobuf4 by easing dependencies ... # make compatible with protobuf4 by easing dependencies ...
substituteInPlace ./contrib/requirements/requirements.txt \ substituteInPlace ./contrib/requirements/requirements.txt \
--replace "protobuf>=3.12,<4" "protobuf>=3.12" --replace "protobuf>=3.20,<4" "protobuf>=3.20"
# ... and regenerating the paymentrequest_pb2.py file # ... and regenerating the paymentrequest_pb2.py file
protoc --python_out=. electrum/paymentrequest.proto protoc --python_out=. electrum/paymentrequest.proto

View file

@ -22,13 +22,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gpxsee"; pname = "gpxsee";
version = "12.2"; version = "12.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tumic0"; owner = "tumic0";
repo = "GPXSee"; repo = "GPXSee";
rev = version; rev = version;
hash = "sha256-d+hQNI+eCSMRFMzq09wL+GN9TgOIt245Z8GlPe7nY8E="; hash = "sha256-/a6c30jv/sI0QbCXYCq9JrMpmZRk33lQBwbd0yjnxsQ=";
}; };
patches = (substituteAll { patches = (substituteAll {

View file

@ -6,6 +6,8 @@
, ninja , ninja
, pkg-config , pkg-config
, cli11 , cli11
, eigen
, fmt
, hidrd , hidrd
, inih , inih
, microsoft_gsl , microsoft_gsl
@ -15,13 +17,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "iptsd"; pname = "iptsd";
version = "1.1.1"; version = "1.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linux-surface"; owner = "linux-surface";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-IwvoqmqJTM6xtEp7AzLgT4dZgRsmXYmu6Zivx3oSm+Q="; hash = "sha256-8RE93pIg5fVAYOOq8zHlWy0uTxep7hrJlowPu48beTs=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -35,6 +37,8 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
cli11 cli11
eigen
fmt
hidrd hidrd
inih inih
microsoft_gsl microsoft_gsl
@ -47,7 +51,7 @@ stdenv.mkDerivation rec {
substituteInPlace etc/meson.build \ substituteInPlace etc/meson.build \
--replace "install_dir: unitdir" "install_dir: '$out/etc/systemd/system'" \ --replace "install_dir: unitdir" "install_dir: '$out/etc/systemd/system'" \
--replace "install_dir: rulesdir" "install_dir: '$out/etc/udev/rules.d'" --replace "install_dir: rulesdir" "install_dir: '$out/etc/udev/rules.d'"
substituteInPlace etc/udev/50-ipts.rules \ substituteInPlace etc/udev/50-iptsd.rules.in \
--replace "/bin/systemd-escape" "${systemd}/bin/systemd-escape" --replace "/bin/systemd-escape" "${systemd}/bin/systemd-escape"
''; '';

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "nwg-bar"; pname = "nwg-bar";
version = "0.1.1"; version = "0.1.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nwg-piotr"; owner = "nwg-piotr";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-XeRQhDQeobO1xNThdNgBkoGvnO3PMAxrNwTljC1GKPM="; sha256 = "sha256-/GkusNhHprXwGMNDruEEuFC2ULVIHBN5F00GNex/uq4=";
}; };
patches = [ ./fix-paths.patch ]; patches = [ ./fix-paths.patch ];
@ -17,7 +17,7 @@ buildGoModule rec {
substituteInPlace tools.go --subst-var out substituteInPlace tools.go --subst-var out
''; '';
vendorHash = "sha256-EewEhkX7Bwnz+J1ptO31HKHU4NHo76r4NqMbcrWdiu4="; vendorHash = "sha256-mqcXhnja8ed7vXIqOKBsNrcbrcaycTQXG1jqdc6zcyI=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

View file

@ -8,11 +8,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "snapmaker-luban"; pname = "snapmaker-luban";
version = "4.7.2"; version = "4.7.3";
src = fetchurl { src = fetchurl {
url = "https://github.com/Snapmaker/Luban/releases/download/v${version}/snapmaker-luban-${version}-linux-x64.tar.gz"; url = "https://github.com/Snapmaker/Luban/releases/download/v${version}/snapmaker-luban-${version}-linux-x64.tar.gz";
sha256 = "sha256-Orl3nKqkz1L1MTUEaxpnhD/nzQPDXxzgAP/GfC5tQ/o="; sha256 = "sha256-CPeTTnwykaa58tpA7Aznrvrs0DqxOKjspZjHrT+e9tw=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "toot"; pname = "toot";
version = "0.34.1"; version = "0.36.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ihabunek"; owner = "ihabunek";
repo = "toot"; repo = "toot";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
sha256 = "sha256-5LTd3FPodYxMm4zZJsAfO0O1Y0AXUxaz+ZtEh6b5Etw="; sha256 = "sha256-gEQA9PASSKAMqulOaK8ynBXX7BdptY1uwdS1tOf3/Jc=";
}; };
nativeCheckInputs = with python3Packages; [ pytest ]; nativeCheckInputs = with python3Packages; [ pytest ];

View file

@ -1,23 +1,31 @@
{ lib, stdenv, fetchFromGitHub { lib
, meson, pkg-config, ninja , fetchFromGitHub
, python3 , python3
, glib, appstream-glib , desktop-file-utils , meson
, gobject-introspection, gtk3 , ninja
, wrapGAppsHook , pkg-config
, libhandy, webkitgtk, glib-networking , appstream-glib
, gnome, dconf , desktop-file-utils
, gobject-introspection
, wrapGAppsHook4
, glib
, gtk4
, librsvg
, libadwaita
, glib-networking
, webkitgtk_6_0
}: }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "wike"; pname = "wike";
version = "1.7.1"; version = "2.0.1";
format = "other"; format = "other";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hugolabe"; owner = "hugolabe";
repo = "Wike"; repo = "Wike";
rev = version; rev = version;
sha256 = "sha256-QLhfzGRrc2En0Hu+UdtPM572PdtXqOFL0W3LoAki4jI="; hash = "sha256-R8Zg/2tr9MrmtTdbvqD+Ra8+MEBJdgMqC3ptx1VgkeA=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -27,17 +35,16 @@ python3.pkgs.buildPythonApplication rec {
appstream-glib appstream-glib
desktop-file-utils desktop-file-utils
gobject-introspection gobject-introspection
wrapGAppsHook wrapGAppsHook4
]; ];
buildInputs = [ buildInputs = [
glib glib
gtk3 gtk4
libhandy librsvg
webkitgtk libadwaita
glib-networking glib-networking
gnome.adwaita-icon-theme webkitgtk_6_0
dconf
]; ];
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [
@ -47,13 +54,21 @@ python3.pkgs.buildPythonApplication rec {
postPatch = '' postPatch = ''
patchShebangs build-aux/meson/postinstall.py patchShebangs build-aux/meson/postinstall.py
substituteInPlace build-aux/meson/postinstall.py \
--replace gtk-update-icon-cache gtk4-update-icon-cache
'';
# prevent double wrapping
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
''; '';
meta = with lib; { meta = with lib; {
description = "Wikipedia Reader for the GNOME Desktop"; description = "Wikipedia Reader for the GNOME Desktop";
homepage = "https://github.com/hugolabe/Wike"; homepage = "https://github.com/hugolabe/Wike";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = webkitgtk.meta.platforms; platforms = platforms.linux;
maintainers = with maintainers; [ samalws ]; maintainers = with maintainers; [ samalws ];
}; };
} }

View file

@ -6,12 +6,12 @@
, gtk-mac-integration , gtk-mac-integration
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "zathura"; pname = "zathura";
version = "0.5.2"; version = "0.5.2";
src = fetchurl { src = fetchurl {
url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; url = "https://pwmt.org/projects/zathura/download/zathura-${finalAttrs.version}.tar.xz";
sha256 = "15314m9chmh5jkrd9vk2h2gwcwkcffv2kjcxkd4v3wmckz5sfjy6"; sha256 = "15314m9chmh5jkrd9vk2h2gwcwkcffv2kjcxkd4v3wmckz5sfjy6";
}; };
@ -25,16 +25,17 @@ stdenv.mkDerivation rec {
"-Dconvert-icon=enabled" "-Dconvert-icon=enabled"
"-Dsynctex=enabled" "-Dsynctex=enabled"
# Make sure tests are enabled for doCheck # Make sure tests are enabled for doCheck
"-Dtests=enabled" (lib.mesonEnable "tests" finalAttrs.finalPackage.doCheck)
] ++ lib.optional (!stdenv.isLinux) "-Dseccomp=disabled"; (lib.mesonEnable "seccomp" stdenv.hostPlatform.isLinux)
];
nativeBuildInputs = [ nativeBuildInputs = [
meson ninja pkg-config desktop-file-utils python3.pkgs.sphinx meson ninja pkg-config desktop-file-utils python3.pythonForBuild.pkgs.sphinx
gettext wrapGAppsHook libxml2 check appstream-glib gettext wrapGAppsHook libxml2 appstream-glib
]; ];
buildInputs = [ buildInputs = [
gtk girara libintl sqlite glib file librsvg gtk girara libintl sqlite glib file librsvg check
texlive.bin.core texlive.bin.core
] ++ lib.optional stdenv.isLinux libseccomp ] ++ lib.optional stdenv.isLinux libseccomp
++ lib.optional stdenv.isDarwin gtk-mac-integration; ++ lib.optional stdenv.isDarwin gtk-mac-integration;
@ -48,4 +49,4 @@ stdenv.mkDerivation rec {
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ globin ]; maintainers = with maintainers; [ globin ];
}; };
} })

View file

@ -3,10 +3,10 @@
rec { rec {
firefox = buildMozillaMach rec { firefox = buildMozillaMach rec {
pname = "firefox"; pname = "firefox";
version = "112.0.1"; version = "112.0.2";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "23a5cd9c1f165275d8ca7465bebce86018441c72292421f4ed56d7ad8ada9402dc8d22a08467d9d0ef3ef8c62338006dfa3bcbddf12cb8a59eafa0bd7d0cda50"; sha512 = "2cd7adeb6c9a39ad4c5366982e0e58382d7f205e6f2cee02b8ec2867034d1c0c884eeeb870a35db35cba60fa9c84aea73f8c77cfd9f36b5146dde06464aaabd1";
}; };
meta = { meta = {

View file

@ -1,19 +1,19 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
activesupport (7.0.4) activesupport (7.0.4.3)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2) i18n (>= 1.6, < 2)
minitest (>= 5.1) minitest (>= 5.1)
tzinfo (~> 2.0) tzinfo (~> 2.0)
addressable (2.8.1) addressable (2.8.4)
public_suffix (>= 2.0.2, < 6.0) public_suffix (>= 2.0.2, < 6.0)
colorize (0.8.1) colorize (0.8.1)
concurrent-ruby (1.1.10) concurrent-ruby (1.2.2)
domain_name (0.5.20190701) domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0) unf (>= 0.0.5, < 1.0.0)
ejson (1.3.1) ejson (1.3.1)
faraday (2.7.1) faraday (2.7.4)
faraday-net_http (>= 2.0, < 3.1) faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4) ruby2_keywords (>= 0.0.4)
faraday-net_http (3.0.2) faraday-net_http (3.0.2)
@ -21,30 +21,28 @@ GEM
ffi-compiler (1.0.1) ffi-compiler (1.0.1)
ffi (>= 1.0.0) ffi (>= 1.0.0)
rake rake
googleauth (1.3.0) googleauth (1.5.2)
faraday (>= 0.17.3, < 3.a) faraday (>= 0.17.3, < 3.a)
jwt (>= 1.4, < 3.0) jwt (>= 1.4, < 3.0)
memoist (~> 0.16) memoist (~> 0.16)
multi_json (~> 1.11) multi_json (~> 1.11)
os (>= 0.9, < 2.0) os (>= 0.9, < 2.0)
signet (>= 0.16, < 2.a) signet (>= 0.16, < 2.a)
http (4.4.1) http (5.1.1)
addressable (~> 2.3) addressable (~> 2.8)
http-cookie (~> 1.0) http-cookie (~> 1.0)
http-form_data (~> 2.2) http-form_data (~> 2.2)
http-parser (~> 1.2.0) llhttp-ffi (~> 0.4.0)
http-accept (1.7.0) http-accept (1.7.0)
http-cookie (1.0.5) http-cookie (1.0.5)
domain_name (~> 0.5) domain_name (~> 0.5)
http-form_data (2.3.0) http-form_data (2.3.0)
http-parser (1.2.3)
ffi-compiler (>= 1.0, < 2.0)
i18n (1.12.0) i18n (1.12.0)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
jsonpath (1.1.2) jsonpath (1.1.2)
multi_json multi_json
jwt (2.5.0) jwt (2.7.0)
krane (3.0.1) krane (3.1.0)
activesupport (>= 5.0) activesupport (>= 5.0)
colorize (~> 0.8) colorize (~> 0.8)
concurrent-ruby (~> 1.1) concurrent-ruby (~> 1.1)
@ -55,21 +53,24 @@ GEM
oj (~> 3.0) oj (~> 3.0)
statsd-instrument (>= 2.8, < 4) statsd-instrument (>= 2.8, < 4)
thor (>= 1.0, < 2.0) thor (>= 1.0, < 2.0)
kubeclient (4.10.1) kubeclient (4.11.0)
http (>= 3.0, < 5.0) http (>= 3.0, < 6.0)
jsonpath (~> 1.0) jsonpath (~> 1.0)
recursive-open-struct (~> 1.1, >= 1.1.1) recursive-open-struct (~> 1.1, >= 1.1.1)
rest-client (~> 2.0) rest-client (~> 2.0)
llhttp-ffi (0.4.0)
ffi-compiler (~> 1.0)
rake (~> 13.0)
memoist (0.16.2) memoist (0.16.2)
mime-types (3.4.1) mime-types (3.4.1)
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2022.0105) mime-types-data (3.2023.0218.1)
minitest (5.16.3) minitest (5.18.0)
multi_json (1.15.0) multi_json (1.15.0)
netrc (0.11.0) netrc (0.11.0)
oj (3.13.23) oj (3.14.3)
os (1.1.4) os (1.1.4)
public_suffix (5.0.0) public_suffix (5.0.1)
rake (13.0.6) rake (13.0.6)
recursive-open-struct (1.1.3) recursive-open-struct (1.1.3)
rest-client (2.1.0) rest-client (2.1.0)
@ -83,9 +84,9 @@ GEM
faraday (>= 0.17.5, < 3.a) faraday (>= 0.17.5, < 3.a)
jwt (>= 1.5, < 3.0) jwt (>= 1.5, < 3.0)
multi_json (~> 1.10) multi_json (~> 1.10)
statsd-instrument (3.5.0) statsd-instrument (3.5.7)
thor (1.2.1) thor (1.2.1)
tzinfo (2.0.5) tzinfo (2.0.6)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
unf (0.1.4) unf (0.1.4)
unf_ext unf_ext
@ -98,4 +99,4 @@ DEPENDENCIES
krane krane
BUNDLED WITH BUNDLED WITH
2.3.24 2.4.10

View file

@ -5,10 +5,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "183az13i4fsm28d0l5xhbjpmcj3l1lxzcxlx8pi8zrbd933jwqd0"; sha256 = "15m0b1im6i401ab51vzr7f8nk8kys1qa0snnl741y3sir3xd07jp";
type = "gem"; type = "gem";
}; };
version = "7.0.4"; version = "7.0.4.3";
}; };
addressable = { addressable = {
dependencies = ["public_suffix"]; dependencies = ["public_suffix"];
@ -16,10 +16,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw"; sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20";
type = "gem"; type = "gem";
}; };
version = "2.8.1"; version = "2.8.4";
}; };
colorize = { colorize = {
groups = ["default"]; groups = ["default"];
@ -36,10 +36,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q";
type = "gem"; type = "gem";
}; };
version = "1.1.10"; version = "1.2.2";
}; };
domain_name = { domain_name = {
dependencies = ["unf"]; dependencies = ["unf"];
@ -68,10 +68,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1wyz9ab0mzi84gpf81fs19vrixglmmxi25k6n1mn9h141qmsp590"; sha256 = "1f20vjx0ywx0zdb4dfx4cpa7kd51z6vg7dw5hs35laa45dy9g9pj";
type = "gem"; type = "gem";
}; };
version = "2.7.1"; version = "2.7.4";
}; };
faraday-net_http = { faraday-net_http = {
groups = ["default"]; groups = ["default"];
@ -110,21 +110,21 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1hpwgwhk0lmnknkw8kbdfxn95qqs6aagpq815l5fkw9w6mi77pai"; sha256 = "1lj5haarpn7rybbq9s031zcn9ji3rlz5bk64bwa2j34q5s1h5gis";
type = "gem"; type = "gem";
}; };
version = "1.3.0"; version = "1.5.2";
}; };
http = { http = {
dependencies = ["addressable" "http-cookie" "http-form_data" "http-parser"]; dependencies = ["addressable" "http-cookie" "http-form_data" "llhttp-ffi"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0z8vmvnkrllkpzsxi94284di9r63g9v561a16an35izwak8g245y"; sha256 = "1bzb8p31kzv6q5p4z5xq88mnqk414rrw0y5rkhpnvpl29x5c3bpw";
type = "gem"; type = "gem";
}; };
version = "4.4.1"; version = "5.1.1";
}; };
http-accept = { http-accept = {
groups = ["default"]; groups = ["default"];
@ -157,17 +157,6 @@
}; };
version = "2.3.0"; version = "2.3.0";
}; };
http-parser = {
dependencies = ["ffi-compiler"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "18qqvckvqjffh88hfib6c8pl9qwk9gp89w89hl3f2s1x8hgyqka1";
type = "gem";
};
version = "1.2.3";
};
i18n = { i18n = {
dependencies = ["concurrent-ruby"]; dependencies = ["concurrent-ruby"];
groups = ["default"]; groups = ["default"];
@ -195,10 +184,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0kcmnx6rgjyd7sznai9ccns2nh7p7wnw3mi8a7vf2wkm51azwddq"; sha256 = "09yj3z5snhaawh2z1w45yyihzmh57m6m7dp8ra8gxavhj5kbiq5p";
type = "gem"; type = "gem";
}; };
version = "2.5.0"; version = "2.7.0";
}; };
krane = { krane = {
dependencies = ["activesupport" "colorize" "concurrent-ruby" "ejson" "googleauth" "jsonpath" "kubeclient" "oj" "statsd-instrument" "thor"]; dependencies = ["activesupport" "colorize" "concurrent-ruby" "ejson" "googleauth" "jsonpath" "kubeclient" "oj" "statsd-instrument" "thor"];
@ -206,10 +195,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1j3hy00vqk58vf7djip7vhqqczb84pjqlp34h1w4jgbw05vfcbqx"; sha256 = "1d8vdj3wd2qp8agyadn0w33qf7z2p5lk3vlslb8jlph8x5y3mm70";
type = "gem"; type = "gem";
}; };
version = "3.0.1"; version = "3.1.0";
}; };
kubeclient = { kubeclient = {
dependencies = ["http" "jsonpath" "recursive-open-struct" "rest-client"]; dependencies = ["http" "jsonpath" "recursive-open-struct" "rest-client"];
@ -217,10 +206,21 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "10rg2l15xmv4sy3cjvw3r9rxkylf36p416fhlhpic9zlq8ang6c4"; sha256 = "1k1zi27fnasqpinfxnajm81pyr11k2j510wacr53d37v97bzr1a9";
type = "gem"; type = "gem";
}; };
version = "4.10.1"; version = "4.11.0";
};
llhttp-ffi = {
dependencies = ["ffi-compiler" "rake"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00dh6zmqdj59rhcya0l4b9aaxq6n8xizfbil93k0g06gndyk5xz5";
type = "gem";
};
version = "0.4.0";
}; };
memoist = { memoist = {
groups = ["default"]; groups = ["default"];
@ -248,20 +248,20 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q"; sha256 = "1pky3vzaxlgm9gw5wlqwwi7wsw3jrglrfflrppvvnsrlaiz043z9";
type = "gem"; type = "gem";
}; };
version = "3.2022.0105"; version = "3.2023.0218.1";
}; };
minitest = { minitest = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0516ypqlx0mlcfn5xh7qppxqc3xndn1fnadxawa8wld5dkcimy30"; sha256 = "0ic7i5z88zcaqnpzprf7saimq2f6sad57g5mkkqsrqrcd6h3mx06";
type = "gem"; type = "gem";
}; };
version = "5.16.3"; version = "5.18.0";
}; };
multi_json = { multi_json = {
groups = ["default"]; groups = ["default"];
@ -288,10 +288,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0lggrhlihxyfgiqqr9b2fqdxc4d2zff2czq30m3rgn8a0b2gsv90"; sha256 = "0l8l90iibzrxs33vn3adrhbg8cbmbn1qfh962p7gzwwybsdw73qy";
type = "gem"; type = "gem";
}; };
version = "3.13.23"; version = "3.14.3";
}; };
os = { os = {
groups = ["default"]; groups = ["default"];
@ -308,10 +308,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6"; sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35";
type = "gem"; type = "gem";
}; };
version = "5.0.0"; version = "5.0.1";
}; };
rake = { rake = {
groups = ["default"]; groups = ["default"];
@ -370,10 +370,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0gl2n26hb8g12n3alh1yg5qg7cjrp9f9fyc25crmaccm5m17v0sa"; sha256 = "1pg308z3ck1vpazrmczklqa6f9qciay8nysnhc16pgfsh2npzzrz";
type = "gem"; type = "gem";
}; };
version = "3.5.0"; version = "3.5.7";
}; };
thor = { thor = {
groups = ["default"]; groups = ["default"];
@ -391,10 +391,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5"; sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd";
type = "gem"; type = "gem";
}; };
version = "2.0.5"; version = "2.0.6";
}; };
unf = { unf = {
dependencies = ["unf_ext"]; dependencies = ["unf_ext"];

View file

@ -2,13 +2,13 @@
(if stdenv.isDarwin then darwin.apple_sdk_11_0.clang14Stdenv else stdenv).mkDerivation rec { (if stdenv.isDarwin then darwin.apple_sdk_11_0.clang14Stdenv else stdenv).mkDerivation rec {
pname = "signalbackup-tools"; pname = "signalbackup-tools";
version = "20230414"; version = "20230421-1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bepaald"; owner = "bepaald";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-0pCItZCYdwX/Bl20HHc/FhIF4ZHsqz9aadfFYNdQ71M="; hash = "sha256-ZQFoajkD7vvz74TXVT7I4D0Qjknt5YxfHYpGi3i01Ns=";
}; };
postPatch = '' postPatch = ''

View file

@ -29,7 +29,7 @@
, tl-expected , tl-expected
, hunspell , hunspell
, glibmm_2_68 , glibmm_2_68
, webkitgtk_4_1 , webkitgtk_6_0
, jemalloc , jemalloc
, rnnoise , rnnoise
, protobuf , protobuf
@ -73,7 +73,7 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "telegram-desktop"; pname = "telegram-desktop";
version = "4.7.1"; version = "4.8.0";
# Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
src = fetchFromGitHub { src = fetchFromGitHub {
@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
repo = "tdesktop"; repo = "tdesktop";
rev = "v${version}"; rev = "v${version}";
fetchSubmodules = true; fetchSubmodules = true;
sha256 = "1qv8029xzp2j1j58b1lkw3q53cwaaazvp2la80mfbjv348c29iyk"; sha256 = "1ari4kdjd99klrla0rn4cjjc54d6glf17s0q881f67vh2v5zdwf0";
}; };
patches = [ patches = [
@ -101,8 +101,8 @@ stdenv.mkDerivation rec {
--replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' --replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"'
substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \ substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \
--replace '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"' --replace '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"'
substituteInPlace Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp \ substituteInPlace Telegram/lib_webview/webview/platform/linux/webview_linux_webkitgtk_library.cpp \
--replace '"libwebkit2gtk-4.1.so.0"' '"${webkitgtk_4_1}/lib/libwebkit2gtk-4.1.so.0"' --replace '"libwebkitgtk-6.0.so.4"' '"${webkitgtk_6_0}/lib/libwebkitgtk-6.0.so.4"'
''; '';
# We want to run wrapProgram manually (with additional parameters) # We want to run wrapProgram manually (with additional parameters)
@ -140,7 +140,7 @@ stdenv.mkDerivation rec {
tl-expected tl-expected
hunspell hunspell
glibmm_2_68 glibmm_2_68
webkitgtk_4_1 webkitgtk_6_0
jemalloc jemalloc
rnnoise rnnoise
protobuf protobuf

View file

@ -9,13 +9,13 @@
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "tg_owt"; pname = "tg_owt";
version = "unstable-2023-03-14"; version = "unstable-2023-04-18";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "desktop-app"; owner = "desktop-app";
repo = "tg_owt"; repo = "tg_owt";
rev = "1a18da2ed4d5ce134e984d1586b915738e0da257"; rev = "fe316b0c5a155cceb2ddecee70d7b582cadfa225";
sha256 = "18srnl688ng8grfpmgcjpdyr4cw87yjdvyw94b2jjq5jmnq9n3a3"; sha256 = "0wl2d1ycvf32prqjxxh6a14zgaqkk7s545cv2pn4dryn6lf7bfsp";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View file

@ -1,16 +1,32 @@
{ lib, fetchurl, mkDerivation, cmake, extra-cmake-modules, pkg-config, qtbase, qtkeychain, sqlite, libsecret }: { lib
, fetchFromGitHub
, mkDerivation
, pkg-config
, cmake
, extra-cmake-modules
, callPackage
, qtbase
, qtkeychain
, qttools
, sqlite
, libsecret
}:
mkDerivation rec { mkDerivation rec {
pname = "owncloud-client"; pname = "owncloud-client";
version = "2.11.0.8354"; version = "3.2.1";
src = fetchurl { libregraph = callPackage ./libre-graph-api-cpp-qt-client.nix { };
url = "https://download.owncloud.com/desktop/ownCloud/stable/${version}/source/ownCloud-${version}.tar.xz";
sha256 = "sha256-YraWvGgeF5b1+3i5Jlk+bwvAULr7KFOSX8y0ZoPpljI="; src = fetchFromGitHub {
owner = "owncloud";
repo = "client";
rev = "refs/tags/v${version}";
hash = "sha256-39tpvzlTy3KRxg8DzCQW2VnsaLqJ+dNQRur2TqRZytE=";
}; };
nativeBuildInputs = [ pkg-config cmake extra-cmake-modules ]; nativeBuildInputs = [ pkg-config cmake extra-cmake-modules ];
buildInputs = [ qtbase qtkeychain sqlite libsecret ]; buildInputs = [ qtbase qttools qtkeychain sqlite libsecret libregraph ];
qtWrapperArgs = [ qtWrapperArgs = [
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}" "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}"
@ -19,13 +35,17 @@ mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-UCMAKE_INSTALL_LIBDIR" "-UCMAKE_INSTALL_LIBDIR"
"-DNO_SHIBBOLETH=1" "-DNO_SHIBBOLETH=1"
# https://github.com/owncloud/client/issues/10537#issuecomment-1447965096
# NB! From 4.0 it may be turned off by default
"-DWITH_AUTO_UPDATER=OFF"
]; ];
meta = with lib; { meta = with lib; {
description = "Synchronise your ownCloud with your computer using this desktop client"; description = "Synchronise your ownCloud with your computer using this desktop client";
homepage = "https://owncloud.org"; homepage = "https://owncloud.org";
maintainers = [ maintainers.qknight ]; maintainers = with maintainers; [ qknight hellwolf ];
platforms = platforms.unix; platforms = platforms.unix;
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
changelog = "https://github.com/owncloud/client/releases/tag/v${version}";
}; };
} }

View file

@ -0,0 +1,34 @@
{ lib
, fetchFromGitHub
, mkDerivation
, cmake
, qtbase
}:
mkDerivation rec {
pname = "libre-graph-api-cpp-qt-client";
version = "0.13.2";
src = fetchFromGitHub {
owner = "owncloud";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-gbrA8P+ukQAiF2czC2szw3fJv1qoPJyMQ72t7PqB5/s=";
};
sourceRoot = "source/client";
nativeBuildInputs = [ cmake ];
buildInputs = [ qtbase ];
cmakeFlags = [ ];
meta = with lib; {
description = "C++ Qt API for Libre Graph, a free API for cloud collaboration inspired by the MS Graph API";
homepage = "https://owncloud.org";
maintainers = with maintainers; [ qknight hellwolf ];
platforms = platforms.unix;
license = licenses.asl20;
changelog = "https://github.com/owncloud/libre-graph-api-cpp-qt-client/releases/tag/v${version}";
};
}

View file

@ -9,6 +9,8 @@
, libX11 , libX11
, lib , lib
, stdenv , stdenv
, libgcrypt
, wrapGAppsHook
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -33,10 +35,12 @@ stdenv.mkDerivation {
stdenv.cc.cc.lib stdenv.cc.cc.lib
libGL libGL
libX11 libX11
libgcrypt
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
autoPatchelfHook autoPatchelfHook
wrapGAppsHook
]; ];
installPhase = '' installPhase = ''

View file

@ -6,6 +6,7 @@
, ncurses, swig2 , ncurses, swig2
, extraPackages ? [] , extraPackages ? []
, testers , testers
, buildPackages
}: }:
let let
@ -51,7 +52,7 @@ in stdenv.mkDerivation (finalAttrs: {
postFixup = lib.optionalString (lib.length extraPackages != 0) '' postFixup = lib.optionalString (lib.length extraPackages != 0) ''
# Join all plugins via symlinking # Join all plugins via symlinking
for i in ${toString extraPackages}; do for i in ${toString extraPackages}; do
${lndir}/bin/lndir -silent $i $out ${buildPackages.xorg.lndir}/bin/lndir -silent $i $out
done done
# Needed for at least the remote plugin server # Needed for at least the remote plugin server
for file in $out/bin/*; do for file in $out/bin/*; do

View file

@ -13,26 +13,32 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "kent"; pname = "kent";
version = "404"; version = "446";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ucscGenomeBrowser"; owner = "ucscGenomeBrowser";
repo = pname; repo = pname;
rev = "v${version}_base"; rev = "v${version}_base";
sha256 = "0l5lmqqc6sqkf4hyk3z4825ly0vdlj5xdfad6zd0708cb1v81nbx"; hash = "sha256-d8gcoyMwINdHoD6xaNKt4rCKrKir99+i4KIzJ2YnxRw=";
}; };
buildInputs = [ libpng libuuid zlib bzip2 xz openssl curl libmysqlclient ]; buildInputs = [ libpng libuuid zlib bzip2 xz openssl curl libmysqlclient ];
patchPhase = '' patchPhase = ''
runHook prePatch
substituteInPlace ./src/checkUmask.sh \ substituteInPlace ./src/checkUmask.sh \
--replace "/bin/bash" "${bash}/bin/bash" --replace "/bin/bash" "${bash}/bin/bash"
substituteInPlace ./src/hg/sqlEnvTest.sh \ substituteInPlace ./src/hg/sqlEnvTest.sh \
--replace "which mysql_config" "${which}/bin/which ${libmysqlclient}/bin/mysql_config" --replace "which mysql_config" "${which}/bin/which ${libmysqlclient}/bin/mysql_config"
runHook postPatch
''; '';
buildPhase = '' buildPhase = ''
runHook preBuild
export MACHTYPE=$(uname -m) export MACHTYPE=$(uname -m)
export CFLAGS="-fPIC" export CFLAGS="-fPIC"
export MYSQLINC=$(mysql_config --include | sed -e 's/^-I//g') export MYSQLINC=$(mysql_config --include | sed -e 's/^-I//g')
@ -56,18 +62,26 @@ stdenv.mkDerivation rec {
cd ../utils cd ../utils
make make
runHook postBuild
''; '';
installPhase = '' installPhase = ''
runHook preInstall
mkdir -p $out/bin mkdir -p $out/bin
mkdir -p $out/lib mkdir -p $out/lib
cp $NIX_BUILD_TOP/lib/jkOwnLib.a $out/lib cp $NIX_BUILD_TOP/lib/jkOwnLib.a $out/lib
cp $NIX_BUILD_TOP/lib/jkweb.a $out/lib cp $NIX_BUILD_TOP/lib/jkweb.a $out/lib
cp $NIX_BUILD_TOP/bin/x86_64/* $out/bin cp $NIX_BUILD_TOP/bin/x86_64/* $out/bin
runHook postInstall
''; '';
meta = with lib; { meta = with lib; {
description = "UCSC Genome Bioinformatics Group's suite of biological analysis tools, i.e. the kent utilities"; description = "UCSC Genome Bioinformatics Group's suite of biological analysis tools, i.e. the kent utilities";
homepage = "http://genome.ucsc.edu";
changelog = "https://github.com/ucscGenomeBrowser/kent/releases/tag/v${version}_base";
license = licenses.unfree; license = licenses.unfree;
maintainers = with maintainers; [ scalavision ]; maintainers = with maintainers; [ scalavision ];
platforms = platforms.linux; platforms = platforms.linux;

View file

@ -12,13 +12,13 @@ assert (blas.isILP64 == arpack.isILP64);
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "octopus"; pname = "octopus";
version = "12.1"; version = "12.2";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "octopus-code"; owner = "octopus-code";
repo = "octopus"; repo = "octopus";
rev = version; rev = version;
sha256 = "sha256-dQdb4wGKOQefrgtQVorq6EH9IiAh1tMmj3GiZOXgTBY="; sha256 = "sha256-tM3D0geOT+8X3EofI+iPR48z8LKFSxQMoO/W/be+OFg=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -19,11 +19,11 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "gromacs"; pname = "gromacs";
version = "2023"; version = "2023.1";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-${version}.tar.gz"; url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-${version}.tar.gz";
sha256 = "sha256-rJLG2nL7vMpBT9io2Xnlbs8XxMHNq+0tpc+05yd7e6g="; sha256 = "sha256-7vK7Smy2MUz52kfybfKg0nr0v3swmXI9Q2AQc6sKQvQ=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

View file

@ -14,13 +14,13 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "terminator"; pname = "terminator";
version = "2.1.2"; version = "2.1.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gnome-terminator"; owner = "gnome-terminator";
repo = "terminator"; repo = "terminator";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-dN9+6VGIdIyY52nm2BMONeb+WV7UGL68frjnHRxRzTU="; hash = "sha256-Kx0z9oheA7Ihgsyg6zgPcGFMrqlXoIpQcL/dMqPB2qA=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -5,11 +5,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "got"; pname = "got";
version = "0.86"; version = "0.87";
src = fetchurl { src = fetchurl {
url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz";
hash = "sha256-FHjLEkxsvkYz4tK1k/pEUfDT9rfvN+K68gRc8fPVp7A="; hash = "sha256-fG8UihNXCxc0j01ImAAI3N0ViNrd9gnTUhRKs7Il5R4=";
}; };
nativeBuildInputs = [ pkg-config bison ] nativeBuildInputs = [ pkg-config bison ]

View file

@ -15,7 +15,7 @@ let
mkDerivation = if stdenv.isDarwin then stdenv.mkDerivation else gnustep.gsmakeDerivation; mkDerivation = if stdenv.isDarwin then stdenv.mkDerivation else gnustep.gsmakeDerivation;
in in
mkDerivation { mkDerivation {
pname = "owl"; pname = "owl-compositor";
version = "unstable-2021-11-10"; version = "unstable-2021-11-10";
src = fetchFromGitHub { src = fetchFromGitHub {

View file

@ -11,7 +11,7 @@
, cargoSetupHook , cargoSetupHook
, cargo , cargo
, cargo-auditable , cargo-auditable
, cargo-auditable-cargo-wrapper , buildPackages
, rustc , rustc
, libiconv , libiconv
, windows , windows
@ -121,7 +121,7 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg
patchRegistryDeps = ./patch-registry-deps; patchRegistryDeps = ./patch-registry-deps;
nativeBuildInputs = nativeBuildInputs ++ lib.optionals auditable [ nativeBuildInputs = nativeBuildInputs ++ lib.optionals auditable [
(cargo-auditable-cargo-wrapper.override { (buildPackages.cargo-auditable-cargo-wrapper.override {
inherit cargo cargo-auditable; inherit cargo cargo-auditable;
}) })
] ++ [ ] ++ [

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, gcc, flex, bison, texinfo, jdk, erlang, makeWrapper { lib, stdenv, fetchurl, gcc, flex, bison, texinfo, jdk_headless, erlang, makeWrapper
, readline }: , readline }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ gcc flex bison texinfo jdk erlang readline ]; buildInputs = [ gcc flex bison texinfo jdk_headless erlang readline ];
patchPhase = '' patchPhase = ''
# Fix calls to programs in /bin # Fix calls to programs in /bin
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
for e in $(ls $out/bin) ; do for e in $(ls $out/bin) ; do
wrapProgram $out/bin/$e \ wrapProgram $out/bin/$e \
--prefix PATH ":" "${gcc}/bin" \ --prefix PATH ":" "${gcc}/bin" \
--prefix PATH ":" "${jdk}/bin" \ --prefix PATH ":" "${jdk_headless}/bin" \
--prefix PATH ":" "${erlang}/bin" --prefix PATH ":" "${erlang}/bin"
done done
''; '';

View file

@ -7,11 +7,11 @@
buildGraalvmNativeImage rec { buildGraalvmNativeImage rec {
pname = "babashka"; pname = "babashka";
version = "1.3.176"; version = "1.3.178";
src = fetchurl { src = fetchurl {
url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
sha256 = "sha256-Kf7Yb7IrXiX5MGbpxvXSKqx3LEdHFV8+hgq43SAoe00="; sha256 = "sha256-ihARaZ8GJsoFmlOd0qtbOAQkbs6a9zohJ9PREJoxdZg=";
}; };
graalvmDrv = graalvmCEPackages.graalvm19-ce; graalvmDrv = graalvmCEPackages.graalvm19-ce;

View file

@ -25,13 +25,13 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "amdvlk"; pname = "amdvlk";
version = "2023.Q1.3"; version = "2023.Q2.1";
src = fetchRepoProject { src = fetchRepoProject {
name = "${pname}-src"; name = "${pname}-src";
manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
rev = "refs/tags/v-${version}"; rev = "refs/tags/v-${version}";
sha256 = "JYGegQQCoKIpvBQYhNbG8j6CgtKb+c8MsK+cFtYUgtY="; sha256 = "znjv50seqN2Rdzwnu/5ks6q1uiUacM/Z5fzMyCgv0b8=";
}; };
buildInputs = [ buildInputs = [

View file

@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
libXi libXi
# libXext is a transitive dependency of libXi # libXext is a transitive dependency of libXi
libXext libXext
] ++ lib.optionals stdenv.hostPlatform.isLinux [ ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform systemd) [
# libsystemd is a needed for dbus-broker support # libsystemd is a needed for dbus-broker support
systemd systemd
]; ];

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libqglviewer"; pname = "libqglviewer";
version = "2.8.0"; version = "2.9.1";
src = fetchurl { src = fetchurl {
url = "http://www.libqglviewer.com/src/libQGLViewer-${version}.tar.gz"; url = "http://www.libqglviewer.com/src/libQGLViewer-${version}.tar.gz";
sha256 = "sha256-A9LTOUhmzcQZ9DcTrtgnJixxTMT6zd6nw7odk9rjxMw="; sha256 = "sha256-J4+DKgstPvvg1pUhGd+8YFh5C3oPGHaQmDfLZzzkP/M=";
}; };
nativeBuildInputs = [ qmake ]; nativeBuildInputs = [ qmake ];

View file

@ -0,0 +1,142 @@
{ config, stdenv, lib, fetchFromGitHub, cmake, gtest, doCheck ? true
, cudaSupport ? config.cudaSupport or false, openclSupport ? false, mpiSupport ? false, javaWrapper ? false, hdfsSupport ? false
, rLibrary ? false, cudaPackages, opencl-headers, ocl-icd, boost, llvmPackages, openmpi, openjdk, swig, hadoop, R, rPackages }:
assert doCheck -> mpiSupport != true;
assert openclSupport -> cudaSupport != true;
assert cudaSupport -> openclSupport != true;
stdenv.mkDerivation rec {
pnameBase = "lightgbm";
# prefix with r when building the R library
# The R package build results in a special binary file
# that contains a subset of the .so file use for the CLI
# and python version. In general, the CRAN version from
# nixpkgs's r-modules should be used, but this non-standard
# build allows for enabling CUDA support and other features
# which aren't included in the CRAN release. Build with:
# nix-build -E "with (import $NIXPKGS{}); \
# let \
# lgbm = lightgbm.override{rLibrary = true; doCheck = false;}; \
# in \
# rWrapper.override{ packages = [ lgbm ]; }"
pname = lib.optionalString rLibrary "r-" + pnameBase;
version = "3.3.5";
src = fetchFromGitHub {
owner = "microsoft";
repo = pnameBase;
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-QRuBbMVtD5J5ECw+bAp57bWaRc/fATMcTq+AKikhj1I=";
};
nativeBuildInputs = [ cmake ]
++ lib.optionals stdenv.isDarwin [ llvmPackages.openmp ]
++ lib.optionals openclSupport [ opencl-headers ocl-icd boost ]
++ lib.optionals mpiSupport [ openmpi ]
++ lib.optionals hdfsSupport [ hadoop ]
++ lib.optionals (hdfsSupport || javaWrapper) [ openjdk ]
++ lib.optionals javaWrapper [ swig ]
++ lib.optionals rLibrary [ R ];
buildInputs = [ gtest ]
++ lib.optional cudaSupport cudaPackages.cudatoolkit;
propagatedBuildInputs = lib.optionals rLibrary [
rPackages.data_table
rPackages.jsonlite
rPackages.Matrix
rPackages.R6
];
# Skip APPLE in favor of linux build for .so files
postPatch = ''
export PROJECT_SOURCE_DIR=./
substituteInPlace CMakeLists.txt \
--replace "find_package(GTest CONFIG)" "find_package(GTest REQUIRED)" \
--replace "OpenCL_INCLUDE_DIRS}" "OpenCL_INCLUDE_DIRS}" \
--replace "elseif(APPLE)" "elseif(APPLESKIP)"
substituteInPlace \
external_libs/compute/include/boost/compute/cl.hpp \
external_libs/compute/include/boost/compute/cl_ext.hpp \
--replace "include <OpenCL/" "include <CL/"
substituteInPlace build_r.R \
--replace "file.path(getwd(), \"lightgbm_r\")" "'$out/tmp'" \
--replace \
"install_args <- c(\"CMD\", \"INSTALL\", \"--no-multiarch\", \"--with-keep.source\", tarball)" \
"install_args <- c(\"CMD\", \"INSTALL\", \"--no-multiarch\", \"--with-keep.source\", \"-l $out/library\", tarball)"
'';
cmakeFlags = lib.optionals doCheck [ "-DBUILD_CPP_TEST=ON" ]
++ lib.optionals cudaSupport [ "-DUSE_CUDA=1" "-DCMAKE_CXX_COMPILER=${cudaPackages.cudatoolkit.cc}/bin/cc" ]
++ lib.optionals openclSupport [ "-DUSE_GPU=ON" ]
++ lib.optionals mpiSupport [ "-DUSE_MPI=ON" ]
++ lib.optionals hdfsSupport [
"-DUSE_HDFS=ON"
"-DHDFS_LIB=${hadoop}/lib/hadoop-3.3.1/lib/native/libhdfs.so"
"-DHDFS_INCLUDE_DIR=${hadoop}/lib/hadoop-3.3.1/include" ]
++ lib.optionals javaWrapper [ "-DUSE_SWIG=ON" ]
++ lib.optionals rLibrary [ "-D__BUILD_FOR_R=ON" ];
configurePhase = lib.optionals rLibrary ''
export R_LIBS_SITE="$out/library:$R_LIBS_SITE''${R_LIBS_SITE:+:}"
'';
# set the R package buildPhase to null because lightgbm has a
# custom builder script that builds and installs in one step
buildPhase = lib.optionals rLibrary ''
'';
inherit doCheck;
installPhase = ''
runHook preInstall
'' + lib.optionalString (!rLibrary) ''
mkdir -p $out
mkdir -p $out/lib
mkdir -p $out/bin
cp -r ../include $out
install -Dm755 ../lib_lightgbm.so $out/lib/lib_lightgbm.so
install -Dm755 ../lightgbm $out/bin/lightgbm
'' + lib.optionalString javaWrapper ''
cp -r java $out
cp -r com $out
cp -r lightgbmlib.jar $out
'' + ''
'' + lib.optionalString javaWrapper ''
cp -r java $out
cp -r com $out
cp -r lightgbmlib.jar $out
'' + lib.optionalString rLibrary ''
mkdir $out
mkdir $out/tmp
mkdir $out/library
mkdir $out/library/lightgbm
'' + lib.optionalString (rLibrary && (!openclSupport)) ''
Rscript build_r.R
rm -rf $out/tmp
'' + lib.optionalString (rLibrary && openclSupport) ''
Rscript build_r.R --use-gpu \
--opencl-library=${ocl-icd}/lib/libOpenCL.so \
--boost-librarydir=${boost}
rm -rf $out/tmp
'' + ''
runHook postInstall
'';
postFixup = lib.optionalString rLibrary ''
if test -e $out/nix-support/propagated-build-inputs; then
ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages
fi
'';
meta = with lib; {
description =
"LightGBM is a gradient boosting framework that uses tree based learning algorithms.";
homepage = "https://github.com/microsoft/LightGBM";
license = licenses.mit;
platforms = platforms.unix;
maintainers = with maintainers; [ nviets ];
};
}

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ntirpc"; pname = "ntirpc";
version = "4.3"; version = "5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nfs-ganesha"; owner = "nfs-ganesha";
repo = "ntirpc"; repo = "ntirpc";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-P9+t9dTiEKjloulypWPJ4sXWWemq9zPUH/Kctvq1SUQ="; sha256 = "sha256-xqnfo07EHwendzibIz187vdaenHwxg078D6zJvoyewc=";
}; };
postPatch = '' postPatch = ''

View file

@ -16,6 +16,7 @@
let let
latex = lib.optionalAttrs buildDocs texlive.combine { latex = lib.optionalAttrs buildDocs texlive.combine {
inherit (texlive) scheme-small inherit (texlive) scheme-small
changepage
latexmk latexmk
varwidth varwidth
multirow multirow

View file

@ -13,7 +13,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "bx-py-utils"; pname = "bx-py-utils";
version = "76"; version = "78";
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "boxine"; owner = "boxine";
repo = "bx_py_utils"; repo = "bx_py_utils";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-daqbF+DCt4yvKHbEzwJyOzEgsYLqhR31a0pYqp9OSvo="; hash = "sha256-dMcbv/qf+8Qzu47MVFU2QUviT/vjKsHp+45F/6NOlWo=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -9,14 +9,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "eigenpy"; pname = "eigenpy";
version = "2.9.2"; version = "3.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stack-of-tasks"; owner = "stack-of-tasks";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-h088il9gih1rJJKOI09qq2180DxbxCAVZcgBXWh8aVk="; hash = "sha256-xaeMsn3G4x5DS6gXc6mbZvi96K1Yu8CuzjcGnYJYrvs=";
}; };
strictDeps = true; strictDeps = true;

View file

@ -16,7 +16,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "fakeredis"; pname = "fakeredis";
version = "2.10.3"; version = "2.11.0";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "dsoftwareinc"; owner = "dsoftwareinc";
repo = "fakeredis-py"; repo = "fakeredis-py";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-qd8tofR5FdfV/A37gfNRYALf5rUMh7ldhS/hETUHo/k="; hash = "sha256-R9fB8Y22HPFxMtFQJmmbxZWh6qUtbXrWFUetaOKRFlg=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -25,7 +25,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "jaraco-abode"; pname = "jaraco-abode";
version = "4.1.0"; version = "5.0.1";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -35,7 +35,7 @@ buildPythonPackage rec {
owner = "jaraco"; owner = "jaraco";
repo = "jaraco.abode"; repo = "jaraco.abode";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-MD8Piwgm+WStEKX+LP0sCezRI4gdHmHis/XMJ8Vuw04="; hash = "sha256-vKlvZrgRKv2C43JLfl4Wum4Icz9yOKEaB6qKapZ0rwQ=";
}; };
postPatch = '' postPatch = ''
@ -86,6 +86,7 @@ buildPythonPackage rec {
]; ];
meta = with lib; { meta = with lib; {
changelog = "https://github.com/jaraco/jaraco.abode/blob/${src.rev}/CHANGES.rst";
homepage = "https://github.com/jaraco/jaraco.abode"; homepage = "https://github.com/jaraco/jaraco.abode";
description = "Library interfacing to the Abode home security system"; description = "Library interfacing to the Abode home security system";
license = licenses.mit; license = licenses.mit;

View file

@ -0,0 +1,40 @@
{ lib
, buildPythonPackage
, fetchPypi
, setuptools
, ledgercomm
, packaging
, typing-extensions
}:
buildPythonPackage rec {
pname = "ledger-bitcoin";
version = "0.2.1";
format = "pyproject";
src = fetchPypi {
inherit version;
pname = "ledger_bitcoin";
hash = "sha256-AWl/q2MzzspNIo6yf30S92PgM/Ygsb+1lJsg7Asztso=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
ledgercomm
packaging
typing-extensions
];
pythonImportsCheck = [
"ledger_bitcoin"
];
meta = with lib; {
description = "Client library for Ledger Bitcoin application.";
homepage = "https://github.com/LedgerHQ/app-bitcoin-new/tree/develop/bitcoin_client/ledger_bitcoin";
license = licenses.asl20;
};
}

View file

@ -0,0 +1,30 @@
{ lib
, buildPythonPackage
, fetchPypi
, setuptools
}:
buildPythonPackage rec {
pname = "ledgercomm";
version = "1.1.2";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-izOPbwv+34Xq8mpq9+QRIGhd+z4pVnGJSMnYOktRVbs=";
};
nativeBuildInputs = [
setuptools
];
pythonImportsCheck = [
"ledgercomm"
];
meta = with lib; {
description = "Python library to send and receive APDU through HID or TCP socket. It can be used with a Ledger Nano S/X or with the Speculos emulator.";
homepage = "https://github.com/LedgerHQ/ledgercomm";
license = licenses.mit;
};
}

View file

@ -0,0 +1,29 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "looseversion";
version = "1.0.3";
format = "flit";
src = fetchPypi {
inherit version pname;
sha256 = "sha256-A1KIhg4a/mfWPqnHAN2dCVxyTi5XIqOQKd2RZS1DFu0";
};
nativeCheckInputs = [
pytestCheckHook
];
pytestFlagsArray = [ "tests.py" ];
pythonImportsCheck = [ "looseversion" ];
meta = with lib; {
description = "Version numbering for anarchists and software realists";
homepage = "https://github.com/effigies/looseversion";
license = licenses.psfl;
maintainers = with maintainers; [ pelme ];
};
}

View file

@ -9,7 +9,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "niko-home-control"; pname = "niko-home-control";
version = "0.2.2"; version = "0.3.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "NoUseFreak"; owner = "NoUseFreak";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0ah02dfnnbk98grvd180fp9rak5gpi58xiql1yyzig5pcbjidvk3"; sha256 = "sha256-n/uQAX2LgxeGTRF56+G5vm5wbeTQQQODV4EKaPgKw1k=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -1,23 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "pyblake2";
version = "1.1.2";
src = fetchPypi {
inherit pname version;
sha256 = "5ccc7eb02edb82fafb8adbb90746af71460fbc29aa0f822526fc976dff83e93f";
};
# requires setting up sphinx doctest
doCheck = false;
meta = {
description = "BLAKE2 hash function extension module";
license = lib.licenses.publicDomain;
homepage = "https://github.com/dchest/pyblake2";
};
}

View file

@ -15,7 +15,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyinsteon"; pname = "pyinsteon";
version = "1.4.1"; version = "1.4.2";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-K8uMyMNZwe6Zr/Qb98wmTLz2+45bx7cmoApnUW5oNPw="; hash = "sha256-5c2hcW9XSEyIMlyrn70U7tgBWdxGrtJoQkjkYzlrbKE=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -14,7 +14,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pylitterbot"; pname = "pylitterbot";
version = "2023.1.2"; version = "2023.4.0";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "natekspencer"; owner = "natekspencer";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-PSg0u4Beg0OVUMxaBCPxJSVO/MxBvCpDu2rQhiYT9OM="; hash = "sha256-nF6njY2qNoHW2ZGNDHNeTBTjSBbitJxitPgyayLaqSE=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -31,7 +31,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyunifiprotect"; pname = "pyunifiprotect";
version = "4.8.1"; version = "4.8.2";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -40,7 +40,7 @@ buildPythonPackage rec {
owner = "briis"; owner = "briis";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-+fZtzSUTObWkLQ7Nq6pCP+vN1+OUFi3d8AJdr5FGI+k="; hash = "sha256-NjoTUK1Tg2RqREI2DDT86mDO4rS5iZk+cffaGWLVSyc=";
}; };
postPatch = '' postPatch = ''

View file

@ -40,7 +40,7 @@ let
}; };
pname = "torchvision"; pname = "torchvision";
version = "0.14.1"; version = "0.15.1";
in in
buildPythonPackage { buildPythonPackage {
inherit pname version; inherit pname version;
@ -49,7 +49,7 @@ buildPythonPackage {
owner = "pytorch"; owner = "pytorch";
repo = "vision"; repo = "vision";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-lKkEJolJQaLr1TVm44CizbJQedGa1wyy0cFWg2LTJN0="; hash = "sha256-CQS2IXb8YSLrrkn/7BsO4Me5Cv0eXgMAKXM4rGzr0Bw=";
}; };
nativeBuildInputs = [ libpng ninja which ] ++ lib.optionals cudaSupport [ cuda-native-redist ]; nativeBuildInputs = [ libpng ninja which ] ++ lib.optionals cudaSupport [ cuda-native-redist ];

View file

@ -14,7 +14,6 @@
, mnemonic , mnemonic
, pillow , pillow
, protobuf , protobuf
, pyblake2
, requests , requests
, shamir-mnemonic , shamir-mnemonic
, simple-rlp , simple-rlp
@ -47,7 +46,6 @@ buildPythonPackage rec {
mnemonic mnemonic
pillow pillow
protobuf protobuf
pyblake2
requests requests
shamir-mnemonic shamir-mnemonic
simple-rlp simple-rlp

View file

@ -18,14 +18,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ttp"; pname = "ttp";
version = "0.9.2"; version = "0.9.4";
format = "pyproject"; format = "pyproject";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dmulyalin"; owner = "dmulyalin";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-KhQRC4zcLCnYUtQm08wJzb/YwBquOEGR5L0YUmnzheg="; hash = "sha256-iZJ38NQnofW9awisY5cFBIN1rjXinA6CpJYSCCnNaOY=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -102,6 +102,7 @@ buildPythonPackage rec {
]; ];
meta = with lib; { meta = with lib; {
changelog = "https://github.com/dmulyalin/ttp/releases/tag/${version}";
description = "Template Text Parser"; description = "Template Text Parser";
homepage = "https://github.com/dmulyalin/ttp"; homepage = "https://github.com/dmulyalin/ttp";
license = licenses.mit; license = licenses.mit;

View file

@ -1,27 +1,28 @@
{ lib { lib
, stdenv , stdenv
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub
, cython
, certifi , certifi
, CFNetwork , CFNetwork
, cmake , cmake
, CoreFoundation , CoreFoundation
, enum34
, fetchpatch
, fetchPypi
, isPy3k
, libcxxabi , libcxxabi
, openssl , openssl
, Security , Security
, six , pytestCheckHook
, pytest-asyncio
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "uamqp"; pname = "uamqp";
version = "1.6.4"; version = "1.6.4";
src = fetchPypi { src = fetchFromGitHub {
inherit pname version; owner = "Azure";
hash = "sha256-IYMzJDXveIL60ick4/L2PT/VpRx/DGNdY0h5SLAuN0k="; repo = "azure-uamqp-python";
rev = "refs/tags/v.${version}";
hash = "sha256-OjZTroaBuUB/dakl5gAYigJkim9EFiCwUEBo7z35vhQ=";
}; };
patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
@ -43,9 +44,12 @@ buildPythonPackage rec {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
cython
]; ];
buildInputs = lib.optionals stdenv.isDarwin [ buildInputs = [
openssl
] ++ lib.optionals stdenv.isDarwin [
CoreFoundation CoreFoundation
CFNetwork CFNetwork
Security Security
@ -53,10 +57,6 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
certifi certifi
openssl
six
] ++ lib.optionals (!isPy3k) [
enum34
]; ];
LDFLAGS = lib.optionals stdenv.isDarwin [ LDFLAGS = lib.optionals stdenv.isDarwin [
@ -65,8 +65,15 @@ buildPythonPackage rec {
dontUseCmakeConfigure = true; dontUseCmakeConfigure = true;
# Project has no tests preCheck = ''
doCheck = false; # remove src module, so tests use the installed module instead
rm -r uamqp
'';
nativeCheckInputs = [
pytestCheckHook
pytest-asyncio
];
pythonImportsCheck = [ pythonImportsCheck = [
"uamqp" "uamqp"

View file

@ -17,14 +17,14 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "muon" pname = "muon"
+ lib.optionalString embedSamurai "-embedded-samurai"; + lib.optionalString embedSamurai "-embedded-samurai";
version = "0.1.0"; version = "0.2.0";
src = fetchFromSourcehut { src = fetchFromSourcehut {
name = "muon-src"; name = "muon-src";
owner = "~lattis"; owner = "~lattis";
repo = "muon"; repo = "muon";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-m382/Y+qOYk7hHdDdOpiYWNWrqpnWPCG4AKGGkmLt4o="; hash = "sha256-ZHWyUV/BqM3ihauXDqDVkZURDDbBiRcEzptyGQmw94I=";
}; };
outputs = [ "out" ] ++ lib.optionals buildDocs [ "man" ]; outputs = [ "out" ] ++ lib.optionals buildDocs [ "man" ];
@ -52,14 +52,14 @@ stdenv.mkDerivation (finalAttrs: {
# URLs manually extracted from subprojects directory # URLs manually extracted from subprojects directory
meson-docs-wrap = fetchurl { meson-docs-wrap = fetchurl {
name = "meson-docs-wrap"; name = "meson-docs-wrap";
url = "https://mochiro.moe/wrap/meson-docs-0.63.0-239-g41a05ff93.tar.gz"; url = "https://mochiro.moe/wrap/meson-docs-1.0.1-19-gdd8d4ee22.tar.gz";
hash = "sha256-wg2mDkrkE1xVNXJf4sVm6cN1ozVeDbbw0CBYtixg5/Q="; hash = "sha256-jHSPdLFR5jUeds4e+hLZ6JOblor5iuCV5cIwoc4K9gI=";
}; };
samurai-wrap = fetchurl { samurai-wrap = fetchurl {
name = "samurai-wrap"; name = "samurai-wrap";
url = "https://mochiro.moe/wrap/samurai-1.2-28-g4e3a595.tar.gz"; url = "https://mochiro.moe/wrap/samurai-1.2-32-g81cef5d.tar.gz";
hash = "sha256-TZAEwndVgoWr/zhykfr0wcz9wM96yG44GfzM5p9TpBo="; hash = "sha256-aPMAtScqweGljvOLaTuR6B0A0GQQQrVbRviXY4dpCoc=";
}; };
in '' in ''
pushd $sourceRoot/subprojects pushd $sourceRoot/subprojects

View file

@ -5,22 +5,22 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "jql"; pname = "jql";
version = "5.2.0"; version = "6.0.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "yamafaktory"; owner = "yamafaktory";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "jql-v${version}";
hash = "sha256-gFPN3aSukh0QMfGLn65icf5ZyYb8Y+r+GMdG2gm2InY="; hash = "sha256-MdIYU6/j+hpFBcaZ1IiW6ImeWD3mmYezGEpZBbWmRzs=";
}; };
cargoHash = "sha256-XJW0TDRJdLwgWDm5ZBSCUj5VS5ZowGCr6tHV0MpZuvI="; cargoHash = "sha256-vb7HyumsLYN9rZTD8KxzV+1SN5F2rLhuullYDwRt7wM=";
meta = with lib; { meta = with lib; {
description = "A JSON Query Language CLI tool built with Rust"; description = "A JSON Query Language CLI tool built with Rust";
homepage = "https://github.com/yamafaktory/jql"; homepage = "https://github.com/yamafaktory/jql";
changelog = "https://github.com/yamafaktory/jql/releases/tag/v${version}"; changelog = "https://github.com/yamafaktory/jql/releases/tag/${src.rev}";
license = with licenses; [ mit ]; license = with licenses; [ asl20 mit ];
maintainers = with maintainers; [ akshgpt7 ]; maintainers = with maintainers; [ akshgpt7 figsoda ];
}; };
} }

View file

@ -19,16 +19,16 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
[[package]] [[package]]
name = "aho-corasick" name = "aho-corasick"
version = "0.7.20" version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04"
dependencies = [ dependencies = [
"memchr", "memchr",
] ]
[[package]] [[package]]
name = "analysis" name = "analysis"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"config", "config",
"diagnostic", "diagnostic",
@ -107,7 +107,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]] [[package]]
name = "chain-map" name = "chain-map"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"fast-hash", "fast-hash",
"str-util", "str-util",
@ -116,11 +116,11 @@ dependencies = [
[[package]] [[package]]
name = "char-name" name = "char-name"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b" source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032"
[[package]] [[package]]
name = "cm-syntax" name = "cm-syntax"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"lex-util", "lex-util",
"paths", "paths",
@ -132,14 +132,14 @@ dependencies = [
[[package]] [[package]]
name = "code-h2-md-map" name = "code-h2-md-map"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b" source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032"
dependencies = [ dependencies = [
"fast-hash", "fast-hash",
] ]
[[package]] [[package]]
name = "config" name = "config"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"fast-hash", "fast-hash",
"serde", "serde",
@ -206,7 +206,7 @@ dependencies = [
[[package]] [[package]]
name = "diagnostic" name = "diagnostic"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b" source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032"
[[package]] [[package]]
name = "diff" name = "diff"
@ -223,7 +223,7 @@ checksum = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1"
[[package]] [[package]]
name = "elapsed" name = "elapsed"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b" source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032"
dependencies = [ dependencies = [
"log", "log",
] ]
@ -271,7 +271,7 @@ dependencies = [
[[package]] [[package]]
name = "event-parse" name = "event-parse"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b" source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032"
dependencies = [ dependencies = [
"drop_bomb", "drop_bomb",
"rowan", "rowan",
@ -281,7 +281,7 @@ dependencies = [
[[package]] [[package]]
name = "fast-hash" name = "fast-hash"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b" source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032"
dependencies = [ dependencies = [
"rustc-hash", "rustc-hash",
] ]
@ -299,7 +299,7 @@ dependencies = [
[[package]] [[package]]
name = "fmt-util" name = "fmt-util"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b" source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032"
[[package]] [[package]]
name = "form_urlencoded" name = "form_urlencoded"
@ -352,7 +352,7 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
[[package]] [[package]]
name = "identifier-case" name = "identifier-case"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b" source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032"
[[package]] [[package]]
name = "idna" name = "idna"
@ -367,7 +367,7 @@ dependencies = [
[[package]] [[package]]
name = "idx" name = "idx"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b" source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032"
[[package]] [[package]]
name = "indexmap" name = "indexmap"
@ -381,7 +381,7 @@ dependencies = [
[[package]] [[package]]
name = "input" name = "input"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"cm-syntax", "cm-syntax",
"config", "config",
@ -440,7 +440,7 @@ checksum = "1dabfe0d01e15fde0eba33b9de62475c59e681a47ce4ffe0534af2577a3f8524"
[[package]] [[package]]
name = "lang-srv" name = "lang-srv"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"analysis", "analysis",
"anyhow", "anyhow",
@ -468,19 +468,19 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]] [[package]]
name = "lex-util" name = "lex-util"
version = "0.9.3" version = "0.9.4"
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.141" version = "0.2.142"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317"
[[package]] [[package]]
name = "linux-raw-sys" name = "linux-raw-sys"
version = "0.3.1" version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" checksum = "9b085a4f2cde5781fc4b1717f2e86c62f5cda49de7ba99a7c2eae02b61c9064c"
[[package]] [[package]]
name = "log" name = "log"
@ -533,7 +533,7 @@ dependencies = [
[[package]] [[package]]
name = "millet-cli" name = "millet-cli"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"analysis", "analysis",
"config", "config",
@ -543,11 +543,12 @@ dependencies = [
"panic-hook", "panic-hook",
"paths", "paths",
"pico-args", "pico-args",
"sml-naive-fmt",
] ]
[[package]] [[package]]
name = "millet-ls" name = "millet-ls"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"env_logger", "env_logger",
@ -567,7 +568,7 @@ dependencies = [
[[package]] [[package]]
name = "mlb-hir" name = "mlb-hir"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"fast-hash", "fast-hash",
"paths", "paths",
@ -578,7 +579,7 @@ dependencies = [
[[package]] [[package]]
name = "mlb-statics" name = "mlb-statics"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"config", "config",
"diagnostic", "diagnostic",
@ -602,7 +603,7 @@ dependencies = [
[[package]] [[package]]
name = "mlb-syntax" name = "mlb-syntax"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"lex-util", "lex-util",
"paths", "paths",
@ -668,7 +669,7 @@ dependencies = [
[[package]] [[package]]
name = "panic-hook" name = "panic-hook"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"better-panic", "better-panic",
] ]
@ -676,7 +677,7 @@ dependencies = [
[[package]] [[package]]
name = "paths" name = "paths"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b" source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032"
dependencies = [ dependencies = [
"fast-hash", "fast-hash",
"glob", "glob",
@ -687,7 +688,7 @@ dependencies = [
[[package]] [[package]]
name = "pattern-match" name = "pattern-match"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b" source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032"
dependencies = [ dependencies = [
"fast-hash", "fast-hash",
] ]
@ -748,9 +749,9 @@ dependencies = [
[[package]] [[package]]
name = "regex" name = "regex"
version = "1.7.3" version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" checksum = "ac6cf59af1067a3fb53fbe5c88c053764e930f932be1d71d3ffe032cbe147f59"
dependencies = [ dependencies = [
"aho-corasick", "aho-corasick",
"memchr", "memchr",
@ -759,9 +760,9 @@ dependencies = [
[[package]] [[package]]
name = "regex-syntax" name = "regex-syntax"
version = "0.6.29" version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" checksum = "b6868896879ba532248f33598de5181522d8b3d9d724dfd230911e1a7d4822f5"
[[package]] [[package]]
name = "rowan" name = "rowan"
@ -778,9 +779,9 @@ dependencies = [
[[package]] [[package]]
name = "rustc-demangle" name = "rustc-demangle"
version = "0.1.22" version = "0.1.23"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d4a36c42d1873f9a77c53bde094f9664d9891bc604a45b4798fd2c389ed12e5b" checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
[[package]] [[package]]
name = "rustc-hash" name = "rustc-hash"
@ -790,9 +791,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
[[package]] [[package]]
name = "rustix" name = "rustix"
version = "0.37.11" version = "0.37.13"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77" checksum = "f79bef90eb6d984c72722595b5b1348ab39275a5e5123faca6863bf07d75a4e0"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"errno", "errno",
@ -861,7 +862,7 @@ dependencies = [
[[package]] [[package]]
name = "slash-var-path" name = "slash-var-path"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"fast-hash", "fast-hash",
"str-util", "str-util",
@ -869,14 +870,14 @@ dependencies = [
[[package]] [[package]]
name = "sml-comment" name = "sml-comment"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"sml-syntax", "sml-syntax",
] ]
[[package]] [[package]]
name = "sml-dynamics" name = "sml-dynamics"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"fast-hash", "fast-hash",
"sml-mir", "sml-mir",
@ -885,7 +886,7 @@ dependencies = [
[[package]] [[package]]
name = "sml-file-syntax" name = "sml-file-syntax"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"config", "config",
"elapsed", "elapsed",
@ -899,7 +900,7 @@ dependencies = [
[[package]] [[package]]
name = "sml-fixity" name = "sml-fixity"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"fast-hash", "fast-hash",
"once_cell", "once_cell",
@ -908,7 +909,7 @@ dependencies = [
[[package]] [[package]]
name = "sml-hir" name = "sml-hir"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"la-arena", "la-arena",
"sml-lab", "sml-lab",
@ -919,7 +920,7 @@ dependencies = [
[[package]] [[package]]
name = "sml-hir-lower" name = "sml-hir-lower"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"config", "config",
"diagnostic", "diagnostic",
@ -933,14 +934,14 @@ dependencies = [
[[package]] [[package]]
name = "sml-lab" name = "sml-lab"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"str-util", "str-util",
] ]
[[package]] [[package]]
name = "sml-lex" name = "sml-lex"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"diagnostic", "diagnostic",
"lex-util", "lex-util",
@ -950,20 +951,29 @@ dependencies = [
[[package]] [[package]]
name = "sml-libs" name = "sml-libs"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/azdavis/sml-libs.git#360d865bfe1e8afc4f8e483e0ac8f53da0593041" source = "git+https://github.com/azdavis/sml-libs.git#7ae671a607a143fd8529e34019f96f6fb275df45"
[[package]] [[package]]
name = "sml-mir" name = "sml-mir"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"sml-lab", "sml-lab",
"sml-scon", "sml-scon",
"uniq", "uniq",
] ]
[[package]]
name = "sml-mir-lower"
version = "0.9.4"
dependencies = [
"sml-hir",
"sml-mir",
"uniq",
]
[[package]] [[package]]
name = "sml-naive-fmt" name = "sml-naive-fmt"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"fast-hash", "fast-hash",
"sml-comment", "sml-comment",
@ -972,11 +982,11 @@ dependencies = [
[[package]] [[package]]
name = "sml-namespace" name = "sml-namespace"
version = "0.9.3" version = "0.9.4"
[[package]] [[package]]
name = "sml-parse" name = "sml-parse"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"diagnostic", "diagnostic",
"event-parse", "event-parse",
@ -988,14 +998,14 @@ dependencies = [
[[package]] [[package]]
name = "sml-path" name = "sml-path"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"str-util", "str-util",
] ]
[[package]] [[package]]
name = "sml-scon" name = "sml-scon"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"num-bigint", "num-bigint",
"num-traits", "num-traits",
@ -1004,7 +1014,7 @@ dependencies = [
[[package]] [[package]]
name = "sml-statics" name = "sml-statics"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"chain-map", "chain-map",
"config", "config",
@ -1025,7 +1035,7 @@ dependencies = [
[[package]] [[package]]
name = "sml-statics-types" name = "sml-statics-types"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"chain-map", "chain-map",
"code-h2-md-map", "code-h2-md-map",
@ -1042,7 +1052,7 @@ dependencies = [
[[package]] [[package]]
name = "sml-syntax" name = "sml-syntax"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"char-name", "char-name",
"code-h2-md-map", "code-h2-md-map",
@ -1055,7 +1065,7 @@ dependencies = [
[[package]] [[package]]
name = "sml-ty-var-scope" name = "sml-ty-var-scope"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"fast-hash", "fast-hash",
"sml-hir", "sml-hir",
@ -1073,7 +1083,7 @@ dependencies = [
[[package]] [[package]]
name = "str-util" name = "str-util"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b" source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032"
dependencies = [ dependencies = [
"smol_str", "smol_str",
] ]
@ -1103,7 +1113,7 @@ dependencies = [
[[package]] [[package]]
name = "syntax-gen" name = "syntax-gen"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b" source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032"
dependencies = [ dependencies = [
"fast-hash", "fast-hash",
"identifier-case", "identifier-case",
@ -1123,7 +1133,7 @@ dependencies = [
[[package]] [[package]]
name = "tests" name = "tests"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"analysis", "analysis",
"cm-syntax", "cm-syntax",
@ -1148,7 +1158,7 @@ dependencies = [
[[package]] [[package]]
name = "text-pos" name = "text-pos"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b" source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032"
dependencies = [ dependencies = [
"fast-hash", "fast-hash",
"text-size-util", "text-size-util",
@ -1163,7 +1173,7 @@ checksum = "288cb548dbe72b652243ea797201f3d481a0609a967980fcc5b2315ea811560a"
[[package]] [[package]]
name = "text-size-util" name = "text-size-util"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b" source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032"
dependencies = [ dependencies = [
"text-size", "text-size",
] ]
@ -1186,7 +1196,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]] [[package]]
name = "token" name = "token"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b" source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032"
[[package]] [[package]]
name = "toml" name = "toml"
@ -1225,7 +1235,7 @@ dependencies = [
[[package]] [[package]]
name = "topo-sort" name = "topo-sort"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b" source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032"
[[package]] [[package]]
name = "ungrammar" name = "ungrammar"
@ -1272,7 +1282,7 @@ checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
[[package]] [[package]]
name = "uniq" name = "uniq"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b" source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032"
[[package]] [[package]]
name = "url" name = "url"
@ -1457,7 +1467,7 @@ dependencies = [
[[package]] [[package]]
name = "xtask" name = "xtask"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"flate2", "flate2",

View file

@ -2,20 +2,20 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "millet"; pname = "millet";
version = "0.9.3"; version = "0.9.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "azdavis"; owner = "azdavis";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-swT16F/gOHiAeZGrD9O4THIHMXDQOpsaUsSjhpkw3fU="; hash = "sha256-wupTEZGsfqH7Ekqr5eiQ5Ne1cD8Fw3cpaZJVsOlXJyw=";
}; };
cargoLock = { cargoLock = {
lockFile = ./Cargo.lock; lockFile = ./Cargo.lock;
outputHashes = { outputHashes = {
"char-name-0.1.0" = "sha256-hO7SO1q5hPY5wJJ8A+OxxCI7GeHtdMz34OWu9ViVny0="; "char-name-0.1.0" = "sha256-IisHUxD6YQIb7uUZ1kYd3hnH1v87OhMBYDqJpBGmwfQ=";
"sml-libs-0.1.0" = "sha256-+sxaPBG5qBIC195BFQYH8Yo6juuelGZzztCUiS45WRg="; "sml-libs-0.1.0" = "sha256-0gRiXJAGddrrbgI3AhlWqVKipNZI0OxMTrkWdcSbG7A=";
}; };
}; };

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "patchelf"; pname = "patchelf";
version = "unstable-2023-03-27"; version = "unstable-2023-04-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";
repo = "patchelf"; repo = "patchelf";
rev = "99db062953e88c26e1b1ae5120b8f8bd9f8d9b90"; rev = "99c24238981b7b1084313aca8f5c493bb46f302c";
sha256 = "sha256-6UQR7pmaeIv4G/eymgrFXXfrh3ODfsqIIAu0A44N/6g="; sha256 = "sha256-v8hMcFVtTknn1LMfRCDQa/bYgP/bpsPhSYp01TiCtew=";
}; };
# Drop test that fails on musl (?) # Drop test that fails on musl (?)

File diff suppressed because it is too large Load diff

View file

@ -15,21 +15,16 @@ let
in in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "texlab"; pname = "texlab";
version = "5.4.1"; version = "5.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "latex-lsp"; owner = "latex-lsp";
repo = "texlab"; repo = "texlab";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "sha256-rTYcYq8SL404A/ke5Rb9QcCtwHKhs+84TQGNqRn11HM="; hash = "sha256-xff6Wj1ZYn3jGrj/snr4ATabLUmL1Jw2LjsjpoG3ZjI=";
}; };
cargoLock = { cargoHash = "sha256-gEwsnVXY84mTO+JZvcI7EEYCOnVFM07m4VvcWI6zFT0=";
lockFile = ./Cargo.lock;
outputHashes = {
"salsa-2022-0.1.0" = "sha256-GupU78LkQGUQ+GzqAVZZlNKL1zZkmdqJz9+81ROXDqE=";
};
};
outputs = [ "out" ] ++ lib.optional (!isCross) "man"; outputs = [ "out" ] ++ lib.optional (!isCross) "man";
@ -46,7 +41,7 @@ rustPlatform.buildRustPackage rec {
# generate the man page # generate the man page
postInstall = lib.optionalString (!isCross) '' postInstall = lib.optionalString (!isCross) ''
# TexLab builds man page separately in CI: # TexLab builds man page separately in CI:
# https://github.com/latex-lsp/texlab/blob/v5.4.0/.github/workflows/publish.yml#L127-L131 # https://github.com/latex-lsp/texlab/blob/v5.5.0/.github/workflows/publish.yml#L127-L131
help2man --no-info "$out/bin/texlab" > texlab.1 help2man --no-info "$out/bin/texlab" > texlab.1
installManPage texlab.1 installManPage texlab.1
''; '';
@ -55,7 +50,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; { meta = with lib; {
description = "An implementation of the Language Server Protocol for LaTeX"; description = "An implementation of the Language Server Protocol for LaTeX";
homepage = "https://texlab.netlify.app"; homepage = "https://github.com/latex-lsp/texlab";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ doronbehar kira-bruneau ]; maintainers = with maintainers; [ doronbehar kira-bruneau ];
platforms = platforms.all; platforms = platforms.all;

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "okteto"; pname = "okteto";
version = "2.14.2"; version = "2.14.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "okteto"; owner = "okteto";
repo = "okteto"; repo = "okteto";
rev = version; rev = version;
hash = "sha256-2bO6konOAyrCD+t31ZJ2+Ptp26ylY9wr1uArFu9rlnI="; hash = "sha256-E96IAAbWmFIQILUU3WLjX6NAXzwIkrbEgKUs4wrh8z4=";
}; };
vendorHash = "sha256-b2qxvP9spXEJVYOq7o0VG2WOxzUchwtLaY97/2IYoV4="; vendorHash = "sha256-b2qxvP9spXEJVYOq7o0VG2WOxzUchwtLaY97/2IYoV4=";

View file

@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-semver-checks"; pname = "cargo-semver-checks";
version = "0.19.0"; version = "0.20.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "obi1kenobi"; owner = "obi1kenobi";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-tZ83Lxo7yKpFQrD1rnm/3YaT3MgiVb/jL2OVdt491xg="; sha256 = "sha256-z7mDGWU498KU6lEHqLhl0HdTA55Wz3RbZOlF6g1gwN4=";
}; };
cargoSha256 = "sha256-k0dc/bOkIcLP++ZH+rh01do5kcVDh/8hNGM3MPhg/0g="; cargoSha256 = "sha256-JQdL4D6ECH8wLOCcAGm7HomJAfJD838KfI4/IRAeqD0=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

View file

@ -0,0 +1,36 @@
{ lib
, fetchFromGitHub
, rustPlatform
, openssl
, pkg-config
, stdenv
, SystemConfiguration
}:
rustPlatform.buildRustPackage rec {
pname = "rye";
version = "unstable-2023-04-23";
src = fetchFromGitHub {
owner = "mitsuhiko";
repo = "rye";
rev = "b3fe43a4e462d10784258cad03c19c9738367346";
hash = "sha256-q9/VUWyrP/NsuLYY1+/5teYvDJGq646WbMXptnUUUyw=";
};
cargoHash = "sha256-eyJ6gXFVnSC1aEt5YLl5rFoa3+M73smu5wJdAN15HQM=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [
openssl
]
++ lib.optional stdenv.isDarwin SystemConfiguration;
meta = with lib; {
description = "A tool to easily manage python dependencies and environments";
homepage = "https://github.com/mitsuhiko/rye";
license = licenses.mit;
maintainers = with maintainers; [ GaetanLepage ];
};
}

View file

@ -17,17 +17,17 @@
buildGoModule rec { buildGoModule rec {
pname = "aaaaxy"; pname = "aaaaxy";
version = "1.3.421"; version = "1.3.457";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "divVerent"; owner = "divVerent";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-MZXnIkOVv49HEkatLEGbIxeJyaiOrh2XLTp5TdvMhk8="; hash = "sha256-PN/Gt2iDOWsbKspyWYKjnX98xF6NQuGVFjlEg3ZZpio=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
vendorHash = "sha256-TPm2X0QERJ5lBfojOAWIS60CeAz+Ps2REFtNIT2zGnY="; vendorHash = "sha256-vI8EyZgjJA89UmqoDuh/H+qQzAKO9pyqpmA8hci9cco=";
buildInputs = [ buildInputs = [
alsa-lib alsa-lib

View file

@ -46,11 +46,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
inherit pname; inherit pname;
version = "4.3.4"; version = "4.3.5";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz"; url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz";
sha256 = "sha256-l4QAF+mTaWi/BNPizqpTPw0KdcrYjw71K+D325/BKdo="; sha256 = "sha256-AdYI9vljjhTXyFffQK0znBv8IHoF2q/nFXrYZSo0BcM=";
}; };
buildInputs = [ buildInputs = [

View file

@ -24,10 +24,10 @@
}: }:
let let
defaultVersion = "2022.10"; defaultVersion = "2023.01";
defaultSrc = fetchurl { defaultSrc = fetchurl {
url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2";
hash = "sha256-ULRIKlBbwoG6hHDDmaPCbhReKbI1ALw1xQ3r1/pGvfg="; hash = "sha256-aUI7rTgPiaCRZjbonm3L0uRRLVhDCNki0QOdHkMxlQ8=";
}; };
buildUBoot = lib.makeOverridable ({ buildUBoot = lib.makeOverridable ({
version ? null version ? null

View file

@ -0,0 +1,18 @@
{ lib, fetchurl, buildLinux, ... } @ args:
with lib;
buildLinux (args // rec {
version = "6.3";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
# branchVersion needs to be x.y
extraMeta.branch = versions.majorMinor version;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
sha256 = "sha256-ujSR9e1r0nCjcMRAQ049aQhfzdUoki+gHnPXZX23Ox4=";
};
} // (args.argsOverride or { }))

View file

@ -3,14 +3,14 @@
let let
# These names are how they are designated in https://xanmod.org. # These names are how they are designated in https://xanmod.org.
ltsVariant = { ltsVariant = {
version = "6.1.24"; version = "6.1.25";
hash = "sha256-mLhuyASE/3kv5MD1v5pwHDkL0m7bTaRuAitG3junRyU="; hash = "sha256-Cn8NAVdfL2VJIPuZ3tANxB3VyQI0X2/YZG0/4r/ccYg=";
variant = "lts"; variant = "lts";
}; };
mainVariant = { mainVariant = {
version = "6.2.11"; version = "6.2.12";
hash = "sha256-rwFlSv5SUwhr8U4mvOGCMKYuU5xVKC7UYRemf7DKwr0="; hash = "sha256-K/s1nSLOrzZ/A3pnv9qFs8SkI9R6keG0WGV1o7K6jUQ=";
variant = "main"; variant = "main";
}; };

View file

@ -20,12 +20,12 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "xp-pen-deco-01-v2-driver"; pname = "xp-pen-deco-01-v2-driver";
version = "3.2.3.220323-1"; version = "3.3.9.230222-1";
src = fetchzip { src = fetchzip {
url = "https://www.xp-pen.com/download/file/id/1936/pid/440/ext/gz.html#.tar.gz"; url = "https://www.xp-pen.com/download/file/id/1936/pid/440/ext/gz.html#.tar.gz";
name = "xp-pen-deco-01-v2-driver-${version}.tar.gz"; name = "xp-pen-deco-01-v2-driver-${version}.tar.gz";
sha256 = "sha256-n/yutkRsjcIRRhB4q1yqEmaa03/1SO8RigJi/ZkfLbk="; sha256 = "sha256-xrRDxH7e00dISXb+lTtrnui+fNFpX7bLke2o+aTjJNk=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -1,6 +1,9 @@
{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook { lib, stdenv, fetchurl, fetchpatch, autoreconfHook
, pam, libkrb5, cyrus_sasl, miniupnpc, libxcrypt }: , pam, libkrb5, cyrus_sasl, miniupnpc, libxcrypt }:
let
remove_getaddrinfo_checks = stdenv.hostPlatform.isMips64 || !(stdenv.buildPlatform.canExecute stdenv.hostPlatform);
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "dante"; pname = "dante";
version = "1.4.3"; version = "1.4.3";
@ -10,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "0pbahkj43rx7rmv2x40mf5p3g3x9d6i2sz7pzglarf54w5ghd2j1"; sha256 = "0pbahkj43rx7rmv2x40mf5p3g3x9d6i2sz7pzglarf54w5ghd2j1";
}; };
nativeBuildInputs = lib.optional stdenv.hostPlatform.isMips64 autoreconfHook; nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ pam libkrb5 cyrus_sasl miniupnpc libxcrypt ]; buildInputs = [ pam libkrb5 cyrus_sasl miniupnpc libxcrypt ];
configureFlags = if !stdenv.isDarwin configureFlags = if !stdenv.isDarwin
@ -19,7 +22,7 @@ stdenv.mkDerivation rec {
dontAddDisableDepTrack = stdenv.isDarwin; dontAddDisableDepTrack = stdenv.isDarwin;
patches = lib.optionals stdenv.hostPlatform.isMips64 [ patches = lib.optionals remove_getaddrinfo_checks [
(fetchpatch { (fetchpatch {
name = "0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch"; name = "0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch";
url = "https://raw.githubusercontent.com/buildroot/buildroot/master/package/dante/0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch"; url = "https://raw.githubusercontent.com/buildroot/buildroot/master/package/dante/0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch";

View file

@ -2,7 +2,7 @@
# Do not edit! # Do not edit!
{ {
version = "2023.4.5"; version = "2023.4.6";
components = { components = {
"3_day_blinds" = ps: with ps; [ "3_day_blinds" = ps: with ps; [
]; ];

View file

@ -310,7 +310,7 @@ let
extraBuildInputs = extraPackages python.pkgs; extraBuildInputs = extraPackages python.pkgs;
# Don't forget to run parse-requirements.py after updating # Don't forget to run parse-requirements.py after updating
hassVersion = "2023.4.5"; hassVersion = "2023.4.6";
in python.pkgs.buildPythonApplication rec { in python.pkgs.buildPythonApplication rec {
pname = "homeassistant"; pname = "homeassistant";
@ -326,7 +326,7 @@ in python.pkgs.buildPythonApplication rec {
# Primary source is the pypi sdist, because it contains translations # Primary source is the pypi sdist, because it contains translations
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-nQ41tHIwmARVOGE4bi22zag4uN+6rPXJ6aDr+018fIw="; hash = "sha256-054MOhLU7sImD5Sl5vUuik6mt7GCupMeBI2pdtpWuls=";
}; };
# Secondary source is git for tests # Secondary source is git for tests
@ -334,7 +334,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant"; owner = "home-assistant";
repo = "core"; repo = "core";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-tFbgQ0e+J3/ERqlAKKXafWDaFIEIGsqX+uw8/bQyO5A="; hash = "sha256-/SYJUW028HvxLMNHhm6cqQ6jv0J+8NatbZ7h7HyGYXs=";
}; };
nativeBuildInputs = with python3.pkgs; [ nativeBuildInputs = with python3.pkgs; [

View file

@ -8,7 +8,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "homeassistant-stubs"; pname = "homeassistant-stubs";
version = "2023.4.5"; version = "2023.4.6";
format = "pyproject"; format = "pyproject";
disabled = python.version != home-assistant.python.version; disabled = python.version != home-assistant.python.version;
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "KapJI"; owner = "KapJI";
repo = "homeassistant-stubs"; repo = "homeassistant-stubs";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-uZuJ2k52p2fuT15srSifdiD/T0Vk9GUhCh7jY9/nV6o="; hash = "sha256-uPSES/yK6pgZJ68tRgmWuAwitlBOhYxMWPIi2tcEPh8=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nfs-ganesha"; pname = "nfs-ganesha";
version = "4.4"; version = "5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nfs-ganesha"; owner = "nfs-ganesha";
repo = "nfs-ganesha"; repo = "nfs-ganesha";
rev = "V${version}"; rev = "V${version}";
sha256 = "sha256-MEPy2TXVTegwCpuaIrMol7ag8anxxdcj11z5eYNkDqQ="; sha256 = "sha256-uJlT0nH3n0zzCVOap7XlxilHqSfklHn0h49He1yZkbs=";
}; };
preConfigure = "cd src"; preConfigure = "cd src";
@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
"-DUSE_SYSTEM_NTIRPC=ON" "-DUSE_SYSTEM_NTIRPC=ON"
"-DSYSSTATEDIR=/var" "-DSYSSTATEDIR=/var"
"-DENABLE_VFS_POSIX_ACL=ON" "-DENABLE_VFS_POSIX_ACL=ON"
"-DUSE_ACL_MAPPING=ON"
]; ];
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "soft-serve"; pname = "soft-serve";
version = "0.4.6"; version = "0.4.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "charmbracelet"; owner = "charmbracelet";
repo = "soft-serve"; repo = "soft-serve";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-7LegGf/fCWJQfiayqkbg0S13NOICzxxCWxS+vXHmP08="; sha256 = "sha256-Bjb2CC7yWhbVyKAL2+R+qLfkElux7pSgkD/glkv/jVw=";
}; };
vendorHash = "sha256-k/IKpeSjgCYQRBRW/TMThQOFWfx1BFJpHpwMQxITkxY="; vendorHash = "sha256-JVEUR05ciD5AX2uhQjWFNVSY2qD2M4kti9ACHyb+UfM=";
doCheck = false; doCheck = false;

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "galene"; pname = "galene";
version = "0.6.1"; version = "0.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jech"; owner = "jech";
repo = "galene"; repo = "galene";
rev = "galene-${version}"; rev = "galene-${version}";
hash = "sha256-Bnx0GqgkOHfoDYLJqVAz/tKyF+cZ0BQTRTGO2pDv7tM="; hash = "sha256-P1KW9JUHzH/aK3wehVMSVJcUmMqDEGc8zVg8P6F828s=";
}; };
vendorSha256 = "sha256-HZQeVa4UB/1jpPbfrh3XgWQe2S3qA8CM268KghgJA0w="; vendorSha256 = "sha256-+itNqxEy0S2g5UGpUIthJE2ILQzToISref/8F4zTmYg=";
ldflags = [ "-s" "-w" ]; ldflags = [ "-s" "-w" ];
preCheck = "export TZ=UTC"; preCheck = "export TZ=UTC";
@ -29,6 +29,6 @@ buildGoModule rec {
changelog = "https://github.com/jech/galene/raw/galene-${version}/CHANGES"; changelog = "https://github.com/jech/galene/raw/galene-${version}/CHANGES";
license = licenses.mit; license = licenses.mit;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ rgrunbla ]; maintainers = with maintainers; [ rgrunbla erdnaxe ];
}; };
} }

View file

@ -33,13 +33,13 @@ let
in package.override rec { in package.override rec {
pname = "snipe-it"; pname = "snipe-it";
version = "6.0.14"; version = "6.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "snipe"; owner = "snipe";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-c2hzuNOpvVl+ZriCo3TRl/GHY+LCrIb2GO2U894S2yk="; sha256 = "0c8cjywhyiywfav2syjkah777qj5f1jrckgri70ypqyxbwgb4rpm";
}; };
meta = with lib; { meta = with lib; {

View file

@ -15,10 +15,10 @@ let
"arietimmerman/laravel-scim-server" = { "arietimmerman/laravel-scim-server" = {
targetDir = ""; targetDir = "";
src = composerEnv.buildZipPackage { src = composerEnv.buildZipPackage {
name = "arietimmerman-laravel-scim-server-d0e3d7c0b5da2ec76283b8a2fa2e672a91596509"; name = "arietimmerman-laravel-scim-server-9e8dd2d3958d3c3c05d0a99fe6475361ad9e9419";
src = fetchurl { src = fetchurl {
url = "https://api.github.com/repos/grokability/laravel-scim-server/zipball/d0e3d7c0b5da2ec76283b8a2fa2e672a91596509"; url = "https://api.github.com/repos/grokability/laravel-scim-server/zipball/9e8dd2d3958d3c3c05d0a99fe6475361ad9e9419";
sha256 = "0xznsbdph32q1nx5ibl90gfqa7j0bj0ikcvz8hfpxxk967k1ayfj"; sha256 = "02if4yvnqagpwgrq8b0371nva24lsk0h3h06q51vjxyqjhqvc2nr";
}; };
}; };
}; };
@ -245,10 +245,10 @@ let
"dompdf/dompdf" = { "dompdf/dompdf" = {
targetDir = ""; targetDir = "";
src = composerEnv.buildZipPackage { src = composerEnv.buildZipPackage {
name = "dompdf-dompdf-79573d8b8a141ec8a17312515de8740eed014fa9"; name = "dompdf-dompdf-e8d2d5e37e8b0b30f0732a011295ab80680d7e85";
src = fetchurl { src = fetchurl {
url = "https://api.github.com/repos/dompdf/dompdf/zipball/79573d8b8a141ec8a17312515de8740eed014fa9"; url = "https://api.github.com/repos/dompdf/dompdf/zipball/e8d2d5e37e8b0b30f0732a011295ab80680d7e85";
sha256 = "0glv4fhzk674jgk1v9rkhb4859x5h1aspr63qdn7ajls27c582l5"; sha256 = "0a2qk57c3qwg7j8gp1hwyd8y8dwm5pb8lg1npb49sijig8kyjlv3";
}; };
}; };
}; };
@ -705,10 +705,10 @@ let
"masterminds/html5" = { "masterminds/html5" = {
targetDir = ""; targetDir = "";
src = composerEnv.buildZipPackage { src = composerEnv.buildZipPackage {
name = "masterminds-html5-f640ac1bdddff06ea333a920c95bbad8872429ab"; name = "masterminds-html5-897eb517a343a2281f11bc5556d6548db7d93947";
src = fetchurl { src = fetchurl {
url = "https://api.github.com/repos/Masterminds/html5-php/zipball/f640ac1bdddff06ea333a920c95bbad8872429ab"; url = "https://api.github.com/repos/Masterminds/html5-php/zipball/897eb517a343a2281f11bc5556d6548db7d93947";
sha256 = "1v9sn44z710wha5jrzy0alx1ayj3d0fcin1xpx6c6fdhlksbqc6z"; sha256 = "12fmcgsrmh0f0llnpcvk33mrs4067nw246ci5619rr79ijy3yc0k";
}; };
}; };
}; };
@ -838,7 +838,7 @@ let
name = "onelogin-php-saml-a7328b11887660ad248ea10952dd67a5aa73ba3b"; name = "onelogin-php-saml-a7328b11887660ad248ea10952dd67a5aa73ba3b";
src = fetchurl { src = fetchurl {
url = "https://api.github.com/repos/onelogin/php-saml/zipball/a7328b11887660ad248ea10952dd67a5aa73ba3b"; url = "https://api.github.com/repos/onelogin/php-saml/zipball/a7328b11887660ad248ea10952dd67a5aa73ba3b";
sha256 = "0ycj3n22k5i3h8p7gn0xff6a7smjypazl2k5qvyzg86fjr7s3vfv"; sha256 = "1df8mxmdh14y2scw80yhh1l90lvdnxq1pjlli3is1cakc0cdw90z";
}; };
}; };
}; };
@ -872,13 +872,13 @@ let
}; };
}; };
}; };
"patchwork/utf8" = { "paragonie/sodium_compat" = {
targetDir = ""; targetDir = "";
src = composerEnv.buildZipPackage { src = composerEnv.buildZipPackage {
name = "patchwork-utf8-e1fa4d4a57896d074c9a8d01742b688d5db4e9d5"; name = "paragonie-sodium_compat-cb15e403ecbe6a6cc515f855c310eb6b1872a933";
src = fetchurl { src = fetchurl {
url = "https://api.github.com/repos/tchwork/utf8/zipball/e1fa4d4a57896d074c9a8d01742b688d5db4e9d5"; url = "https://api.github.com/repos/paragonie/sodium_compat/zipball/cb15e403ecbe6a6cc515f855c310eb6b1872a933";
sha256 = "0rarkg8v23y58bc4n6j39wdi6is0p1rgqxnixqlgavcm35xjgnw0"; sha256 = "01jxl868i8bkx5szgp2fp6mi438ani80bqkdcc7rnn9z22lrsm78";
}; };
}; };
}; };
@ -895,10 +895,10 @@ let
"phenx/php-svg-lib" = { "phenx/php-svg-lib" = {
targetDir = ""; targetDir = "";
src = composerEnv.buildZipPackage { src = composerEnv.buildZipPackage {
name = "phenx-php-svg-lib-4498b5df7b08e8469f0f8279651ea5de9626ed02"; name = "phenx-php-svg-lib-76876c6cf3080bcb6f249d7d59705108166a6685";
src = fetchurl { src = fetchurl {
url = "https://api.github.com/repos/dompdf/php-svg-lib/zipball/4498b5df7b08e8469f0f8279651ea5de9626ed02"; url = "https://api.github.com/repos/dompdf/php-svg-lib/zipball/76876c6cf3080bcb6f249d7d59705108166a6685";
sha256 = "01w65haq96sfyjl8ahm9nb95wasgl66ymv5lycx1cbagy653xdin"; sha256 = "0bjynrs81das9f9jwd5jgsxx9gjv2m6c0mkvlgx4w1f4pgbvwsf5";
}; };
}; };
}; };

View file

@ -0,0 +1,63 @@
{ lib
, stdenv
, fetchFromGitHub
, installShellFiles
, zig
}:
stdenv.mkDerivation rec {
pname = "linuxwave";
version = "0.1.3";
src = fetchFromGitHub {
owner = "orhun";
repo = "linuxwave";
rev = "v${version}";
hash = "sha256-e+QTteyHAyYmU4vb86Ju92DxNFFX01g/rsViNI5ba1s=";
fetchSubmodules = true;
};
nativeBuildInputs = [
installShellFiles
zig
];
postConfigure = ''
export XDG_CACHE_HOME=$(mktemp -d)
'';
buildPhase = ''
runHook preBuild
zig build -Drelease-safe -Dcpu=baseline
runHook postBuild
'';
checkPhase = ''
runHook preCheck
zig build test
runHook postCheck
'';
installPhase = ''
runHook preInstall
zig build -Drelease-safe -Dcpu=baseline --prefix $out install
installManPage man/linuxwave.1
runHook postInstall
'';
meta = with lib; {
description = "Generate music from the entropy of Linux";
homepage = "https://github.com/orhun/linuxwave";
changelog = "https://github.com/orhun/linuxwave/blob/${src.rev}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
platforms = platforms.all;
};
}

View file

@ -1,17 +1,18 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, nixosTests
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "apfsprogs"; pname = "apfsprogs";
version = "unstable-2022-10-15"; version = "unstable-2023-03-21";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linux-apfs"; owner = "linux-apfs";
repo = "apfsprogs"; repo = "apfsprogs";
rev = "e3d5eec21da31107457f868f7f37c48c6809b7fa"; rev = "be41cc38194bd41a41750631577e6d8b31953103";
hash = "sha256-gxcsWLIs2+28SOLLeAP7iP6MaLE445CKTlD+gVE6V5g="; hash = "sha256-9o8DKXyK5qIoVGVKMJxsinEkbJImyuDglf534kanzFE=";
}; };
buildPhase = '' buildPhase = ''
@ -28,6 +29,10 @@ stdenv.mkDerivation {
runHook postInstall runHook postInstall
''; '';
passthru.tests = {
apfs = nixosTests.apfs;
};
meta = with lib; { meta = with lib; {
description = "Experimental APFS tools for linux"; description = "Experimental APFS tools for linux";
homepage = "https://github.com/linux-apfs/apfsprogs"; homepage = "https://github.com/linux-apfs/apfsprogs";

View file

@ -1,7 +1,7 @@
{ lib, perlPackages, fetchurl }: { lib, perlPackages, fetchurl }:
perlPackages.buildPerlPackage { perlPackages.buildPerlPackage {
pname = "Graph-Easy"; pname = "graph-easy";
version = "0.76"; version = "0.76";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Graph-Easy-0.76.tar.gz"; url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Graph-Easy-0.76.tar.gz";

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