Merge branch 'master' into staging-next
This commit is contained in:
Weijia Wang
commit
eb5334c27d
160 changed files with 2233 additions and 2022 deletions
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
## Using Ruby {#using-ruby}
|
||||
|
||||
Several versions of Ruby interpreters are available on Nix, as well as over 250 gems and many applications written in Ruby. The attribute `ruby` refers to the default Ruby interpreter, which is currently MRI 2.6. It's also possible to refer to specific versions, e.g. `ruby_2_y`, `jruby`, or `mruby`.
|
||||
Several versions of Ruby interpreters are available on Nix, as well as over 250 gems and many applications written in Ruby. The attribute `ruby` refers to the default Ruby interpreter, which is currently MRI 3.1. It's also possible to refer to specific versions, e.g. `ruby_3_y`, `jruby`, or `mruby`.
|
||||
|
||||
In the Nixpkgs tree, Ruby packages can be found throughout, depending on what they do, and are called from the main package set. Ruby gems, however are separate sets, and there's one default set for each interpreter (currently MRI only).
|
||||
|
||||
There are two main approaches for using Ruby with gems. One is to use a specifically locked `Gemfile` for an application that has very strict dependencies. The other is to depend on the common gems, which we'll explain further down, and rely on them being updated regularly.
|
||||
|
||||
The interpreters have common attributes, namely `gems`, and `withPackages`. So you can refer to `ruby.gems.nokogiri`, or `ruby_2_7.gems.nokogiri` to get the Nokogiri gem already compiled and ready to use.
|
||||
The interpreters have common attributes, namely `gems`, and `withPackages`. So you can refer to `ruby.gems.nokogiri`, or `ruby_3_2.gems.nokogiri` to get the Nokogiri gem already compiled and ready to use.
|
||||
|
||||
Since not all gems have executables like `nokogiri`, it's usually more convenient to use the `withPackages` function like this: `ruby.withPackages (p: with p; [ nokogiri ])`. This will also make sure that the Ruby in your environment will be able to find the gem and it can be used in your Ruby code (for example via `ruby` or `irb` executables) via `require "nokogiri"` as usual.
|
||||
|
||||
|
|
@ -33,7 +33,7 @@ Again, it's possible to launch the interpreter from the shell. The Ruby interpre
|
|||
#### Load Ruby environment from `.nix` expression {#load-ruby-environment-from-.nix-expression}
|
||||
|
||||
As explained [in the `nix-shell` section](https://nixos.org/manual/nix/stable/command-ref/nix-shell) of the Nix manual, `nix-shell` can also load an expression from a `.nix` file.
|
||||
Say we want to have Ruby 2.6, `nokogori`, and `pry`. Consider a `shell.nix` file with:
|
||||
Say we want to have Ruby, `nokogori`, and `pry`. Consider a `shell.nix` file with:
|
||||
|
||||
```nix
|
||||
with import <nixpkgs> {};
|
||||
|
|
@ -114,7 +114,7 @@ With this file in your directory, you can run `nix-shell` to build and use the g
|
|||
|
||||
The `bundlerEnv` is a wrapper over all the gems in your gemset. This means that all the `/lib` and `/bin` directories will be available, and the executables of all gems (even of indirect dependencies) will end up in your `$PATH`. The `wrappedRuby` provides you with all executables that come with Ruby itself, but wrapped so they can easily find the gems in your gemset.
|
||||
|
||||
One common issue that you might have is that you have Ruby 2.6, but also `bundler` in your gemset. That leads to a conflict for `/bin/bundle` and `/bin/bundler`. You can resolve this by wrapping either your Ruby or your gems in a `lowPrio` call. So in order to give the `bundler` from your gemset priority, it would be used like this:
|
||||
One common issue that you might have is that you have Ruby, but also `bundler` in your gemset. That leads to a conflict for `/bin/bundle` and `/bin/bundler`. You can resolve this by wrapping either your Ruby or your gems in a `lowPrio` call. So in order to give the `bundler` from your gemset priority, it would be used like this:
|
||||
|
||||
```nix
|
||||
# ...
|
||||
|
|
|
|||
|
|
@ -534,7 +534,7 @@
|
|||
name = "James Alexander Feldman-Crough";
|
||||
};
|
||||
afontain = {
|
||||
email = "antoine.fontaine@epfl.ch";
|
||||
email = "afontain@posteo.net";
|
||||
github = "necessarily-equal";
|
||||
githubId = 59283660;
|
||||
name = "Antoine Fontaine";
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
|||
The `nimPackages` and `nim2Packages` sets have been removed.
|
||||
See https://nixos.org/manual/nixpkgs/unstable#nim for more information.
|
||||
|
||||
- [Portunus](https://github.com/majewsky/portunus) has been updated to 2.0.
|
||||
- [Portunus](https://github.com/majewsky/portunus) has been updated to major version 2.
|
||||
This version of Portunus supports strong password hashes, but the legacy hash SHA-256 is also still supported to ensure a smooth migration of existing user accounts.
|
||||
After upgrading, follow the instructions on the [upstream release notes](https://github.com/majewsky/portunus/releases/tag/v2.0.0) to upgrade all user accounts to strong password hashes.
|
||||
Support for weak password hashes will be removed in NixOS 24.11.
|
||||
|
|
|
|||
|
|
@ -22,11 +22,19 @@ let
|
|||
})
|
||||
(builtins.genList guixBuildUser numberOfUsers));
|
||||
|
||||
# A set of Guix user profiles to be linked at activation.
|
||||
# A set of Guix user profiles to be linked at activation. All of these should
|
||||
# be default profiles managed by Guix CLI and the profiles are located in
|
||||
# `${cfg.stateDir}/profiles/per-user/$USER/$PROFILE`.
|
||||
guixUserProfiles = {
|
||||
# The current Guix profile that is created through `guix pull`.
|
||||
# The default Guix profile managed by `guix pull`. Take note this should be
|
||||
# the profile with the most precedence in `PATH` env to let users use their
|
||||
# updated versions of `guix` CLI.
|
||||
"current-guix" = "\${XDG_CONFIG_HOME}/guix/current";
|
||||
|
||||
# The default Guix home profile. This profile contains more than exports
|
||||
# such as an activation script at `$GUIX_HOME_PROFILE/activate`.
|
||||
"guix-home" = "$HOME/.guix-home/profile";
|
||||
|
||||
# The default Guix profile similar to $HOME/.nix-profile from Nix.
|
||||
"guix-profile" = "$HOME/.guix-profile";
|
||||
};
|
||||
|
|
@ -256,20 +264,31 @@ in
|
|||
# ephemeral setups where only certain part of the filesystem is
|
||||
# persistent (e.g., "Erase my darlings"-type of setup).
|
||||
system.userActivationScripts.guix-activate-user-profiles.text = let
|
||||
guixProfile = profile: "${cfg.stateDir}/guix/profiles/per-user/\${USER}/${profile}";
|
||||
linkProfile = profile: location: let
|
||||
userProfile = guixProfile profile;
|
||||
in ''
|
||||
[ -d "${userProfile}" ] && ln -sfn "${userProfile}" "${location}"
|
||||
'';
|
||||
linkProfileToPath = acc: profile: location: let
|
||||
guixProfile = "${cfg.stateDir}/guix/profiles/per-user/\${USER}/${profile}";
|
||||
in acc + ''
|
||||
[ -d "${guixProfile}" ] && [ -L "${location}" ] || ln -sf "${guixProfile}" "${location}"
|
||||
'';
|
||||
in acc + (linkProfile profile location);
|
||||
|
||||
activationScript = lib.foldlAttrs linkProfileToPath "" guixUserProfiles;
|
||||
# This should contain export-only Guix user profiles. The rest of it is
|
||||
# handled manually in the activation script.
|
||||
guixUserProfiles' = lib.attrsets.removeAttrs guixUserProfiles [ "guix-home" ];
|
||||
|
||||
linkExportsScript = lib.foldlAttrs linkProfileToPath "" guixUserProfiles';
|
||||
in ''
|
||||
# Don't export this please! It is only expected to be used for this
|
||||
# activation script and nothing else.
|
||||
XDG_CONFIG_HOME=''${XDG_CONFIG_HOME:-$HOME/.config}
|
||||
|
||||
# Linking the usual Guix profiles into the home directory.
|
||||
${activationScript}
|
||||
${linkExportsScript}
|
||||
|
||||
# Activate all of the default Guix non-exports profiles manually.
|
||||
${linkProfile "guix-home" "$HOME/.guix-home"}
|
||||
[ -L "$HOME/.guix-home" ] && "$HOME/.guix-home/activate"
|
||||
'';
|
||||
|
||||
# GUIX_LOCPATH is basically LOCPATH but for Guix libc which in turn used by
|
||||
|
|
|
|||
|
|
@ -249,6 +249,7 @@ in
|
|||
acmeDirectory = config.security.acme.certs."${cfg.domain}".directory;
|
||||
in
|
||||
{
|
||||
PORTUNUS_SERVER_HTTP_SECURE = "true";
|
||||
PORTUNUS_SLAPD_TLS_CA_CERTIFICATE = "/etc/ssl/certs/ca-certificates.crt";
|
||||
PORTUNUS_SLAPD_TLS_CERTIFICATE = "${acmeDirectory}/cert.pem";
|
||||
PORTUNUS_SLAPD_TLS_DOMAIN_NAME = cfg.domain;
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ in
|
|||
enable = mkEnableOption (lib.mdDoc "Redmine");
|
||||
|
||||
package = mkPackageOption pkgs "redmine" {
|
||||
example = "redmine.override { ruby = pkgs.ruby_2_7; }";
|
||||
example = "redmine.override { ruby = pkgs.ruby_3_2; }";
|
||||
};
|
||||
|
||||
user = mkOption {
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ let
|
|||
jsonFormat = pkgs.formats.json {};
|
||||
|
||||
defaultPHPSettings = {
|
||||
output_buffering = "0";
|
||||
short_open_tag = "Off";
|
||||
expose_php = "Off";
|
||||
error_reporting = "E_ALL & ~E_DEPRECATED & ~E_STRICT";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "btcd";
|
||||
version = "0.23.4";
|
||||
version = "0.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "btcsuite";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-X1kfr6jrVArm0HK0XiN/93OPxqPo8J4U+qglJAf23+A=";
|
||||
hash = "sha256-TLnJZW2CkvAqPTnJKfBY41siHtdZ+HRABsc+4vnQ9/w=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3w8rb0sfAIFCXqPXOKb4QwoLd7WsbFv3phu/rJCEjeY=";
|
||||
vendorHash = "sha256-quJEpSDltXhJcgI9H707p3HeLj1uuLzaMplT+YXzh/4=";
|
||||
|
||||
subPackages = [ "." "cmd/*" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
|||
mktplcRef = {
|
||||
name = "lua";
|
||||
publisher = "sumneko";
|
||||
version = "3.6.19";
|
||||
sha256 = "sha256-7f8zovJS1lNwrUryxgadrBbNRw/OwFqry57JWKY1D8E=";
|
||||
version = "3.7.3";
|
||||
sha256 = "sha256-JsZrCeT843QvQkebyOVlO9MI2xbEQI8xX0DrPacfGrM=";
|
||||
};
|
||||
|
||||
# Running chmod in runtime will lock up extension
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
--- a/client/out/languageserver.js
|
||||
+++ b/client/out/languageserver.js
|
||||
@@ -145,11 +145,9 @@
|
||||
@@ -164,11 +164,9 @@ class LuaClient extends vscode_1.Disposable {
|
||||
break;
|
||||
case "linux":
|
||||
command = this.context.asAbsolutePath(path.join('server', binDir ? binDir : 'bin-Linux', 'lua-language-server'));
|
||||
- yield fs.promises.chmod(command, '777');
|
||||
command = this.context.asAbsolutePath(path.join("server", binDir ? binDir : "bin-Linux", "lua-language-server"));
|
||||
- yield fs.promises.chmod(command, "777");
|
||||
break;
|
||||
case "darwin":
|
||||
command = this.context.asAbsolutePath(path.join('server', binDir ? binDir : 'bin-macOS', 'lua-language-server'));
|
||||
- yield fs.promises.chmod(command, '777');
|
||||
command = this.context.asAbsolutePath(path.join("server", binDir ? binDir : "bin-macOS", "lua-language-server"));
|
||||
- yield fs.promises.chmod(command, "777");
|
||||
break;
|
||||
default:
|
||||
throw new Error(`Unsupported operating system "${platform}"!`);
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt
|
||||
index 82a52da89a7e..5127dc1d8f41 100644
|
||||
--- a/bindings/python/CMakeLists.txt
|
||||
+++ b/bindings/python/CMakeLists.txt
|
||||
@@ -160,7 +160,7 @@ function(finish_swig_python swig_target lldb_python_bindings_dir lldb_python_tar
|
||||
if(LLDB_BUILD_FRAMEWORK)
|
||||
set(LLDB_PYTHON_INSTALL_PATH ${LLDB_FRAMEWORK_INSTALL_DIR}/LLDB.framework/Versions/${LLDB_FRAMEWORK_VERSION}/Resources/Python)
|
||||
else()
|
||||
- set(LLDB_PYTHON_INSTALL_PATH ${LLDB_PYTHON_RELATIVE_PATH})
|
||||
+ set(LLDB_PYTHON_INSTALL_PATH ${CMAKE_INSTALL_LIBDIR}/../${LLDB_PYTHON_RELATIVE_PATH})
|
||||
endif()
|
||||
if (NOT CMAKE_CFG_INTDIR STREQUAL ".")
|
||||
string(REPLACE ${CMAKE_CFG_INTDIR} "\$\{CMAKE_INSTALL_CONFIG_NAME\}" LLDB_PYTHON_INSTALL_PATH ${LLDB_PYTHON_INSTALL_PATH})
|
||||
|
|
@ -13,12 +13,6 @@ in (llvmPackages.lldb.overrideAttrs (oldAttrs: rec {
|
|||
inherit llvmSrc;
|
||||
};
|
||||
|
||||
patches = oldAttrs.patches ++ [
|
||||
# backport of https://github.com/NixOS/nixpkgs/commit/0d3002334850a819d1a5c8283c39f114af907cd4
|
||||
# remove when https://github.com/NixOS/nixpkgs/issues/166604 fixed
|
||||
./fix-python-installation.patch
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
# installCheck for lldb_14 currently broken
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cubiomes-viewer";
|
||||
version = "3.3.0";
|
||||
version = "3.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Cubitect";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-V6zPbL1/tP2B38wo4a05+vXCSjPE1YKpMR3zl/BbnY8=";
|
||||
sha256 = "sha256-HtwTPY/SJ3dQd5S0GLVjS/xkjo/hk6cQF5aqFx+bPEQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
let
|
||||
pname = "joplin-desktop";
|
||||
version = "2.13.11";
|
||||
version = "2.13.12";
|
||||
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
throwSystem = throw "Unsupported system: ${system}";
|
||||
|
|
@ -16,9 +16,9 @@ let
|
|||
src = fetchurl {
|
||||
url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}${suffix}";
|
||||
sha256 = {
|
||||
x86_64-linux = "sha256-YkNtvgPAYD7Rw72QoMHqRN24K1RB1GR8W9ka8wCUA8w=";
|
||||
x86_64-darwin = "sha256-/T8OkTIIQ6ApnL0y5+xRdkQlByzXSwrpw5wXqbhoSoE=";
|
||||
aarch64-darwin = "sha256-OM+Le2c1esvE8+QwAMpXc03yLUwxibKRRc37WaTGnTs=";
|
||||
x86_64-linux = "sha256-h+aprE7D2bZcKgBoOKwPGgiM2Yo05c3TZaR1elOsp70=";
|
||||
x86_64-darwin = "sha256-4VHipPJ3Tkf7NSy7sytk793ApOQm7cRsl5DNO0xjpIw=";
|
||||
aarch64-darwin = "sha256-LW7myTExWblFDke/o/E7tNBRBrkyNkOvnHiztIT7x3Q=";
|
||||
}.${system} or throwSystem;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "phockup";
|
||||
version = "1.10.1";
|
||||
version = "1.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ivandokov";
|
||||
repo = "phockup";
|
||||
rev = version;
|
||||
sha256 = "sha256-wnTdNzH/2Lcr3FXqm84ITiAmbKpFWLo/0/cf0fCv+4M=";
|
||||
sha256 = "sha256-44UjxTbC2XK+NThvesROdd7aGP7zr7g7bQiQZv2TvvM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -9,12 +9,12 @@ with python3Packages;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "vit";
|
||||
version = "2.2.0";
|
||||
version = "2.3.2";
|
||||
disabled = lib.versionOlder python.version "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-6GbIc5giuecxUqswyaAJw675R1M8BvelyyRNFcTqKW8=";
|
||||
sha256 = "sha256-qDfY6GWnDQ44Sh540xQzDwANEI+mLjpy2a7G3sfKIzw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -246,17 +246,9 @@ let
|
|||
# (we currently package 1.26 in Nixpkgs while Chromium bundles 1.21):
|
||||
# Source: https://bugs.chromium.org/p/angleproject/issues/detail?id=7582#c1
|
||||
./patches/angle-wayland-include-protocol.patch
|
||||
] ++ lib.optionals (!chromiumVersionAtLeast "120") [
|
||||
# We need to revert this patch to build M114+ with LLVM 16:
|
||||
(githubPatch {
|
||||
# Reland [clang] Disable autoupgrading debug info in ThinLTO builds
|
||||
commit = "54969766fd2029c506befc46e9ce14d67c7ed02a";
|
||||
hash = "sha256-Vryjg8kyn3cxWg3PmSwYRG6zrHOqYWBMSdEMGiaPg6M=";
|
||||
revert = true;
|
||||
})
|
||||
] ++ lib.optionals (chromiumVersionAtLeast "120") [
|
||||
# We need to revert this patch to build M120+ with LLVM 16:
|
||||
./patches/chromium-120-llvm-16.patch
|
||||
# We need to revert this patch to build M120+ with LLVM 17:
|
||||
./patches/chromium-120-llvm-17.patch
|
||||
] ++ lib.optionals (!chromiumVersionAtLeast "119.0.6024.0") [
|
||||
# Fix build with at-spi2-core ≥ 2.49
|
||||
# This version is still needed for electron.
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ let
|
|||
# Sometimes we access `llvmPackages` via `pkgs`, and other times
|
||||
# via `pkgsFooBar`, so a string (attrname) is the only way to have
|
||||
# a single point of control over the LLVM version used.
|
||||
llvmPackages_attrName = "llvmPackages_16";
|
||||
llvmPackages_attrName = "llvmPackages_17";
|
||||
stdenv = pkgs.${llvmPackages_attrName}.stdenv;
|
||||
|
||||
# Helper functions for changes that depend on specific versions:
|
||||
|
|
|
|||
|
|
@ -27,17 +27,3 @@ index de1cd6e..bb5700b 100644
|
|||
# TODO(crbug.com/1235145): Investigate why/if this should be needed.
|
||||
if (is_win) {
|
||||
cflags += [ "/clang:-ffp-contract=off" ]
|
||||
@@ -800,13 +782,6 @@ config("compiler") {
|
||||
if (is_apple) {
|
||||
ldflags += [ "-Wcrl,object_path_lto" ]
|
||||
}
|
||||
- if (!is_chromeos) {
|
||||
- # TODO(https://crbug.com/972449): turn on for ChromeOS when that
|
||||
- # toolchain has this flag.
|
||||
- # We only use one version of LLVM within a build so there's no need to
|
||||
- # upgrade debug info, which can be expensive since it runs the verifier.
|
||||
- ldflags += [ "-Wl,-mllvm,-disable-auto-upgrade-debug-info" ]
|
||||
- }
|
||||
}
|
||||
|
||||
# TODO(https://crbug.com/1211155): investigate why this isn't effective on
|
||||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "aiac";
|
||||
version = "4.0.0";
|
||||
version = "4.1.0";
|
||||
excludedPackages = [".ci"];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gofireflyio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-OXqHZlVo1rFt/hJbc14faXTbckLx9CvsL131qj6G1dw=";
|
||||
hash = "sha256-X3KmqKltoIFyMjLF1h8EN3RLbZ+EZu0mOH2koN0FJh8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JWQQUB4/yIDGzWeshtcWnkXQS7jYcDHwG/tef6sBizQ=";
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ appimageTools.wrapType2 {
|
|||
homepage = "https://github.com/MuhammedKalkan/OpenLens";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ benwbooth sebtm ];
|
||||
mainProgram = "openlens";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,8 +8,11 @@
|
|||
, qtmultimedia
|
||||
, qtlocation
|
||||
, qqc2-desktop-style
|
||||
, kirigami-addons
|
||||
, kirigami2
|
||||
, kio
|
||||
, knotifications
|
||||
, kquickimageedit
|
||||
, zxing-cpp
|
||||
, qxmpp
|
||||
, sonnet
|
||||
|
|
@ -18,14 +21,14 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "kaidan";
|
||||
version = "0.8.0";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "invent.kde.org";
|
||||
owner = "network";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "070njci5zyzahmz3nqyp660chxnqx1mxp31w17syfllvrw403qmg";
|
||||
hash = "sha256-F5GhN9hAF2e8b0T3peUnLk8CVd+nq4YR8k52x6ZOoLM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ];
|
||||
|
|
@ -35,8 +38,11 @@ mkDerivation rec {
|
|||
qtmultimedia
|
||||
qtlocation
|
||||
qqc2-desktop-style
|
||||
kirigami-addons
|
||||
kirigami2
|
||||
kio
|
||||
knotifications
|
||||
kquickimageedit
|
||||
zxing-cpp
|
||||
qxmpp
|
||||
sonnet
|
||||
|
|
|
|||
|
|
@ -80,14 +80,14 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "telegram-desktop";
|
||||
version = "4.13.1";
|
||||
version = "4.14.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "telegramdesktop";
|
||||
repo = "tdesktop";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-WhctvEmOGOxkVQUC84BcC4Td5GUEpY7dOG5La6lTv8E=";
|
||||
hash = "sha256-1awdqojy2nWUtrK/VS8ALCK47rGWpS8Q6H2LciG2ymw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -222,6 +222,7 @@ stdenv.mkDerivation rec {
|
|||
"-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c"
|
||||
# See: https://github.com/NixOS/nixpkgs/pull/130827#issuecomment-885212649
|
||||
"-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF"
|
||||
"-DDESKTOP_APP_DISABLE_SCUDO=ON"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
|
|
|
|||
|
|
@ -5,20 +5,20 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "lieer";
|
||||
version = "1.4";
|
||||
version = "1.5";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gauteh";
|
||||
repo = "lieer";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-2LujfvsxMHHmYjYOnLJaLdSlzDeej+ehUr4YfVe903U=";
|
||||
sha256 = "sha256-z3OGCjLsOi6K1udChlSih8X6e2qvT8kNhh2PWBGB9zU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
notmuch2
|
||||
oauth2client
|
||||
google-api-python-client
|
||||
google-auth-oauthlib
|
||||
tqdm
|
||||
setuptools
|
||||
];
|
||||
|
|
@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec {
|
|||
'';
|
||||
homepage = "https://lieer.gaute.vetsj.com/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ flokli ];
|
||||
maintainers = with maintainers; [ archer-65 flokli ];
|
||||
mainProgram = "gmi";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
, ninja
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "modem-manager-gui";
|
||||
version = "0.0.20";
|
||||
|
||||
|
|
@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
|
|||
domain = "salsa.debian.org";
|
||||
owner = "debian";
|
||||
repo = "modem-manager-gui";
|
||||
rev = "upstream%2F${version}";
|
||||
sha256 = "1pjx4rbsxa7gcs628yjkwb0zqrm5xq8pkmp0cfk4flfk1ryflmgr";
|
||||
rev = "upstream/${finalAttrs.version}";
|
||||
hash = "sha256-+VXqfA7TUUemY+DWeRHupWb8weJTeiSMZu+orlcmXd4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -49,19 +49,19 @@ stdenv.mkDerivation rec {
|
|||
# Fix missing tray icon
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/debian/modem-manager-gui/-/raw/7c3e67a1cf7788d7a4b86be12803870d79aa27f2/debian/patches/fix-tray-icon.patch";
|
||||
sha256 = "sha256-9LjCEQl8YfraVlO1W7+Yy7egLAPu5YfnvGvCI3uGFh8=";
|
||||
hash = "sha256-9LjCEQl8YfraVlO1W7+Yy7egLAPu5YfnvGvCI3uGFh8=";
|
||||
})
|
||||
# Fix build with meson 0.61
|
||||
# appdata/meson.build:3:5: ERROR: Function does not take positional arguments.
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/debian/modem-manager-gui/-/raw/7c3e67a1cf7788d7a4b86be12803870d79aa27f2/debian/patches/meson0.61.patch";
|
||||
sha256 = "sha256-B+tBPIz5RxOwZWYEWttqSKGw2Wbfk0mnBY0Zy0evvAQ=";
|
||||
hash = "sha256-B+tBPIz5RxOwZWYEWttqSKGw2Wbfk0mnBY0Zy0evvAQ=";
|
||||
})
|
||||
# Fix segfault on launch: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1004258
|
||||
# Segmentation fault at address: 0x20
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/debian/modem-manager-gui/-/commit/8ccffd6dd6b42625d09d5408f37f155d91411116.patch";
|
||||
sha256 = "sha256-q+B+Bcm3uitJ2IfkCiMo3reFV1C06ekmy1vXWC0oHnw=";
|
||||
hash = "sha256-q+B+Bcm3uitJ2IfkCiMo3reFV1C06ekmy1vXWC0oHnw=";
|
||||
})
|
||||
];
|
||||
|
||||
|
|
@ -83,4 +83,4 @@ stdenv.mkDerivation rec {
|
|||
platforms = platforms.linux;
|
||||
mainProgram = "modem-manager-gui";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
2197
pkgs/applications/networking/mullvad/Cargo.lock
generated
2197
pkgs/applications/networking/mullvad/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, mullvad
|
||||
, fetchpatch
|
||||
}:
|
||||
buildGoModule {
|
||||
pname = "libwg";
|
||||
|
|
@ -12,7 +13,7 @@ buildGoModule {
|
|||
|
||||
sourceRoot = "${mullvad.src.name}/wireguard/libwg";
|
||||
|
||||
vendorHash = "sha256-QNde5BqkSuqp3VJQOhn7aG6XknRDZQ62PE3WGhEJ5LU=";
|
||||
vendorHash = "sha256-MQ5tVbcwMee6lmPyKSsNBh9jrz4zwx7INf1Cb0GxjHo=";
|
||||
|
||||
# XXX: hack to make the ar archive go to the correct place
|
||||
# This is necessary because passing `-o ...` to `ldflags` does not work
|
||||
|
|
@ -21,13 +22,23 @@ buildGoModule {
|
|||
GOBIN = "${placeholder "out"}/lib";
|
||||
ldflags = [ "-s" "-w" "-buildmode=c-archive" ];
|
||||
|
||||
patches = [
|
||||
# build broken without wintun reference
|
||||
# https://github.com/mullvad/mullvadvpn-app/pull/5621
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mullvad/mullvadvpn-app/commit/5dff68ac9c8ec26f1a39a7f44e3b684bb0833bf1.patch";
|
||||
hash = "sha256-bUcDVmrrDblK7OJvHqf627vzVwmmvO2EL+sioAnZGbk=";
|
||||
relative = "wireguard/libwg";
|
||||
})
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/lib/libwg{,.a}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tiny wrapper around wireguard-go";
|
||||
homepage = "https://github.com/mullvad/mullvadvpn-app/tree/master/wireguard/libwg";
|
||||
homepage = "https://github.com/mullvad/mullvadvpn-app/tree/main/wireguard/libwg";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ cole-h ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -17,20 +17,19 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mullvad";
|
||||
version = "2023.5";
|
||||
version = "2023.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mullvad";
|
||||
repo = "mullvadvpn-app";
|
||||
rev = version;
|
||||
hash = "sha256-bu16U9XJiIuYG9Npljos2ytfloSoGIl1ayH43w0aeKY=";
|
||||
hash = "sha256-O4YnHwG5GUDR7MzGsuLnElcczEct+P+4/Vn/eAoo6/s=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"nix-0.26.1" = "sha256-b5bLeZVNbJE7aBnyzl0qvo0mXFeXa4hAZiuT1VJiFLk=";
|
||||
"shadowsocks-1.15.3" = "sha256-P35IQL2sAfrtjwMDn8k/kmkk2IMsvq6zICRRGUGfqJI=";
|
||||
"udp-over-tcp-0.3.0" = "sha256-5PeaM7/zhux1UdlaKpnQ2yIdmFy1n2weV/ux9lSRha4=";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -24,11 +24,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "liferea";
|
||||
version = "1.15.4";
|
||||
version = "1.15.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
|
||||
hash = "sha256-twczHU41xXJvBg4nTQyJrmNCCSoJWAnRLs4DV0uKpjE=";
|
||||
hash = "sha256-7lanrs63N6ZnqxvjcW/+cUZVDqUbML2gftQUc/sLr3Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "seaweedfs";
|
||||
version = "3.59";
|
||||
version = "3.60";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "seaweedfs";
|
||||
repo = "seaweedfs";
|
||||
rev = version;
|
||||
hash = "sha256-askngehfEBJzJG0MVBA4WCRUPDELWlwJWcRPH6gTvzw=";
|
||||
hash = "sha256-OfRqcoFhPjA8Trj5tXnyDxhl587v6Okc7h/5LUdi7lo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-o+moq4arkQLQZcsW4Tahpv1MpGRHwMv+IL5E03W0U5c=";
|
||||
vendorHash = "sha256-9i11Kf6rIS1ktHMCk9y3+e0u1hDGNRP/oHKWpOVayy4=";
|
||||
|
||||
subPackages = [ "weed" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,18 +5,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "storj-uplink";
|
||||
version = "1.92.1";
|
||||
version = "1.93.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "storj";
|
||||
repo = "storj";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-yeKI8vOuYFhABz09awPuCmjrifLttvBq1kaxMf78/HI=";
|
||||
hash = "sha256-3q3z5dYFjBpBbwj64Kp2fiTmxn2PUgc0DGJBMR71yN0=";
|
||||
};
|
||||
|
||||
subPackages = [ "cmd/uplink" ];
|
||||
|
||||
vendorHash = "sha256-odtCBLg04gG1ztyDLdBADhdEhMkrizNjOGymAtzXy9g=";
|
||||
vendorHash = "sha256-1K74yoMMeMzjldMjZVmmCJRrLYBrVmmOgqqCA1CBzrQ=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
diff --git a/lib/bookletimposer/config.py b/lib/bookletimposer/config.py
|
||||
index 8f107a4..d4d335d 100644
|
||||
--- a/lib/bookletimposer/config.py
|
||||
+++ b/lib/bookletimposer/config.py
|
||||
@@ -45,14 +41,7 @@ def debug(msg):
|
||||
|
||||
|
||||
def get_sharedir():
|
||||
- if debug_enabled and os.path.exists(os.path.join("/", "usr", "local",
|
||||
- "share",
|
||||
- "bookletimposer")):
|
||||
- return os.path.join("/", "usr", "local", "share")
|
||||
- elif os.path.exists(os.path.join("/", "usr", "share", "bookletimposer")):
|
||||
- return os.path.join("/", "usr", "share")
|
||||
- else:
|
||||
- return ""
|
||||
+ return os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "..", "..", "share"))
|
||||
|
||||
|
||||
def get_datadir():
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
{ lib
|
||||
, fetchFromGitLab
|
||||
, python3
|
||||
, intltool
|
||||
, pandoc
|
||||
, gobject-introspection
|
||||
, wrapGAppsHook
|
||||
, gtk3
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "bookletimposer";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "git.codecoop.org";
|
||||
owner = "kjo";
|
||||
repo = "bookletimposer";
|
||||
rev = version;
|
||||
sha256 = "sha256-AEpvsFBJfyqLucC0l4AN/nA2+aYBR50BEgAcNDJBSqg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./i18n.patch
|
||||
./configdir.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ intltool pandoc wrapGAppsHook gobject-introspection ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
gtk3
|
||||
(python3.withPackages (ps: with ps; [ distutils-extra pypdf2 pygobject3 ]))
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://kjo.herbesfolles.org/bookletimposer/";
|
||||
description = "A utility to achieve some basic imposition on PDF documents, especially designed to work on booklets";
|
||||
platforms = lib.platforms.linux;
|
||||
license = "GPL-3.0-or-later";
|
||||
maintainers = with lib.maintainers; [ afontain ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
--- a/setup.cfg 2022-06-04 17:10:10.477581502 +0200
|
||||
+++ b/setup.cfg 2022-06-04 17:10:15.185594382 +0200
|
||||
@@ -1,6 +1,3 @@
|
||||
[build]
|
||||
icons=False
|
||||
help=True
|
||||
-
|
||||
-[build_i18n]
|
||||
-domain=bookletimposer
|
||||
--- a/setup.py 2022-06-04 17:25:18.020872735 +0200
|
||||
+++ b/setup.py 2022-06-04 17:25:23.075884898 +0200
|
||||
@@ -115,7 +115,6 @@ It allows:
|
||||
requires = ['gtk', 'PyPDF2'],
|
||||
cmdclass = { "build" : build_extra.build_extra,
|
||||
"build_uiheaders" : build_uiheaders,
|
||||
- "build_i18n" : build_i18n.build_i18n,
|
||||
"build_help" : build_help.build_help,
|
||||
"build_icons" : build_icons.build_icons,
|
||||
"build_man" : build_man,
|
||||
|
|
@ -18,11 +18,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnote";
|
||||
version = "45.0";
|
||||
version = "45.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-XRb9h9FA7HL7s1ewVp2u+4Io4HgUcBVG5r3mVyGTwko=";
|
||||
hash = "sha256-nuwn+MsKENL9uRSkUei4QYwmDni/BzYHgaeKXkGM+UE=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,25 +15,25 @@ let
|
|||
in
|
||||
mkYarnPackage rec {
|
||||
pname = "micropad";
|
||||
version = "4.4.0";
|
||||
version = "4.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MicroPad";
|
||||
repo = "Micropad-Electron";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VK3sSXYW/Dev7jCdkgrU9PXFbJ6+R2hy6QMRjj6bJ5M=";
|
||||
hash = "sha256-z+g+FwmoX4Qqf+v4BVLCtfrXwGiAUFlPLQQhp2CMhLU=";
|
||||
};
|
||||
|
||||
micropad-core = fetchzip {
|
||||
url = "https://github.com/MicroPad/MicroPad-Core/releases/download/v${version}/micropad.tar.xz";
|
||||
hash = "sha256-KfS13p+mjIh7VShVCT6vFuQY0e/EO/sENOx4GPAORHU=";
|
||||
hash = "sha256-y13PVA/AKKsc5q7NDwZFasb7fOo+56IW8qbTbsm2WWc=";
|
||||
};
|
||||
|
||||
packageJSON = ./package.json;
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${src}/yarn.lock";
|
||||
hash = "sha256-8M0VZI5I4fLoLLmXkIVeCqouww+CyiXbd+vJc8+2tIs=";
|
||||
hash = "sha256-ESYSHuHLNsn3EYKIe2p0kg142jyC0USB+Ef//oGeF08=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ copyDesktopItems makeWrapper ]
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "micropad",
|
||||
"version": "4.4.0",
|
||||
"version": "4.5.1",
|
||||
"description": "A powerful note-taking app that helps you organise + take notes without restrictions.",
|
||||
"main": "main.js",
|
||||
"scripts": {
|
||||
|
|
@ -28,8 +28,8 @@
|
|||
"@types/mime": "^3.0.1",
|
||||
"@types/node": "^18.7.18",
|
||||
"@types/typo-js": "^1.2.1",
|
||||
"electron": "^27.0.2",
|
||||
"electron-builder": "^24.6.4",
|
||||
"electron": "^28.1.0",
|
||||
"electron-builder": "^24.9.1",
|
||||
"typescript": "~5.2.2"
|
||||
},
|
||||
"dependencies": {
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
, lib
|
||||
, mkDerivation
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, wafHook
|
||||
, pkg-config
|
||||
, cmake
|
||||
|
|
@ -26,21 +25,16 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "semantik";
|
||||
version = "1.2.7";
|
||||
version = "1.2.10";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "ita1024";
|
||||
repo = "semantik";
|
||||
rev = "semantik-${version}";
|
||||
sha256 = "sha256-aXOokji6fYTpaeI/IIV+5RnTE2Cm8X3WfADf4Uftkss=";
|
||||
hash = "sha256-qJ6MGxnxXcibF2qXZ2w7Ey/aBIEIx8Gg0dM2PnCl09Y=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-kdelibs4support.patch";
|
||||
url = "https://gitlab.com/ita1024/semantik/-/commit/a991265bd6e3ed6541f8ec099420bc08cc62e30c.patch";
|
||||
sha256 = "sha256-E4XjdWfUnqhmFJs9ORznHoXMDS9zHWNXvQIKKkN4AAo=";
|
||||
})
|
||||
./qt5.patch
|
||||
];
|
||||
|
||||
|
|
@ -90,11 +84,11 @@ mkDerivation rec {
|
|||
];
|
||||
|
||||
meta = with lib; {
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64);
|
||||
description = "A mind-mapping application for KDE";
|
||||
license = licenses.mit;
|
||||
homepage = "https://waf.io/semantik.html";
|
||||
maintainers = [ maintainers.shamilton ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "semantik";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -45,11 +45,11 @@
|
|||
# If one wishes to use a different src or name for a very custom build
|
||||
, overrideSrc ? {}
|
||||
, pname ? "gnuradio"
|
||||
, version ? "3.10.8.0"
|
||||
, version ? "3.10.9.1"
|
||||
}:
|
||||
|
||||
let
|
||||
sourceSha256 = "sha256-4BoJciL3ffd9Dgk3HxXCOOwnGHqCEVuo+a1AtzJG4IY=";
|
||||
sourceSha256 = "sha256-prCQj2gan5udOj2vnV8Vrr8B4OwpYpzAGb9w+kkJDQc=";
|
||||
featuresInfo = {
|
||||
# Needed always
|
||||
basic = {
|
||||
|
|
|
|||
|
|
@ -32,21 +32,21 @@
|
|||
assert withMPI -> trilinos.withMPI;
|
||||
|
||||
let
|
||||
version = "7.7.0";
|
||||
version = "7.8.0";
|
||||
|
||||
# useing fetchurl or fetchFromGitHub doesn't include the manuals
|
||||
# due to .gitattributes files
|
||||
xyce_src = fetchgit {
|
||||
url = "https://github.com/Xyce/Xyce.git";
|
||||
rev = "Release-${version}";
|
||||
sha256 = "sha256-F0kO86eliD1AfUUjeVllxJ231ZElXkfBfGJ3jhT0s9w=";
|
||||
sha256 = "sha256-+aNy2bGuFQ517FZUvU0YqN0gmChRpVuFEmFGTCx9AgY=";
|
||||
};
|
||||
|
||||
regression_src = fetchFromGitHub {
|
||||
owner = "Xyce";
|
||||
repo = "Xyce_Regression";
|
||||
rev = "Release-${version}";
|
||||
sha256 = "sha256-iDxm0Vcn3JuuREciCt3/b7q94E8GhXoIUD/BCx0mW6Q=";
|
||||
sha256 = "sha256-Fxi/NpXXIw/bseWaLi2iQ4sg4S9Z+othGgSvQoxyJ9c=";
|
||||
};
|
||||
in
|
||||
|
||||
|
|
@ -82,11 +82,13 @@ stdenv.mkDerivation rec {
|
|||
libtool_2
|
||||
] ++ lib.optionals enableDocs [
|
||||
(texliveMedium.withPackages (ps: with ps; [
|
||||
enumitem
|
||||
koma-script
|
||||
optional
|
||||
framed
|
||||
enumitem
|
||||
multirow
|
||||
newtx
|
||||
preprint
|
||||
]))
|
||||
];
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pspp";
|
||||
version = "1.6.2";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/pspp/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-cylMovWy9/xBu/i3jFiIyAdfQ8YJf9SCq7BPhasIR7Y=";
|
||||
sha256 = "sha256-qPbLiGr1sIOENXm81vsZHAVKzOKMxotY58XwmZai2N8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config texinfo python3 makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -131,6 +131,20 @@ stdenv.mkDerivation rec {
|
|||
url = "https://github.com/sagemath/sage/commit/461727b453712550a2c5dc0ae11933523255aaed.diff";
|
||||
sha256 = "sha256-mC8084VQoUBk4hocALF+Y9Cwb38Zt360eldi/SSjna8=";
|
||||
})
|
||||
|
||||
# https://github.com/sagemath/sage/pull/36218, landed in 10.2.beta3
|
||||
(fetchpatch {
|
||||
name = "sageenv-disable-file-validation.patch";
|
||||
url = "https://github.com/sagemath/sage/commit/31a764f4a9ec54d3ea970aa9514a088c4e603ebd.diff";
|
||||
sha256 = "sha256-NhYUTTmYlyjss3eS8HZXP8U11TElQY0cv6KW4wBOaJY=";
|
||||
})
|
||||
|
||||
# https://github.com/sagemath/sage/pull/36235, landed in 10.2.beta3
|
||||
(fetchpatch {
|
||||
name = "ecl-23.9.9.patch";
|
||||
url = "https://github.com/sagemath/sage/commit/b6b50a80e9660c002d069019f5b8f04e9324a423.diff";
|
||||
sha256 = "sha256-nF+5oKad1VYms6Dxr1t9/V0XBkoMfhy0KCY/ZPddrm0=";
|
||||
})
|
||||
];
|
||||
|
||||
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, rustPlatform
|
||||
, nixosTests
|
||||
|
||||
|
|
@ -11,6 +10,7 @@
|
|||
, ncurses
|
||||
, pkg-config
|
||||
, python3
|
||||
, scdoc
|
||||
|
||||
, expat
|
||||
, fontconfig
|
||||
|
|
@ -49,16 +49,16 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "alacritty";
|
||||
version = "0.12.3";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alacritty";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-SUEI7DTgs6NYT4oiqaMBNCQ8gP1XoZjPFIKhob7tfsk=";
|
||||
hash = "sha256-5jStrLwuuFWlKHIPS5QJ4DUQj9kXLqlpRxeVDXK/uzU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-iLhctiCDNpcTxoMrWwUWHBRc6X5rxSH9Jl2EDuktWmw=";
|
||||
cargoHash = "sha256-IdkDlxT7pvV+LYbEBsjNvDAWg9TDcmneLF1yrIU3BLU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
|
@ -67,6 +67,7 @@ rustPlatform.buildRustPackage rec {
|
|||
ncurses
|
||||
pkg-config
|
||||
python3
|
||||
scdoc
|
||||
];
|
||||
|
||||
buildInputs = rpathLibs
|
||||
|
|
@ -107,16 +108,17 @@ rustPlatform.buildRustPackage rec {
|
|||
patchelf --add-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/alacritty
|
||||
''
|
||||
) + ''
|
||||
|
||||
installShellCompletion --zsh extra/completions/_alacritty
|
||||
installShellCompletion --bash extra/completions/alacritty.bash
|
||||
installShellCompletion --fish extra/completions/alacritty.fish
|
||||
|
||||
install -dm 755 "$out/share/man/man1"
|
||||
gzip -c extra/alacritty.man > "$out/share/man/man1/alacritty.1.gz"
|
||||
gzip -c extra/alacritty-msg.man > "$out/share/man/man1/alacritty-msg.1.gz"
|
||||
install -dm 755 "$out/share/man/man5"
|
||||
|
||||
install -Dm 644 alacritty.yml $out/share/doc/alacritty.yml
|
||||
scdoc < extra/man/alacritty.1.scd | gzip -c > $out/share/man/man1/alacritty.1.gz
|
||||
scdoc < extra/man/alacritty-msg.1.scd | gzip -c > $out/share/man/man1/alacritty-msg.1.gz
|
||||
scdoc < extra/man/alacritty.5.scd | gzip -c > $out/share/man/man5/alacritty.5.gz
|
||||
scdoc < extra/man/alacritty-bindings.5.scd | gzip -c > $out/share/man/man5/alacritty-bindings.5.gz
|
||||
|
||||
install -dm 755 "$terminfo/share/terminfo/a/"
|
||||
tic -xe alacritty,alacritty-direct -o "$terminfo/share/terminfo" extra/alacritty.info
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "iterm2";
|
||||
version = "3.4.22";
|
||||
version = "3.4.23";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://iterm2.com/downloads/stable/iTerm2-${lib.replaceStrings ["."] ["_"] version}.zip";
|
||||
hash = "sha256-bHHAA9H6oUS0cXkGEaY/A0TLWrshgno3UN5xJA6+8lU=";
|
||||
hash = "sha256-hQV/jGT/3JOvHBICyCeNnuSYMeeF7lfErN55f+Frg2w=";
|
||||
};
|
||||
|
||||
dontFixup = true;
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vcsh";
|
||||
version = "2.0.5";
|
||||
version = "2.0.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/RichiH/vcsh/releases/download/v${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0bf3gacbyxw75ksd8y6528kgk7mqx6grz40gfiffxa2ghsz1xl01";
|
||||
sha256 = "sha256-8KkTU1BrO39vgWproT+QsRaBN2I6WR3lp4Oehd6yOMs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
30
pkgs/applications/video/kodi/addons/mediacccde/default.nix
Normal file
30
pkgs/applications/video/kodi/addons/mediacccde/default.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ lib, buildKodiAddon, fetchzip, addonUpdateScript, requests, routing }:
|
||||
|
||||
buildKodiAddon rec {
|
||||
pname = "media.ccc.de";
|
||||
namespace = "plugin.video.media-ccc-de";
|
||||
version = "0.3.0+matrix.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://mirrors.kodi.tv/addons/nexus/plugin.video.media-ccc-de/plugin.video.media-ccc-de-${version}.zip";
|
||||
hash = "sha256-T8J2HtPVDfaPU0gZEa0xVBzwjNInxkRFCCSxS53QhmU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
routing
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = addonUpdateScript {
|
||||
attrPath = "kodi.packages.mediacccde";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/voc/plugin.video.media-ccc-de/";
|
||||
description = "media.ccc.de for Kodi";
|
||||
license = licenses.mit;
|
||||
maintainers = teams.kodi.members;
|
||||
};
|
||||
}
|
||||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "obs-replay-source";
|
||||
version = "1.6.12";
|
||||
version = "1.6.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exeldro";
|
||||
repo = "obs-replay-source";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-MzugH6r/jY5Kg7GIR8/o1BN36FenBzMnqrPUceJmbPs=";
|
||||
sha256 = "sha256-i64rpIVnUplA9AKZtR3xeByeawca7B00kGmEcKi7DWQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
51
pkgs/by-name/an/annotator/package.nix
Normal file
51
pkgs/by-name/an/annotator/package.nix
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
, vala
|
||||
, wrapGAppsHook
|
||||
, desktop-file-utils
|
||||
, libgee
|
||||
, pantheon
|
||||
, libxml2
|
||||
, libhandy
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "annotator";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phase1geo";
|
||||
repo = "annotator";
|
||||
rev = version;
|
||||
hash = "sha256-VHvznkGvrE8o9qq+ijrIStSavq46dS8BqclWEWZ8mG8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
meson
|
||||
ninja
|
||||
vala
|
||||
wrapGAppsHook
|
||||
desktop-file-utils
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libgee
|
||||
pantheon.granite
|
||||
libxml2
|
||||
libhandy
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Image annotation for Elementary OS";
|
||||
homepage = "https://github.com/phase1geo/Annotator";
|
||||
license = licenses.gpl3Plus;
|
||||
mainProgram = "com.github.phase1geo.annotator";
|
||||
maintainers = with maintainers; [ aleksana ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,52 +2,31 @@
|
|||
, nix-update-script
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, ninja
|
||||
}:
|
||||
let
|
||||
tree-sitter-bitbake = fetchFromGitHub {
|
||||
owner = "amaanq";
|
||||
repo = "tree-sitter-bitbake";
|
||||
rev = "v1.0.0";
|
||||
hash = "sha256-HfWUDYiBCmtlu5fFX287BSDHyCiD7gqIVFDTxH5APAE=";
|
||||
};
|
||||
in
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "bitbake-language-server";
|
||||
version = "0.0.6";
|
||||
version = "0.0.7";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Freed-Wu";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-UOeOvaQplDn7jM+3sUZip1f05TbczoaRQKMxVm+euDU=";
|
||||
hash = "sha256-FQKZtrzfjEkAIyzrJvI7qiB4gV2yAH9w1fwO6oLPhNc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
cmake
|
||||
ninja
|
||||
pathspec
|
||||
pyproject-metadata
|
||||
scikit-build-core
|
||||
setuptools-scm
|
||||
setuptools-generate
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
lsprotocol
|
||||
platformdirs
|
||||
oelint-parser
|
||||
pygls
|
||||
tree-sitter
|
||||
];
|
||||
|
||||
# The scikit-build-core runs CMake internally so we must let it run the configure step itself.
|
||||
dontUseCmakeConfigure = true;
|
||||
SKBUILD_CMAKE_ARGS = lib.strings.concatStringsSep ";" [
|
||||
"-DFETCHCONTENT_FULLY_DISCONNECTED=ON"
|
||||
"-DFETCHCONTENT_QUIET=OFF"
|
||||
"-DFETCHCONTENT_SOURCE_DIR_TREE-SITTER-BITBAKE=${tree-sitter-bitbake}"
|
||||
];
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
|
|
|||
46
pkgs/by-name/bl/bluetuith/package.nix
Normal file
46
pkgs/by-name/bl/bluetuith/package.nix
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "bluetuith";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "darkhz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5Jn5qkCUj2ohpZU+XqR90Su2svcLqW+hW6kmeEVfrtI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-pYVEFKLPfstWWO6ypgv7ntAaE1Wmq2XKuZC2ccMa8Vc=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/darkhz/bluetuith/cmd.Version=${version}@nixpkgs"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "TUI-based bluetooth connection manager";
|
||||
longDescription = ''
|
||||
Bluetuith can transfer files via OBEX, perform authenticated pairing,
|
||||
and (dis)connect different bluetooth devices. It interacts with bluetooth
|
||||
adapters and can toogle their power and discovery state. Bluetuith can also
|
||||
manage Bluetooth-based networking/tethering (PANU/DUN) and remote control
|
||||
devices. The TUI has mouse support.
|
||||
'';
|
||||
homepage = "https://github.com/darkhz/bluetuith";
|
||||
changelog = "https://github.com/darkhz/bluetuith/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "bluetuith";
|
||||
maintainers = with maintainers; [ thehedgeh0g katexochen ];
|
||||
};
|
||||
}
|
||||
|
|
@ -13,10 +13,10 @@ let
|
|||
}.${system} or throwSystem;
|
||||
|
||||
hash = {
|
||||
x86_64-linux = "sha256-rgA0n0XxYmP9mjjz8lQGL4dbqpXj9CNx3d8qT7e9Ye4=";
|
||||
aarch64-linux = "sha256-pX+CPvJbhrrAxmZhy/aBeNFq9ShgYDQXbBNa6lbPnSo=";
|
||||
x86_64-darwin = "sha256-vQj7tZghYZOcDpGT4DmFIrwiY8hguTtyo83M2BaUOkw=";
|
||||
aarch64-darwin = "sha256-qd6newnk/9nRMM/7aaVO+CkTP74mMwAPKu658c6KZyY=";
|
||||
x86_64-linux = "sha256-t+PM6ZYj/Lrho2wEiu+EUC27ApBPXyp78uoDUolov+4=";
|
||||
aarch64-linux = "sha256-XdPsfhH4P9rWRC1+weSdRvCvCp8EETIN+QWHYIFh5w8=";
|
||||
x86_64-darwin = "sha256-p9eDWtvxLipjcQnv35SMo9qRWJFEJN+gd+dzA/7LuHY=";
|
||||
aarch64-darwin = "sha256-rlq5NG1nqAfrveLpH79edvTdPjlmigsjycqz99+Mb2I=";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
bin = "$out/bin/codeium_language_server";
|
||||
|
|
@ -24,7 +24,7 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "codeium";
|
||||
version = "1.6.10";
|
||||
version = "1.6.16";
|
||||
src = fetchurl {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}.gz";
|
||||
url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz";
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
assert lib.assertOneOf "graphicsLibrary" graphicsLibrary [ "SDL2" "GLFW" ];
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "jazz2";
|
||||
version = "2.4.0";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deathkiller";
|
||||
repo = "jazz2-native";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-Rv+fU2SGxdmxfDANX+HpZDZBm9HYzSvAQDqPSQ8WJps=";
|
||||
hash = "sha256-AbB7xtdyin/VySswHoPRq9LmhHLUJfetXqtIxEw+KSI=";
|
||||
};
|
||||
|
||||
patches = [ ./nocontent.patch ];
|
||||
|
|
|
|||
50
pkgs/by-name/la/labwc-tweaks/package.nix
Normal file
50
pkgs/by-name/la/labwc-tweaks/package.nix
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, gtk3
|
||||
, libxml2
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "labwc-tweaks";
|
||||
version = "unstable-2023-12-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "labwc";
|
||||
repo = finalAttrs.pname;
|
||||
rev = "1c79d6a5ee3ac3d1a6140a1a98ae89674ef36635";
|
||||
hash = "sha256-RD1VCKVoHsoY7SezY7tjZzomikMgA7N6B5vaYkIo9Es=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
libxml2
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace stack-lang.c --replace /usr/share /run/current-system/sw/share
|
||||
sed -i '/{ NULL, "\/usr\/share" },/i { NULL, "/run/current-system/sw/share" },' theme.c
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/labwc/labwc-tweaks";
|
||||
description = "Configuration gui app for labwc";
|
||||
mainProgram = "labwc-tweaks";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ romildo ];
|
||||
};
|
||||
})
|
||||
29
pkgs/by-name/li/libomemo-c/package.nix
Normal file
29
pkgs/by-name/li/libomemo-c/package.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, openssl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libomemo-c";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dino";
|
||||
repo = "libomemo-c";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-GvHMp0FWoApbYLMhKfNxSBel1xxWWF3TZ4lnkLvu2s4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildsInputs = [ openssl ];
|
||||
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fork of libsignal-protocol-c adding support for OMEMO XEP-0384 0.5.0+";
|
||||
homepage = "https://github.com/dino/libomemo-c";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = [ maintainers.astro ];
|
||||
};
|
||||
}
|
||||
|
|
@ -18,13 +18,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "noto-fonts${suffix}";
|
||||
version = "23.12.1";
|
||||
version = "24.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "notofonts";
|
||||
repo = "notofonts.github.io";
|
||||
rev = "noto-monthly-release-${version}";
|
||||
hash = "sha256-Hmw6yGFbnxgKMdKjQCQzuVl+pFCVxbJrT3sGntXUPgk=";
|
||||
hash = "sha256-0KghEIuIxEP6vbAuqwA5iiVTpTpZibysIgtjOkV1un0=";
|
||||
};
|
||||
|
||||
_variants = map (variant: builtins.replaceStrings [ " " ] [ "" ] variant) variants;
|
||||
|
|
|
|||
38
pkgs/by-name/nu/nucleiparser/package.nix
Normal file
38
pkgs/by-name/nu/nucleiparser/package.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "nucleiparser";
|
||||
version = "unstable-2023-12-26";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sinkmanu";
|
||||
repo = "nucleiparser";
|
||||
# https://github.com/Sinkmanu/nucleiparser/issues/1
|
||||
rev = "42f3d57c70300c436497c2539cdb3c49977fc48d";
|
||||
hash = "sha256-/SLaRuO06rF7aLV7zY7tfIxkJRzsx+/Z+mc562RX2OQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
prettytable
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"nucleiparser"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Nuclei output parser for CLI";
|
||||
homepage = "https://github.com/sinkmanu/nucleiparser";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "nparser";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,20 +1,20 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, fetchpatch }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "nvidia-texture-tools";
|
||||
version = "unstable-2020-12-21";
|
||||
version = "2.1.2-unstable-2020-12-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "castano";
|
||||
repo = "nvidia-texture-tools";
|
||||
rev = "aeddd65f81d36d8cb7b169b469ef25156666077e";
|
||||
sha256 = "sha256-BYNm8CxPQbfmnnzNmOQ2Dc8HSyO8mkqzYsBZ5T80398=";
|
||||
hash = "sha256-BYNm8CxPQbfmnnzNmOQ2Dc8HSyO8mkqzYsBZ5T80398=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
outputs = [ "out" "dev" "lib" ];
|
||||
|
||||
postPatch = ''
|
||||
# Make a recently added pure virtual function just virtual,
|
||||
# to keep compatibility.
|
||||
|
|
@ -25,8 +25,14 @@ stdenv.mkDerivation rec {
|
|||
sed -i '/libsquish/d;/CMP_Core/d' extern/CMakeLists.txt
|
||||
'';
|
||||
|
||||
outputs = [ "out" "dev" "lib" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DNVTT_SHARED=TRUE"
|
||||
(lib.cmakeBool "NVTT_SHARED" true)
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
|
@ -38,7 +44,7 @@ stdenv.mkDerivation rec {
|
|||
description = "A set of cuda-enabled texture tools and compressors";
|
||||
homepage = "https://github.com/castano/nvidia-texture-tools";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ wegank ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "oelint-adv";
|
||||
version = "3.26.5";
|
||||
version = "3.26.6";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "oelint_adv";
|
||||
hash = "sha256-+kmPV42y4Za/ZLXLCyt73E8Nxn0zBftTZT5JDsAQkEw=";
|
||||
hash = "sha256-RRNuuGpK9c8Cj4FUEHZses3CMDZku/AzY7S9yl5DrSo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
53
pkgs/by-name/pk/pkcrack/package.nix
Normal file
53
pkgs/by-name/pk/pkcrack/package.nix
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pkcrack";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.unix-ag.uni-kl.de/~conrad/krypto/pkcrack/pkcrack-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-TS3Bk/+kNCrC7TpjEf33cK5qB3Eiaz70U9yo0D5DiVo=";
|
||||
};
|
||||
sourceRoot = "pkcrack-${finalAttrs.version}/src";
|
||||
|
||||
postPatch = ''
|
||||
# malloc.h is not needed because stdlib.h is already included.
|
||||
# On macOS, malloc.h does not even exist, resulting in an error.
|
||||
substituteInPlace exfunc.c extract.c main.c readhead.c zipdecrypt.c \
|
||||
--replace '#include <malloc.h>' ""
|
||||
'';
|
||||
|
||||
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -D extract $out/bin/extract
|
||||
install -D findkey $out/bin/findkey
|
||||
install -D makekey $out/bin/makekey
|
||||
install -D pkcrack $out/bin/pkcrack
|
||||
install -D zipdecrypt $out/bin/zipdecrypt
|
||||
|
||||
mkdir -p $out/share/doc
|
||||
cp -R ../doc/ $out/share/doc/pkcrack
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Breaking PkZip-encryption";
|
||||
homepage = "https://www.unix-ag.uni-kl.de/~conrad/krypto/pkcrack.html";
|
||||
license = {
|
||||
fullName = "PkCrack Non Commercial License";
|
||||
url = "https://www.unix-ag.uni-kl.de/~conrad/krypto/pkcrack/pkcrack-readme.html";
|
||||
free = false;
|
||||
};
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
platforms = platforms.all;
|
||||
mainProgram = "pkcrack";
|
||||
};
|
||||
})
|
||||
66
pkgs/by-name/re/read-it-later/package.nix
Normal file
66
pkgs/by-name/re/read-it-later/package.nix
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, rustPlatform
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, rustc
|
||||
, cargo
|
||||
, wrapGAppsHook4
|
||||
, desktop-file-utils
|
||||
, libxml2
|
||||
, libadwaita
|
||||
, openssl
|
||||
, libsoup_3
|
||||
, webkitgtk_6_0
|
||||
, sqlite
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "read-it-later";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-A8u1fecJAsVlordgZmUJt/KZWxx6EWMhfdayKWHTTFY=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-wK7cegcjiu8i1Grey6ELoqAn2BrvElDXlCwafTLuFv0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
rustPlatform.cargoSetupHook
|
||||
rustc
|
||||
cargo
|
||||
wrapGAppsHook4
|
||||
desktop-file-utils
|
||||
libxml2.bin #xmllint
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libadwaita
|
||||
openssl
|
||||
libsoup_3
|
||||
webkitgtk_6_0
|
||||
sqlite
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple Wallabag client with basic features to manage articles";
|
||||
homepage = "https://gitlab.gnome.org/World/read-it-later";
|
||||
license = licenses.gpl3Plus;
|
||||
mainProgram = "read-it-later";
|
||||
maintainers = with maintainers; [ aleksana ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
50
pkgs/by-name/sw/sway-easyfocus/package.nix
Normal file
50
pkgs/by-name/sw/sway-easyfocus/package.nix
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, wrapGAppsHook
|
||||
, atk
|
||||
, cairo
|
||||
, gdk-pixbuf
|
||||
, glib
|
||||
, gtk3
|
||||
, pango
|
||||
, gtk-layer-shell
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sway-easyfocus";
|
||||
version = "unstable-2023-11-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "edzdez";
|
||||
repo = "sway-easyfocus";
|
||||
rev = "4c70f6728dbfc859e60505f0a7fd82f5a90ed42c";
|
||||
hash = "sha256-WvYXhf13ZCoa+JAF4bYgi5mI22i9pZLtbIhF1odqaTU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-9cN0ervcU8JojwG7J250fprbCD2rB9kh9TbRU+wCE/Y=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
atk
|
||||
cairo
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gtk3
|
||||
gtk-layer-shell
|
||||
pango
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "A tool to help efficiently focus windows in Sway, inspired by i3-easyfocus";
|
||||
homepage = "https://github.com/edzdez/sway-easyfocus";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ eclairevoyant ];
|
||||
mainProgram = "sway-easyfocus";
|
||||
};
|
||||
}
|
||||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "txr";
|
||||
version = "292";
|
||||
version = "293";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.kylheku.com/cgit/txr/snapshot/txr-${finalAttrs.version}.tar.bz2";
|
||||
hash = "sha256-tFqaQBCYur7b6U6SbthAGp0HVvIrfD63xMObzzI49Og=";
|
||||
hash = "sha256-b8Ia5zMvmPl681rTyhgI0AQ8TIU4TE5768/Oln42+lw=";
|
||||
};
|
||||
|
||||
buildInputs = [ libffi ];
|
||||
|
|
|
|||
63
pkgs/by-name/un/universal-android-debloater/package.nix
Normal file
63
pkgs/by-name/un/universal-android-debloater/package.nix
Normal file
|
|
@ -0,0 +1,63 @@
|
|||
{ android-tools
|
||||
, clang
|
||||
, expat
|
||||
, fetchFromGitHub
|
||||
, fontconfig
|
||||
, freetype
|
||||
, lib
|
||||
, libglvnd
|
||||
, makeWrapper
|
||||
, mold
|
||||
, pkg-config
|
||||
, rustPlatform
|
||||
, xorg
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "universal-android-debloater";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Universal-Debloater-Alliance";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-8s4/lAekW2glz4lH79UtbziToytT53m5wQGTVMBAqMU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-fMW9CmDyJ77PIuJ6QGI8nNZsuAZwkL9xf3xbbX13HKw=";
|
||||
|
||||
buildInputs = [
|
||||
expat
|
||||
fontconfig
|
||||
freetype
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
mold
|
||||
pkg-config
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
clang
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME="$(mktemp -d)"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/uad_gui \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ fontconfig freetype libglvnd xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr ]} \
|
||||
--suffix PATH : ${lib.makeBinPath [ android-tools ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool to debloat non-rooted Android devices";
|
||||
changelog = "https://github.com/Universal-Debloater-Alliance/universal-android-debloater/blob/${src.rev}/CHANGELOG.md";
|
||||
homepage = "https://github.com/Universal-Debloater-Alliance/universal-android-debloater";
|
||||
license = licenses.gpl3Only;
|
||||
mainProgram = "uad_gui";
|
||||
maintainers = with maintainers; [ xfix ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, fetchgit
|
||||
, buildGoModule
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
buildGoModule {
|
||||
|
|
@ -16,11 +15,10 @@ buildGoModule {
|
|||
|
||||
vendorHash = "sha256-85jFSAOfNMihv710LtfETmkKRqcdRuFCHVuPkW94X/Y=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
CGO_LDFLAGS = "-s -w";
|
||||
|
||||
GOFLAGS = "-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw";
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A waybar component/utility for displaying and controlling MPRIS2 compliant media players individually";
|
||||
|
|
@ -30,4 +28,3 @@ buildGoModule {
|
|||
maintainers = with maintainers; [ khaneliman ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
}:
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "commit-mono";
|
||||
version = "1.142";
|
||||
version = "1.143";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/eigilnikolajsen/commit-mono/releases/download/v${version}/CommitMono-${version}.zip";
|
||||
hash = "sha256-ZOEo+uD1Vug+F38/eXD6xG1netEIAYn25bPBZ1H7aEE=";
|
||||
hash = "sha256-JTyPgWfbWq+lXQU/rgnyvPG6+V3f+FB5QUkd+I1oFKE=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "sarasa-gothic";
|
||||
version = "0.42.6";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
# Use the 'ttc' files here for a smaller closure size.
|
||||
# (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
|
||||
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z";
|
||||
hash = "sha256-G6REQA3Eq5fqVQCQN967Yv1xaLQSG06meJ0KeD0I/TM=";
|
||||
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/Sarasa-TTC-${version}.7z";
|
||||
hash = "sha256-h34M5waO2uaqsZDYEEI72LIYv7B1Qjwms2v6qGTaNKg=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
let
|
||||
generator = pkgsBuildBuild.buildGoModule rec {
|
||||
pname = "v2ray-domain-list-community";
|
||||
version = "20231219144426";
|
||||
version = "20240101162810";
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "domain-list-community";
|
||||
rev = version;
|
||||
hash = "sha256-xiHQL4fyGcb0yY++aqwaaZ8spPINQwbhI/VIer2LOe0=";
|
||||
hash = "sha256-aL5QH+bvQt3l40GuM0lbvamjl1I7MpkSNceiaccyttg=";
|
||||
};
|
||||
vendorHash = "sha256-azvMUi8eLNoNofRa2X4SKTTiMd6aOyO6H/rOiKjkpIY=";
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation (self: {
|
||||
name = "alacritty-theme";
|
||||
version = "unstable-2023-11-07";
|
||||
version = "unstable-2023-12-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alacritty";
|
||||
repo = "alacritty-theme";
|
||||
rev = "808b81b2e88884e8eca5d951b89f54983fa6c237";
|
||||
hash = "sha256-g5tM6VBPLXin5s7X0PpzWOOGTEwHpVUurWOPqM/O13A=";
|
||||
rev = "b7a59c92fd54a005893b99479fb0aa466a37a4b7";
|
||||
hash = "sha256-UBWH4Q9MliqcolFq1tZrfRdzCkUO1pRn84qvZEVw8Gg=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
let
|
||||
validAccents = [ "blue" "flamingo" "green" "lavender" "maroon" "mauve" "peach" "pink" "red" "rosewater" "sapphire" "sky" "teal" "yellow" ];
|
||||
validSizes = [ "standard" "compact" ];
|
||||
validTweaks = [ "black" "rimless" "normal" ];
|
||||
validTweaks = [ "black" "rimless" "normal" "float" ];
|
||||
validVariants = [ "latte" "frappe" "macchiato" "mocha" ];
|
||||
|
||||
pname = "catppuccin-gtk";
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ index 360ca6f..6db93ab 100644
|
|||
wallpaper = bg.getId();
|
||||
} else {
|
||||
- wallpaper = "file:///usr/share/wallpapers/deepin/desktop.jpg";
|
||||
+ wallpaper = "file:///run/current-system/sw/wallpapers/deepin/desktop.jpg";
|
||||
+ wallpaper = "file:///run/current-system/sw/share/wallpapers/deepin/desktop.jpg";
|
||||
}
|
||||
|
||||
PhaseWallPaper::setWallpaperUri(index, monitorName, wallpaper);
|
||||
|
|
@ -62,7 +62,7 @@ index bf739a5..1076d59 100644
|
|||
#include <QDBusReply>
|
||||
|
||||
-QStringList Backgrounds::systemWallpapersDir = { "/usr/share/wallpapers/deepin" };
|
||||
+QStringList Backgrounds::systemWallpapersDir = { "/run/current-system/sw/wallpapers/deepin" };
|
||||
+QStringList Backgrounds::systemWallpapersDir = { "/run/current-system/sw/share/wallpapers/deepin" };
|
||||
QStringList Backgrounds::uiSupportedFormats = { "jpeg", "png", "bmp", "tiff", "gif" };
|
||||
|
||||
Backgrounds::Backgrounds(QObject *parent)
|
||||
|
|
|
|||
|
|
@ -5,21 +5,21 @@
|
|||
, qtbase
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "cmake-extras";
|
||||
version = "unstable-2022-11-21";
|
||||
version = "1.7";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "ubports";
|
||||
repo = "development/core/cmake-extras";
|
||||
rev = "99aab4514ee182cb7a94821b4b51e4d8cb9a82ef";
|
||||
hash = "sha256-axj5QxgDrHy0HiZkfrbm22hVvSCKkWFoQC8MdQMm9tg=";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-5bLMk21pSZkuU3jAGTnjPc9ZrvVZqMUWSfFgkTtkYLw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# We have nothing to build here, no need to depend on a C compiler
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace 'project(cmake-extras)' 'project(cmake-extras NONE)'
|
||||
--replace 'project(cmake-extras' 'project(cmake-extras LANGUAGES NONE'
|
||||
|
||||
# This is in a function that reverse dependencies use to determine where to install their files to
|
||||
substituteInPlace src/QmlPlugins/QmlPluginsConfig.cmake \
|
||||
|
|
@ -46,4 +46,4 @@ stdenvNoCC.mkDerivation {
|
|||
maintainers = teams.lomiri.members;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,34 +1,29 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 79d451965ed4..78188978d6de 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -10,6 +10,8 @@ set(CMAKE_MODULE_PATH
|
||||
# If we are not building as part of LLVM, build LLDB as a standalone project,
|
||||
# using LLVM as an external library.
|
||||
if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
|
||||
+ include(GNUInstallDirs)
|
||||
+
|
||||
project(lldb)
|
||||
set(LLDB_BUILT_STANDALONE TRUE)
|
||||
endif()
|
||||
@@ -108,7 +110,7 @@ if (LLDB_ENABLE_PYTHON)
|
||||
diff --git a/bindings/lua/CMakeLists.txt b/bindings/lua/CMakeLists.txt
|
||||
index 1a739a980..59f8fc3a0 100644
|
||||
--- a/bindings/lua/CMakeLists.txt
|
||||
+++ b/bindings/lua/CMakeLists.txt
|
||||
@@ -56,7 +56,7 @@ function(finish_swig_lua swig_target lldb_lua_bindings_dir lldb_lua_target_dir)
|
||||
if(LLDB_BUILD_FRAMEWORK)
|
||||
set(lldb_python_target_dir "${LLDB_FRAMEWORK_ABSOLUTE_BUILD_DIR}/LLDB.framework/Resources/Python/lldb")
|
||||
set(LLDB_LUA_INSTALL_PATH ${LLDB_FRAMEWORK_INSTALL_DIR}/LLDB.framework/Resources/Python)
|
||||
else()
|
||||
- set(lldb_python_target_dir "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${LLDB_PYTHON_RELATIVE_PATH}/lldb")
|
||||
+ set(lldb_python_target_dir "${CMAKE_INSTALL_LIBDIR}/../${LLDB_PYTHON_RELATIVE_PATH}/lldb")
|
||||
- set(LLDB_LUA_INSTALL_PATH ${LLDB_LUA_RELATIVE_PATH})
|
||||
+ set(LLDB_LUA_INSTALL_PATH ${CMAKE_INSTALL_LIBDIR}/../${LLDB_LUA_RELATIVE_PATH})
|
||||
endif()
|
||||
get_target_property(lldb_python_bindings_dir swig_wrapper_python BINARY_DIR)
|
||||
finish_swig_python("lldb-python" "${lldb_python_bindings_dir}" "${lldb_python_target_dir}")
|
||||
@@ -118,7 +120,7 @@ if (LLDB_ENABLE_LUA)
|
||||
install(DIRECTORY ${lldb_lua_target_dir}/
|
||||
DESTINATION ${LLDB_LUA_INSTALL_PATH}
|
||||
diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt
|
||||
index c631faf52ac3..1d92d069960b 100644
|
||||
--- a/bindings/python/CMakeLists.txt
|
||||
+++ b/bindings/python/CMakeLists.txt
|
||||
@@ -160,7 +160,7 @@ function(finish_swig_python swig_target lldb_python_bindings_dir lldb_python_tar
|
||||
if(LLDB_BUILD_FRAMEWORK)
|
||||
set(lldb_lua_target_dir "${LLDB_FRAMEWORK_ABSOLUTE_BUILD_DIR}/LLDB.framework/Resources/Lua")
|
||||
set(LLDB_PYTHON_INSTALL_PATH ${LLDB_FRAMEWORK_INSTALL_DIR}/LLDB.framework/Versions/${LLDB_FRAMEWORK_VERSION}/Resources/Python)
|
||||
else()
|
||||
- set(lldb_lua_target_dir "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${LLDB_LUA_RELATIVE_PATH}")
|
||||
+ set(lldb_lua_target_dir "${CMAKE_INSTALL_LIBDIR}/../${LLDB_LUA_RELATIVE_PATH}")
|
||||
- set(LLDB_PYTHON_INSTALL_PATH ${LLDB_PYTHON_RELATIVE_PATH})
|
||||
+ set(LLDB_PYTHON_INSTALL_PATH ${CMAKE_INSTALL_LIBDIR}/../${LLDB_PYTHON_RELATIVE_PATH})
|
||||
endif()
|
||||
get_target_property(lldb_lua_bindings_dir swig_wrapper_lua BINARY_DIR)
|
||||
finish_swig_lua("lldb-lua" "${lldb_lua_bindings_dir}" "${lldb_lua_target_dir}")
|
||||
if (NOT CMAKE_CFG_INTDIR STREQUAL ".")
|
||||
string(REPLACE ${CMAKE_CFG_INTDIR} "\$\{CMAKE_INSTALL_CONFIG_NAME\}" LLDB_PYTHON_INSTALL_PATH ${LLDB_PYTHON_INSTALL_PATH})
|
||||
diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake
|
||||
index 3291a7c808e1..b27d27ce6a87 100644
|
||||
--- a/cmake/modules/AddLLDB.cmake
|
||||
|
|
@ -52,16 +47,3 @@ index 7d48491ec89a..c04543585588 100644
|
|||
install(TARGETS lldbIntelFeatures
|
||||
- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX})
|
||||
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
|
||||
diff --git a/cmake/modules/LLDBStandalone.cmake b/cmake/modules/LLDBStandalone.cmake
|
||||
index 7d48491ec89a..c04543585588 100644
|
||||
--- a/cmake/modules/LLDBStandalone.cmake
|
||||
+++ b/cmake/modules/LLDBStandalone.cmake
|
||||
@@ -70,7 +70,7 @@ endif()
|
||||
|
||||
# They are used as destination of target generators.
|
||||
set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin)
|
||||
-set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX})
|
||||
+set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
|
||||
if(WIN32 OR CYGWIN)
|
||||
# DLL platform -- put DLLs into bin.
|
||||
set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
|
||||
|
|
@ -10,6 +10,7 @@ with builtins; with lib; let
|
|||
{ case = "8.16"; out = { version = "1.17.0"; };}
|
||||
{ case = "8.17"; out = { version = "1.17.0"; };}
|
||||
{ case = "8.18"; out = { version = "1.17.0"; };}
|
||||
{ case = "8.19"; out = { version = "1.18.1"; };}
|
||||
] {} );
|
||||
in mkCoqDerivation {
|
||||
pname = "elpi";
|
||||
|
|
@ -17,6 +18,7 @@ in mkCoqDerivation {
|
|||
owner = "LPCIC";
|
||||
inherit version;
|
||||
defaultVersion = lib.switch coq.coq-version [
|
||||
{ case = "8.19"; out = "2.0.1"; }
|
||||
{ case = "8.18"; out = "1.19.0"; }
|
||||
{ case = "8.17"; out = "1.18.0"; }
|
||||
{ case = "8.16"; out = "1.15.6"; }
|
||||
|
|
@ -26,6 +28,7 @@ in mkCoqDerivation {
|
|||
{ case = "8.12"; out = "1.8.3_8.12"; }
|
||||
{ case = "8.11"; out = "1.6.3_8.11"; }
|
||||
] null;
|
||||
release."2.0.1".sha256 = "sha256-cuoPsEJ+JRLVc9Golt2rJj4P7lKltTrrmQijjoViooc=";
|
||||
release."1.19.0".sha256 = "sha256-kGoo61nJxeG/BqV+iQaV3iinwPStND+7+fYMxFkiKrQ=";
|
||||
release."1.18.0".sha256 = "sha256-2fCOlhqi4YkiL5n8SYHuc3pLH+DArf9zuMH7IhpBc2Y=";
|
||||
release."1.17.0".sha256 = "sha256-J8GatRKFU0ekNCG3V5dBI+FXypeHcLgC5QJYGYzFiEM=";
|
||||
|
|
|
|||
|
|
@ -206,7 +206,7 @@ in {
|
|||
|
||||
pypy39_prebuilt = callPackage ./pypy/prebuilt.nix {
|
||||
# Not included at top-level
|
||||
self = __splicedPackages.pythonInterpreters.pypy38_prebuilt;
|
||||
self = __splicedPackages.pythonInterpreters.pypy39_prebuilt;
|
||||
sourceVersion = {
|
||||
major = "7";
|
||||
minor = "3";
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
, autoconf, libiconv, libobjc, libunwind, Foundation
|
||||
, buildEnv, bundler, bundix, cargo, rustPlatform, rustc
|
||||
, makeBinaryWrapper, buildRubyGem, defaultGemConfig, removeReferencesTo
|
||||
, openssl, openssl_1_1
|
||||
, openssl
|
||||
, linuxPackages, libsystemtap
|
||||
} @ args:
|
||||
|
||||
|
|
@ -20,7 +20,6 @@ let
|
|||
|
||||
generic = { version, hash, cargoHash ? null }: let
|
||||
ver = version;
|
||||
atLeast30 = lib.versionAtLeast ver.majMin "3.0";
|
||||
atLeast31 = lib.versionAtLeast ver.majMin "3.1";
|
||||
atLeast32 = lib.versionAtLeast ver.majMin "3.2";
|
||||
# https://github.com/ruby/ruby/blob/v3_2_2/yjit.h#L21
|
||||
|
|
@ -30,7 +29,7 @@ let
|
|||
, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub
|
||||
, rubygemsSupport ? true
|
||||
, zlib, zlibSupport ? true
|
||||
, openssl, openssl_1_1, opensslSupport ? true
|
||||
, openssl, opensslSupport ? true
|
||||
, gdbm, gdbmSupport ? true
|
||||
, ncurses, readline, cursesSupport ? true
|
||||
, groff, docSupport ? true
|
||||
|
|
@ -84,8 +83,7 @@ let
|
|||
++ (op fiddleSupport libffi)
|
||||
++ (ops cursesSupport [ ncurses readline ])
|
||||
++ (op zlibSupport zlib)
|
||||
++ (op (atLeast30 && opensslSupport) openssl)
|
||||
++ (op (!atLeast30 && opensslSupport) openssl_1_1)
|
||||
++ (op opensslSupport openssl)
|
||||
++ (op gdbmSupport gdbm)
|
||||
++ (op yamlSupport libyaml)
|
||||
# Looks like ruby fails to build on darwin without readline even if curses
|
||||
|
|
@ -103,7 +101,7 @@ let
|
|||
enableParallelInstalling = false;
|
||||
|
||||
patches = op (lib.versionOlder ver.majMin "3.1") ./do-not-regenerate-revision.h.patch
|
||||
++ op (atLeast30 && useBaseRuby) (
|
||||
++ op useBaseRuby (
|
||||
if atLeast32 then ./do-not-update-gems-baseruby-3.2.patch
|
||||
else ./do-not-update-gems-baseruby.patch
|
||||
)
|
||||
|
|
@ -114,21 +112,6 @@ let
|
|||
hash = "sha256-43hI9L6bXfeujgmgKFVmiWhg7OXvshPCCtQ4TxqK1zk=";
|
||||
})
|
||||
]
|
||||
++ ops (!atLeast30 && rubygemsSupport) [
|
||||
# We upgrade rubygems to a version that isn't compatible with the
|
||||
# ruby 2.7 installer. Backport the upstream fix.
|
||||
./rbinstall-new-rubygems-compat.patch
|
||||
|
||||
# Ruby prior to 3.0 has a bug the installer (tools/rbinstall.rb) but
|
||||
# the resulting error was swallowed. Newer rubygems no longer swallows
|
||||
# this error. We upgrade rubygems when rubygemsSupport is enabled, so
|
||||
# we have to fix this bug to prevent the install step from failing.
|
||||
# See https://github.com/ruby/ruby/pull/2930
|
||||
(fetchpatch {
|
||||
url = "https://github.com/ruby/ruby/commit/261d8dd20afd26feb05f00a560abd99227269c1c.patch";
|
||||
hash = "sha256-HqfaevMYuIVOsdEr+CnjnUqr2IrH5fkW2uKzzoqIMXM=";
|
||||
})
|
||||
]
|
||||
++ ops atLeast31 [
|
||||
# When using a baseruby, ruby always sets "libdir" to the build
|
||||
# directory, which nix rejects due to a reference in to /build/ in
|
||||
|
|
@ -154,10 +137,6 @@ let
|
|||
sed -i configure.ac -e '/config.guess/d'
|
||||
cp --remove-destination ${config}/config.guess tool/
|
||||
cp --remove-destination ${config}/config.sub tool/
|
||||
'' + opString (!atLeast30) ''
|
||||
# Make the build reproducible for ruby <= 2.7
|
||||
# See https://github.com/ruby/io-console/commit/679a941d05d869f5e575730f6581c027203b7b26#diff-d8422f096931c58d4463e2489f62a228b0f24f0492950ba88c8c89a0d741cfe6
|
||||
sed -i ext/io/console/io-console.gemspec -e '/s\.date/d'
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
|
|
@ -315,11 +294,6 @@ in {
|
|||
mkRubyVersion = rubyVersion;
|
||||
mkRuby = generic;
|
||||
|
||||
ruby_2_7 = generic {
|
||||
version = rubyVersion "2" "7" "8" "";
|
||||
hash = "sha256-wtq2PLyPKgVSYQitQZ76Y6Z+1AdNu8+fwrHKZky0W6A=";
|
||||
};
|
||||
|
||||
ruby_3_1 = generic {
|
||||
version = rubyVersion "3" "1" "4" "";
|
||||
hash = "sha256-o9VYeaDfqx1xQf3xDSKgfb+OXNxEFdob3gYSfVzDx7Y=";
|
||||
|
|
|
|||
|
|
@ -1,87 +0,0 @@
|
|||
From 8e85d27f9ccfe152fc1b891c19f125915a907493 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
|
||||
Date: Tue, 1 Oct 2019 12:03:33 +0200
|
||||
Subject: [PATCH] Use `Gem::Package` like object instead of monkey patching.
|
||||
|
||||
1. This is similar to what RubyGems does and it is less magic [[1]].
|
||||
2. It avoids deprecated code paths in RubyGems [[2]].
|
||||
|
||||
[1]: https://github.com/rubygems/rubygems/blob/92892bbc3adba86a90756c385433835f6761b8da/lib/rubygems/installer.rb#L151
|
||||
[2]: https://github.com/rubygems/rubygems/blob/92892bbc3adba86a90756c385433835f6761b8da/lib/rubygems/installer.rb#L187
|
||||
|
||||
(cherry picked from commit e960ef6f18a25c637c54f00c75bb6c24f8ab55d0)
|
||||
---
|
||||
tool/rbinstall.rb | 47 +++++++++++++++++++++++++++--------------------
|
||||
1 file changed, 27 insertions(+), 20 deletions(-)
|
||||
|
||||
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
|
||||
index 060390626f..28ae8c409a 100755
|
||||
--- a/tool/rbinstall.rb
|
||||
+++ b/tool/rbinstall.rb
|
||||
@@ -710,28 +710,34 @@ def remove_prefix(prefix, string)
|
||||
end
|
||||
end
|
||||
|
||||
- class UnpackedInstaller < Gem::Installer
|
||||
- module DirPackage
|
||||
- def extract_files(destination_dir, pattern = "*")
|
||||
- path = File.dirname(@gem.path)
|
||||
- return if path == destination_dir
|
||||
- File.chmod(0700, destination_dir)
|
||||
- mode = pattern == "bin/*" ? $script_mode : $data_mode
|
||||
- spec.files.each do |f|
|
||||
- src = File.join(path, f)
|
||||
- dest = File.join(without_destdir(destination_dir), f)
|
||||
- makedirs(dest[/.*(?=\/)/m])
|
||||
- install src, dest, :mode => mode
|
||||
- end
|
||||
- File.chmod($dir_mode, destination_dir)
|
||||
+ class DirPackage
|
||||
+ attr_reader :spec
|
||||
+
|
||||
+ attr_accessor :dir_mode
|
||||
+ attr_accessor :prog_mode
|
||||
+ attr_accessor :data_mode
|
||||
+
|
||||
+ def initialize(spec)
|
||||
+ @spec = spec
|
||||
+ @src_dir = File.dirname(@spec.loaded_from)
|
||||
+ end
|
||||
+
|
||||
+ def extract_files(destination_dir, pattern = "*")
|
||||
+ path = @src_dir
|
||||
+ return if path == destination_dir
|
||||
+ File.chmod(0700, destination_dir)
|
||||
+ mode = pattern == "bin/*" ? $script_mode : $data_mode
|
||||
+ spec.files.each do |f|
|
||||
+ src = File.join(path, f)
|
||||
+ dest = File.join(without_destdir(destination_dir), f)
|
||||
+ makedirs(dest[/.*(?=\/)/m])
|
||||
+ install src, dest, :mode => mode
|
||||
end
|
||||
+ File.chmod($dir_mode, destination_dir)
|
||||
end
|
||||
+ end
|
||||
|
||||
- def initialize(spec, *options)
|
||||
- super(spec.loaded_from, *options)
|
||||
- @package.extend(DirPackage).spec = spec
|
||||
- end
|
||||
-
|
||||
+ class UnpackedInstaller < Gem::Installer
|
||||
def write_cache_file
|
||||
end
|
||||
|
||||
@@ -890,7 +896,8 @@ def install_default_gem(dir, srcdir)
|
||||
if File.directory?(ext = "#{gem_ext_dir}/#{spec.full_name}")
|
||||
spec.extensions[0] ||= "-"
|
||||
end
|
||||
- ins = RbInstall::UnpackedInstaller.new(spec, options)
|
||||
+ package = RbInstall::DirPackage.new spec
|
||||
+ ins = RbInstall::UnpackedInstaller.new(package, options)
|
||||
puts "#{INDENT}#{spec.name} #{spec.version}"
|
||||
ins.install
|
||||
File.chmod($data_mode, File.join(install_dir, "specifications", "#{spec.full_name}.gemspec"))
|
||||
--
|
||||
2.35.1
|
||||
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "snobol4";
|
||||
version = "2.3.1";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
|
|
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
|||
# fallback for when the current version is moved to the old folder
|
||||
"https://ftp.regressive.org/snobol4/old/snobol4-${version}.tar.gz"
|
||||
];
|
||||
hash = "sha256-kSRNZ9TinSqtzlZVvUOC/6tExiSn6krWQRQn86vxdTU=";
|
||||
hash = "sha256-QeMB6d0YDXARfWTzaU+d1U+e2QmjajJYfIvthatorBU=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" "doc" ];
|
||||
|
|
|
|||
|
|
@ -5,6 +5,9 @@
|
|||
, pkg-config
|
||||
, withGstreamer ? true
|
||||
, gst_all_1
|
||||
, withOmemo ? true
|
||||
, qca-qt5
|
||||
, libomemo-c
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
|
|
@ -20,7 +23,7 @@ mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
] ++ lib.optionals withGstreamer [
|
||||
] ++ lib.optionals (withGstreamer || withOmemo) [
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = lib.optionals withGstreamer (with gst_all_1; [
|
||||
|
|
@ -28,12 +31,17 @@ mkDerivation rec {
|
|||
gst-plugins-bad
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
]);
|
||||
]) ++ lib.optionals withOmemo [
|
||||
qca-qt5
|
||||
libomemo-c
|
||||
];
|
||||
cmakeFlags = [
|
||||
"-DBUILD_EXAMPLES=false"
|
||||
"-DBUILD_TESTS=false"
|
||||
] ++ lib.optionals withGstreamer [
|
||||
"-DWITH_GSTREAMER=ON"
|
||||
] ++ lib.optionals withOmemo [
|
||||
"-DBUILD_OMEMO=ON"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -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.17.0"
|
||||
, version ? if lib.versionAtLeast ocaml.version "4.08" then "1.18.1"
|
||||
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.18.1".sha256 = "sha256-zgBJefQDe3JyCGbC0wvMcx/9iMVbftBJ43NPogkNeHY=";
|
||||
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=";
|
||||
|
|
|
|||
|
|
@ -3,10 +3,23 @@
|
|||
, fmtSupport ? lib.versionAtLeast ocaml.version "4.08"
|
||||
, js_of_ocaml
|
||||
, jsooSupport ? true
|
||||
, lwtSupport ? true
|
||||
, cmdlinerSupport ? true
|
||||
}:
|
||||
let
|
||||
pname = "logs";
|
||||
webpage = "https://erratique.ch/software/${pname}";
|
||||
|
||||
optional_deps = [
|
||||
{ pkg = js_of_ocaml; enable_flag = "--with-js_of_ocaml"; enabled = jsooSupport; }
|
||||
{ pkg = fmt; enable_flag = "--with-fmt"; enabled = fmtSupport; }
|
||||
{ pkg = lwt; enable_flag = "--with-lwt"; enabled = lwtSupport; }
|
||||
{ pkg = cmdliner; enable_flag = "--with-cmdliner"; enabled = cmdlinerSupport; }
|
||||
];
|
||||
enable_flags =
|
||||
lib.concatMap (d: [ d.enable_flag (lib.boolToString d.enabled)]) optional_deps;
|
||||
optional_buildInputs =
|
||||
map (d: d.pkg) (lib.filter (d: d.enabled) optional_deps);
|
||||
in
|
||||
|
||||
if lib.versionOlder ocaml.version "4.03"
|
||||
|
|
@ -23,14 +36,12 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];
|
||||
buildInputs = [ cmdliner lwt topkg ]
|
||||
++ lib.optional fmtSupport fmt
|
||||
++ lib.optional jsooSupport js_of_ocaml;
|
||||
buildInputs = [ topkg ] ++ optional_buildInputs;
|
||||
propagatedBuildInputs = [ result ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
buildPhase = "${topkg.run} build --with-js_of_ocaml ${lib.boolToString jsooSupport} --with-fmt ${lib.boolToString fmtSupport}";
|
||||
buildPhase = "${topkg.run} build ${lib.escapeShellArgs enable_flags}";
|
||||
|
||||
inherit (topkg) installPhase;
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,13 @@
|
|||
, gitUpdater
|
||||
}:
|
||||
|
||||
let
|
||||
# Strip optional dependencies from logs to make the closure smaller as this
|
||||
# package contains a binary
|
||||
logs' = logs.override { jsooSupport = false; lwtSupport = false; };
|
||||
|
||||
in
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "mdx";
|
||||
version = "2.3.1";
|
||||
|
|
@ -16,7 +23,9 @@ buildDunePackage rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ cppo ];
|
||||
propagatedBuildInputs = [ astring fmt logs csexp ocaml-version camlp-streams re findlib ];
|
||||
propagatedBuildInputs = [
|
||||
astring fmt logs' csexp ocaml-version camlp-streams re findlib
|
||||
];
|
||||
checkInputs = [ alcotest lwt ];
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
46
pkgs/development/ocaml-modules/otfed/default.nix
Normal file
46
pkgs/development/ocaml-modules/otfed/default.nix
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
{ lib
|
||||
, buildDunePackage
|
||||
, fetchFromGitHub
|
||||
, base
|
||||
, ppx_deriving
|
||||
, ppx_inline_test
|
||||
, uutf
|
||||
, alcotest
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "otfed";
|
||||
version = "0.3.1";
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gfngfn";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-6QCom9nrz0B5vCmuBzqsM0zCs8tBLJC6peig+vCgMVA=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
uutf
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
base
|
||||
ppx_deriving
|
||||
ppx_inline_test
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
alcotest
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/gfngfn/otfed";
|
||||
description = "OpenType Font Format Encoder & Decoder";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
};
|
||||
}
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohomekit";
|
||||
version = "3.1.0";
|
||||
version = "3.1.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
|
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
|||
owner = "Jc2k";
|
||||
repo = "aiohomekit";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-yaPliPKa/mS9amUkEx/iM398HGoiKrR6miCtK7fThNw=";
|
||||
hash = "sha256-6dR7hMcHOjbFl4tnInMEYfnEWMFx+A+9TXoBcB83mrE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,28 +1,29 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, hatch-vcs
|
||||
, hatchling
|
||||
, in-n-out
|
||||
, psygnal
|
||||
, pydantic
|
||||
, pydantic-compat
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, typing-extensions
|
||||
, hatch-vcs
|
||||
, hatchling
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "app-model";
|
||||
version = "0.2.2";
|
||||
format = "pyproject";
|
||||
version = "0.2.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pyapp-kit";
|
||||
repo = pname;
|
||||
repo = "app-model";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-vo10BHUzvYlldAqTw/1LxgvSXgTM3LAls9jQIeB5LcU=";
|
||||
hash = "sha256-idie99ditHJG/6rv97LDaF71iTjjgJyhLiTrbkQmbts=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -33,6 +34,7 @@ buildPythonPackage rec {
|
|||
propagatedBuildInputs = [
|
||||
psygnal
|
||||
pydantic
|
||||
pydantic-compat
|
||||
in-n-out
|
||||
typing-extensions
|
||||
];
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bip-utils";
|
||||
version = "2.8.0";
|
||||
version = "2.9.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "ebellocchia";
|
||||
repo = "bip_utils";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-FW3ni7kPB0VeVK/uWjDEeWgilP9dNiuvSaboUpG5DLo=";
|
||||
hash = "sha256-PUWKpAn6Z1E7uMk8+XFm6FDtupzj6eMSkyXR9vN1w3I=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bleak-esphome";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "bluetooth-devices";
|
||||
repo = "bleak-esphome";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-CgzYZTDWI9vvUtndxyERsWk738e22SIF+s5oi7gI9R0=";
|
||||
hash = "sha256-cLjQg54DL17VtM/NFOQUE0dJThz5EhjipW2t9yhAMQ0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -363,12 +363,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.34.8";
|
||||
version = "1.34.11";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-A/4+po7ZeLAYiQnd2EjjYPEZns4GK6F0J53z3JDM/fA=";
|
||||
hash = "sha256-GE8NvJAbr/H1slIhjVf7ylt1UhwGQa2aTX+jSqIM+3o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
responses,
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "btsmarthub_devicelist";
|
||||
pname = "btsmarthub-devicelist";
|
||||
version = "0.2.3";
|
||||
format = "setuptools";
|
||||
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "clarifai-grpc";
|
||||
version = "9.11.4";
|
||||
version = "9.11.5";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "Clarifai";
|
||||
repo = "clarifai-python-grpc";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-uCXtd9m2phIgP85syIPtoFIxM9dkBzFxxK6OOF0VWAA=";
|
||||
hash = "sha256-jH5B3iakMj7tyKWREicrqmBvekjocRbYuvuUjudB8vg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "clarifai";
|
||||
version = "9.11.0";
|
||||
version = "9.11.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
owner = "Clarifai";
|
||||
repo = "clarifai-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-4m4h2TbiZPvcpZn8h0z+GN+9w3Udik2NVAtFSF4gFgQ=";
|
||||
hash = "sha256-fVari/SnrUnEbrYefV9j2yA/EMJoGiLOV7q/DrS0AQ8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cloup";
|
||||
version = "3.0.3";
|
||||
version = "3.0.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-5b13idF8DelxOaxeuK+ML42Wotg2PoQRIk32JaaFjSE=";
|
||||
hash = "sha256-ZYER4vSbglaoItrF+gIFv2QQn978Q185kjSQoysT7Ak=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -42,14 +42,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "Django";
|
||||
version = "5.0";
|
||||
version = "5.0.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-fSnhTfvBnLapWkvWae294R9dTGpx/apCwtQLaEboB/c=";
|
||||
hash = "sha256-jIZZZlvG46RP7+GrCikeWj+zl5+agjC+Kd6XXlfo+FQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ha-mqtt-discoverable";
|
||||
version = "0.13.0";
|
||||
version = "0.13.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "unixorn";
|
||||
repo = "ha-mqtt-discoverable";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-DY2VvCxcbSO+H+SCRmIybq9fcB+areYQ+R6Js6oExjk=";
|
||||
hash = "sha256-Ue8az6Q7uU02IJJyyHk64Ji4J6sf/bShvTeHhN9U92Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "oelint-parser";
|
||||
version = "2.12.3";
|
||||
version = "2.13.3";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "oelint_parser";
|
||||
hash = "sha256-fzHEy9/BxstPAYhVTG0o7Gn2D9UKuSZvI0X5ynZ+oEk=";
|
||||
hash = "sha256-pjonw0VZlDK3xf8cfgn+qT4jZSYD8wRSDLz1Go9Y5so=";
|
||||
};
|
||||
|
||||
buildInputs = [ pip ];
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
, pyproj
|
||||
, python-dateutil
|
||||
, joblib
|
||||
, repoze_lru
|
||||
, repoze-lru
|
||||
, xmltodict
|
||||
, cloudpickle
|
||||
, scipy
|
||||
|
|
@ -97,7 +97,7 @@ buildPythonPackage rec {
|
|||
pyproj
|
||||
python-dateutil
|
||||
joblib
|
||||
repoze_lru
|
||||
repoze-lru
|
||||
xmltodict
|
||||
cloudpickle
|
||||
];
|
||||
|
|
|
|||
54
pkgs/development/python-modules/pydantic-compat/default.nix
Normal file
54
pkgs/development/python-modules/pydantic-compat/default.nix
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, git
|
||||
, hatch-vcs
|
||||
, hatchling
|
||||
, importlib-metadata
|
||||
, pydantic
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydantic-compat";
|
||||
version = "0.1.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pyapp-kit";
|
||||
repo = "pydantic-compat";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-YJUfWu+nyGlwpJpxYghCKzj3CasdAaqYoNVCcfo/7YE=";
|
||||
leaveDotGit = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
git
|
||||
hatch-vcs
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
importlib-metadata
|
||||
pydantic
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pydantic_compat"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Compatibility layer for pydantic v1/v2";
|
||||
homepage = "https://github.com/pyapp-kit/pydantic-compat";
|
||||
changelog = "https://github.com/pyapp-kit/pydantic-compat/releases/tag/v${version}";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyduotecno";
|
||||
version = "2023.11.1";
|
||||
version = "2024.1.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "Cereal2nd";
|
||||
repo = "pyDuotecno";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-gLP5N07msjuQeeyjbCvZK4TrVyZKUCSSKsjNY5Pa9gQ=";
|
||||
hash = "sha256-+mPbx678QIV567umbmVKqBTq696pFlFXhlb4cMv54ak=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyngrok";
|
||||
version = "7.0.4";
|
||||
version = "7.0.5";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-VEIsGjVFx5Q7G2cKtMYQY7Te1TpFUZYZJRZvRMAwSS8=";
|
||||
hash = "sha256-YTe9n5cZLYQ9ghTOF8MHg/1d8iRElPHNnAQj0pnEjR4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
, pastedeploy
|
||||
, plaster
|
||||
, plaster-pastedeploy
|
||||
, repoze_lru
|
||||
, repoze-lru
|
||||
, translationstring
|
||||
, venusian
|
||||
, webob
|
||||
|
|
@ -33,7 +33,7 @@ buildPythonPackage rec {
|
|||
pastedeploy
|
||||
plaster
|
||||
plaster-pastedeploy
|
||||
repoze_lru
|
||||
repoze-lru
|
||||
translationstring
|
||||
venusian
|
||||
webob
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytensor";
|
||||
version = "2.18.4";
|
||||
version = "2.18.5";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -33,7 +33,7 @@ buildPythonPackage rec {
|
|||
owner = "pymc-devs";
|
||||
repo = "pytensor";
|
||||
rev = "refs/tags/rel-${version}";
|
||||
hash = "sha256-j7SNXFiQUofP5NtggSOwLxXkg267yneqoWH2uoDZogs=";
|
||||
hash = "sha256-0xwzFmYsec7uQaq6a4BAA6MYy2zIVZ0cTwodVJQ6yMs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue