Merge branch 'master' into staging-next

b04fc593e7 seems to have accidentally changed mkDerivation function for dfilemanager and solarus-quest-editor so I have reverted that here.
This commit is contained in:
Jan Tojnar 2021-01-07 13:04:31 +01:00
commit f19eb635b4
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
457 changed files with 8208 additions and 3945 deletions

3
.github/CODEOWNERS vendored
View file

@ -220,3 +220,6 @@
/pkgs/development/compilers/go @kalbasit @Mic92 @zowoq
/pkgs/development/go-modules @kalbasit @Mic92 @zowoq
/pkgs/development/go-packages @kalbasit @Mic92 @zowoq
# Cinnamon
/pkgs/desktops/cinnamon @mkg20001

View file

@ -1162,6 +1162,12 @@
githubId = 37907;
name = "Julian Stecklina";
};
bloomvdomino = {
name = "Laura Fäßler";
email = "0x@ytex.de";
github = "bloomvdomino";
githubId = 33204710;
};
bluescreen303 = {
email = "mathijs@bluescreen303.nl";
github = "bluescreen303";

View file

@ -0,0 +1,67 @@
{ maintainer }:
let
pkgs = import ./../../default.nix { };
maintainer_ = pkgs.lib.maintainers.${maintainer};
packagesWith = cond: return: prefix: set:
(pkgs.lib.flatten
(pkgs.lib.mapAttrsToList
(name: pkg:
let
result = builtins.tryEval
(
if pkgs.lib.isDerivation pkg && cond name pkg then
# Skip packages whose closure fails on evaluation.
# This happens for pkgs like `python27Packages.djangoql`
# that have disabled Python pkgs as dependencies.
builtins.seq pkg.outPath
[ (return "${prefix}${name}") ]
else if pkg.recurseForDerivations or false || pkg.recurseForRelease or false
# then packagesWith cond return pkg
then packagesWith cond return "${name}." pkg
else [ ]
);
in
if result.success then result.value
else [ ]
)
set
)
);
packages = packagesWith
(name: pkg:
(
if builtins.hasAttr "meta" pkg && builtins.hasAttr "maintainers" pkg.meta
then
(
if builtins.isList pkg.meta.maintainers
then builtins.elem maintainer_ pkg.meta.maintainers
else maintainer_ == pkg.meta.maintainers
)
else false
)
)
(name: name)
("")
pkgs;
in
pkgs.stdenv.mkDerivation {
name = "nixpkgs-update-script";
buildCommand = ''
echo ""
echo "----------------------------------------------------------------"
echo ""
echo "nix-shell maintainers/scripts/check-hydra-by-maintainer.nix --argstr maintainer SuperSandro2000"
echo ""
echo "----------------------------------------------------------------"
exit 1
'';
shellHook = ''
unset shellHook # do not contaminate nested shells
echo "Please stand by"
echo nix-shell -p hydra-check --run "hydra-check ${builtins.concatStringsSep " " packages}"
nix-shell -p hydra-check --run "hydra-check ${builtins.concatStringsSep " " packages}"
exit $?
'';
}

View file

@ -286,6 +286,16 @@
<xref linkend="opt-services.privoxy.enableTor" /> = true;
</programlisting>
</listitem>
<listitem>
<para>
The <literal>services.tor</literal> module has a new exhaustively typed <xref linkend="opt-services.tor.settings" /> option following RFC 0042; backward compatibility with old options has been preserved when aliasing was possible.
The corresponding systemd service has been hardened,
but there is a chance that the service still requires more permissions,
so please report any related trouble on the bugtracker.
Onion services v3 are now supported in <xref linkend="opt-services.tor.relay.onionServices" />.
A new <xref linkend="opt-services.tor.openFirewall" /> option as been introduced for allowing connections on all the TCP ports configured.
</para>
</listitem>
<listitem>
<para>
The options <literal>services.slurm.dbdserver.storagePass</literal>
@ -309,6 +319,14 @@
Based on <xref linkend="opt-system.stateVersion" />, existing installations will continue to work.
</para>
</listitem>
<listitem>
<para>
<package>fish-foreign-env</package> is now an alias for the
<package>fishPlugins.foreign-env</package> package, in which the fish
functions have been relocated to the
<literal>vendor_functions.d</literal> directory to be loaded automatically.
</para>
</listitem>
<listitem>
<para>
The prometheus json exporter is now managed by the prometheus community. Together with additional features

View file

@ -24,6 +24,15 @@ in
'';
};
package = mkOption {
type = types.package;
default = pkgs.opentabletdriver;
defaultText = "pkgs.opentabletdriver";
description = ''
OpenTabletDriver derivation to use.
'';
};
daemon = {
enable = mkOption {
default = true;
@ -37,9 +46,9 @@ in
};
config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [ opentabletdriver ];
environment.systemPackages = [ cfg.package ];
services.udev.packages = with pkgs; [ opentabletdriver ];
services.udev.packages = [ cfg.package ];
boot.blacklistedKernelModules = cfg.blacklistedKernelModules;
@ -50,7 +59,7 @@ in
serviceConfig = {
Type = "simple";
ExecStart = "${opentabletdriver}/bin/otd-daemon -c ${opentabletdriver}/lib/OpenTabletDriver/Configurations";
ExecStart = "${cfg.package}/bin/otd-daemon -c ${cfg.package}/lib/OpenTabletDriver/Configurations";
Restart = "on-failure";
};
};

View file

@ -104,7 +104,7 @@ in
'';
# Some more help text.
services.mingetty.helpLine =
services.getty.helpLine =
''
Log in as "root" with an empty password. ${

View file

@ -122,7 +122,7 @@ in
device = "/dev/something";
};
services.mingetty = {
services.getty = {
# Some more help text.
helpLine = ''
Log in as "root" with an empty password. ${

View file

@ -261,7 +261,7 @@ in
++ optionals cfg.doc.enable ([ manual.manualHTML nixos-help ]
++ optionals config.services.xserver.enable [ pkgs.nixos-icons ]);
services.mingetty.helpLine = mkIf cfg.doc.enable (
services.getty.helpLine = mkIf cfg.doc.enable (
"\nRun 'nixos-help' for the NixOS manual."
);
})

View file

@ -852,7 +852,7 @@
./services/torrent/peerflix.nix
./services/torrent/rtorrent.nix
./services/torrent/transmission.nix
./services/ttys/agetty.nix
./services/ttys/getty.nix
./services/ttys/gpm.nix
./services/ttys/kmscon.nix
./services/wayland/cage.nix

View file

@ -45,10 +45,10 @@ with lib;
};
# Automatically log in at the virtual consoles.
services.mingetty.autologinUser = "nixos";
services.getty.autologinUser = "nixos";
# Some more help text.
services.mingetty.helpLine = ''
services.getty.helpLine = ''
The "nixos" and "root" accounts have empty passwords.
An ssh daemon is running. You then must set a password

View file

@ -112,7 +112,7 @@ in
environment.etc."fish/nixos-env-preinit.fish".text = ''
# This happens before $__fish_datadir/config.fish sets fish_function_path, so it is currently
# unset. We set it and then completely erase it, leaving its configuration to $__fish_datadir/config.fish
set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $__fish_datadir/functions
set fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d $__fish_datadir/functions
# source the NixOS environment config
if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]
@ -128,7 +128,7 @@ in
# if we haven't sourced the general config, do it
if not set -q __fish_nixos_general_config_sourced
set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path
set --prepend fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d
fenv source /etc/fish/foreign-env/shellInit > /dev/null
set -e fish_function_path[1]
@ -142,7 +142,7 @@ in
# if we haven't sourced the login config, do it
status --is-login; and not set -q __fish_nixos_login_config_sourced
and begin
set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path
set --prepend fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d
fenv source /etc/fish/foreign-env/loginShellInit > /dev/null
set -e fish_function_path[1]
@ -158,7 +158,7 @@ in
and begin
${fishAliases}
set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path
set --prepend fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d
fenv source /etc/fish/foreign-env/interactiveShellInit > /dev/null
set -e fish_function_path[1]

View file

@ -49,6 +49,11 @@ in {
default = "https://hoogle.haskell.org";
};
host = mkOption {
type = types.str;
description = "Set the host to bind on.";
default = "127.0.0.1";
};
};
config = mkIf cfg.enable {
@ -59,7 +64,7 @@ in {
serviceConfig = {
Restart = "always";
ExecStart = ''${hoogleEnv}/bin/hoogle server --local --port ${toString cfg.port} --home ${cfg.home}'';
ExecStart = ''${hoogleEnv}/bin/hoogle server --local --port ${toString cfg.port} --home ${cfg.home} --host ${cfg.host}'';
DynamicUser = true;

View file

@ -367,7 +367,7 @@ in {
mailman-web-setup = {
description = "Prepare mailman-web files and database";
before = [ "uwsgi.service" "mailman-uwsgi.service" ];
before = [ "mailman-uwsgi.service" ];
requiredBy = [ "mailman-uwsgi.service" ];
restartTriggers = [ config.environment.etc."mailman3/settings.py".source ];
script = ''

View file

@ -16,7 +16,7 @@ let
${concatMapStrings (f: "actionsfile ${f}\n") cfg.actionsFiles}
${concatMapStrings (f: "filterfile ${f}\n") cfg.filterFiles}
'' + optionalString cfg.enableTor ''
forward-socks4a / ${config.services.tor.client.socksListenAddressFaster} .
forward-socks5t / 127.0.0.1:9063 .
toggle 1
enable-remote-toggle 0
enable-edit-actions 0
@ -123,6 +123,11 @@ in
serviceConfig.ProtectSystem = "full";
};
services.tor.settings.SOCKSPort = mkIf cfg.enableTor [
# Route HTTP traffic over a faster port (without IsolateDestAddr).
{ addr = "127.0.0.1"; port = 9063; IsolateDestAddr = false; }
];
};
meta.maintainers = with lib.maintainers; [ rnhmjoj ];

File diff suppressed because it is too large Load diff

View file

@ -4,7 +4,7 @@ with lib;
let
autologinArg = optionalString (config.services.mingetty.autologinUser != null) "--autologin ${config.services.mingetty.autologinUser}";
autologinArg = optionalString (config.services.getty.autologinUser != null) "--autologin ${config.services.getty.autologinUser}";
gettyCmd = extraArgs: "@${pkgs.util-linux}/sbin/agetty agetty --login-program ${pkgs.shadow}/bin/login ${autologinArg} ${extraArgs}";
in
@ -13,9 +13,13 @@ in
###### interface
imports = [
(mkRenamedOptionModule [ "services" "mingetty" ] [ "services" "getty" ])
];
options = {
services.mingetty = {
services.getty = {
autologinUser = mkOption {
type = types.nullOr types.str;
@ -29,7 +33,7 @@ in
greetingLine = mkOption {
type = types.str;
description = ''
Welcome line printed by mingetty.
Welcome line printed by agetty.
The default shows current NixOS version label, machine type and tty.
'';
};
@ -38,7 +42,7 @@ in
type = types.lines;
default = "";
description = ''
Help line printed by mingetty below the welcome line.
Help line printed by agetty below the welcome line.
Used by the installation CD to give some hints on
how to proceed.
'';
@ -65,7 +69,7 @@ in
config = {
# Note: this is set here rather than up there so that changing
# nixos.label would not rebuild manual pages
services.mingetty.greetingLine = mkDefault ''<<< Welcome to NixOS ${config.system.nixos.label} (\m) - \l >>>'';
services.getty.greetingLine = mkDefault ''<<< Welcome to NixOS ${config.system.nixos.label} (\m) - \l >>>'';
systemd.services."getty@" =
{ serviceConfig.ExecStart = [
@ -76,7 +80,7 @@ in
};
systemd.services."serial-getty@" =
let speeds = concatStringsSep "," (map toString config.services.mingetty.serialSpeed); in
let speeds = concatStringsSep "," (map toString config.services.getty.serialSpeed); in
{ serviceConfig.ExecStart = [
"" # override upstream default with an empty ExecStart
(gettyCmd "%I ${speeds} $TERM")
@ -106,8 +110,8 @@ in
{ # Friendly greeting on the virtual consoles.
source = pkgs.writeText "issue" ''
${config.services.mingetty.greetingLine}
${config.services.mingetty.helpLine}
${config.services.getty.greetingLine}
${config.services.getty.helpLine}
'';
};

View file

@ -10,6 +10,10 @@
<link linkend="opt-services.nextcloud.enable">services.nextcloud</link>. A
desktop client is packaged at <literal>pkgs.nextcloud-client</literal>.
</para>
<para>
The current default by NixOS is <package>nextcloud20</package> which is also the latest
major version available.
</para>
<section xml:id="module-services-nextcloud-basic-usage">
<title>Basic usage</title>
@ -210,7 +214,7 @@
nextcloud17 = generic {
version = "17.0.x";
sha256 = "0000000000000000000000000000000000000000000000000000";
insecure = true;
eol = true;
};
}</programlisting>
</para>

View file

@ -27,6 +27,33 @@ let
) cfg.virtualHosts;
enableIPv6 = config.networking.enableIPv6;
defaultFastcgiParams = {
SCRIPT_FILENAME = "$document_root$fastcgi_script_name";
QUERY_STRING = "$query_string";
REQUEST_METHOD = "$request_method";
CONTENT_TYPE = "$content_type";
CONTENT_LENGTH = "$content_length";
SCRIPT_NAME = "$fastcgi_script_name";
REQUEST_URI = "$request_uri";
DOCUMENT_URI = "$document_uri";
DOCUMENT_ROOT = "$document_root";
SERVER_PROTOCOL = "$server_protocol";
REQUEST_SCHEME = "$scheme";
HTTPS = "$https if_not_empty";
GATEWAY_INTERFACE = "CGI/1.1";
SERVER_SOFTWARE = "nginx/$nginx_version";
REMOTE_ADDR = "$remote_addr";
REMOTE_PORT = "$remote_port";
SERVER_ADDR = "$server_addr";
SERVER_PORT = "$server_port";
SERVER_NAME = "$server_name";
REDIRECT_STATUS = "200";
};
recommendedProxyConfig = pkgs.writeText "nginx-recommended-proxy-headers.conf" ''
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
@ -283,6 +310,10 @@ let
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $connection_upgrade;
''}
${concatStringsSep "\n"
(mapAttrsToList (n: v: ''fastcgi_param ${n} "${v}";'')
(optionalAttrs (config.fastcgiParams != {})
(defaultFastcgiParams // config.fastcgiParams)))}
${optionalString (config.index != null) "index ${config.index};"}
${optionalString (config.tryFiles != null) "try_files ${config.tryFiles};"}
${optionalString (config.root != null) "root ${config.root};"}

View file

@ -101,6 +101,16 @@ with lib;
'';
};
fastcgiParams = mkOption {
type = types.attrsOf types.str;
default = {};
description = ''
FastCGI parameters to override. Unlike in the Nginx
configuration file, overriding only some default parameters
won't unset the default values for other parameters.
'';
};
extraConfig = mkOption {
type = types.lines;
default = "";

View file

@ -11,7 +11,7 @@ with lib;
users.users.root.initialHashedPassword = mkOverride 150 "";
# Some more help text.
services.mingetty.helpLine =
services.getty.helpLine =
''
Log in as "root" with an empty password.

View file

@ -247,5 +247,12 @@ import ./make-test-python.nix ({ pkgs, ... }: {
).strip()
== "${if pkgs.system == "aarch64-linux" then "amd64" else "arm64"}"
)
with subtest("buildLayeredImage doesn't dereference /nix/store symlink layers"):
docker.succeed(
"docker load --input='${examples.layeredStoreSymlink}'",
"docker run --rm ${examples.layeredStoreSymlink.imageName} bash -c 'test -L ${examples.layeredStoreSymlink.passthru.symlink}'",
"docker rmi ${examples.layeredStoreSymlink.imageName}",
)
'';
})

View file

@ -50,7 +50,7 @@ import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... }:
with subtest("Virtual console logout"):
machine.send_chars("exit\n")
machine.wait_until_fails("pgrep -u alice bash")
machine.screenshot("mingetty")
machine.screenshot("getty")
with subtest("Check whether ctrl-alt-delete works"):
machine.send_key("ctrl-alt-delete")

View file

@ -1,11 +1,19 @@
{ system ? builtins.currentSystem,
config ? {},
pkgs ? import ../.. { inherit system config; }
}:
with import ../lib/testing-python.nix { inherit system pkgs; };
let
lib = pkgs.lib;
# Makes a test for a PostgreSQL package, given by name and looked up from `pkgs`.
makePostgresqlWalReceiverTest = postgresqlPackage:
{
name = postgresqlPackage;
value =
import ./make-test-python.nix ({ pkgs, lib, ... }: let
let
pkg = pkgs."${postgresqlPackage}";
postgresqlDataDir = "/var/lib/postgresql/${pkg.psqlSchema}";
replicationUser = "wal_receiver_user";
@ -19,7 +27,7 @@ let
then pkgs.writeTextDir "recovery.signal" ""
else pkgs.writeTextDir "recovery.conf" "restore_command = 'cp ${walBackupDir}/%f %p'";
in {
in makeTest {
name = "postgresql-wal-receiver-${postgresqlPackage}";
meta.maintainers = with lib.maintainers; [ pacien ];
@ -104,7 +112,7 @@ let
"test $(sudo -u postgres psql --pset='pager=off' --tuples-only --command='select count(distinct val) from dummy;') -eq 100"
)
'';
});
};
};
# Maps the generic function over all attributes of PostgreSQL packages

View file

@ -17,7 +17,7 @@ rec {
environment.systemPackages = with pkgs; [ netcat ];
services.tor.enable = true;
services.tor.client.enable = true;
services.tor.controlPort = 9051;
services.tor.settings.ControlPort = 9051;
};
testScript = ''

View file

@ -1,5 +1,6 @@
{ stdenv
, fetchurl
, pkg-config
, alsaLib
, audiofile
, libjack2
@ -9,9 +10,14 @@
, libsndfile
, lilv
, lv2
, ncurses
, readline
}:
# TODO: fix readline, ncurses, lilv, liblo, liboil and python. See configure log.
# TODO: fix python. See configure log.
# fix -Dnullptr=0 cludge below.
# The error is
# /nix/store/*-lilv-0.24.10/include/lilv-0/lilv/lilvmm.hpp:272:53: error: 'nullptr' was not declared in this scope
stdenv.mkDerivation rec {
pname = "ecasound";
@ -22,7 +28,34 @@ stdenv.mkDerivation rec {
sha256 = "1m7njfjdb7sqf0lhgc4swihgdr4snkg8v02wcly08wb5ar2fr2s6";
};
buildInputs = [ alsaLib audiofile libjack2 liblo liboil libsamplerate libsndfile lilv lv2 ];
nativeBuildInputs = [
pkg-config
];
buildInputs = [
alsaLib
audiofile
libjack2
liblo
liboil
libsamplerate
libsndfile
lilv
lv2
ncurses
readline
];
strictDeps = true;
configureFlags = "--enable-liblilv --with-extra-cppflags=-Dnullptr=0";
postPatch = ''
sed -i -e '
s@^#include <readline.h>@#include <readline/readline.h>@
s@^#include <history.h>@#include <readline/history.h>@
' ecasound/eca-curses.cpp
'';
meta = {
description = "Software package designed for multitrack audio processing";

View file

@ -1,6 +1,7 @@
{ lib
, mopidy
, python3Packages
, fetchpatch
}:
python3Packages.buildPythonApplication rec {
@ -21,6 +22,14 @@ python3Packages.buildPythonApplication rec {
python3Packages.pytestCheckHook
];
patches = [
# Fix tests for Mopidy≥3.1.0. Remove with the next release.
(fetchpatch {
url = "https://github.com/mopidy/mopidy-local/commit/f1d7598d3a9587f0823acb97ecb615f4f4817fd2.patch";
sha256 = "193kd5zwsr0qpp2y8icdy13vqpglmjdm7x1rw5hliwyq18a34vjp";
})
];
meta = with lib; {
homepage = "https://github.com/mopidy/mopidy-local";
description = "Mopidy extension for playing music from your local music archive";

View file

@ -4,13 +4,13 @@
pythonPackages.buildPythonApplication rec {
pname = "mopidy";
version = "3.0.2";
version = "3.1.1";
src = fetchFromGitHub {
owner = "mopidy";
repo = "mopidy";
rev = "v${version}";
sha256 = "1n9lpgq0p112cjgsrc1cd6mnffk56y36g2c5skk9cqzw27qrkd15";
sha256 = "14m80z9spi2vhfs2bbff7ky80mr6bksl4550y17hwd7zpkid60za";
};
nativeBuildInputs = [ wrapGAppsHook ];

View file

@ -2,13 +2,13 @@
pythonPackages.buildPythonApplication rec {
pname = "mopidy-soundcloud";
version = "2.1.0";
version = "3.0.1";
src = fetchFromGitHub {
owner = "mopidy";
repo = "mopidy-soundcloud";
rev = "v${version}";
sha256 = "131qdm9i0j3ayff0js11qcmbjv50ws5s6iiqr6x5b66ymjl4scfv";
sha256 = "18wiiv4rca9vibvnc27f3q4apf8n61kbp7mdbm2pmz86qwmd47pa";
};
propagatedBuildInputs = [ mopidy ];

View file

@ -29,7 +29,7 @@ stdenv.mkDerivation {
description = "Lossless mp3 normalizer with statistical analysis";
homepage = "http://mp3gain.sourceforge.net/";
license = licenses.lgpl21;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = with maintainers; [ devhell ];
};
}

View file

@ -12,13 +12,13 @@ let
;
in pythonPackages.buildPythonApplication rec {
pname = "picard";
version = "2.5.5";
version = "2.5.6";
src = fetchFromGitHub {
owner = "metabrainz";
repo = pname;
rev = "release-${version}";
sha256 = "0i97cfnfgg4g13ms8x3bq279s4r7jckxxrv3sdz7dxpcn6gkw35s";
sha256 = "1mkbg44bm642mlpfxsdlw947var6a3sf9m6c897b4n0742hsdkbc";
};
nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ]

View file

@ -1,27 +1,34 @@
{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, python3, libxcb, AppKit, Security }:
{ stdenv, fetchFromGitHub, rustPlatform, installShellFiles, pkgconfig, openssl, python3, libxcb, AppKit, Security }:
rustPlatform.buildRustPackage rec {
pname = "spotify-tui";
version = "0.22.0";
version = "0.23.0";
src = fetchFromGitHub {
owner = "Rigellute";
repo = "spotify-tui";
rev = "v${version}";
sha256 = "0w1y37qh9n3936d59hvqzjz2878x2nwxqxc4s7mp4f9xqcfl0c5r";
sha256 = "082y5m2vglzx9kdc2088zynz0njcnljnb0y170igmlsxq9wkrgg2";
};
cargoSha256 = "1ri054p08si95x1gh2bkh4fk50ja79c5izzjnkvs0yhfj1wzbghi";
cargoSha256 = "100c7x603qyhav3p24clwfal4ngh0258x9lqsi84kcj4wq2f3i8f";
nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkgconfig python3 ];
nativeBuildInputs = [ installShellFiles ] ++ stdenv.lib.optionals stdenv.isLinux [ pkgconfig python3 ];
buildInputs = [ ]
++ stdenv.lib.optionals stdenv.isLinux [ openssl libxcb ]
++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ];
postInstall = ''
for shell in bash fish zsh; do
$out/bin/spt --completions $shell > spt.$shell
installShellCompletion spt.$shell
done
'';
meta = with stdenv.lib; {
description = "Spotify for the terminal written in Rust";
homepage = "https://github.com/Rigellute/spotify-tui";
changelog = "https://github.com/Rigellute/spotify-tui/releases/tag/v${version}";
changelog = "https://github.com/Rigellute/spotify-tui/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ jwijenbergh ];
};

View file

@ -1,5 +1,4 @@
{ lib, python3Packages, gobject-introspection, gtk3, pango, wrapGAppsHook
, chromecastSupport ? false
, serverSupport ? false
, keyringSupport ? true
@ -51,6 +50,10 @@ python3Packages.buildPythonApplication rec {
# https://github.com/NixOS/nixpkgs/issues/56943
strictDeps = false;
# no tests
doCheck = false;
pythonImportsCheck = [ "sublime" ];
meta = with lib; {
description = "GTK3 Subsonic/Airsonic client";
homepage = "https://sublimemusic.app/";

View file

@ -13,11 +13,11 @@ let
in
stdenv.mkDerivation rec {
pname = "SunVox";
version = "1.9.5d";
version = "1.9.6c";
src = fetchurl {
url = "http://www.warmplace.ru/soft/sunvox/sunvox-${version}.zip";
sha256 = "04f7psm0lvc09nw7d2wp0sncf37bym2v7hhxp4v8c8gdgayj7k8m";
sha256 = "0lqzr68n2c6aifw2vbyars91wn1chmgb9xfdk463g4vjqiava3ih";
};
buildInputs = [ unzip ];

View file

@ -1,16 +1,16 @@
{ stdenv, fetchurl
, lzip, ncurses
{ stdenv
, fetchurl
, ncurses
, lzip
}:
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "moe";
version = "1.10";
version = "1.11";
src = fetchurl {
url = "mirror://gnu/moe/${pname}-${version}.tar.lz";
sha256 = "0fymywdiy9xqppcmvgs7mf7d3gfrky3jp5jkxs2l3v93asml9zcc";
sha256 = "sha256-DvvLz1pKjZZlQcbLCZugq2QWeANm286C2f+ZWoWl4vk=";
};
prePatch = ''
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ lzip ];
buildInputs = [ ncurses ];
meta = {
meta = with stdenv.lib; {
description = "A small, 8-bit clean editor";
longDescription = ''
GNU moe is a powerful, 8-bit clean, console text editor for ISO-8859 and

View file

@ -4,13 +4,13 @@ with python3.pkgs;
buildPythonApplication rec {
pname = "thonny";
version = "3.3.1";
version = "3.3.2";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "0nk4kx6apmnd6fyd9zw77yprjzgjf7micvcws2i2sci0d9fff34c";
sha256 = "1pzy7v48x4ip8v6aqm8hl5ywx7xiqbsfypxxifih8gnlangp1n8y";
};
propagatedBuildInputs = with python3.pkgs; [

View file

@ -5,7 +5,7 @@ let
plat = {
x86_64-linux = "linux-x64";
x86_64-darwin = "darwin";
x86_64-darwin = "darwin-x64";
aarch64-linux = "linux-arm64";
armv7l-linux = "linux-armhf";
}.${system};

View file

@ -114,6 +114,7 @@ mkDerivation rec {
"-DENABLE_INTERNALMYSQL=1"
"-DENABLE_MEDIAPLAYER=1"
"-DENABLE_QWEBENGINE=on"
"-DENABLE_APPSTYLES=on"
];
dontWrapGApps = true;

View file

@ -0,0 +1,101 @@
{ stdenv
, fetchFromGitLab
, fetchpatch
, cmake
, pkg-config
, python3
, SDL2
, dbus
, eigen
, ffmpeg
, glslang
, hidapi
, libGL
, libXau
, libXdmcp
, libXrandr
, libffi
# , librealsense
, libsurvive
, libusb1
, libuvc
, libv4l
, libxcb
, opencv4
, openhmd
, udev
, vulkan-headers
, vulkan-loader
, wayland
, wayland-protocols
, zlib
}:
stdenv.mkDerivation rec {
pname = "monado";
version = "0.4.1";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "114aif79dqyn2qg07mkv6lzmqn15k6fdcii818rdf5g4bp7zzzgm";
};
patches = [
# fix libsurvive autodetection, drop with the next version update
(fetchpatch {
url = "https://gitlab.freedesktop.org/monado/monado/-/commit/345e9eab56e2de9e8b07cf72c2a67cf2ebd01e62.patch";
sha256 = "17c110an6sxc8rn7dfz30rfkbayg64w68licicwc8cqabi6cgrm3";
})
];
nativeBuildInputs = [ cmake pkg-config python3 ];
buildInputs = [
SDL2
dbus
eigen
ffmpeg
glslang
hidapi
libGL
libXau
libXdmcp
libXrandr
libffi
# librealsense.dev - see below
libsurvive
libusb1
libuvc
libv4l
libxcb
opencv4
openhmd
udev
vulkan-headers
vulkan-loader
wayland
wayland-protocols
zlib
];
# realsense is disabled, the build ends with the following error:
#
# CMake Error in src/xrt/drivers/CMakeLists.txt:
# Imported target "realsense2::realsense2" includes non-existent path
# "/nix/store/2v95aps14hj3jy4ryp86vl7yymv10mh0-librealsense-2.41.0/include"
# in its INTERFACE_INCLUDE_DIRECTORIES.
#
# for some reason cmake is trying to use ${librealsense}/include
# instead of ${librealsense.dev}/include as an include directory
meta = with stdenv.lib; {
description = "Open source XR runtime";
homepage = "https://monado.freedesktop.org/";
license = licenses.boost;
maintainers = with maintainers; [ prusnak ];
platforms = platforms.linux;
};
}

View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "1password";
version = "1.7.0";
version = "1.8.0";
src =
if stdenv.isLinux then fetchzip {
url = {
@ -10,13 +10,13 @@ stdenv.mkDerivation rec {
"x86_64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip";
}.${stdenv.hostPlatform.system};
sha256 = {
"i686-linux" = "0fvi9pfcm6pfy628q2lg62bkikrgsisynrk3kkjisb9ldcyjgabw";
"x86_64-linux" = "1iskhls8g8w2zhk79gprz4vzrmm7r7fq87gwgd4xmj5md4nkzran";
"i686-linux" = "teoxscan+EZ76Q0sfKT6nt1w/LSsmDoiN2oh+NGO/4A=";
"x86_64-linux" = "nRK2GSwhQe5OgcAdR1fg0vUp3fzEkhwU/teIwsEEemw=";
}.${stdenv.hostPlatform.system};
stripRoot = false;
} else fetchurl {
url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.pkg";
sha256 = "0x6s26zgjryzmcg9qxmv5s2vml06q96yqbapasjfxqc3l205lnnn";
sha256 = "0pycia75vdfh6gxfd2hr32cxrryfxydid804n0v76l2fpr9v9v3d";
};
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ xar cpio ];

View file

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "dasel";
version = "1.12.0";
version = "1.12.2";
src = fetchFromGitHub {
owner = "TomWright";
repo = pname;
rev = "v${version}";
sha256 = "69igz0Q7pT0f6PsbZWHcwUiTKRTTzj7r5E6E5ExUoJo=";
sha256 = "/WB/SsOih0N5P4cUAD6zkCajplzZ/Jez0H80+CG08rc=";
};
vendorSha256 = "BdX4DO77mIf/+aBdkNVFUzClsIml1UMcgvikDbbdgcY=";

View file

@ -1,13 +1,14 @@
{ stdenv, fetchgit, cmake, file, qtbase, qttools, solid }:
{ stdenv, mkDerivation, fetchFromGitHub, cmake, file, qtbase, qttools, solid }:
stdenv.mkDerivation {
mkDerivation {
pname = "dfilemanager";
version = "git-2016-01-10";
version = "git-2020-09-04";
src = fetchgit {
url = "git://git.code.sf.net/p/dfilemanager/code";
rev = "2c5078b05e0ad74c037366be1ab3e6a03492bde4";
sha256 = "1qwhnlcc2j8sr1f3v63sxs3m7q7w1xy6c2jqsnznjgm23b5h3hxd";
src = fetchFromGitHub {
owner = "probonopd";
repo = "dfilemanager";
rev = "c592d643d76942dc2c2ccb6e4bfdf53f5e805e48";
sha256 = "7hIgaWjjOck5i4QbeVeQK7yrjK4yDoAZ5qY9RhM5ABY=";
};
nativeBuildInputs = [ cmake ];

View file

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, zlib, which, IOKit, qtbase, libusb-compat-0_1 }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, libusb1, qtbase, zlib, IOKit, which, expat }:
stdenv.mkDerivation rec {
pname = "gpsbabel";
version = "1.6.0";
version = "1.7.0";
src = fetchFromGitHub {
owner = "gpsbabel";
repo = "gpsbabel";
rev = "gpsbabel_${lib.replaceStrings ["."] ["_"] version}";
sha256 = "0q17jhmaf7z5lld2ff7h6jb3v1yz8hbwd2rmaq2dsamc53dls8iw";
sha256 = "010g0vd2f5knpq5p7qfnl31kv3r8m5sjdsafcinbj5gh02j2nzpy";
};
patches = [
@ -18,9 +18,11 @@ stdenv.mkDerivation rec {
})
];
buildInputs = [ zlib qtbase which libusb-compat-0_1 ]
buildInputs = [ libusb1 qtbase zlib ]
++ lib.optionals stdenv.isDarwin [ IOKit ];
checkInputs = [ expat.dev which ]; # Avoid ./testo.d/kml.test: line 74: which: command not found. Skipping KML validation phase.
/* FIXME: Building the documentation, with "make doc", requires this:
[ libxml2 libxslt perl docbook_xml_dtd_412 docbook_xsl fop ]
@ -41,6 +43,8 @@ stdenv.mkDerivation rec {
patchShebangs testo
substituteInPlace testo \
--replace "-x /usr/bin/hexdump" ""
rm -v testo.d/alantrl.test
''
# The raymarine and gtm tests fail on i686 despite -ffloat-store.
+ lib.optionalString stdenv.isi686 "rm -v testo.d/raymarine.test testo.d/gtm.test;"

View file

@ -14,6 +14,7 @@ gem "jekyll-coffeescript"
gem "jekyll-feed", "~> 0.9"
gem "jekyll-gist"
gem "jekyll-paginate"
gem "jekyll-polyglot"
gem "jekyll-redirect-from"
gem "kramdown-syntax-coderay"
gem "mime-types", "~> 3.0"

View file

@ -64,6 +64,8 @@ GEM
html-pipeline (~> 2.3)
jekyll (>= 3.7, < 5.0)
jekyll-paginate (1.1.0)
jekyll-polyglot (1.3.3)
jekyll (>= 3.0)
jekyll-redirect-from (0.16.0)
jekyll (>= 3.3, < 5.0)
jekyll-sass-converter (2.1.0)
@ -140,6 +142,7 @@ DEPENDENCIES
jekyll-gist
jekyll-mentions
jekyll-paginate
jekyll-polyglot
jekyll-redirect-from
jekyll-seo-tag
jekyll-sitemap

View file

@ -297,6 +297,17 @@
};
version = "1.1.0";
};
jekyll-polyglot = {
dependencies = ["jekyll"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "4ad9140733250b65bc1ffab84650c588d036d23129e82f0349d31e56f1fe10a8";
type = "gem";
};
version = "1.3.3";
};
jekyll-redirect-from = {
dependencies = ["jekyll"];
groups = ["default"];
@ -723,4 +734,4 @@
};
version = "2.4.2";
};
}
}

View file

@ -1,20 +1,20 @@
{ stdenv, fetchurl, fetchsvn, makeWrapper, unzip, jre, libXxf86vm }:
let
pname = "josm";
version = "17329";
version = "17428";
srcs = {
jar = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
sha256 = "0hra146akadqz9acj1xa2vzrmipfzf8li7sgsmk169xr991y653k";
sha256 = "0fhnq0836jp72br808hhw1ki70zc9wqcwfhnizb8pzjvs4wgx36w";
};
macosx = fetchurl {
url = "https://josm.openstreetmap.de/download/macosx/josm-macosx-${version}.zip";
sha256 = "0i09jnfqbcirmic9vayrp78lnyk4mfh7ax3v3cs8kyqhk930pscf";
sha256 = "126yy6y7mkpqzkrkqkzzn3mwnl1yjkmd5k895k7mmk2inmcsvqgm";
};
pkg = fetchsvn {
url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";
rev = version;
sha256 = "0ybjca6dhnbwl3xqwrc91c444fzs1zrlnz7qr3l79s1vll9r4qd1";
sha256 = "198kq490y5wzxz0a5prb9anykq6dzg0imxfkchsas233inbzggql";
};
};
in

View file

@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
homepage = "https://repo.or.cz/w/llpp.git";
description = "A MuPDF based PDF pager written in OCaml";
platforms = platforms.linux;
maintainers = with maintainers; [ pSub enzime ];
maintainers = with maintainers; [ pSub ];
license = licenses.gpl3;
};
}

View file

@ -1,18 +1,25 @@
{ stdenv, fetchFromGitHub, makeWrapper, qmake, pkgconfig, boost, gdal, proj
, qtbase, qtsvg, qtwebview, qtwebkit }:
{ mkDerivation, lib, fetchFromGitHub, qmake, pkgconfig, fetchpatch
, boost, gdal, proj, qtbase, qtsvg, qtwebview, qtwebkit }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "merkaartor";
version = "unstable-2019-11-12";
version = "0.18.4";
src = fetchFromGitHub {
owner = "openstreetmap";
repo = "merkaartor";
rev = "29b3388680a03f1daac0037a2b504ea710da879a";
sha256 = "0h3d3srzl06p2ajq911j05zr4vkl88qij18plydx45yqmvyvh0xz";
rev = version;
sha256 = "vwO4/a7YF9KbpxcFGTFCdG6SfwEyhISlEtcA+rMebUA=";
};
nativeBuildInputs = [ makeWrapper qmake pkgconfig ];
patches = [
(fetchpatch {
url = "https://github.com/openstreetmap/merkaartor/commit/e72553a7ea2c7ba0634cc3afcd27a9f7cfef089c.patch";
sha256 = "NAisplnS3xHSlRpX+fH15NpbaD+uM57OCsTYGKlIR7U=";
})
];
nativeBuildInputs = [ qmake pkgconfig ];
buildInputs = [ boost gdal proj qtbase qtsvg qtwebview qtwebkit ];
@ -20,12 +27,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H";
postInstall = ''
wrapProgram $out/bin/merkaartor \
--set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "OpenStreetMap editor";
homepage = "http://merkaartor.be/";
license = licenses.gpl2Plus;

View file

@ -1,21 +1,26 @@
{ stdenv, lib, fetchFromGitHub, pkgconfig, qmake, mkDerivation,
qtsvg,
libxml2, postgresql }:
{ stdenv
, lib
, fetchFromGitHub
, pkg-config
, qmake
, mkDerivation
, qtsvg
, libxml2
, postgresql
}:
mkDerivation rec {
pname = "pgmodeler";
version = "0.9.2";
version = "0.9.3";
src = fetchFromGitHub {
owner = "pgmodeler";
repo = "pgmodeler";
rev = "v${version}";
sha256 = "1wkvg20krfwkziz7skgmwlinx07jm5nl3455payg5brv69zf60kl";
sha256 = "1bci5x418dbnkny7hn0b5q5lxyajrgl3frv41ji0hcw9vivrds2g";
};
enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig qmake ];
nativeBuildInputs = [ pkg-config qmake ];
qmakeFlags = [ "pgmodeler.pro" "CONFIG+=release" ];
# todo: libpq would suffice here. Unfortunately this won't work, if one uses only postgresql.lib here.
@ -23,7 +28,6 @@ mkDerivation rec {
meta = with stdenv.lib; {
description = "A database modeling tool for PostgreSQL";
longDescription = ''pgModeler (PostgreSQL Database Modeler) is an open source database modeling tool designed for PostgreSQL.'';
homepage = "https://pgmodeler.io/";
license = licenses.gpl3;
maintainers = [ maintainers.esclear ];

View file

@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
description = "Share one mouse and keyboard between multiple computers";
homepage = "http://synergy-project.org/";
license = licenses.gpl2;
maintainers = with maintainers; [ enzime ];
maintainers = with maintainers; [ ];
platforms = platforms.all;
};
}

View file

@ -0,0 +1,28 @@
{ stdenv
, rustPlatform
, fetchFromGitHub
}:
rustPlatform.buildRustPackage rec {
pname = "taskwarrior-tui";
version = "0.9.5";
src = fetchFromGitHub {
owner = "kdheepak";
repo = "taskwarrior-tui";
rev = "v${version}";
sha256 = "1348ypjphm5f46civbrcxbbahwwl2j47z1hg8ndq1cg2bh5wb8kg";
};
# Because there's a test that requires terminal access
doCheck = false;
cargoSha256 = "11zpy3whzir9mlbvf0jyscqwj9z44a6s5i1bc2cnxyciqy9b57md";
meta = with stdenv.lib; {
description = "A terminal user interface for taskwarrior ";
homepage = "https://github.com/kdheepak/taskwarrior-tui";
license = with licenses; [ mit ];
maintainers = with maintainers; [ matthiasbeyer ];
};
}

View file

@ -7,10 +7,19 @@ symlinkJoin {
buildInputs = [ makeWrapper ];
postBuild = ''
postBuild = let
fishCompletion = "share/fish/vendor_completions.d/zathura.fish";
in ''
makeWrapper ${zathura_core.bin}/bin/zathura $out/bin/zathura \
--prefix PATH ":" "${lib.makeBinPath [ file ]}" \
--add-flags --plugins-dir="$out/lib/zathura"
# zathura fish completion references the zathura_core derivation to
# check for supported plugins which live in the wrapper derivation,
# so we need to fix the path to reference $out instead.
rm "$out/${fishCompletion}"
substitute "${zathura_core.out}/${fishCompletion}" "$out/${fishCompletion}" \
--replace "${zathura_core.out}" "$out"
'';
meta = with lib; {

View file

@ -2,7 +2,7 @@
let
pname = "Sylk";
version = "2.9.3";
version = "2.9.4";
in
appimageTools.wrapType2 rec {
@ -10,7 +10,7 @@ appimageTools.wrapType2 rec {
src = fetchurl {
url = "http://download.ag-projects.com/Sylk/Sylk-${version}-x86_64.AppImage";
hash = "sha256-JH/TUGAYZTIb/L926CoYb5yzPtbOKVmnWRmHO6DxDyY=";
hash = "sha256-LnJ8Pd+AHIrHrYpIx+rxnFKZ1uh2viDHC5TaU1BL62s=";
};
profile = ''

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, jdk14, makeWrapper, autoPatchelfHook, makeDesktopItem, glib, libsecret }:
{ stdenv, fetchurl, jdk, makeWrapper, autoPatchelfHook, makeDesktopItem, glib, libsecret }:
let
desktopItem = makeDesktopItem {
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
makeWrapper "$dest/ApacheDirectoryStudio" \
"$out/bin/ApacheDirectoryStudio" \
--prefix PATH : "${jdk14}/bin"
--prefix PATH : "${jdk}/bin"
install -D icon.xpm "$out/share/pixmaps/apache-directory-studio.xpm"
install -D -t "$out/share/applications" ${desktopItem}/share/applications/*
'';

View file

@ -1,8 +1,8 @@
{
"stable": {
"version": "87.0.4280.88",
"sha256": "1h09g9b2zxad85vd146ymvg3w2kpngpi78yig3dn1vrmhwr4aiiy",
"sha256bin64": "0n3fm6wf8zfkv135d50xl8xxrnng3q55vyxkck1da8jyvh18bijb",
"version": "87.0.4280.141",
"sha256": "0x9k809m36pfirnw2vnr9pk93nxdbgrvna0xf1rs3q91zkbr2x8l",
"sha256bin64": "0wq3yi0qyxzcid390w5rh4xjq92fjajvlifjl70g6sqnbk6vgvdp",
"deps": {
"gn": {
"version": "2020-09-09",
@ -13,7 +13,7 @@
},
"chromedriver": {
"version": "87.0.4280.88",
"sha256_linux": "11plh2hs2zpa14ymlbnj92pa58krl28yw4c0s55wk8qsxvzvl02m",
"sha256_linux": "1insh1imi25sj4hdkbll5rzwnag8wvfxv4ckshpq8akl8r13p6lj",
"sha256_darwin": "048hsqp6575r980m769lzznvxypmfcwn89f1d3ik751ymzmb5r78"
}
},

View file

@ -11,9 +11,9 @@
buildGoModule rec {
pname = "minikube";
version = "1.15.1";
version = "1.16.0";
vendorSha256 = "1xkk4f8qjqx5x878iniclni3jm2f7ka47va756vc3vk8p5s6vpdk";
vendorSha256 = "0nc2f9h77h24f0nvai5wvgmf1gh09dqfwrb6d5qghmq03a459san";
doCheck = false;
@ -21,7 +21,7 @@ buildGoModule rec {
owner = "kubernetes";
repo = "minikube";
rev = "v${version}";
sha256 = "03knkc8z3vri73j1aa9ry6p1rxql3d75kphd429x5am856mpnn6g";
sha256 = "00dn8yy7mna0j8rdcnxbgnd5vkjdkqij8akgqhvbd32kxpqss890";
};
nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ];

View file

@ -54,7 +54,7 @@ buildPythonApplication rec {
meta = with lib; {
description = "BDD test framework for terraform";
homepage = https://github.com/eerkunt/terraform-compliance;
homepage = "https://github.com/eerkunt/terraform-compliance";
license = licenses.mit;
maintainers = with maintainers; [ kalbasit ];
};

View file

@ -137,8 +137,8 @@ let
];
in rec {
terraform_0_12 = pluggable (generic {
version = "0.12.29";
sha256 = "18i7vkvnvfybwzhww8d84cyh93xfbwswcnwfrgvcny1qwm8rsaj8";
version = "0.12.30";
sha256 = "0mv2nsy2ygb1kgkw98xckihcdqxpzhdmks5p2gi2l7wb7lx51yz2";
patches = [
./provider-path.patch
(fetchpatch {
@ -150,16 +150,16 @@ in rec {
});
terraform_0_13 = pluggable (generic {
version = "0.13.5";
sha256 = "1fnydzm5h65pdy2gkq403sllx05cvpldkdzdpcy124ywljb4x9d8";
version = "0.13.6";
sha256 = "04vas8i894ssfhncdvljdvmvj2qzfrcs20zcv71l1wmnnv9ibs6l";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };
});
terraform_0_14 = pluggable (generic {
version = "0.14.3";
sha256 = "0w2j1phjv989bspbyvkhr25bdz1zjch3zggwk2lgjyk77mdw5h20";
vendorSha256 = "03dg703pw3h98vfvi2mnd2lw0mv6hlhvmc1l7ngrqdyv54cmihnp";
version = "0.14.4";
sha256 = "0kjbx1gshp1lvhnjfigfzza0sbl3m6d9qb3in7q5vc6kdkiplb66";
vendorSha256 = "10vb6gsw7mha99lvx3lbgd80vf0imcqyc0va0y64f6wzaw557n7v";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };
});

View file

@ -2,17 +2,17 @@
buildGoModule rec {
pname = "waypoint";
version = "0.1.5";
version = "0.2.0";
src = fetchFromGitHub {
owner = "hashicorp";
repo = pname;
rev = "v${version}";
sha256 = "115cak87kpfjckqgn8ws09z1w8x8l9bch9xrm29k4r0zi71xparn";
sha256 = "sha256-iGR2N1ZYA5G9K2cpfrwWRhSEfehRshx157ot1yq15AY=";
};
deleteVendor = true;
vendorSha256 = "1xdari6841jp6lpjwydv19v3wafj17hmnwsa2b55iw6dysm4yxdr";
vendorSha256 = "sha256-ArebHOjP3zvpASVAoaPXpSbrG/jq+Jbx7+EaQ1uHSVY=";
subPackages = ["."];

View file

@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
pname = "FlexGet";
version = "3.1.91";
version = "3.1.95";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "5d6668dd9721b60738ea44c616fcdee6210f7ef52b461eb13b77091caef4a832";
sha256 = "5dc80828713c0ece57c6e86a2bad41bbdf34ec41a0ea4da71adfb43784d85120";
};
postPatch = ''

View file

@ -10,6 +10,11 @@ in stdenv.mkDerivation rec {
sha256 = "1q97p4g3f1q2m567i2dbx7mm7ixw3g91ww2rymwj42cxk9iyizhv";
};
postPatch = ''
substituteInPlace sbr/Makefile.in \
--replace "ar " "${stdenv.cc.targetPrefix}ar "
'';
buildInputs = [ ncurses ];
nativeBuildInputs = [ autoreconfHook flex ];

View file

@ -19,40 +19,41 @@ stdenv.mkDerivation rec {
python3Packages.python
];
pythonPath = [
python3Packages.libtorrent-rasterbar
python3Packages.twisted
python3Packages.netifaces
python3Packages.pycrypto
python3Packages.pyasn1
python3Packages.requests
python3Packages.m2crypto
python3Packages.pyqt5
python3Packages.chardet
python3Packages.cherrypy
python3Packages.cryptography
python3Packages.libnacl
python3Packages.configobj
python3Packages.decorator
python3Packages.feedparser
python3Packages.service-identity
python3Packages.psutil
python3Packages.pillow
python3Packages.networkx
python3Packages.pony
python3Packages.lz4
python3Packages.pyqtgraph
pythonPath = with python3Packages; [
libtorrent-rasterbar
twisted
netifaces
pycrypto
pyasn1
requests
m2crypto
pyqt5
chardet
cherrypy
cryptography
libnacl
configobj
decorator
feedparser
service-identity
psutil
pillow
networkx
pony
lz4
pyqtgraph
# there is a BTC feature, but it requires some unclear version of
# bitcoinlib, so this doesn't work right now.
# python3Packages.bitcoinlib
# bitcoinlib
];
postPatch = ''
${stdenv.lib.optionalString enablePlayer ''
substituteInPlace "./TriblerGUI/vlc.py" --replace "ctypes.CDLL(p)" "ctypes.CDLL('${libvlc}/lib/libvlc.so')"
substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" --replace "if vlc and vlc.plugin_path" "if vlc"
substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" --replace "os.environ['VLC_PLUGIN_PATH'] = vlc.plugin_path" "os.environ['VLC_PLUGIN_PATH'] = '${libvlc}/lib/vlc/plugins'"
substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" \
--replace "if vlc and vlc.plugin_path" "if vlc" \
--replace "os.environ['VLC_PLUGIN_PATH'] = vlc.plugin_path" "os.environ['VLC_PLUGIN_PATH'] = '${libvlc}/lib/vlc/plugins'"
''}
'';

View file

@ -38,6 +38,13 @@ mkDerivation rec {
ln -s /var/log/teamviewer $out/share/teamviewer/logfiles
ln -s ${xdg_utils}/bin $out/share/teamviewer/tv_bin/xdg-utils
for i in 16 20 24 32 48 256; do
size=$i"x"$i
mkdir -p $out/share/icons/hicolor/$size/apps
ln -s $out/share/teamviewer/tv_bin/desktop/teamviewer_$i.png $out/share/icons/hicolor/$size/apps/TeamViewer.png
done;
sed -i "s,/opt/teamviewer,$out/share/teamviewer,g" $out/share/teamviewer/tv_bin/desktop/com.teamviewer.*.desktop
substituteInPlace $out/share/teamviewer/tv_bin/script/tvw_aux \
@ -50,6 +57,7 @@ mkDerivation rec {
wrapProgram $out/share/teamviewer/tv_bin/TeamViewer --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libXrandr libX11 ]}"
wrapProgram $out/share/teamviewer/tv_bin/TeamViewer_Desktop --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [libXrandr libX11 libXext libXdamage libXtst libSM libXfixes ]}"
wrapQtApp $out/share/teamviewer/tv_bin/script/teamviewer
wrapQtApp $out/bin/teamviewer
'';

View file

@ -6,14 +6,14 @@
stdenv.mkDerivation rec {
pname = "waypipe-unstable";
version = "0.7.1";
version = "0.7.2";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "mstoeckl";
repo = "waypipe";
rev = "v${version}";
sha256 = "00skyxmbssfxksb8wlqdr8gajpysadirjcn230fd5gaf5msvllx7";
sha256 = "sha256-LtfrSEwZikOXp/fdyJ/+EylRx19zdsHMkrl1eEf1/aY=";
};
postPatch = ''

View file

@ -4,13 +4,13 @@
mkDerivation rec {
pname = "seafile-client";
version = "7.0.10";
version = "8.0.1";
src = fetchFromGitHub {
owner = "haiwen";
repo = "seafile-client";
rev = "v${version}";
sha256 = "082v1qbysrqb7m0lk56fpx8n403fjxbvbj0svm4mkjl6mzs2cv22";
rev = "b4b944921c7efef13a93d693c45c997943899dec";
sha256 = "2vV+6ZXjVg81JVLfWeD0UK+RdmpBxBU2Ozx790WFSyw=";
};
nativeBuildInputs = [ pkgconfig cmake ];

View file

@ -3,17 +3,17 @@
let
common = { stname, target, postInstall ? "" }:
buildGoModule rec {
version = "1.12.0";
version = "1.12.1";
name = "${stname}-${version}";
src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing";
rev = "v${version}";
sha256 = "09kqc66pnklhmlcn66c5zydnvy2mfs2hqzd1465ydww8bbgcncss";
sha256 = "1jyqkprb9ps8xc86qnf140wbx5kvshyihxxgym409kfks6dk3cq5";
};
vendorSha256 = "1jw0k1wm9mfsa2yr2fi2j8mrlykrlcwfnii07rafv9dnnwabs022";
vendorSha256 = "1xlkc47wfhsf6gzq9sgimlzqnrqdsjgc1zzfkjp3xzbbv5ay7wca";
doCheck = false;

View file

@ -0,0 +1,36 @@
{ stdenv, fetchurl, pkg-config, alsaLib, audiofile, gtk2, libxml2 }:
stdenv.mkDerivation rec {
name = "soundmodem";
version = "0.20";
src = fetchurl {
url = "https://archive.org/download/${name}-${version}/${name}-${version}.tar.gz";
sha256 = "156l3wjnh5rcisxb42kcmlf74swf679v4xnj09zy5j74rd4h721z";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ alsaLib audiofile gtk2 libxml2 ];
patches = [ ./matFix.patch ];
doCheck = true;
meta = with stdenv.lib; {
description = "Audio based modem for ham radio supporting ax.25";
longDescription = ''
This software allows a standard PC soundcard to be used as a packet radio "modem". The whole processing is done on the main processor CPU.
Unlike previous packet radio modem software, this new release offers several new benefits:
- Now uses standard operating system sound drivers (OSS/Free under Linux, /dev/audio under Solaris and DirectSound under Windows), thus runs on all soundcards for which drivers for the desired operating system are available.
- No fixed relationship between bitrate, sampling rate, and modem parameters. Modems may be parametrized, and multiple modems may even run on the same audio channel!
- Usermode solution allows the use of MMX, VIS, Floating point and other media instruction sets to speed up computation.
- Cross platform builds from a single source code provides ubiquitous availability.
'';
#homepage = "http://gna.org/projects/soundmodem"; # official, but "Connection refused"
homepage = "http://soundmodem.vk4msl.id.au/";
downloadPage = "https://archive.org/download/${name}-${version}/${name}-${version}.tar.gz";
license = licenses.gpl2Only;
maintainers = with maintainers; [ ymarkus ];
platforms = platforms.all;
};
}

View file

@ -0,0 +1,11 @@
--- a/matlib/mat.hh 2003-01-06 23:47:26.000000000 +0100
+++ b/matlib/mat.copy.hh 2021-01-06 10:05:34.332415179 +0100
@@ -91,7 +91,7 @@
memcpy(c, r, d1 * d3 * sizeof(c[0]));
}
-template<typename T> void mdet(const T *c, unsigned int d)
+template<typename T> int mdet(const T *c, unsigned int d)
{
T *c2;
unsigned int i, j, k, l;

View file

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkg-config, cmake, gtk3,
wxGTK30-gtk3, curl, gettext, glib, indilib, libnova }:
{ stdenv, fetchFromGitHub, pkg-config, cmake, gtk3, wxGTK30-gtk3,
curl, gettext, glib, indilib, libnova, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "phd2";
@ -12,13 +12,18 @@ stdenv.mkDerivation rec {
sha256 = "1ih7m9lilh12xbhmwm9kkicaqy72mi3firl6df7m5x38n2zj3zm4";
};
nativeBuildInputs = [ cmake pkg-config ];
nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ];
buildInputs = [ gtk3 wxGTK30-gtk3 curl gettext glib indilib libnova ];
cmakeFlags = [
"-DOPENSOURCE_ONLY=1"
];
# Fix broken wrapped name scheme by moving wrapped binary to where wrapper expects it
postFixup = ''
mv $out/bin/.phd2.bin-wrapped $out/bin/.phd2-wrapped.bin
'';
meta = with stdenv.lib; {
homepage = "https://openphdguiding.org/";
description = "Telescope auto-guidance application";

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "last";
version = "1145";
version = "1170";
src = fetchurl {
url = "http://last.cbrc.jp/last-${version}.zip";
sha256 = "0g54nmxxrirgid1i1k5i6rf7vnjpk9548sy06yqb4fj7vdzqgq99";
sha256 = "sha256-hBuG6QGXtBrvNrtaZU+i8gxu2ZQw+srFRkbuWoL5JHc=";
};
nativeBuildInputs = [ unzip ];

View file

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
sha256 = "1jqjzhch0rips0vp04prvb8vmc20c5pdmsqn8knadcf91yy859fh";
};
buildInputs = if mpi then [ pkgs.openmpi ] else [];
buildInputs = stdenv.lib.optionals mpi [ pkgs.openmpi ];
# TODO darwin, AVX and AVX2 makefile targets
buildPhase = if mpi then ''

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "varscan";
version = "2.4.2";
version = "2.4.4";
src = fetchurl {
url = "https://github.com/dkoboldt/varscan/releases/download/${version}/VarScan.v${version}.jar";
sha256 = "0cfhshinyqgwc6i7zf8lhbfybyly2x5anrz824zyvdhzz5i69zrl";
url = "https://github.com/dkoboldt/varscan/raw/master/VarScan.v${version}.jar";
sha256 = "sha256-+yO3KrZ2+1qJvQIJHCtsmv8hC5a+4E2d7mrvTYtygU0=";
};
buildInputs = [ jre makeWrapper ];

View file

@ -1,19 +1,37 @@
{ stdenv, fetchurl
, m4, tcsh, libX11, tcl, tk
, cairo, ncurses, mesa_glu, python3
{ stdenv
, fetchurl
, python3
, m4
, cairo
, libX11
, mesa_glu
, ncurses
, tcl
, tcsh
, tk
}:
stdenv.mkDerivation rec {
pname = "magic-vlsi";
version = "8.3.80";
version = "8.3.109";
src = fetchurl {
url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz";
sha256 = "0a5x4sh5xsr79pqbgv6221jc4fvaxkg2pvrdhy1cs4bmsc1sbm9j";
sha256 = "sha256-ZK4OF5XwjW1OJmOVUFqLklfpM10eIwCILygqIyjRbEQ=";
};
buildInputs = [ m4 tcsh libX11 tcl tk cairo ncurses mesa_glu ];
nativeBuildInputs = [ python3 ];
buildInputs = [
cairo
libX11
m4
mesa_glu
ncurses
tcl
tcsh
tk
];
enableParallelBuilding = true;
configureFlags = [
@ -37,6 +55,6 @@ stdenv.mkDerivation rec {
description = "VLSI layout tool written in Tcl";
homepage = "http://opencircuitdesign.com/magic/";
license = licenses.mit;
maintainers = with maintainers; [ anna328p thoughtpolice ];
maintainers = with maintainers; [ anna328p thoughtpolice AndersonTorres ];
};
}

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "lean";
version = "3.23.0";
version = "3.24.0";
src = fetchFromGitHub {
owner = "leanprover-community";
repo = "lean";
rev = "v${version}";
sha256 = "09mklc1p6ms1jayg2f89hqfmhca3h5744lli936l38ypn1d00sxx";
sha256 = "npzBuZ37KrUYwC0TglryVTqui/3/t1ma1Zjpnty0d7c=";
};
nativeBuildInputs = [ cmake ];

View file

@ -0,0 +1,25 @@
diff --git a/src/sage/interfaces/sympy.py b/src/sage/interfaces/sympy.py
index cc35a42a9f..6e577d5d8d 100644
--- a/src/sage/interfaces/sympy.py
+++ b/src/sage/interfaces/sympy.py
@@ -397,7 +397,7 @@ def _sympysage_rf(self):
sage: from sympy import Symbol, rf
sage: _ = var('x, y')
sage: rfxy = rf(Symbol('x'), Symbol('y'))
- sage: assert rising_factorial(x,y)._sympy_() == rfxy.rewrite('gamma')
+ sage: assert rising_factorial(x,y)._sympy_() == rfxy.rewrite('gamma', piecewise=False)
sage: assert rising_factorial(x,y) == rfxy._sage_()
"""
from sage.arith.all import rising_factorial
diff --git a/src/sage/symbolic/expression.pyx b/src/sage/symbolic/expression.pyx
index 7c18ec1efa..c2619ac42d 100644
--- a/src/sage/symbolic/expression.pyx
+++ b/src/sage/symbolic/expression.pyx
@@ -955,6 +955,6 @@ cdef class Expression(CommutativeRingElement):
sage: unicode_art(13 - I)
13 -
sage: unicode_art(1.3 - I)
- 1.3 - 1.0⋅ⅈ
+ 1.3 -
sage: unicode_art(cos(I))
cosh(1)

View file

@ -103,6 +103,9 @@ stdenv.mkDerivation rec {
# adapt sage's Image class to pillow 8.0.1 (https://trac.sagemath.org/ticket/30971)
./patches/pillow-update.patch
# fix test output with sympy 1.7 (https://trac.sagemath.org/ticket/30985)
./patches/sympy-1.7-update.patch
];
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;

View file

@ -0,0 +1,55 @@
{ stdenv
, fetchFromGitHub
, autoreconfHook
, pkg-config
, appstream-glib
, dbus
, pango
, pcre2
, tmux
, vte
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "germinal";
version = "26";
src = fetchFromGitHub {
owner = "Keruspe";
repo = "Germinal";
rev = "v${version}";
sha256 = "sha256-HUi+skF4bJj5CY2cNTOC4tl7jhvpXYKqBx2rqKzjlo0=";
};
nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ];
buildInputs = [
appstream-glib
dbus
pango
pcre2
vte
];
configureFlags = [
"--with-dbusservicesdir=${placeholder "out"}/etc/dbus-1/system-services/"
];
dontWrapGApps = true;
fixupPhase = ''
runHook preFixup
wrapProgram $out/bin/germinal \
--prefix PATH ":" "${stdenv.lib.makeBinPath [ tmux ]}" \
"''${gappsWrapperArgs[@]}"
runHook postFixup
'';
meta = with stdenv.lib; {
description = "A minimal terminal emulator";
homepage = "https://github.com/Keruspe/Germinal";
license = with licenses; gpl3Plus;
platforms = with platforms; unix;
maintainers = with maintainers; [ AndersonTorres ];
};
}

View file

@ -1,23 +1,35 @@
{ stdenv, fetchFromGitHub, pkgconfig
, autoreconfHook, gettext, expat, pcre2
, libconfuse, vte, gtk
, makeWrapper }:
{ stdenv
, fetchFromGitHub
, autoreconfHook
, pkg-config
, expat
, gettext
, gtk
, libconfuse
, pcre2
, vte
, makeWrapper
}:
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "tilda";
version = "1.5.2";
version = "1.5.4";
src = fetchFromGitHub {
owner = "lanoxx";
repo = "tilda";
rev = "${pname}-${version}";
sha256 = "0psq0f4s0s92bba6wwcf6b0j7i59b76svqxhvpavwv53yvhmmamn";
sha256 = "sha256-uDx28jmjNUyzJbgTJiHbjI9U5mYb9bnfl/9AjbxNUWA=";
};
nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ];
buildInputs = [ gettext pcre2 libconfuse vte gtk ];
nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ];
buildInputs = [
gettext
gtk
libconfuse
pcre2
vte
];
LD_LIBRARY_PATH = "${expat.out}/lib"; # ugly hack for xgettext to work during build
@ -30,10 +42,10 @@ stdenv.mkDerivation rec {
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
'';
meta = {
meta = with stdenv.lib; {
description = "A Gtk based drop down terminal for Linux and Unix";
homepage = "https://github.com/lanoxx/tilda/";
license = licenses.gpl3;
license = licenses.gpl3Plus;
maintainers = [ maintainers.AndersonTorres ];
platforms = platforms.linux;
};

View file

@ -41,7 +41,7 @@ buildPythonApplication rec {
distro
appdirs
]
++ lib.optional enableGoogle google_cloud_storage
++ lib.optional enableGoogle google-cloud-storage
++ lib.optional enableAWS boto3
++ lib.optional enableAzure azure-storage-blob
++ lib.optional enableSSH paramiko;

View file

@ -172,6 +172,8 @@ let
inherit (darwin.apple_sdk.frameworks) Security;
};
git-when-merged = callPackage ./git-when-merged { };
git-workspace = callPackage ./git-workspace {
inherit (darwin.apple_sdk.frameworks) Security;
};

View file

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "delta";
version = "0.5.0";
version = "0.5.1";
src = fetchFromGitHub {
owner = "dandavison";
repo = pname;
rev = version;
sha256 = "134dhkk6ckhk6pb2hmfy1q2hkb8d1fkhbshw9qzbnp0qwbv3wgqj";
sha256 = "17cmwkha25hwsvnjcp388zd9kwacfq7adjp0sjw59y0vyr1maf22";
};
cargoSha256 = "0633g8jyhmhs33cdspa46gvmnzl2jfwxylmjfhsvbxznzygb4dw3";
cargoSha256 = "1bji818cmkl0286a4qcnfiwibnqd5q5fvzmzgk5cabrdwaag2ia5";
nativeBuildInputs = [ installShellFiles ];

View file

@ -0,0 +1,40 @@
{ stdenv, fetchFromGitHub, python3 }:
stdenv.mkDerivation rec {
pname = "git-when-merged";
version = "1.2.0";
src = fetchFromGitHub {
owner = "mhagger";
repo = pname;
rev = "v${version}";
sha256 = "0sw98gmsnd4iki9fx455jga9m80bxvvfgys8i1r2fc7d5whc2qa6";
};
buildInputs = [ python3 ];
installPhase = ''
install -D --target-directory $out/bin/ bin/git-when-merged
'';
meta = with stdenv.lib; {
description =
"Helps you figure out when and why a commit was merged into a branch";
longDescription = ''
If you use standard Git workflows, then you create a feature
branch for each feature that you are working on. When the feature
is complete, you merge it into your master branch. You might even
have sub-feature branches that are merged into a feature branch
before the latter is merged.
In such a workflow, the first-parent history of master consists
mainly of merges of feature branches into the mainline. git
when-merged can be used to ask, "When (and why) was commit C
merged into the current branch?"
'';
homepage = "https://github.com/mhagger/git-when-merged";
license = licenses.gpl2Only;
platforms = python3.meta.platforms;
maintainers = with maintainers; [ DamienCassou ];
};
}

View file

@ -1,32 +1,32 @@
{ lib, buildGoModule, fetchFromGitHub, makeWrapper, xdg_utils }:
{ lib, buildGoModule, fetchFromGitHub, makeWrapper, xdg_utils, installShellFiles, git }:
buildGoModule rec {
pname = "lab";
version = "0.17.2";
version = "0.18.0";
src = fetchFromGitHub {
owner = "zaquestion";
repo = "lab";
rev = "v${version}";
sha256 = "0zkwvmzgj7h8lc8jkg2a81392b28c8hkwqzj6dds6q4asbmymx5c";
sha256 = "1vl5ylix4h6z1vrdslv9qphgb6yqpqd4r54jzk5kd6zgrnf9c2zc";
};
subPackages = [ "." ];
vendorSha256 = "1lrmafvv5zfn9kc0p8g5vdz351n1zbaqwhwk861fxys0rdpqskyc";
vendorSha256 = "07zl5xhzgrgr5skba6cds5nal58pllf10gak0ap62j1k9gk2ych2";
doCheck = false;
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper installShellFiles ];
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
postInstall = ''
mkdir -p "$out/share/bash-completion/completions" "$out/share/zsh/site-functions"
export LAB_CORE_HOST=a LAB_CORE_USER=b LAB_CORE_TOKEN=c
$out/bin/lab completion bash > $out/share/bash-completion/completions/lab
$out/bin/lab completion zsh > $out/share/zsh/site-functions/_lab
wrapProgram $out/bin/lab --prefix PATH ":" "${lib.makeBinPath [ xdg_utils ]}";
wrapProgram $out/bin/lab --prefix PATH ":" "${lib.makeBinPath [ git xdg_utils ]}";
for shell in bash fish zsh; do
$out/bin/lab completion $shell > lab.$shell
installShellCompletion lab.$shell
done
'';
meta = with lib; {

View file

@ -2,12 +2,12 @@
let
pname = "radicle-upstream";
version = "0.1.5";
version = "0.1.6";
name = "${pname}-${version}";
src = fetchurl {
url = "https://releases.radicle.xyz/radicle-upstream-${version}.AppImage";
sha256 = "1q5p6bvzi5awxd9a3xvvdhy26bz0dx8drb1z0zzqdvqqcxxyydq7";
sha256 = "1s299rxala6gqj69j5q4d4n5wfdk2zsb4r9qrhml0m79b4f79yar";
};
contents = appimageTools.extractType2 { inherit name src; };

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "git-repo";
version = "2.10";
version = "2.11";
src = fetchFromGitHub {
owner = "android";
repo = "tools_repo";
rev = "v${version}";
sha256 = "0jd28281wys2iy7pbyyrzkzrkzq9ms7p9pbj6j2fha6bg1bh7rkz";
sha256 = "sha256-eb35yNsE0F+xPA1j7Czag1aOZO4cr6OeRsBlCrQwCRk=";
};
patches = [ ./import-ssl-module.patch ];

View file

@ -45,6 +45,8 @@ in buildPythonPackage rec {
cp ${buildWorker "${src}/worker"}/bin/worker $out/bin/builds.sr.ht-worker
'';
dontUseSetuptoolsCheck = true;
meta = with stdenv.lib; {
homepage = "https://git.sr.ht/~sircmpwn/builds.sr.ht";
description = "Continuous integration service for the sr.ht network";

View file

@ -24,6 +24,8 @@ buildPythonPackage rec {
export PKGVER=${version}
'';
dontUseSetuptoolsCheck = true;
meta = with stdenv.lib; {
homepage = "https://dispatch.sr.ht/~sircmpwn/dispatch.sr.ht";
description = "Task dispatcher and service integration tool for the sr.ht network";

View file

@ -67,6 +67,8 @@ in buildPythonPackage rec {
cp ${buildAPI "${src}/api"}/bin/api $out/bin/gitsrht-api
'';
dontUseSetuptoolsCheck = true;
meta = with stdenv.lib; {
homepage = "https://git.sr.ht/~sircmpwn/git.sr.ht";
description = "Git repository hosting service for the sr.ht network";

View file

@ -25,6 +25,8 @@ buildPythonPackage rec {
export PKGVER=${version}
'';
dontUseSetuptoolsCheck = true;
meta = with stdenv.lib; {
homepage = "https://git.sr.ht/~sircmpwn/hg.sr.ht";
description = "Mercurial repository hosting service for the sr.ht network";

View file

@ -22,6 +22,8 @@ buildPythonPackage rec {
export PKGVER=${version}
'';
dontUseSetuptoolsCheck = true;
meta = with stdenv.lib; {
homepage = "https://git.sr.ht/~sircmpwn/hub.sr.ht";
description = "Project hub service for the sr.ht network";

View file

@ -26,6 +26,8 @@ buildPythonPackage rec {
export PKGVER=${version}
'';
dontUseSetuptoolsCheck = true;
meta = with stdenv.lib; {
homepage = "https://git.sr.ht/~sircmpwn/lists.sr.ht";
description = "Mailing list service for the sr.ht network";

View file

@ -23,6 +23,8 @@ buildPythonPackage rec {
export PKGVER=${version}
'';
dontUseSetuptoolsCheck = true;
meta = with stdenv.lib; {
homepage = "https://git.sr.ht/~sircmpwn/man.sr.ht";
description = "Wiki service for the sr.ht network";

View file

@ -48,6 +48,8 @@ in buildPythonPackage rec {
cp ${buildAPI "${src}/api"}/bin/api $out/bin/metasrht-api
'';
dontUseSetuptoolsCheck = true;
meta = with stdenv.lib; {
homepage = "https://git.sr.ht/~sircmpwn/meta.sr.ht";
description = "Account management service for the sr.ht network";

View file

@ -23,6 +23,8 @@ buildPythonPackage rec {
export PKGVER=${version}
'';
dontUseSetuptoolsCheck = true;
meta = with stdenv.lib; {
homepage = "https://git.sr.ht/~sircmpwn/paste.sr.ht";
description = "Ad-hoc text file hosting service for the sr.ht network";

View file

@ -0,0 +1,58 @@
{ stdenv, fetchFromGitHub
, ffmpeg, libjpeg_turbo, gtk3, alsaLib, speex, libusbmuxd, libappindicator-gtk3
, pkg-config
}:
stdenv.mkDerivation rec {
pname = "droidcam";
version = "1.6";
src = fetchFromGitHub {
owner = "aramg";
repo = "droidcam";
rev = "v${version}";
sha256 = "sha256-3RmEmLNUbwIh+yr7vtYZnMwbzfmtW3mz5u4Ohau9OLU=";
};
nativeBuildInputs = [
pkg-config
];
buildInputs = [
ffmpeg
libjpeg_turbo
gtk3
alsaLib
speex
libusbmuxd
libappindicator-gtk3
];
postPatch = ''
substituteInPlace linux/src/droidcam.c \
--replace "/opt/droidcam-icon.png" "$out/share/icons/hicolor/droidcam.png"
'';
preBuild = ''
cd linux
makeFlagsArray+=("JPEG=$(pkg-config --libs --cflags libturbojpeg)")
makeFlagsArray+=("USBMUXD=$(pkg-config --libs --cflags libusbmuxd-2.0)")
'';
installPhase = ''
runHook preInstall
install -Dt $out/bin droidcam droidcam-cli
install -D icon2.png $out/share/icons/hicolor/droidcam.png
runHook postInstall
'';
meta = with stdenv.lib; {
description = "Linux client for DroidCam app";
homepage = "https://github.com/aramg/droidcam";
license = licenses.gpl2Only;
maintainers = [ maintainers.suhr ];
platforms = platforms.linux;
};
}

View file

@ -1,4 +1,4 @@
{ lib, python3Packages, gtk3, gobject-introspection, ffmpeg_3, wrapGAppsHook }:
{ stdenv, lib, python3Packages, gtk3, gobject-introspection, ffmpeg_3, wrapGAppsHook }:
with python3Packages;
buildPythonApplication rec {
@ -24,5 +24,6 @@ buildPythonApplication rec {
description = "A native Linux GUI for Chromecasting local files";
homepage = "https://github.com/keredson/gnomecast";
license = with licenses; [ gpl3 ];
broken = stdenv.isDarwin;
};
}

View file

@ -53,6 +53,10 @@ buildPythonApplication rec {
pywebview
];
# no tests
doCheck = false;
pythonImportsCheck = [ "jellyfin_mpv_shim" ];
meta = with stdenv.lib; {
homepage = "https://github.com/iwalton3/jellyfin-mpv-shim";
description = "Allows casting of videos to MPV via the jellyfin mobile and web app";

View file

@ -29,6 +29,7 @@ mkDerivation rec {
homepage = "https://gitlab.com/mpc-qt/mpc-qt";
license = licenses.gpl2;
platforms = platforms.unix;
broken = stdenv.isDarwin;
maintainers = with maintainers; [ romildo ];
};
}

View file

@ -13,6 +13,9 @@ buildPythonApplication rec {
propagatedBuildInputs = [ mpv requests python-mpv-jsonipc ];
# does not contain tests
doCheck = false;
meta = with stdenv.lib; {
homepage = "https://github.com/iwalton3/plex-mpv-shim";
description = "Allows casting of videos to MPV via the Plex mobile and web app";

View file

@ -22,7 +22,7 @@
let
pname = "qmplay2";
version = "20.07.04";
version = "20.12.16";
in stdenv.mkDerivation {
inherit pname version;
@ -30,7 +30,7 @@ in stdenv.mkDerivation {
owner = "zaps166";
repo = "QMPlay2";
rev = version;
sha256 = "sha256-sUDucxSvsdD2C2FSVrrXeHdNdrjECtJSXVr106OdHzA=";
sha256 = "sha256-+XXlQI9MyENioYmzqbbZYQ6kaMATBjPrPaErR2Vqhus=";
fetchSubmodules = true;
};

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