Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
5b7eca152b
|
|
@ -1,8 +1,8 @@
|
|||
name: "Update terraform-providers"
|
||||
|
||||
on:
|
||||
schedule:
|
||||
- cron: "0 3 * * *"
|
||||
#schedule:
|
||||
# - cron: "0 3 * * *"
|
||||
workflow_dispatch:
|
||||
|
||||
permissions:
|
||||
|
|
|
|||
|
|
@ -1,10 +1,63 @@
|
|||
# Nixpkgs Maintainers
|
||||
|
||||
The *Nixpkgs maintainers* are people who have assigned themselves to
|
||||
maintain specific individual packages. We encourage people who care
|
||||
about a package to assign themselves as a maintainer. When a pull
|
||||
request is made against a package, OfBorg will notify the appropriate
|
||||
maintainer(s).
|
||||
Unlike other packaging ecosystems, the maintainer doesn't have exclusive
|
||||
control over the packages and modules they maintain. This more fluid approach
|
||||
is one reason why we scale to so many packages.
|
||||
|
||||
## Definition and role of the maintainer
|
||||
|
||||
The main responsibility of a maintainer is to keep the packages they maintain
|
||||
in a functioning state, and keep up with updates. In order to do that, they
|
||||
are empowered to make decisions over the packages they maintain.
|
||||
|
||||
That being said, the maintainer is not alone proposing changes to the
|
||||
packages. Anybody (both bots and humans) can send PRs to bump or tweak the
|
||||
package.
|
||||
|
||||
We also allow other non-maintainer committers to merge changes to the package,
|
||||
provided enough time and priority has been given to the maintainer.
|
||||
|
||||
For most packages, we expect committers to wait at least a week before merging
|
||||
changes not endorsed by a package maintainer (which may be themselves). This should leave enough time
|
||||
for the maintainers to provide feedback.
|
||||
|
||||
For critical packages, this convention needs to be negotiated with the
|
||||
maintainer. A critical package is one that causes mass-rebuild, or where an
|
||||
author is listed in the [`CODEOWNERS`](../.github/CODEOWNERS) file.
|
||||
|
||||
In case of critical security updates, the [security team](https://nixos.org/community/teams/security) might override these
|
||||
heuristics in order to get the fixes in as fast as possible.
|
||||
|
||||
In case of conflict, the maintainer takes priority and is allowed to revert
|
||||
the changes. This can happen for example if the maintainer was on holiday.
|
||||
|
||||
### How to become a maintainer
|
||||
|
||||
We encourage people who care about a package to assign themselves as a
|
||||
maintainer. Commit access to the Nixpkgs repository is not required for that.
|
||||
|
||||
In order to do so, add yourself to the
|
||||
[`maintainer-list.nix`](./maintainer-list.nix), and then to the desired
|
||||
package's `meta.maintainers` list, and send a PR with the changes.
|
||||
|
||||
### How to lose maintainer status
|
||||
|
||||
Maintainers who have become inactive on a given package can be removed. This
|
||||
helps us keep an accurate view of the state of maintenance in Nixpkgs.
|
||||
|
||||
The inactivity measure is currently not strictly enforced. We would typically
|
||||
look at it if we notice that the author hasn't reacted to package-related
|
||||
notifications for more than 3 months.
|
||||
|
||||
Removing the maintainer happens by making a PR on the package, adding that
|
||||
person as a reviewer, and then waiting a week for a reaction.
|
||||
|
||||
The maintainer is welcome to come back at any time.
|
||||
|
||||
### Tools for maintainers
|
||||
|
||||
When a pull request is made against a package, OfBorg will notify the
|
||||
appropriate maintainer(s).
|
||||
|
||||
## Reviewing contributions
|
||||
|
||||
|
|
|
|||
|
|
@ -18007,6 +18007,12 @@
|
|||
fingerprint = "5814 50EB 6E17 E715 7C63 E7F1 9879 8C3C 4D68 8D6D";
|
||||
}];
|
||||
};
|
||||
viktornordling = {
|
||||
email = "antique_paler_0i@icloud.com";
|
||||
github = "viktornordling";
|
||||
githubId = 90482;
|
||||
name = "Viktor Nordling";
|
||||
};
|
||||
viluon = {
|
||||
email = "nix@viluon.me";
|
||||
github = "viluon";
|
||||
|
|
|
|||
|
|
@ -221,6 +221,8 @@ The module update takes care of the new config syntax and the data itself (user
|
|||
|
||||
- `services.prometheus.exporters` has a new [exporter](https://github.com/hipages/php-fpm_exporter) to monitor PHP-FPM processes, see [#240394](https://github.com/NixOS/nixpkgs/pull/240394) for more details.
|
||||
|
||||
- `services.github-runner` / `services.github-runners.<name>` gained the option `nodeRuntimes`. The option defaults to `[ "node20" ]`, i.e., the service supports Node.js 20 GitHub Actions only. The list of Node.js versions accepted by `nodeRuntimes` tracks the versions the upstream GitHub Actions runner supports. See [#249103](https://github.com/NixOS/nixpkgs/pull/249103) for details.
|
||||
|
||||
- `programs.gnupg.agent.pinentryFlavor` is now set in `/etc/gnupg/gpg-agent.conf`, and will no longer take precedence over a `pinentry-program` set in `~/.gnupg/gpg-agent.conf`.
|
||||
|
||||
- `services.influxdb2` now supports doing an automatic initial setup and provisioning of users, organizations, buckets and authentication tokens, see [#249502](https://github.com/NixOS/nixpkgs/pull/249502) for more details.
|
||||
|
|
|
|||
|
|
@ -208,4 +208,12 @@ with lib;
|
|||
'';
|
||||
default = null;
|
||||
};
|
||||
|
||||
nodeRuntimes = mkOption {
|
||||
type = with types; nonEmptyListOf (enum [ "node16" "node20" ]);
|
||||
default = [ "node20" ];
|
||||
description = mdDoc ''
|
||||
List of Node.js runtimes the runner should support.
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ with lib;
|
|||
|
||||
let
|
||||
workDir = if cfg.workDir == null then runtimeDir else cfg.workDir;
|
||||
package = cfg.package.override { inherit (cfg) nodeRuntimes; };
|
||||
in
|
||||
{
|
||||
description = "GitHub Actions runner";
|
||||
|
|
@ -47,7 +48,7 @@ in
|
|||
|
||||
serviceConfig = mkMerge [
|
||||
{
|
||||
ExecStart = "${cfg.package}/bin/Runner.Listener run --startuptype service";
|
||||
ExecStart = "${package}/bin/Runner.Listener run --startuptype service";
|
||||
|
||||
# Does the following, sequentially:
|
||||
# - If the module configuration or the token has changed, purge the state directory,
|
||||
|
|
@ -149,7 +150,7 @@ in
|
|||
else
|
||||
args+=(--token "$token")
|
||||
fi
|
||||
${cfg.package}/bin/Runner.Listener configure "''${args[@]}"
|
||||
${package}/bin/Runner.Listener configure "''${args[@]}"
|
||||
# Move the automatically created _diag dir to the logs dir
|
||||
mkdir -p "$STATE_DIRECTORY/_diag"
|
||||
cp -r "$STATE_DIRECTORY/_diag/." "$LOGS_DIRECTORY/"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ in
|
|||
settings = mkOption {
|
||||
description = lib.mdDoc ''
|
||||
Attrset that is converted and passed as TOML config file.
|
||||
For available params, see: <https://github.com/DNSCrypt/dnscrypt-proxy/blob/${pkgs.dnscrypt-proxy2.version}/dnscrypt-proxy/example-dnscrypt-proxy.toml>
|
||||
For available params, see: <https://github.com/DNSCrypt/dnscrypt-proxy/blob/${pkgs.dnscrypt-proxy.version}/dnscrypt-proxy/example-dnscrypt-proxy.toml>
|
||||
'';
|
||||
example = literalExpression ''
|
||||
{
|
||||
|
|
@ -49,7 +49,7 @@ in
|
|||
passAsFile = [ "json" ];
|
||||
} ''
|
||||
${if cfg.upstreamDefaults then ''
|
||||
${pkgs.remarshal}/bin/toml2json ${pkgs.dnscrypt-proxy2.src}/dnscrypt-proxy/example-dnscrypt-proxy.toml > example.json
|
||||
${pkgs.remarshal}/bin/toml2json ${pkgs.dnscrypt-proxy.src}/dnscrypt-proxy/example-dnscrypt-proxy.toml > example.json
|
||||
${pkgs.jq}/bin/jq --slurp add example.json $jsonPath > config.json # merges the two
|
||||
'' else ''
|
||||
cp $jsonPath config.json
|
||||
|
|
@ -80,7 +80,7 @@ in
|
|||
AmbientCapabilities = "CAP_NET_BIND_SERVICE";
|
||||
CacheDirectory = "dnscrypt-proxy";
|
||||
DynamicUser = true;
|
||||
ExecStart = "${pkgs.dnscrypt-proxy2}/bin/dnscrypt-proxy -config ${cfg.configFile}";
|
||||
ExecStart = "${pkgs.dnscrypt-proxy}/bin/dnscrypt-proxy -config ${cfg.configFile}";
|
||||
LockPersonality = true;
|
||||
LogsDirectory = "dnscrypt-proxy";
|
||||
MemoryDenyWriteExecute = true;
|
||||
|
|
|
|||
|
|
@ -308,8 +308,6 @@ in
|
|||
pools.cloudlog = {
|
||||
inherit (cfg) user;
|
||||
group = config.services.nginx.group;
|
||||
# cloudlog is currently broken on php 8.2
|
||||
phpPackage = pkgs.php81;
|
||||
settings = {
|
||||
"listen.owner" = config.services.nginx.user;
|
||||
"listen.group" = config.services.nginx.group;
|
||||
|
|
|
|||
|
|
@ -230,5 +230,9 @@ in {
|
|||
});
|
||||
})
|
||||
cfg.tmpfiles.users;
|
||||
|
||||
system.userActivationScripts.tmpfiles = ''
|
||||
${config.systemd.package}/bin/systemd-tmpfiles --user --create --remove
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ import ./make-test-python.nix ({ lib, ... }: {
|
|||
initialPassword = "pass1";
|
||||
isNormalUser = true;
|
||||
};
|
||||
systemd.user.tmpfiles.users.alice.rules = [ "r %h/file-to-remove" ];
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
|
|
@ -27,7 +28,9 @@ import ./make-test-python.nix ({ lib, ... }: {
|
|||
machine.wait_for_file("/home/alice/login-ok")
|
||||
verify_user_activation_run_count(1)
|
||||
|
||||
machine.succeed("touch /home/alice/file-to-remove")
|
||||
machine.succeed("/run/current-system/bin/switch-to-configuration test")
|
||||
verify_user_activation_run_count(2)
|
||||
machine.succeed("[[ ! -f /home/alice/file-to-remove ]] || false")
|
||||
'';
|
||||
})
|
||||
|
|
|
|||
|
|
@ -348,14 +348,15 @@ All versions of a package _must_ be included in `all-packages.nix` to make sure
|
|||
* Not start with the package name.
|
||||
* More generally, it should not refer to the package name.
|
||||
* 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.
|
||||
* Provide factual information.
|
||||
* Avoid subjective language.
|
||||
* `meta.license` must be set and match the upstream license.
|
||||
* 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.
|
||||
* `meta.mainProgram` must be set when appropriate.
|
||||
* `meta.maintainers` should be set.
|
||||
|
||||
See the nixpkgs manual for more details on [standard meta-attributes](https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes).
|
||||
See the Nixpkgs manual for more details on [standard meta-attributes](https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes).
|
||||
|
||||
### Import From Derivation
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bchoppr";
|
||||
version = "1.12.2";
|
||||
version = "1.12.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sjaehn";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-P6sbxhgnlek1IJ4i9yTe/3g/2C8oLPKXI3zbLdswvl8=";
|
||||
sha256 = "sha256-/aLoLUpWu66VKd9lwjli+FZZctblrZUPSEsdYH85HwQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "10.19";
|
||||
version = "10.20";
|
||||
pname = "monkeys-audio";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://monkeysaudio.com/files/MAC_${
|
||||
builtins.concatStringsSep "" (lib.strings.splitString "." version)}_SDK.zip";
|
||||
sha256 = "sha256-kuK6Uok5PAK66OtY+Uu1R7g8T7geA9edn2Sv6LN2pXc=";
|
||||
sha256 = "sha256-RBrWz0iGVny1YC6H9NJbFb2HhlAxRiFrTBg1Evm85B8=";
|
||||
stripRoot = false;
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,33 +1,68 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, qttools, wrapQtAppsHook
|
||||
, alsa-lib, dssi, fluidsynth, ladspaH, lash, libinstpatch, libjack2, liblo
|
||||
, libsamplerate, libsndfile, lilv, lrdf, lv2, qtsvg, rtaudio, rubberband, sord, serd
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, qttools
|
||||
, wrapQtAppsHook
|
||||
, alsa-lib
|
||||
, dssi
|
||||
, fluidsynth
|
||||
, ladspaH
|
||||
, lash
|
||||
, libinstpatch
|
||||
, libjack2
|
||||
, liblo
|
||||
, libsamplerate
|
||||
, libsndfile
|
||||
, lilv
|
||||
, lrdf
|
||||
, lv2
|
||||
, qtsvg
|
||||
, rtaudio
|
||||
, rubberband
|
||||
, sord
|
||||
, serd
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "muse-sequencer";
|
||||
version = "3.1.1";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "muse-sequencer";
|
||||
repo = "muse";
|
||||
rev = "muse_${builtins.replaceStrings ["."] ["_"] version}";
|
||||
sha256 = "1rasp2v1ds2aw296lbf27rzw0l9fjl0cvbvw85d5ycvh6wkm301p";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-JPvoximDL4oKO8reXW7alMegwUyUTSAcdq3ueXeUMMY=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/muse3";
|
||||
|
||||
patches = [ ./fix-parallel-building.patch ];
|
||||
sourceRoot = "${finalAttrs.src.name}/src";
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib dssi fluidsynth ladspaH lash libinstpatch libjack2 liblo
|
||||
libsamplerate libsndfile lilv lrdf lv2 qtsvg rtaudio rubberband sord
|
||||
alsa-lib
|
||||
dssi
|
||||
fluidsynth
|
||||
ladspaH
|
||||
lash
|
||||
libinstpatch
|
||||
libjack2
|
||||
liblo
|
||||
libsamplerate
|
||||
libsndfile
|
||||
lilv
|
||||
lrdf
|
||||
lv2
|
||||
qtsvg
|
||||
rtaudio
|
||||
rubberband
|
||||
sord
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [ "-I${lib.getDev serd}/include/serd-0" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://muse-sequencer.github.io/";
|
||||
description = "MIDI/Audio sequencer with recording and editing capabilities";
|
||||
longDescription = ''
|
||||
|
|
@ -38,7 +73,9 @@ stdenv.mkDerivation rec {
|
|||
MusE aims to be a complete multitrack virtual studio for Linux,
|
||||
it is published under the GNU General Public License.
|
||||
'';
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ orivej ];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ eclairevoyant orivej ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "muse4";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,93 +0,0 @@
|
|||
To confirm these dependencies, run in a fresh build tree:
|
||||
|
||||
|
||||
ninja muse/components/CMakeFiles/components.dir/confmport.o
|
||||
|
||||
In file included from ../muse/components/confmport.cpp:48:
|
||||
../muse/mplugins/midifilterimpl.h:28:10: fatal error:
|
||||
ui_midifilter.h: No such file or directory
|
||||
|
||||
|
||||
ninja muse/waveedit/CMakeFiles/waveedit.dir/wavecanvas.o
|
||||
|
||||
In file included from ../muse/waveedit/wavecanvas.cpp:72:
|
||||
../muse/components/copy_on_write.h:26:10: fatal error:
|
||||
ui_copy_on_write_base.h: No such file or directory
|
||||
|
||||
|
||||
ninja muse/instruments/CMakeFiles/instruments.dir/editinstrument.o
|
||||
|
||||
In file included from ../muse/instruments/editinstrument.cpp:58:
|
||||
../muse/components/editevent.h:26:10: fatal error:
|
||||
ui_editnotedialogbase.h: No such file or directory
|
||||
|
||||
|
||||
ninja muse/liste/CMakeFiles/liste.dir/listedit.o
|
||||
|
||||
In file included from ../muse/liste/listedit.cpp:37:
|
||||
../muse/components/editevent.h:26:10: fatal error:
|
||||
ui_editnotedialogbase.h: No such file or directory
|
||||
|
||||
|
||||
ninja muse/mixer/CMakeFiles/mixer.dir/rack.o
|
||||
|
||||
In file included from ../muse/mixer/rack.cpp:49:
|
||||
../muse/components/plugindialog.h:4:10: fatal error:
|
||||
ui_plugindialogbase.h: No such file or directory
|
||||
|
||||
|
||||
ninja muse/midiedit/CMakeFiles/midiedit.dir/drumedit.o
|
||||
|
||||
In file included from /build/source/muse3/muse/midiedit/drumedit.cpp:64:
|
||||
/build/source/muse3/muse/components/filedialog.h:29:10: fatal error:
|
||||
ui_fdialogbuttons.h: No such file or directory
|
||||
|
||||
|
||||
--- a/muse/components/CMakeLists.txt
|
||||
+++ b/muse/components/CMakeLists.txt
|
||||
@@ -343,4 +343,5 @@ set_target_properties( components
|
||||
target_link_libraries ( components
|
||||
${QT_LIBRARIES}
|
||||
+ mplugins
|
||||
widgets
|
||||
xml_module
|
||||
--- a/muse/waveedit/CMakeLists.txt
|
||||
+++ b/muse/waveedit/CMakeLists.txt
|
||||
@@ -79,4 +79,5 @@ set_target_properties( waveedit
|
||||
target_link_libraries( waveedit
|
||||
${QT_LIBRARIES}
|
||||
+ components
|
||||
widgets
|
||||
)
|
||||
--- a/muse/instruments/CMakeLists.txt
|
||||
+++ b/muse/instruments/CMakeLists.txt
|
||||
@@ -78,4 +78,5 @@ set_target_properties( instruments
|
||||
target_link_libraries ( instruments
|
||||
${QT_LIBRARIES}
|
||||
+ components
|
||||
icons
|
||||
widgets
|
||||
--- a/muse/liste/CMakeLists.txt
|
||||
+++ b/muse/liste/CMakeLists.txt
|
||||
@@ -65,4 +65,5 @@ set_target_properties( liste
|
||||
target_link_libraries ( liste
|
||||
${QT_LIBRARIES}
|
||||
+ components
|
||||
awl
|
||||
widgets
|
||||
--- a/muse/mixer/CMakeLists.txt
|
||||
+++ b/muse/mixer/CMakeLists.txt
|
||||
@@ -87,4 +87,5 @@ set_target_properties ( mixer
|
||||
target_link_libraries ( mixer
|
||||
${QT_LIBRARIES}
|
||||
+ components
|
||||
widgets
|
||||
)
|
||||
--- a/muse/midiedit/CMakeLists.txt
|
||||
+++ b/muse/midiedit/CMakeLists.txt
|
||||
@@ -93,4 +93,5 @@ set_target_properties( midiedit
|
||||
target_link_libraries ( midiedit
|
||||
${QT_LIBRARIES}
|
||||
+ components
|
||||
al
|
||||
ctrl
|
||||
|
|
@ -21,11 +21,11 @@
|
|||
|
||||
let
|
||||
pname = "sparrow";
|
||||
version = "1.7.8";
|
||||
version = "1.7.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}-x86_64.tar.gz";
|
||||
sha256 = "0nazqxffmai74x47dbkwryvx1pjm8k85rcfz5nr19h7fa1bj8rkc";
|
||||
sha256 = "0bz8mx6mszqadx7nlb4ini45r2r57grdgmrq6k9lxgrgcpd8gasy";
|
||||
};
|
||||
|
||||
launcher = writeScript "sparrow" ''
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@
|
|||
, libXaw
|
||||
, libXcursor
|
||||
, libXft
|
||||
, libXi
|
||||
, libXpm
|
||||
, libgccjit
|
||||
, libjpeg
|
||||
|
|
@ -274,6 +275,8 @@ mkDerivation (finalAttrs: {
|
|||
libpng
|
||||
librsvg
|
||||
libtiff
|
||||
] ++ lib.optionals withXinput2 [
|
||||
libXi
|
||||
] ++ lib.optionals withXwidgets [
|
||||
webkitgtk
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "orbiton";
|
||||
version = "2.63.1";
|
||||
version = "2.64.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xyproto";
|
||||
repo = "orbiton";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZUbWptE5BckAm/14ZPGJqTbbACC9cDOUUmzzmvuNUSA=";
|
||||
hash = "sha256-mx6k6OXr3iTCD1FTC7J1fnz7Gs/GyggHXnVywuPo5BY=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@ with python3.pkgs;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "thonny";
|
||||
version = "4.1.1";
|
||||
version = "4.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-DlizSm5cDvYXQ8Gok+W/RTSaAWJTkdyTQ4uewOiDVXg=";
|
||||
hash = "sha256-vVDTizU+WDWJ75Ln93TAFYn7PJq5qc3hxVJiNGtK24g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ copyDesktopItems ];
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "uxn";
|
||||
version = "unstable-2023-08-10";
|
||||
version = "unstable-2023-08-30";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~rabbits";
|
||||
repo = "uxn";
|
||||
rev = "a394dcb999525ac56ea37d0563d35849964b6d6a";
|
||||
hash = "sha256-3Q8460pkoATKCEqfa+OfpQ4Lp18Ro5i84s88pkz+uzU=";
|
||||
rev = "cfd29ac5119e5b270d5f3e3e9e29d020dadef8d3";
|
||||
hash = "sha256-0fE9M+IEKTBG0WLKEbXG1kAJv19TrQWTFMjedOyX8N0=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "projects" ];
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "doublecmd";
|
||||
version = "1.0.11";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "doublecmd";
|
||||
repo = "doublecmd";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-UV5LooVkCBzUk9E7dYje6t19HOuMCO8jY+fNGTES0KA=";
|
||||
hash = "sha256-IccM7AwPiOtGHjAzvjQ99mrLFh8iZu8G7Rf71LJHB/g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
{ lib
|
||||
, fmt
|
||||
, stdenv
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, doxygen
|
||||
, ninja
|
||||
, gitpython
|
||||
, boost
|
||||
|
|
@ -46,15 +47,15 @@
|
|||
, zlib
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "freecad";
|
||||
version = "0.20.2";
|
||||
version = "0.21.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FreeCAD";
|
||||
repo = "FreeCAD";
|
||||
rev = version;
|
||||
hash = "sha256-v8hanhy0UE0o+XqqIH3ZUtVom3q0KGELcfXFRSDr0TA=";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-rwt81Z+Bp8uZlR4iuGQEDKBu/Dr9Rqg7d9SsCdofTUU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -71,7 +72,9 @@ mkDerivation rec {
|
|||
gitpython # for addon manager
|
||||
boost
|
||||
coin3d
|
||||
doxygen
|
||||
eigen
|
||||
fmt
|
||||
gts
|
||||
hdf5
|
||||
libGLU
|
||||
|
|
@ -143,8 +146,8 @@ mkDerivation rec {
|
|||
ln -s $out/bin/FreeCADCmd $out/bin/freecadcmd
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.freecadweb.org/";
|
||||
meta = {
|
||||
homepage = "https://www.freecad.org";
|
||||
description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler";
|
||||
longDescription = ''
|
||||
FreeCAD is an open-source parametric 3D modeler made primarily to design
|
||||
|
|
@ -162,8 +165,8 @@ mkDerivation rec {
|
|||
programmer, an experienced CAD user, a student or a teacher, you will feel
|
||||
right at home with FreeCAD.
|
||||
'';
|
||||
license = licenses.lgpl2Plus;
|
||||
maintainers = with maintainers; [ viric gebner AndersonTorres ];
|
||||
platforms = platforms.linux;
|
||||
license = lib.licenses.lgpl2Plus;
|
||||
maintainers = with lib.maintainers; [ viric gebner AndersonTorres ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -4,23 +4,26 @@
|
|||
, cmake
|
||||
, libqalculate
|
||||
, muparser
|
||||
, libarchive
|
||||
, python3Packages
|
||||
, qtbase
|
||||
, qtscxml
|
||||
, qtsvg
|
||||
, qtdeclarative
|
||||
, qt5compat
|
||||
, wrapQtAppsHook
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "albert";
|
||||
version = "0.20.14";
|
||||
version = "0.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "albertlauncher";
|
||||
repo = "albert";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-c1Bp7rIloXuWv/kUzWGJJ+bh9656vpuqADy77zYZjqk=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-x5H7z0rwunfMwtihXEerc47Sdkl6IvSHfavXzXMLse0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
@ -31,16 +34,19 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
libqalculate
|
||||
libarchive
|
||||
muparser
|
||||
qtbase
|
||||
qtscxml
|
||||
qtsvg
|
||||
qtdeclarative
|
||||
qt5compat
|
||||
] ++ (with python3Packages; [ python pybind11 ]);
|
||||
|
||||
postPatch = ''
|
||||
find -type f -name CMakeLists.txt -exec sed -i {} -e '/INSTALL_RPATH/d' \;
|
||||
|
||||
sed -i src/nativepluginprovider.cpp \
|
||||
sed -i src/qtpluginprovider.cpp \
|
||||
-e "/QStringList dirs = {/a QFileInfo(\"$out/lib\").canonicalFilePath(),"
|
||||
'';
|
||||
|
||||
|
|
@ -50,7 +56,9 @@ stdenv.mkDerivation rec {
|
|||
done
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A fast and flexible keyboard launcher";
|
||||
|
|
@ -60,9 +68,9 @@ stdenv.mkDerivation rec {
|
|||
framework.
|
||||
'';
|
||||
homepage = "https://albertlauncher.github.io";
|
||||
changelog = "https://github.com/albertlauncher/albert/blob/${src.rev}/CHANGELOG.md";
|
||||
changelog = "https://github.com/albertlauncher/albert/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ ericsagnes synthetica ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
From 324a267b0e5505c9124874581bc48fb174fb2542 Mon Sep 17 00:00:00 2001
|
||||
From: "P. R. d. O" <d.ol.rod@tutanota.com>
|
||||
Date: Fri, 4 Mar 2022 07:03:17 -0600
|
||||
Subject: [PATCH] Pillow update
|
||||
|
||||
---
|
||||
pyproject.toml | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/pyproject.toml b/pyproject.toml
|
||||
index 5dc25e0..b3ba397 100644
|
||||
--- a/pyproject.toml
|
||||
+++ b/pyproject.toml
|
||||
@@ -11,7 +11,7 @@ readme = "README.rst"
|
||||
[tool.poetry.dependencies]
|
||||
python = "^3.7"
|
||||
logbook = "^1.5.3"
|
||||
-Pillow = "^8.2.0"
|
||||
+Pillow = "^9.0.0"
|
||||
requests = "^2.24.0"
|
||||
kiss-headers = "^2.2.3"
|
||||
single-version = "^1.5.1"
|
||||
@@ -33,4 +33,4 @@ skip-string-normalization = true
|
||||
|
||||
[build-system]
|
||||
-requires = ["poetry>=0.12"]
|
||||
+requires = ["poetry-core"]
|
||||
-build-backend = "poetry.masonry.api"
|
||||
+build-backend = "poetry.core.masonry.api"
|
||||
--
|
||||
2.35.1
|
||||
|
||||
|
|
@ -1,49 +1,62 @@
|
|||
{ lib
|
||||
, atk
|
||||
, buildPythonApplication
|
||||
, fetchFromGitHub
|
||||
, wrapGAppsHook
|
||||
, atk
|
||||
, gdk-pixbuf
|
||||
, gobject-introspection
|
||||
, gtk3
|
||||
, gst-plugins-good
|
||||
, gst-python
|
||||
, gtk3
|
||||
, kiss-headers
|
||||
, libhandy
|
||||
, librsvg
|
||||
, logbook
|
||||
, networkmanager
|
||||
, pango
|
||||
, gst-python
|
||||
, kiss-headers
|
||||
, logbook
|
||||
, pillow
|
||||
, poetry-core
|
||||
, pygobject3
|
||||
, pytestCheckHook
|
||||
, python
|
||||
, python-zbar
|
||||
, pythonRelaxDepsHook
|
||||
, requests
|
||||
, single-version
|
||||
, pytestCheckHook }:
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "cobang";
|
||||
version = "0.9.6";
|
||||
version = "0.10.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hongquan";
|
||||
repo = "CoBang";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YcXQ2wAgFSsJEqcaDQotpX1put4pQaF511kwq/c2yHw=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-yNDnBTBmwcP3g51UkkLNyF4eHYjblwxPxS2lMwbFKUM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0001-Poetry-core-and-pillow-9.patch
|
||||
pythonRelaxDeps = [
|
||||
"logbook"
|
||||
"Pillow"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
pythonRelaxDepsHook
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
atk
|
||||
gdk-pixbuf
|
||||
gst-plugins-good
|
||||
libhandy
|
||||
networkmanager
|
||||
pango
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
gst-python
|
||||
kiss-headers
|
||||
|
|
@ -56,15 +69,6 @@ buildPythonApplication rec {
|
|||
single-version
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
atk
|
||||
gdk-pixbuf
|
||||
gst-plugins-good
|
||||
libhandy
|
||||
networkmanager
|
||||
pango
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
|
|
|||
|
|
@ -3,15 +3,15 @@
|
|||
}:
|
||||
let
|
||||
pname = "josm";
|
||||
version = "18789";
|
||||
version = "18822";
|
||||
srcs = {
|
||||
jar = fetchurl {
|
||||
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
|
||||
hash = "sha256-0NuCdGqDNY+UCXv9AhX4oT0WJbxMc5ghkL0YvqVWXOs=";
|
||||
hash = "sha256-pzB12lkcWGJ7sVdcfJZC2MnUowfWdElxny0pSQ5vjlw=";
|
||||
};
|
||||
macosx = fetchurl {
|
||||
url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip";
|
||||
hash = "sha256-f8VoPMF7cR6idzadkXC6/oUfzq4dnKb3UPa2JjsRNsw=";
|
||||
hash = "sha256-MFiWbEU8C6Jvq9wkIKANQeqJh2/yC3y40ANnGEl4IF0=";
|
||||
};
|
||||
pkg = fetchsvn {
|
||||
url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";
|
||||
|
|
|
|||
|
|
@ -7,19 +7,22 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "nimbo";
|
||||
version = "0.2.4";
|
||||
version = "0.3.0";
|
||||
disabled = python3.pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nimbo-sh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1fs28s9ynfxrb4rzba6cmik0kl0q0vkpb4zdappsq62jqf960k24";
|
||||
sha256 = "YC5T02Sw22Uczufbyts8l99oCQW4lPq0gPMRXCoKsvw=";
|
||||
};
|
||||
|
||||
# Rich + Colorama are added in `propagatedBuildInputs`
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "awscli>=1.19<2.0" ""
|
||||
--replace "awscli>=1.19<2.0" "" \
|
||||
--replace "colorama==0.4.3" "" \
|
||||
--replace "rich>=10.1.0" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
|
@ -31,6 +34,8 @@ python3.pkgs.buildPythonApplication rec {
|
|||
click
|
||||
pyyaml
|
||||
pydantic
|
||||
rich
|
||||
colorama
|
||||
];
|
||||
|
||||
# nimbo tests require an AWS instance
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
let
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
pname = "obsidian";
|
||||
version = "1.3.7";
|
||||
version = "1.4.5";
|
||||
appname = "Obsidian";
|
||||
meta = with lib; {
|
||||
description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files";
|
||||
|
|
@ -25,7 +25,7 @@ let
|
|||
filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
|
||||
sha256 = if stdenv.isDarwin then "sha256-jHsrSYBHJBMyChGsgXHxH/S7wdI1CMonzid8WenNSmI=" else "sha256-8Qi12d4oZ2R6INYZH/qNUBDexft53uy9Uug7UoArwYw=";
|
||||
sha256 = if stdenv.isDarwin then "sha256-1xGlXjQrJ8gNtKYlCBiIfNnTZU591JZdU6NJqMA5gug=" else "sha256-Y/RlT+3xBbF9tjCbRQnQ+j8ogzLMfsQPnOdiCVj+NK0=";
|
||||
};
|
||||
|
||||
icon = fetchurl {
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ let
|
|||
outputs = lib.filter (x: x != "doc") outputs;
|
||||
};
|
||||
|
||||
# Follow issue below for Python 3.11 support
|
||||
# https://github.com/privacyidea/privacyidea/issues/3593
|
||||
python3' = python310.override {
|
||||
packageOverrides = self: super: {
|
||||
django = super.django_3;
|
||||
|
|
@ -20,6 +22,15 @@ let
|
|||
};
|
||||
doCheck = false;
|
||||
});
|
||||
# version 3.3.0+ does not support SQLAlchemy 1.3
|
||||
factory_boy = super.factory_boy.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "3.2.1";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
hash = "sha256-qY0newwEfHXrbkq4UIp/gfsD0sshmG9ieRNUbveipV4=";
|
||||
};
|
||||
postPatch = "";
|
||||
});
|
||||
# fails with `no tests ran in 1.75s`
|
||||
alembic = super.alembic.overridePythonAttrs (lib.const {
|
||||
doCheck = false;
|
||||
|
|
@ -180,6 +191,7 @@ in
|
|||
python3'.pkgs.buildPythonPackage rec {
|
||||
pname = "privacyIDEA";
|
||||
version = "3.8.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ttdl";
|
||||
version = "4.0.0";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VladimirMarkelov";
|
||||
repo = "ttdl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-er2IDPVFbcuT0COBCpBymNVBKtETdWjzR2330WUBp6U=";
|
||||
sha256 = "sha256-twl72feo1PpWZbs50a962pvvD5YUHfZRW9OjY/meYVo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-WcqkvnXRgsDJM7p2WGa5lmeeuwNwBy2ZQATVkTHRX7Q=";
|
||||
cargoHash = "sha256-ZoVPC/PyMm+yuDYhVFykIBk0T5RNLAfmIT36Tl/dxCo=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A CLI tool to manage todo lists in todo.txt format";
|
||||
|
|
|
|||
|
|
@ -91,11 +91,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "brave";
|
||||
version = "1.57.53";
|
||||
version = "1.57.57";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
sha256 = "sha256-vySznLCjEqol3FOZHvDpY9LY1UG2ExOu/shu8suKuoM=";
|
||||
sha256 = "sha256-B1V4BsGWBOhWgW4loY12OLLiwlqkIO3y2P6/h0WF71Y=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ let
|
|||
++ lib.optionals mediaSupport [ ffmpeg ]
|
||||
);
|
||||
|
||||
version = "12.5.2";
|
||||
version = "12.5.3";
|
||||
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
|
|
@ -86,7 +86,7 @@ let
|
|||
"https://cdn.mullvad.net/browser/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz"
|
||||
"https://github.com/mullvad/mullvad-browser/releases/download/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz"
|
||||
];
|
||||
hash = "sha256-sVVgQTpPQFiG1mEIih0CemNV5qjC2l+JTxef37/nC9k=";
|
||||
hash = "sha256-vnxpmZSqPe7wE4USDbYGm+5k9J/nuUk2uJx4CmwFPvw=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ lib.warnIf (useHardenedMalloc != null)
|
|||
fteLibPath = lib.makeLibraryPath [ stdenv.cc.cc gmp ];
|
||||
|
||||
# Upstream source
|
||||
version = "12.5.2";
|
||||
version = "12.5.3";
|
||||
|
||||
lang = "ALL";
|
||||
|
||||
|
|
@ -104,7 +104,7 @@ lib.warnIf (useHardenedMalloc != null)
|
|||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
|
||||
];
|
||||
hash = "sha256-Mm2/ianon+RtOJqmuZCl+2cPliKiJvIOZ+TyzJ8l5es=";
|
||||
hash = "sha256-QF71UXZXwLjr1XugKeFWZH9RXb4xeKWZScds+xtNekI=";
|
||||
};
|
||||
|
||||
i686-linux = fetchurl {
|
||||
|
|
@ -114,7 +114,7 @@ lib.warnIf (useHardenedMalloc != null)
|
|||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
|
||||
];
|
||||
hash = "sha256-mouxVi/Y5duIQXHYd8WcIzLZEXs5FZAt20dFq4vHzso=";
|
||||
hash = "sha256-xaLTYo8aJO0DzFQLSUHF12vKOEMO6hbVXQdL3PHLb8s=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ let
|
|||
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "vivaldi";
|
||||
version = "6.1.3035.302";
|
||||
version = "6.2.3105.45";
|
||||
|
||||
suffix = {
|
||||
aarch64-linux = "arm64";
|
||||
|
|
@ -33,8 +33,8 @@ in stdenv.mkDerivation rec {
|
|||
src = fetchurl {
|
||||
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
|
||||
hash = {
|
||||
aarch64-linux = "sha256-HWnHuLcJrV4yYt/l0iLl0N2p9v7r5RwQod1s0op52Z4=";
|
||||
x86_64-linux = "sha256-NPmiatlGK+8GJHwDXyOZ+J1PSN7Oj8sAKfm6r1usI1E=";
|
||||
aarch64-linux = "sha256-AumYFbCa5+Ou89e6MDQZFlyCu30IvX8jbz+deRojzOQ=";
|
||||
x86_64-linux = "sha256-9U7vPvmCbwgkYGIZblKghuqClhOfGSEQqTVkaDgc0Ms=";
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gatekeeper";
|
||||
version = "3.12.0";
|
||||
version = "3.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-policy-agent";
|
||||
repo = "gatekeeper";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DGLod05gmDzItPOBaGc2X/oMXSzvH932Wa44R+DUt/U=";
|
||||
hash = "sha256-7ciI8KgkC1NRYP8bFW5RnZ2oLXaCuPHQBd2tvgQ+YO8=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tektoncd-cli";
|
||||
version = "0.31.1";
|
||||
version = "0.31.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tektoncd";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-SneGlXEthl/x6n+IlMN6y/ZubgHlfseoV0PS9sGcrTM=";
|
||||
sha256 = "sha256-QBJ8UoR61XOFT6u5glpL+DHaj5Kyqq73r0pyteINQNA=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -5,20 +5,21 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "terraform-compliance";
|
||||
version = "1.3.34";
|
||||
version = "1.3.43";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "terraform-compliance";
|
||||
repo = "cli";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-1TFLpBwkpMMdiJJfVvDXlJg4SXWQ8VV605wMFGU+InQ=";
|
||||
sha256 = "sha256-Otz0jXSqqg8u8jVnqHTpPW/oyb+Qq2NywgxYPtIAKEc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "IPython==7.16.1" "IPython" \
|
||||
--replace "diskcache==5.1.0" "diskcache>=5.1.0"
|
||||
--replace "diskcache==5.1.0" "diskcache>=5.1.0" \
|
||||
--replace "radish-bdd==0.13.1" "radish-bdd" \
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
@ -33,6 +34,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
netaddr
|
||||
radish-bdd
|
||||
semver
|
||||
orjson
|
||||
];
|
||||
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "zarf";
|
||||
version = "0.29.0";
|
||||
version = "0.29.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "defenseunicorns";
|
||||
repo = "zarf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MpjxyVOouivB1FT8ejKhq3lPSfCaXwxMXpyxoaNxVEk=";
|
||||
hash = "sha256-m/eyy3MpHHlxlWU9Y7tsQw5jGGZIKCvBkIgoRmvecBI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-h/N50x64ROW3KJ5965vauSpkIoeq8Zn26eCEmJqU0Zg=";
|
||||
vendorHash = "sha256-p1QLNbkNlIwqHzLjGX5YGC2Xxu0nAjmMfGwKXhi9XkU=";
|
||||
proxyVendor = true;
|
||||
|
||||
preBuild = ''
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "alfaview";
|
||||
version = "8.72.0";
|
||||
version = "9.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb";
|
||||
sha256 = "sha256-8oc3Wy/jI/GKbTnv7IV6q159WmMZSGedMh5EXvf7ZR0=";
|
||||
sha256 = "sha256-Mmw4wWjU1Fr2dqonD3Vin8m6VX2dfDXbMDl+lTT4YT4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "chatterino2";
|
||||
version = "2.4.4";
|
||||
version = "2.4.5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Chatterino";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-zvwvvwMPWnNT44L7g8fiY0N7H62Ot1lNCFCIkL8SxQw=";
|
||||
sha256 = "sha256-ughEavlvL1/mvevbYrDG+2/JYigMhVwyy3RFysQqUNs=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "juju";
|
||||
version = "3.2.0";
|
||||
version = "3.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juju";
|
||||
repo = "juju";
|
||||
rev = "juju-${version}";
|
||||
sha256 = "sha256-wm6yWxGFQBlNtFfL1PnUuljy6ODOboiyND4cqPjl1nM=";
|
||||
sha256 = "sha256-ZmMOQCKQWtzB2O6CNZTRhhj7gkpRRXY9ILN2KdSQoWk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ll0qm0noD1Zox8uOlp2Rr/sFFzQlJlpss4Ot3LQn/g4=";
|
||||
vendorHash = "sha256-rqf5nAXwcW6lm7sidEcxMqatT4KPju4Seo1/Awse5Zs=";
|
||||
|
||||
# Disable tests because it attempts to use a mongodb instance
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@ assert trackerSearch -> (python3 != null);
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "qbittorrent" + lib.optionalString (!guiSupport) "-nox";
|
||||
version = "4.5.4";
|
||||
version = "4.5.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qbittorrent";
|
||||
repo = "qBittorrent";
|
||||
rev = "release-${version}";
|
||||
hash = "sha256-c/ZJ83kxxFo/iI7Tjo3ZY0/vmVanjoJXBOu8XTnFm+Q=";
|
||||
hash = "sha256-rWv+KGw+3385GOKK4MvoSP0CepotUZELiDVFpyDf+9k=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
@ -53,6 +53,6 @@ mkDerivation rec {
|
|||
changelog = "https://github.com/qbittorrent/qBittorrent/blob/release-${version}/Changelog";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ Anton-Latukha ];
|
||||
maintainers = with maintainers; [ Anton-Latukha kashw2 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,13 +39,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "transmission";
|
||||
version = "4.0.3";
|
||||
version = "4.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "transmission";
|
||||
repo = "transmission";
|
||||
rev = version;
|
||||
hash = "sha256-P7omd49xLmReo9Zrg0liO1msUVzCa5CxH7PGmH4oPzg=";
|
||||
hash = "sha256-Sz3+5VvfOgET1aiormEnBOrF+yN79tiSQvjLAoGqTLw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -12,22 +12,22 @@ let
|
|||
in
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "tremc";
|
||||
version = "0.9.2";
|
||||
version = "0.9.3";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tremc";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1fqspp2ckafplahgba54xmx0sjidx1pdzyjaqjhz0ivh98dkx2n5";
|
||||
hash = "sha256-219rntmetmj1JFG+4NyYMFTWmrHKJL7fnLoMIvnTP4Y=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Remove when version >0.9.2 is released
|
||||
# Remove when tremc > 0.9.3 is released
|
||||
(fetchpatch {
|
||||
url = "https://github.com/tremc/tremc/commit/bdffff2bd76186a4e3488b83f719fc7f7e3362b6.patch";
|
||||
sha256 = "1zip2skh22v0yyv2hmszxn5jshp9m1jpw0fsyfvmqfxzq7m3czy5";
|
||||
name = "replace-decodestring-with-decodebytes.patch";
|
||||
url = "https://github.com/tremc/tremc/commit/a8aaf9a6728a9ef3d8f13b3603456b0086122891.patch";
|
||||
hash = "sha256-+HYdWTbcpvZqjshdHLZ+Svmr6U/aKFc3sy0aka6rn/A=";
|
||||
name = "support-transmission-4.patch";
|
||||
})
|
||||
];
|
||||
|
||||
|
|
@ -56,5 +56,6 @@ python3Packages.buildPythonApplication rec {
|
|||
description = "Curses interface for transmission";
|
||||
homepage = "https://github.com/tremc/tremc";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ kashw2 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, stdenv, fetchurl, rpmextract, patchelf, bash }:
|
||||
{ lib, stdenv, fetchurl, rpmextract, patchelf, bash, testers, scaleft }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "scaleft";
|
||||
version = "1.45.4";
|
||||
version = "1.67.4";
|
||||
|
||||
src =
|
||||
fetchurl {
|
||||
url = "http://pkg.scaleft.com/rpm/scaleft-client-tools-${version}-1.x86_64.rpm";
|
||||
sha256 = "1yskybjba9ljy1wazddgrm7a4cc72i1xbk7sxnjpcq4hdy3b50l0";
|
||||
sha256 = "kRCShTMKf5qKFth/8H8XHLj12YIVQ9G5f2MvVJRtyDs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ patchelf rpmextract ];
|
||||
|
|
@ -31,6 +31,12 @@ stdenv.mkDerivation rec {
|
|||
patchShebangs $out
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = scaleft;
|
||||
command = "sft -v";
|
||||
version = "sft version ${version}";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "ScaleFT provides Zero Trust software which you can use to secure your internal servers and services";
|
||||
homepage = "https://www.scaleft.com";
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
, copyDesktopItems
|
||||
, makeDesktopItem
|
||||
, gtk3
|
||||
, openssl_1_1
|
||||
, xdg-user-dirs
|
||||
, keybinder3
|
||||
}:
|
||||
|
|
@ -29,7 +28,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
openssl_1_1
|
||||
keybinder3
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "5.9.0";
|
||||
version = "6.2.2";
|
||||
pname = "timeular";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage";
|
||||
sha256 = "sha256-RbP//rrKgvChIbBVwC8ElMUe+XsGMgHxowSdw6tRWNI=";
|
||||
sha256 = "sha256-i6VLKGHst6gykXOpkt+VFMkdm9RLAWVgAhQ2UZ7Lt5Y=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "cloudlog";
|
||||
version = "2.4.5";
|
||||
version = "2.4.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "magicbug";
|
||||
repo = "Cloudlog";
|
||||
rev = version;
|
||||
sha256 = "sha256-L68jk49lGw9LNSqIPlDp2WHoQhn8UBW6VDZwsCtjTQI=";
|
||||
sha256 = "sha256-LY8kTZooBzwrrruCjwdiNhxjrmIDV4N2HcfhbSSe6o4=";
|
||||
};
|
||||
|
||||
postPath = ''
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sambamba";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "biod";
|
||||
repo = "sambamba";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HwAzsbT71Q35Io6H7Hzs4RTatpRpdHqV0cwPYAlsf6c=";
|
||||
sha256 = "sha256-3O9bHGpMuCgdR2Wm7Dv1VUjMT1QTn8K1hdwgjvwhFDw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "egglog";
|
||||
version = "unstable-2023-08-23";
|
||||
version = "unstable-2023-08-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "egraphs-good";
|
||||
repo = "egglog";
|
||||
rev = "9e530381961a59524f2bbacd89973575b4e036d8";
|
||||
hash = "sha256-xzfa1Z7ibSO4D5zpprC7heaswA7Be5Qmb81XoDwANqw=";
|
||||
rev = "c83fc750878755eb610a314da90f9273b3bfe25d";
|
||||
hash = "sha256-bo3LU7WQ7WWnyL4EVOpzxxSFioXTozCSQFIFXyoxKLg=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
|
|
|||
|
|
@ -26,14 +26,14 @@ let
|
|||
});
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.1.0";
|
||||
version = "2.2.0";
|
||||
pname = "openmvs";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cdcseacave";
|
||||
repo = "openmvs";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-eqNprBgR0hZnbLKLZLJqjemKxHhDtGblmaSxYlmegsc=";
|
||||
sha256 = "sha256-j/tGkR73skZiU+bP4j6aZ5CxkbIcHtqKcaUTgNvj0C8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -76,6 +76,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Beautiful GTK 4 terminal";
|
||||
mainProgram = "blackbox";
|
||||
homepage = "https://gitlab.gnome.org/raggesilver/blackbox";
|
||||
changelog = "https://gitlab.gnome.org/raggesilver/blackbox/-/raw/v${version}/CHANGELOG.md";
|
||||
license = licenses.gpl3Plus;
|
||||
|
|
|
|||
49
pkgs/applications/version-management/gitnr/default.nix
Normal file
49
pkgs/applications/version-management/gitnr/default.nix
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, libxkbcommon
|
||||
, openssl
|
||||
, stdenv
|
||||
, darwin
|
||||
, wayland
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gitnr";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "reemus-dev";
|
||||
repo = "gitnr";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5HZT/e53e2dUMFnT+4a5GJk3JqJu5+62yxrsnNfSqD8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-rO8qHa+GI76s5CN52aMa58W8ERuTWQtQ96jpLbXKzOs=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.AppKit
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
libxkbcommon
|
||||
wayland
|
||||
];
|
||||
|
||||
# requires internet access
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Create `.gitignore` files using one or more templates from TopTal, GitHub or your own collection";
|
||||
homepage = "https://github.com/reemus-dev/gitnr";
|
||||
changelog = "https://github.com/reemus-dev/gitnr/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
mainProgram = "gitnr";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,21 +1,19 @@
|
|||
{ lib, stdenv, fetchFromGitHub, git, makeWrapper, openssl, coreutils, util-linux, gnugrep, gnused, gawk }:
|
||||
{ lib, stdenv, fetchFromGitHub, git, makeWrapper, openssl, coreutils, util-linux, gnugrep, gnused, gawk, testers, transcrypt }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "transcrypt";
|
||||
version = "1.1.0";
|
||||
version = "2.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elasticdog";
|
||||
repo = "transcrypt";
|
||||
rev = "v${version}";
|
||||
sha256 = "1dkr69plk16wllk5bzlkchrzw63pk239dgbjhrb3mb61i065jdam";
|
||||
sha256 = "+B8CYHDneDd0GwiTwQK6YVScDMKao2JXFpGk9PY6/EE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ git openssl coreutils util-linux gnugrep gnused gawk ];
|
||||
|
||||
patches = [ ./helper-scripts_depspathprefix.patch ];
|
||||
|
||||
installPhase = ''
|
||||
install -m 755 -D transcrypt $out/bin/transcrypt
|
||||
install -m 644 -D man/transcrypt.1 $out/share/man/man1/transcrypt.1
|
||||
|
|
@ -32,6 +30,12 @@ stdenv.mkDerivation rec {
|
|||
chmod +x $out/bin/transcrypt-depspathprefix
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = transcrypt;
|
||||
command = "transcrypt --version";
|
||||
version = "transcrypt ${version}";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Transparently encrypt files within a Git repository";
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -1,37 +0,0 @@
|
|||
diff --git a/transcrypt b/transcrypt
|
||||
index a0b562d..7888f5d 100755
|
||||
--- a/transcrypt
|
||||
+++ b/transcrypt
|
||||
@@ -278,6 +278,7 @@ save_helper_scripts() {
|
||||
|
||||
cat <<-'EOF' > "${GIT_DIR}/crypt/clean"
|
||||
#!/usr/bin/env bash
|
||||
+ PATH="$(transcrypt-depspathprefix 2>/dev/null)$PATH"
|
||||
filename=$1
|
||||
# ignore empty files
|
||||
if [[ -s $filename ]]; then
|
||||
@@ -300,6 +301,7 @@ save_helper_scripts() {
|
||||
|
||||
cat <<-'EOF' > "${GIT_DIR}/crypt/smudge"
|
||||
#!/usr/bin/env bash
|
||||
+ PATH="$(transcrypt-depspathprefix 2>/dev/null)$PATH"
|
||||
tempfile=$(mktemp 2> /dev/null || mktemp -t tmp)
|
||||
trap 'rm -f "$tempfile"' EXIT
|
||||
cipher=$(git config --get --local transcrypt.cipher)
|
||||
@@ -309,6 +311,7 @@ save_helper_scripts() {
|
||||
|
||||
cat <<-'EOF' > "${GIT_DIR}/crypt/textconv"
|
||||
#!/usr/bin/env bash
|
||||
+ PATH="$(transcrypt-depspathprefix 2>/dev/null)$PATH"
|
||||
filename=$1
|
||||
# ignore empty files
|
||||
if [[ -s $filename ]]; then
|
||||
@@ -351,7 +354,7 @@ save_configuration() {
|
||||
git config merge.renormalize 'true'
|
||||
|
||||
# add a git alias for listing encrypted files
|
||||
- git config alias.ls-crypt "!git ls-files | git check-attr --stdin filter | awk 'BEGIN { FS = \":\" }; /crypt$/{ print \$1 }'"
|
||||
+ git config alias.ls-crypt "!PATH=\"\$(transcrypt-depspathprefix 2>/dev/null)\$PATH\"; git ls-files | git check-attr --stdin filter | awk 'BEGIN { FS = \":\" }; /crypt$/{ print \$1 }'"
|
||||
}
|
||||
|
||||
# display the current configuration settings
|
||||
|
|
@ -5,14 +5,14 @@ let
|
|||
inherit (python3Packages) dbus-python buildPythonApplication pygobject3 urllib3 setuptools;
|
||||
in buildPythonApplication rec {
|
||||
pname = "devede";
|
||||
version = "4.16.0";
|
||||
version = "4.17.0";
|
||||
namePrefix = "";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "rastersoft";
|
||||
repo = "devedeng";
|
||||
rev = version;
|
||||
sha256 = "1xb7acjphvn4ya8fgjsvag5gzi9a6c2famfl0ffr8nhb9y8ig9mg";
|
||||
sha256 = "sha256-CdntdD5DRA/eXTBRBRszkbYFeFxj+0odb8XHkAFdobU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, fetchurl, appimageTools, makeWrapper, electron }:
|
||||
{ stdenv, lib, fetchurl, appimageTools, makeWrapper, electron_22 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freetube";
|
||||
|
|
@ -35,8 +35,9 @@ stdenv.mkDerivation rec {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
# Electron version is set to 22 in order to match upstream
|
||||
postFixup = ''
|
||||
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
|
||||
makeWrapper ${electron_22}/bin/electron $out/bin/${pname} \
|
||||
--add-flags $out/share/${pname}/resources/app.asar
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jftui";
|
||||
version = "0.7.1";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Aanok";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dkMJn5ZsM1pfHvSsj0kHsP17PqbR+yrRYX62RxoxwwM=";
|
||||
sha256 = "sha256-w5DK9B3D3/9VExAQktigVPim33VfpoQPHUZefAS3pWQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib, stdenv, fetchurl, dpkg, makeWrapper, buildFHSEnv
|
||||
, gtk3, gdk-pixbuf, cairo, libjpeg_original, glib, pango, libGLU
|
||||
, libGL, nvidia_cg_toolkit, zlib, openssl, libuuid , alsa-lib, udev, libjack2
|
||||
, libGL, nvidia_cg_toolkit, zlib, openssl, libuuid
|
||||
, alsa-lib, udev, libjack2, freetype, libva, libvdpau
|
||||
}:
|
||||
let
|
||||
fullPath = lib.makeLibraryPath [
|
||||
|
|
@ -20,18 +21,21 @@ let
|
|||
alsa-lib
|
||||
libjack2
|
||||
udev
|
||||
freetype
|
||||
libva
|
||||
libvdpau
|
||||
];
|
||||
|
||||
lightworks = stdenv.mkDerivation rec {
|
||||
version = "2022.1.1";
|
||||
rev = "132926";
|
||||
version = "2023.1";
|
||||
rev = "141770";
|
||||
pname = "lightworks";
|
||||
|
||||
src =
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "https://cdn.lwks.com/releases/${version}/lightworks_${version}_r${rev}.deb";
|
||||
sha256 = "sha256-f2lxfv0sFESpDnINDKlfVcR0pySAueMeOMbkgBWzz7Q=";
|
||||
sha256 = "sha256-QRbghrZQbprl2wUBKNMJVBeW0Ek6nWvo4006jyPYIBg=";
|
||||
}
|
||||
else throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";
|
||||
|
||||
|
|
@ -87,7 +91,7 @@ in buildFHSEnv {
|
|||
homepage = "https://www.lwks.com/";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [ antonxy vojta001 ];
|
||||
maintainers = with lib.maintainers; [ antonxy vojta001 kashw2 ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
62
pkgs/applications/video/shaka-packager/default.nix
Normal file
62
pkgs/applications/video/shaka-packager/default.nix
Normal file
|
|
@ -0,0 +1,62 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, runCommand
|
||||
, shaka-packager
|
||||
}:
|
||||
|
||||
let
|
||||
sources = {
|
||||
"x86_64-linux" = {
|
||||
filename = "packager-linux-x64";
|
||||
hash = "sha256-MoMX6PEtvPmloXJwRpnC2lHlT+tozsV4dmbCqweyyI0=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
filename = "packager-linux-arm64";
|
||||
hash = "sha256-6+7SfnwVRsqFwI7/1F7yqVtkJVIoOFUmhoGU3P6gdQ0=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
filename = "packager-osx-x64";
|
||||
hash = "sha256-fFBtOp/Zb37LP7TWAEB0yp0xM88cMT9QS59EwW4MrAY=";
|
||||
};
|
||||
};
|
||||
|
||||
source = sources."${stdenv.hostPlatform.system}"
|
||||
or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "shaka-packager";
|
||||
version = "2.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/shaka-project/shaka-packager/releases/download/v${finalAttrs.version}/${source.filename}";
|
||||
inherit (source) hash;
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
sourceRoot = ".";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -m755 -D $src $out/bin/packager
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
simple = runCommand "${finalAttrs.pname}-test" { } ''
|
||||
${shaka-packager}/bin/packager -version | grep ${finalAttrs.version} > $out
|
||||
'';
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Media packaging framework for VOD and Live DASH and HLS applications";
|
||||
homepage = "https://shaka-project.github.io/shaka-packager/html/";
|
||||
license = lib.licenses.bsd3;
|
||||
mainProgram = "packager";
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
platforms = builtins.attrNames sources;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
})
|
||||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "containerd";
|
||||
version = "1.7.3";
|
||||
version = "1.7.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containerd";
|
||||
repo = "containerd";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-BUbZe37rBZTr6nWb4lY2HHuwtq7toDUkGaJOiOoVkWI=";
|
||||
hash = "sha256-g+1JfXO1k0ijPpVTo+WxmXro4p4MbRCIZdgtgy58M60=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||
homepage = "https://tart.run";
|
||||
license = licenses.fairsource09;
|
||||
maintainers = with maintainers; [ emilytrau Enzime ];
|
||||
mainProgram = finalAttrs.pname;
|
||||
platforms = [ "aarch64-darwin" ];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -15,16 +15,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "i3status-rust";
|
||||
version = "0.31.9";
|
||||
version = "0.32.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "greshake";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-PldCtV979mJSgQtMHx/gfhKrsBByiywLMO9LjyggvCA=";
|
||||
hash = "sha256-cBcmNeGfVPCdVvXkMe2Vx3zUaWGE1vMSfwmNPapTwBo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-wCBg3qYy9wrsM4eJ1FV4OEI+ZwkbXn5jQZ/m7KMgHCc=";
|
||||
cargoHash = "sha256-cD4QFrDgwwJIrpSYmoale+2p0xD2JMHcIcuc4sRH4wI=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
|
||||
|
|
|
|||
|
|
@ -83,5 +83,6 @@ mkDerivation rec {
|
|||
homepage = "https://github.com/Nitrux/maui-shell";
|
||||
license = licenses.lgpl3;
|
||||
maintainers = with maintainers; [ onny ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -86,6 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
fortuneteller2k
|
||||
rodrgz
|
||||
];
|
||||
mainProgram = "river";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -336,10 +336,11 @@ rec {
|
|||
{ name
|
||||
, text
|
||||
, runtimeInputs ? [ ]
|
||||
, meta ? { }
|
||||
, checkPhase ? null
|
||||
}:
|
||||
writeTextFile {
|
||||
inherit name;
|
||||
inherit name meta;
|
||||
executable = true;
|
||||
destination = "/bin/${name}";
|
||||
allowSubstitutes = true;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "papirus-icon-theme";
|
||||
version = "20230801";
|
||||
version = "20230901";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PapirusDevelopmentTeam";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-sEfJKlGdogM0rOqg3Buytgd7vm0zEkmkSR343ZgGI2I=";
|
||||
hash = "sha256-FcTNZgCdPlYjpheA3PfZBR3apOkDi4+RafQtXdqchGI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 papirus-folders ];
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "dbip-country-lite";
|
||||
version = "2023-08";
|
||||
version = "2023-09";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz";
|
||||
hash = "sha256-+IQSHgfVZ2codxkOKwi23CLjm+rYDZOQq5EWJs0OLiQ=";
|
||||
hash = "sha256-3Mapa4qxUEMGUeqzoyzhatL43l1PPmw+Aye4bX92CAA=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -23,13 +23,13 @@ in
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "where-is-my-sddm-theme";
|
||||
version = "1.3.0";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stepanzubkov";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-40XTihp3hYbXzXSmgrmFCQjZUBkDi/NLiGQEs5ZmRIg=";
|
||||
hash = "sha256-kW6W8DELi9Xqn9xWLlcKmxk4tO5FKdApaYTZimQ+7B0=";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [ qtgraphicaleffects ];
|
||||
|
|
|
|||
|
|
@ -3,8 +3,10 @@
|
|||
, fetchFromGitHub
|
||||
, cmake
|
||||
, kwindowsystem
|
||||
, libexif
|
||||
, libfm-qt
|
||||
, lxqt-qtplugin
|
||||
, menu-cache
|
||||
, qtx11extras
|
||||
, gitUpdater
|
||||
, extraQtStyles ? []
|
||||
|
|
@ -27,8 +29,10 @@ mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
kwindowsystem
|
||||
libexif
|
||||
libfm-qt
|
||||
lxqt-qtplugin
|
||||
menu-cache
|
||||
qtx11extras
|
||||
]
|
||||
++ extraQtStyles;
|
||||
|
|
|
|||
|
|
@ -70,6 +70,7 @@ mixRelease {
|
|||
'';
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "elixir-ls";
|
||||
maintainers = teams.beam.members;
|
||||
};
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aspectj";
|
||||
version = "1.9.19";
|
||||
version = "1.9.20";
|
||||
builder = ./builder.sh;
|
||||
|
||||
src = let
|
||||
versionSnakeCase = builtins.replaceStrings ["."] ["_"] version;
|
||||
in fetchurl {
|
||||
url = "https://github.com/eclipse/org.aspectj/releases/download/V${versionSnakeCase}/aspectj-${version}.jar";
|
||||
sha256 = "sha256-Oujyg05yvtcyfLmqonc++GX9AyFKwfIzITOHDz0px0M=";
|
||||
sha256 = "sha256-zrU7JlEyUwoYxQ+sTaJM4YGVW5NucDXDiEao4glJAk0=";
|
||||
};
|
||||
|
||||
inherit jre;
|
||||
|
|
|
|||
|
|
@ -5,19 +5,16 @@
|
|||
, lua5_3
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "lunarml";
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
inherit pname;
|
||||
pname = "lunarml";
|
||||
|
||||
version = "unstable-2023-07-25";
|
||||
version = "unstable-2023-08-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minoki";
|
||||
repo = "LunarML";
|
||||
rev = "4a5f9c7d42c6b1fcd3d73ab878321f887a153aa7";
|
||||
sha256 = "dpYUXMbYPRvk+t6Cnc4uh8w5MwuPXuKPgZQl2P0EBZU=";
|
||||
rev = "69d09b47601f4041ca7e8a513c75f3e4835af9dd";
|
||||
sha256 = "sha256-GXUcWI4/akOKIvCHrsOfceZEdyNZdIdalTc6wX+svS4=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
|
@ -37,18 +34,21 @@ stdenvNoCC.mkDerivation {
|
|||
doCheck = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $doc/${pname} $out/{bin,lib}
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $doc/lunarml $out/{bin,lib}
|
||||
cp -r bin $out
|
||||
cp -r lib $out
|
||||
cp -r doc/* README.* LICENSE* $doc/${pname}
|
||||
cp -r example $doc/${pname}
|
||||
cp -r example $doc/lunarml
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Standard ML compiler that produces Lua/JavaScript";
|
||||
homepage = "https://github.com/minoki/LunarML";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ toastal ];
|
||||
maintainers = with lib.maintainers; [ toastal ratsclub ];
|
||||
platforms = mlton.meta.platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ with builtins; with lib; let
|
|||
{ case = "8.13"; out = { version = "1.13.7"; };}
|
||||
{ case = "8.14"; out = { version = "1.13.7"; };}
|
||||
{ case = "8.15"; out = { version = "1.15.0"; };}
|
||||
{ case = "8.16"; out = { version = "1.16.5"; };}
|
||||
{ case = "8.17"; out = { version = "1.16.5"; };}
|
||||
{ case = "8.16"; out = { version = "1.17.0"; };}
|
||||
{ case = "8.17"; out = { version = "1.17.0"; };}
|
||||
] {} );
|
||||
in mkCoqDerivation {
|
||||
pname = "elpi";
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "clojure";
|
||||
version = "1.11.1.1405";
|
||||
version = "1.11.1.1413";
|
||||
|
||||
src = fetchurl {
|
||||
# https://github.com/clojure/brew-install/releases
|
||||
url = "https://github.com/clojure/brew-install/releases/download/${finalAttrs.version}/clojure-tools-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-sqKhnddOy2rKcYtM2rSiaHIihoajZ8GBfBfyU4oPtXQ=";
|
||||
hash = "sha256-k8Olo63KUcWFgGNBmr9myD2/JOoV4f2S95v35mI4H+A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cyber";
|
||||
version = "unstable-2023-08-24";
|
||||
version = "unstable-2023-09-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fubark";
|
||||
repo = "cyber";
|
||||
rev = "be76bc13590285cffa502c3c97470a80ff1f27bd";
|
||||
hash = "sha256-DhGp+vHz+FfF9ZGopQshF2t0Q4/yeN7CEpIlPliPBgQ=";
|
||||
rev = "1dae891be5ca1e64ad8ab9d60be0b30e1ef28439";
|
||||
hash = "sha256-5GCIdk6XCJIXZLFsNMzo15Qhtj7zd/DOcARe8GXF2lc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -112,12 +112,12 @@ let
|
|||
};
|
||||
|
||||
self = mkDerivation rec {
|
||||
version = "8.2.0";
|
||||
version = "8.3.0";
|
||||
pname = "octave";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/octave/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-V9F/kYqUDTjKM0ghHhELNNc1oyKofbccF3xGkqSanIQ=";
|
||||
sha256 = "sha256-K0gRHLZ7MSgX5dHz4XH1utFRK7Bn4WdLnEspKBiVuXo=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "belcard";
|
||||
version = "5.2.12";
|
||||
version = "5.2.98";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.linphone.org";
|
||||
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
group = "BC";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Q5FJ1Nh61woyXN7BVTZGNGXOVhcZXakLWcxaavPpgeY=";
|
||||
sha256 = "sha256-pRNJ1bDS2v0Cn+6cxMeFa0JQ27UZR6kCI9P6gQ5W2GA=";
|
||||
};
|
||||
|
||||
buildInputs = [ bctoolbox belr ];
|
||||
|
|
|
|||
50
pkgs/development/libraries/hax11/default.nix
Normal file
50
pkgs/development/libraries/hax11/default.nix
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
{ lib
|
||||
, multiStdenv
|
||||
, fetchFromGitHub
|
||||
, libX11
|
||||
, libXxf86vm
|
||||
, xorgproto
|
||||
, unstableGitUpdater
|
||||
}:
|
||||
|
||||
multiStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hax11";
|
||||
version = "unstable-2022-12-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CyberShadow";
|
||||
repo = "hax11";
|
||||
rev = "dce456f2b209f1be18d91064be257b66b69b7d9f";
|
||||
hash = "sha256-e3jYvbglQ5Nzoz/B+WEkCw48Tu+i73t+PNq51mjzmjY=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
buildInputs = [
|
||||
libX11
|
||||
libXxf86vm
|
||||
xorgproto
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm644 lib32/hax11.so -t $out/lib32/
|
||||
install -Dm644 lib64/hax11.so -t $out/lib64/
|
||||
install -Dm644 README.md -t $doc/share/doc/hax11/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = unstableGitUpdater { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/CyberShadow/hax11";
|
||||
description = "Hackbrary to Hook and Augment X11 protocol calls";
|
||||
license = with lib.licenses; [ mit ];
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
|
@ -41,6 +41,15 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
--replace "includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@" "includedir=@CMAKE_INSTALL_INCLUDEDIR@"
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
bin/unit-hyperscan
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "High-performance multiple regex matching library";
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libisoburn";
|
||||
version = "1.5.4";
|
||||
version = "1.5.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-LYmEbUOIDxf6WRxTs76kL/uANijk5jDGgPwskYT3kTI=";
|
||||
sha256 = "sha256-K4Cm9z3WM6XSQ/rL6XoV5cmgdkSl4aJCwhm5N1pF9xs=";
|
||||
};
|
||||
|
||||
buildInputs = [ attr zlib libburn libisofs ];
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nghttp3";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ngtcp2";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ypoq+wXBaA5p5ZjRC8SNn9jHcMHHLJZLDLNOFMoua0g=";
|
||||
hash = "sha256-DqqT8rgGlbV0upe0E37AR8bk3SIsoyCXt8xJzIkz9xc=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sqlcipher";
|
||||
version = "4.5.4";
|
||||
version = "4.5.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sqlcipher";
|
||||
repo = "sqlcipher";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-n9KPtTj/mHXrnFJnbWPO3H+Vol3Z2mg7XLl55ynyLwY=";
|
||||
hash = "sha256-amWYkVQr+Rmcj+32lFDRq43Q+Ojj8V8B6KoURqdwGt0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tevent";
|
||||
version = "0.14.1";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://samba/tevent/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-74X8qoD/0jUQNrpLNHYw/vKhrD2pZKfxggRmutA80A0=";
|
||||
sha256 = "sha256-ZiqfJ3KBvPUGtrwKC6oD5EpiIpUW7jS8xwOguCqkaQU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,32 +1,32 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
{ dbus
|
||||
, docbook-xsl-nons
|
||||
, docbook_xml_dtd_43
|
||||
, fetchurl
|
||||
, glib
|
||||
, lib
|
||||
, libxslt
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, libxslt
|
||||
, docbook-xsl-nons
|
||||
, docbook_xml_dtd_43
|
||||
, dbus
|
||||
, glib
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xdg-dbus-proxy";
|
||||
version = "0.1.4";
|
||||
version = "0.1.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/flatpak/xdg-dbus-proxy/releases/download/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-HsDqtT0eSZZtciNSvP1RrEAtzlGQuu3HSahUHnYWcKs=";
|
||||
url = "https://github.com/flatpak/xdg-dbus-proxy/releases/download/${finalAttrs.version}/xdg-dbus-proxy-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-Bh3Pr4oGUOX9nVQy3+iL2nSeoNB53BNjBL/s+84GYfs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
docbook-xsl-nons
|
||||
docbook_xml_dtd_43
|
||||
libxslt
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
libxslt
|
||||
docbook-xsl-nons
|
||||
docbook_xml_dtd_43
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -40,12 +40,12 @@ stdenv.mkDerivation rec {
|
|||
# dbus[2345]: Failed to start message bus: Failed to open "/etc/dbus-1/session.conf": No such file or directory
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "DBus proxy for Flatpak and others";
|
||||
homepage = "https://github.com/flatpak/xdg-dbus-proxy";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ jtojnar ];
|
||||
platforms = platforms.linux;
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
mainProgram = "xdg-dbus-proxy";
|
||||
maintainers = with lib.maintainers; [ jtojnar ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
, ppxlib, ppx_deriving
|
||||
, ppxlib_0_15, ppx_deriving_0_15
|
||||
, coqPackages
|
||||
, version ? if lib.versionAtLeast ocaml.version "4.08" then "1.16.5"
|
||||
, version ? if lib.versionAtLeast ocaml.version "4.08" then "1.17.0"
|
||||
else if lib.versionAtLeast ocaml.version "4.07" then "1.15.2" else "1.14.1"
|
||||
}:
|
||||
|
||||
|
|
@ -16,6 +16,7 @@ let p5 = camlp5; in
|
|||
let camlp5 = p5.override { legacy = true; }; in
|
||||
|
||||
let fetched = coqPackages.metaFetch ({
|
||||
release."1.17.0".sha256 = "sha256-DTxE8CvYl0et20pxueydI+WzraI6UPHMNvxyp2gU/+w=";
|
||||
release."1.16.5".sha256 = "sha256-tKX5/cVPoBeHiUe+qn7c5FIRYCwY0AAukN7vSd/Nz9A=";
|
||||
release."1.15.2".sha256 = "sha256-XgopNP83POFbMNyl2D+gY1rmqGg03o++Ngv3zJfCn2s=";
|
||||
release."1.15.0".sha256 = "sha256:1ngdc41sgyzyz3i3lkzjhnj66gza5h912virkh077dyv17ysb6ar";
|
||||
|
|
@ -34,7 +35,7 @@ buildDunePackage rec {
|
|||
pname = "elpi";
|
||||
inherit (fetched) version src;
|
||||
|
||||
patches = lib.optional (lib.versionAtLeast version "1.16" || version == "dev")
|
||||
patches = lib.optional (version == "1.16.5")
|
||||
./atd_2_10.patch;
|
||||
|
||||
minimalOCamlVersion = "4.04";
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
, lib
|
||||
, openssl
|
||||
, zstd
|
||||
, krb5
|
||||
}:
|
||||
|
||||
with self;
|
||||
|
|
@ -426,6 +427,13 @@ with self;
|
|||
'';
|
||||
};
|
||||
|
||||
hex_encode = janePackage {
|
||||
pname = "hex_encode";
|
||||
hash = "sha256-jnsf5T1D1++AUdrato/NO3gTVXu14klXozHFIG9HH/o=";
|
||||
meta.description = "Hexadecimal encoding library";
|
||||
propagatedBuildInputs = [ core ppx_jane ounit ];
|
||||
};
|
||||
|
||||
higher_kinded = janePackage {
|
||||
pname = "higher_kinded";
|
||||
hash = "sha256-aCpYc7f4mrPsGp038YabEyw72cA6GbCKsok+5Hej5P0=";
|
||||
|
|
@ -525,6 +533,13 @@ with self;
|
|||
buildInputs = [ dune-configurator ppx_assert stdio ];
|
||||
};
|
||||
|
||||
krb = janePackage {
|
||||
pname = "krb";
|
||||
hash = "sha256-+XwYKwpl668fZ23YEbL1wW9PlaIIjbP/hHwNanf3dAY=";
|
||||
meta.description = "A library for using Kerberos for both Rpc and Tcp communication";
|
||||
propagatedBuildInputs = [ async base core env_config hex_encode ppx_jane protocol_version_header username_kernel dune-configurator krb5 ];
|
||||
};
|
||||
|
||||
lru_cache = janePackage {
|
||||
pname = "lru_cache";
|
||||
hash = "sha256-FqOBC4kBL9IuFIL4JrVU7iF1AUu+1R/CchR52eyEsa8=";
|
||||
|
|
@ -1184,6 +1199,13 @@ with self;
|
|||
propagatedBuildInputs = [ base ];
|
||||
};
|
||||
|
||||
username_kernel = janePackage {
|
||||
pname = "username_kernel";
|
||||
hash = "sha256-UvFL/M9OsD+SOs9MYMKiKzZilLJHzriop6SPA4bOhZQ=";
|
||||
meta.description = "An identifier for a user";
|
||||
propagatedBuildInputs = [ core ppx_jane ];
|
||||
};
|
||||
|
||||
variantslib = janePackage {
|
||||
pname = "variantslib";
|
||||
hash = "sha256-8NoNkyIP7iEEiei+Q1zrPoJjnWwhCsLsY1vgua22gnw=";
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiolifx-themes";
|
||||
version = "0.4.7";
|
||||
version = "0.4.8";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "Djelibeybi";
|
||||
repo = "aiolifx-themes";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-0zcyMn0Y0UI5S8JGdYVXkK7FBdSHCA0FOmkmXDT9P48=";
|
||||
hash = "sha256-jbL6f6gDH6AxsfuD7mFtvCGKLqy/NKoo5bUmXN9hBrM=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "appthreat-vulnerability-db";
|
||||
version = "5.2.3";
|
||||
version = "5.2.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
owner = "AppThreat";
|
||||
repo = "vulnerability-db";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-HIUBHyuh66PjHRPTFKIq859+tSYnaseQE9GOMduxBP4=";
|
||||
hash = "sha256-h1xpP3fFr8+twa5jXQrZfKFjNAlCvXv7sFvhgJZ88H0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyncsleepiq";
|
||||
version = "1.3.6";
|
||||
version = "1.3.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-h+Q9g0kznGMLLi8i/iKodGXB+f/m3PXoF6h6hhIX9ys=";
|
||||
hash = "sha256-nKXZXOpwVN8Xe1vwwPGPucvyffiIQ8I4D+0A3qGco5w=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "awkward-cpp";
|
||||
version = "21";
|
||||
version = "22";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-sobmPegDBI/4EvdpxrY28TsNO8vyLhuRsV9s+5WThR4=";
|
||||
hash = "sha256-IWeWNvshz+NxX4ijIyaleRmThNstpKYplcMQUC1/6F8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aws-lambda-builders";
|
||||
version = "1.36.0";
|
||||
version = "1.37.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "awslabs";
|
||||
repo = "aws-lambda-builders";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-cHpeNY0WY4yai/yWw2Oy1QLLjlj8PFNdB3BMbkP31Ds=";
|
||||
hash = "sha256-ukHDrxx+Jxlp/Ypg1ltz7WN07X16spNdC7YygJhTBJo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "botocore-stubs";
|
||||
version = "1.31.38";
|
||||
version = "1.31.39";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "botocore_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-ZgduwHPPoW+RPMtudt8GsggJdHhgQNY6mo0pdFnryuc=";
|
||||
hash = "sha256-pqpGnPXZT5lDnTpXBfsJk0/tBtUovgazAWZf/TZJfNg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "casbin";
|
||||
version = "1.25.0";
|
||||
version = "1.26.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = pname;
|
||||
repo = "pycasbin";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-o8pjoVuZLifGOmijJIl2LpjLguYwPLRVB44iFsGe1BM=";
|
||||
hash = "sha256-wM27HW5w8fDjHoGV+OGDTaO5SKJrq8fGKh1EPQt+wlo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -28,14 +28,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "celery";
|
||||
version = "5.3.1";
|
||||
version = "5.3.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-+E0cIaFSDBFsK30mWTkmWBGRQ1oDqnS3fJQbk8ocYhA=";
|
||||
hash = "sha256-uskO+ZtwubW11M/Ov28atRaLhsYSC8fFgUzYI039k4E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -95,6 +95,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Distributed task queue";
|
||||
homepage = "https://github.com/celery/celery/";
|
||||
changelog = "https://github.com/celery/celery/releases/tag/v${version}";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "censys";
|
||||
version = "2.2.4";
|
||||
version = "2.2.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "censys";
|
||||
repo = "censys-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-gCq01lfAoKoS74C8gjj84mZpXDMtdNVaRLwhlEXwiPI=";
|
||||
hash = "sha256-D25deUPMWc6KRlwytSfZqoPeJGmTV304slUP9gCyrUw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,15 +10,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cmaes";
|
||||
version = "0.9.1";
|
||||
disabled = pythonOlder "3.7";
|
||||
version = "0.10.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CyberAgentAILab";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-dd5vLT4Q0cI5ts0WgBpjPtOA81exGNjWSNHEiPggYbg=";
|
||||
hash = "sha256-1mXulG/yqNwKQKDFGBh8uxIYOPSsm8+PNp++CSswc50=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
|
@ -31,6 +32,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python library for CMA evolution strategy";
|
||||
homepage = "https://github.com/CyberAgentAILab/cmaes";
|
||||
changelog = "https://github.com/CyberAgentAILab/cmaes/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.bcdarwin ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "coredis";
|
||||
version = "4.15.1";
|
||||
version = "4.16.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "alisaifee";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-9nojHufUt53Ovoos4gaR7qh1xN8D1+gJOEyFsOndXJU=";
|
||||
hash = "sha256-7qpoNc5/z8/EKtGWULrPPwfH9swYe9TqqUL+zxrFQSk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dataclasses-json";
|
||||
version = "0.5.14";
|
||||
version = "0.5.15";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "lidatong";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-pCvVKHh2elHaukEJNTw8MgJmoTlYjO9aVWFCQXXD13c=";
|
||||
hash = "sha256-ADWNB2Eu4TwlAvchyzBwGiw9YT9McPr9lsNfo1lR1WI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,39 +1,55 @@
|
|||
{ buildPythonPackage
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, loguru
|
||||
, mbstrdecoder
|
||||
, typepy
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, tcolorpy
|
||||
, termcolor
|
||||
, typepy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dataproperty";
|
||||
version = "0.55.0";
|
||||
version = "1.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thombashi";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ODSrKZ8M/ni9r2gkVIKWaKkdr+3AVi4INkEKJ+cmb44=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-adUxUU9eASkC9n5ppZYNN0MP19u4xcL8XziBWSCp2L8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ mbstrdecoder typepy ];
|
||||
propagatedBuildInputs = [
|
||||
mbstrdecoder
|
||||
typepy
|
||||
tcolorpy
|
||||
] ++ typepy.optional-dependencies.datetime;
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
checkInputs = [ termcolor ];
|
||||
passthru.optional-dependencies = {
|
||||
logging = [
|
||||
loguru
|
||||
];
|
||||
};
|
||||
|
||||
# Tests fail, even on non-nixos
|
||||
pytestFlagsArray = [
|
||||
"--deselect test/test_dataproperty.py::Test_DataPeroperty_len::test_normal_ascii_escape_sequence"
|
||||
"--deselect test/test_dataproperty.py::Test_DataPeroperty_is_include_ansi_escape::test_normal"
|
||||
"--deselect test/test_dataproperty.py::Test_DataPeroperty_repr::test_normal"
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
termcolor
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"dataproperty"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for extracting properties from data";
|
||||
homepage = "https://github.com/thombashi/dataproperty";
|
||||
description = "A library for extracting properties from data";
|
||||
maintainers = with maintainers; [ genericnerdyusername ];
|
||||
changelog = "https://github.com/thombashi/DataProperty/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ genericnerdyusername ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue