Merge master into staging-next

This commit is contained in:
Frederik Rietdijk 2020-11-03 12:06:06 +01:00
commit 237966224d
317 changed files with 3210 additions and 2827 deletions

4
.github/CODEOWNERS vendored
View file

@ -176,6 +176,10 @@
/pkgs/applications/editors/emacs @adisbladis /pkgs/applications/editors/emacs @adisbladis
/pkgs/top-level/emacs-packages.nix @adisbladis /pkgs/top-level/emacs-packages.nix @adisbladis
# Neovim
/pkgs/applications/editors/neovim @jonringer
/pkgs/applications/editors/neovim @teto
# VimPlugins # VimPlugins
/pkgs/misc/vim-plugins @jonringer @softinio /pkgs/misc/vim-plugins @jonringer @softinio

View file

@ -6,9 +6,7 @@
<para> <para>
Kakoune can be built to autoload plugins: Kakoune can be built to autoload plugins:
<programlisting>(kakoune.override { <programlisting>(kakoune.override {
configure = { plugins = with pkgs.kakounePlugins; [ parinfer-rust ];
plugins = with pkgs.kakounePlugins; [ parinfer-rust ];
};
})</programlisting> })</programlisting>
</para> </para>
</section> </section>

View file

@ -7407,6 +7407,12 @@
githubId = 1217934; githubId = 1217934;
name = "José Romildo Malaquias"; name = "José Romildo Malaquias";
}; };
ronanmacf = {
email = "macfhlar@tcd.ie";
github = "ronanmacf";
githubId = 25930627;
name = "Ronan Mac Fhlannchadha";
};
rongcuid = { rongcuid = {
email = "rongcuid@outlook.com"; email = "rongcuid@outlook.com";
github = "rongcuid"; github = "rongcuid";
@ -9892,4 +9898,10 @@
github = "wilsonehusin"; github = "wilsonehusin";
githubId = 14004487; githubId = 14004487;
}; };
bb2020 = {
email = "bb2020@users.noreply.github.com";
github = "bb2020";
githubId = 19290397;
name = "Tunc Uzlu";
};
} }

View file

@ -39,7 +39,7 @@ in
default = ""; default = "";
description = '' description = ''
Verbatim additional configuration variables for TLP. Verbatim additional configuration variables for TLP.
DEPRECATED: use services.tlp.config instead. DEPRECATED: use services.tlp.settings instead.
''; '';
}; };
}; };

View file

@ -197,7 +197,7 @@ in
install -D -m 600 -o '${cfg.user}' -g '${cfg.group}' /dev/stdin \ install -D -m 600 -o '${cfg.user}' -g '${cfg.group}' /dev/stdin \
'${cfg.home}/${settingsDir}/settings.json' '${cfg.home}/${settingsDir}/settings.json'
'')]; '')];
ExecStart="${pkgs.transmission}/bin/transmission-daemon -f"; ExecStart="${pkgs.transmission}/bin/transmission-daemon -f -g ${cfg.home}/${settingsDir}";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
User = cfg.user; User = cfg.user;
Group = cfg.group; Group = cfg.group;

View file

@ -549,9 +549,7 @@ in {
}; };
"/" = { "/" = {
priority = 900; priority = 900;
extraConfig = if major < 20 extraConfig = "rewrite ^ /index.php;";
then "rewrite ^ /index.php;"
else "try_files $uri $uri/ /index.php$request_uri;";
}; };
"~ ^/store-apps" = { "~ ^/store-apps" = {
priority = 201; priority = 201;
@ -575,7 +573,7 @@ in {
"~ ^/(?:\\.|autotest|occ|issue|indie|db_|console)".extraConfig = '' "~ ^/(?:\\.|autotest|occ|issue|indie|db_|console)".extraConfig = ''
return 404; return 404;
''; '';
${if major < 20 then "~ ^\\/(?:index|remote|public|cron|core\\/ajax\\/update|status|ocs\\/v[12]|updater\\/.+|oc[ms]-provider\\/.+|.+\\/richdocumentscode\\/proxy)\\.php(?:$|\\/)" else "~ \\.php(?:$|/)"} = { "~ ^\\/(?:index|remote|public|cron|core\\/ajax\\/update|status|ocs\\/v[12]|updater\\/.+|oc[ms]-provider\\/.+|.+\\/richdocumentscode\\/proxy)\\.php(?:$|\\/)" = {
priority = 500; priority = 500;
extraConfig = '' extraConfig = ''
include ${config.services.nginx.package}/conf/fastcgi.conf; include ${config.services.nginx.package}/conf/fastcgi.conf;

View file

@ -261,10 +261,7 @@ let
ssl_trusted_certificate ${vhost.sslTrustedCertificate}; ssl_trusted_certificate ${vhost.sslTrustedCertificate};
''} ''}
${optionalString (vhost.basicAuthFile != null || vhost.basicAuth != {}) '' ${mkBasicAuth vhostName vhost}
auth_basic secured;
auth_basic_user_file ${if vhost.basicAuthFile != null then vhost.basicAuthFile else mkHtpasswd vhostName vhost.basicAuth};
''}
${mkLocations vhost.locations} ${mkLocations vhost.locations}
@ -293,9 +290,19 @@ let
${optionalString (config.return != null) "return ${config.return};"} ${optionalString (config.return != null) "return ${config.return};"}
${config.extraConfig} ${config.extraConfig}
${optionalString (config.proxyPass != null && cfg.recommendedProxySettings) "include ${recommendedProxyConfig};"} ${optionalString (config.proxyPass != null && cfg.recommendedProxySettings) "include ${recommendedProxyConfig};"}
${mkBasicAuth "sublocation" config}
} }
'') (sortProperties (mapAttrsToList (k: v: v // { location = k; }) locations))); '') (sortProperties (mapAttrsToList (k: v: v // { location = k; }) locations)));
mkHtpasswd = vhostName: authDef: pkgs.writeText "${vhostName}.htpasswd" (
mkBasicAuth = name: zone: optionalString (zone.basicAuthFile != null || zone.basicAuth != {}) (let
auth_file = if zone.basicAuthFile != null
then zone.basicAuthFile
else mkHtpasswd name zone.basicAuth;
in ''
auth_basic secured;
auth_basic_user_file ${auth_file};
'');
mkHtpasswd = name: authDef: pkgs.writeText "${name}.htpasswd" (
concatStringsSep "\n" (mapAttrsToList (user: password: '' concatStringsSep "\n" (mapAttrsToList (user: password: ''
${user}:{PLAIN}${password} ${user}:{PLAIN}${password}
'') authDef) '') authDef)

View file

@ -9,6 +9,34 @@ with lib;
{ {
options = { options = {
basicAuth = mkOption {
type = types.attrsOf types.str;
default = {};
example = literalExample ''
{
user = "password";
};
'';
description = ''
Basic Auth protection for a vhost.
WARNING: This is implemented to store the password in plain text in the
Nix store.
'';
};
basicAuthFile = mkOption {
type = types.nullOr types.path;
default = null;
description = ''
Basic Auth password file for a vhost.
Can be created via: <command>htpasswd -c &lt;filename&gt; &lt;username&gt;</command>.
WARNING: The generate file contains the users' passwords in a
non-cryptographically-securely hashed way.
'';
};
proxyPass = mkOption { proxyPass = mkOption {
type = types.nullOr types.str; type = types.nullOr types.str;
default = null; default = null;

View file

@ -198,7 +198,7 @@ with lib;
Basic Auth protection for a vhost. Basic Auth protection for a vhost.
WARNING: This is implemented to store the password in plain text in the WARNING: This is implemented to store the password in plain text in the
nix store. Nix store.
''; '';
}; };
@ -207,7 +207,10 @@ with lib;
default = null; default = null;
description = '' description = ''
Basic Auth password file for a vhost. Basic Auth password file for a vhost.
Can be created via: <command>htpasswd -c &lt;filename&gt; &lt;username&gt;</command> Can be created via: <command>htpasswd -c &lt;filename&gt; &lt;username&gt;</command>.
WARNING: The generate file contains the users' passwords in a
non-cryptographically-securely hashed way.
''; '';
}; };

View file

@ -82,6 +82,15 @@ in {
''; '';
}; };
executable = mkOption {
type = types.str;
default = "/bin/redshift";
example = "/bin/redshift-gtk";
description = ''
Redshift executable to use within the package.
'';
};
extraOptions = mkOption { extraOptions = mkOption {
type = types.listOf types.str; type = types.listOf types.str;
default = []; default = [];
@ -114,7 +123,7 @@ in {
partOf = [ "graphical-session.target" ]; partOf = [ "graphical-session.target" ];
serviceConfig = { serviceConfig = {
ExecStart = '' ExecStart = ''
${cfg.package}/bin/redshift \ ${cfg.package}${cfg.executable} \
-l ${providerString} \ -l ${providerString} \
-t ${toString cfg.temperature.day}:${toString cfg.temperature.night} \ -t ${toString cfg.temperature.day}:${toString cfg.temperature.night} \
-b ${toString cfg.brightness.day}:${toString cfg.brightness.night} \ -b ${toString cfg.brightness.day}:${toString cfg.brightness.night} \

View file

@ -242,6 +242,7 @@ in
nfs4 = handleTest ./nfs { version = 4; }; nfs4 = handleTest ./nfs { version = 4; };
nghttpx = handleTest ./nghttpx.nix {}; nghttpx = handleTest ./nghttpx.nix {};
nginx = handleTest ./nginx.nix {}; nginx = handleTest ./nginx.nix {};
nginx-auth = handleTest ./nginx-auth.nix {};
nginx-etag = handleTest ./nginx-etag.nix {}; nginx-etag = handleTest ./nginx-etag.nix {};
nginx-pubhtml = handleTest ./nginx-pubhtml.nix {}; nginx-pubhtml = handleTest ./nginx-pubhtml.nix {};
nginx-sandbox = handleTestOn ["x86_64-linux"] ./nginx-sandbox.nix {}; nginx-sandbox = handleTestOn ["x86_64-linux"] ./nginx-sandbox.nix {};

View file

@ -0,0 +1,47 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "nginx-auth";
nodes = {
webserver = { pkgs, lib, ... }: {
services.nginx = let
root = pkgs.runCommand "testdir" {} ''
mkdir "$out"
echo hello world > "$out/index.html"
'';
in {
enable = true;
virtualHosts.lockedroot = {
inherit root;
basicAuth.alice = "jane";
};
virtualHosts.lockedsubdir = {
inherit root;
locations."/sublocation/" = {
alias = "${root}/";
basicAuth.bob = "john";
};
};
};
};
};
testScript = ''
webserver.wait_for_unit("nginx")
webserver.wait_for_open_port(80)
webserver.fail("curl --fail --resolve lockedroot:80:127.0.0.1 http://lockedroot")
webserver.succeed(
"curl --fail --resolve lockedroot:80:127.0.0.1 http://alice:jane@lockedroot"
)
webserver.succeed("curl --fail --resolve lockedsubdir:80:127.0.0.1 http://lockedsubdir")
webserver.fail(
"curl --fail --resolve lockedsubdir:80:127.0.0.1 http://lockedsubdir/sublocation/index.html"
)
webserver.succeed(
"curl --fail --resolve lockedsubdir:80:127.0.0.1 http://bob:john@lockedsubdir/sublocation/index.html"
)
'';
})

View file

@ -19,7 +19,6 @@ let
secret_key = s3.secretKey; secret_key = s3.secretKey;
insecure = true; insecure = true;
signature_version2 = false; signature_version2 = false;
encrypt_sse = false;
put_user_metadata = {}; put_user_metadata = {};
http_config = { http_config = {
idle_conn_timeout = "0s"; idle_conn_timeout = "0s";

View file

@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sjaehn"; owner = "sjaehn";
repo = pname; repo = pname;
rev = "${version}"; rev = version;
sha256 = "1nd6byy75f0rbz9dm9drhxmpsfhxhg0y7q3v2m3098llynhy9k2j"; sha256 = "1nd6byy75f0rbz9dm9drhxmpsfhxhg0y7q3v2m3098llynhy9k2j";
}; };

View file

@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sjaehn"; owner = "sjaehn";
repo = pname; repo = pname;
rev = "${version}"; rev = version;
sha256 = "0hagnn104ybzdp13r95idw20fhmzif8p3kmiypnr20m6c64rdd29"; sha256 = "0hagnn104ybzdp13r95idw20fhmzif8p3kmiypnr20m6c64rdd29";
}; };

View file

@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sjaehn"; owner = "sjaehn";
repo = pname; repo = pname;
rev = "${version}"; rev = version;
sha256 = "1f7xrljvsy7a1p8c7wln2zhwarl3ara7gbjxkpyh47wfdpigpdb0"; sha256 = "1f7xrljvsy7a1p8c7wln2zhwarl3ara7gbjxkpyh47wfdpigpdb0";
}; };

View file

@ -2,11 +2,11 @@
mkDerivation rec { mkDerivation rec {
pname = "drumkv1"; pname = "drumkv1";
version = "0.9.16"; version = "0.9.18";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/drumkv1/${pname}-${version}.tar.gz"; url = "mirror://sourceforge/drumkv1/${pname}-${version}.tar.gz";
sha256 = "1r55575w9r0ifysw9mgxjvv0fszvx8ykjgim3zczf3mb5s9ngavv"; sha256 = "1bzkaz7sqx1pvirja8zm7i2ckzl5ad6xspr4840389ik3l8qpnr5";
}; };
buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ];

View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "geonkick"; pname = "geonkick";
version = "2.4.0"; version = "2.5.0";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "iurie-sw"; owner = "iurie-sw";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1ibsfyzkvzijv929p91db56gaxm582b7nikbn10wbbjvv4f46mmj"; sha256 = "19zbz4v2n5ph4af721xls7ignmis2q2yqyd0m97g9b3njrgnfy3n";
}; };
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];

View file

@ -3,12 +3,12 @@
mkDerivation rec { mkDerivation rec {
pname = "jamulus"; pname = "jamulus";
version = "3.5.10"; version = "3.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "corrados"; owner = "corrados";
repo = "jamulus"; repo = "jamulus";
rev = "r${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}"; rev = "r${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}";
sha256 = "0bw2v40csjmlkvkhr3dh0g1a7mfqrs1xkqjsii61yfzy2ckbsi82"; sha256 = "06x9b2kjsgk8kddhif0x59nwzhnwjmq40x3w5nrphqaimqlrhlcf";
}; };
nativeBuildInputs = [ pkg-config qmake ]; nativeBuildInputs = [ pkg-config qmake ];

View file

@ -1,4 +1,4 @@
{ stdenv, mkDerivation, lib, fetchzip, cmake, pkgconfig { stdenv, mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig
, alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis , alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis
, portaudio, portmidi, qtbase, qtdeclarative, qtgraphicaleffects , portaudio, portmidi, qtbase, qtdeclarative, qtgraphicaleffects
, qtquickcontrols2, qtscript, qtsvg, qttools , qtquickcontrols2, qtscript, qtsvg, qttools
@ -7,12 +7,13 @@
mkDerivation rec { mkDerivation rec {
pname = "musescore"; pname = "musescore";
version = "3.5.0"; version = "3.5.2";
src = fetchzip { src = fetchFromGitHub {
url = "https://github.com/musescore/MuseScore/releases/download/v3.5/MuseScore-${version}.zip"; owner = "musescore";
sha256 = "0m598xh0s4f5m4l2ymy7g44bbvc14bcfi4gifhjnrg091rsk57c9"; repo = "MuseScore";
stripRoot = false; rev = "v${version}";
sha256 = "VA0+npLUUXQJHalD01pmFTTum2Re7FiiyAwU1XvR93s=";
}; };
patches = [ patches = [

View file

@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "exodus"; pname = "exodus";
version = "20.8.28"; version = "20.10.23";
src = fetchurl { src = fetchurl {
url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip"; url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip";
sha256 = "fde9165f71f0d641f6892ddce3ec26d200e8095a383f2b4c8f924de4041d65ef"; sha256 = "083hcxljqg36ilpy6xa4j455ngpc775qgam0dbj26kg7sh33dz2c";
}; };
sourceRoot = "."; sourceRoot = ".";

View file

@ -30,6 +30,15 @@ stdenv.mkDerivation rec {
$out/bin/kak -ui json -E "kill 0" $out/bin/kak -ui json -E "kill 0"
''; '';
postInstall = ''
# make share/kak/autoload a directory, so we can use symlinkJoin with plugins
cd "$out/share/kak"
autoload_target=$(readlink autoload)
rm autoload
mkdir autoload
ln -s --relative "$autoload_target" autoload
'';
meta = { meta = {
homepage = "http://kakoune.org/"; homepage = "http://kakoune.org/";
description = "A vim inspired text editor"; description = "A vim inspired text editor";

View file

@ -1,7 +1,7 @@
{ pkgs, parinfer-rust }: { pkgs, parinfer-rust, rep }:
{ {
inherit parinfer-rust; inherit parinfer-rust rep;
case-kak = pkgs.callPackage ./case.kak.nix { }; case-kak = pkgs.callPackage ./case.kak.nix { };
kak-ansi = pkgs.callPackage ./kak-ansi.nix { }; kak-ansi = pkgs.callPackage ./kak-ansi.nix { };

View file

@ -1,44 +1,31 @@
{ stdenv, bash }: { symlinkJoin, makeWrapper, kakoune, plugins ? [], configure ? {} }:
with stdenv.lib;
kakoune:
let let
getPlugins = { plugins ? [] }: plugins; # "plugins" is the preferred way, but some configurations may be
# using "configure.plugins", so accept both
requestedPlugins = plugins ++ (configure.plugins or []);
wrapper = { configure ? {} }: in
stdenv.mkDerivation rec { symlinkJoin {
pname = "kakoune"; name = "kakoune-${kakoune.version}";
version = getVersion kakoune;
src = ./.; buildInputs = [ makeWrapper ];
buildCommand = ''
mkdir -p $out/share/kak
for plugin in ${strings.escapeShellArgs (getPlugins configure)}; do
if [[ -d $plugin/share/kak/autoload ]]; then
find "$plugin/share/kak/autoload" -type f -name '*.kak'| while read rcfile; do
printf 'source "%s"\n' "$rcfile"
done
fi
done >>$out/share/kak/plugins.kak
mkdir -p $out/bin paths = [ kakoune ] ++ requestedPlugins;
substitute ${src}/wrapper.sh $out/bin/kak \
--subst-var-by bash "${bash}" \ postBuild = ''
--subst-var-by kakoune "${kakoune}" \ # location of kak binary is used to find ../share/kak/autoload,
--subst-var-by out "$out" # unless explicitly overriden with KAKOUNE_RUNTIME
chmod +x $out/bin/kak rm "$out/bin/kak"
makeWrapper "${kakoune}/bin/kak" "$out/bin/kak" --set KAKOUNE_RUNTIME "$out/share/kak"
# currently kakoune ignores doc files if they are symlinks, so workaround by
# copying doc files over, so they become regular files...
mkdir "$out/DELETE_ME"
mv "$out/share/kak/doc" "$out/DELETE_ME"
cp -r --dereference "$out/DELETE_ME/doc" "$out/share/kak"
rm -Rf "$out/DELETE_ME"
''; '';
preferLocalBuild = true; meta = kakoune.meta // { priority = (kakoune.meta.priority or 0) - 1; };
buildInputs = [ bash kakoune ]; }
passthru = { unwrapped = kakoune; };
meta = kakoune.meta // {
# prefer wrapper over the package
priority = (kakoune.meta.priority or 0) - 1;
hydraPlatforms = [];
};
};
in
makeOverridable wrapper

View file

@ -1,30 +0,0 @@
#!@bash@/bin/bash
# We use the -E option to load plugins. This only makes sense when we are
# starting a new session, so we detect that. Also, Kakoune can only handle
# one -E option, so we prepend loading plugins to an existing one.
args=( "$@" )
loadPlugins=true
EValueOffset=-1
pluginScript='@out@/share/kak/plugins.kak'
for (( i = 0; i < ${#args[@]}; i++ )); do
case "${args[i]}" in
-n|-c|-l|-p|-clear|-version) loadPlugins=false;;
-E) EValueOffset=$(( i + 1 ));;
--) break;;
esac
case "${args[i]}" in
-E|-c|-e|-s|-p|-f|-i|-ui|-debug) i=$(( i + 1 ));;
esac
done
if [[ $loadPlugins = true ]]; then
if (( EValueOffset >= 0 )); then
args[EValueOffset]="source '$pluginScript'"$'\n'"${args[EValueOffset]}"
else
args=( "-E" "source '$pluginScript'" "${args[@]}" )
fi
fi
exec @kakoune@/bin/kak "${args[@]}"

View file

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fabiocolacio"; owner = "fabiocolacio";
repo = "Marker"; repo = "Marker";
rev = "${version}"; rev = version;
fetchSubmodules = true; fetchSubmodules = true;
sha256 = "1iy7izyprf050bix8am1krqivgyxnhx3jm775v8f80cgbqxy7m5r"; sha256 = "1iy7izyprf050bix8am1krqivgyxnhx3jm775v8f80cgbqxy7m5r";
}; };

View file

@ -24,7 +24,7 @@ let
withPython2 ? false withPython2 ? false
/* the function you would have passed to python.withPackages */ /* the function you would have passed to python.withPackages */
, extraPython2Packages ? (_: [ ]) , extraPython2Packages ? (_: [ ])
, withPython3 ? true , withPython3 ? true
/* the function you would have passed to python3.withPackages */ /* the function you would have passed to python3.withPackages */
, extraPython3Packages ? (_: [ ]) , extraPython3Packages ? (_: [ ])
, withNodeJs ? false , withNodeJs ? false
@ -35,7 +35,7 @@ let
# for forward compability, when adding new environments, haskell etc. # for forward compability, when adding new environments, haskell etc.
, ... , ...
}: }@args:
let let
rubyEnv = bundlerEnv { rubyEnv = bundlerEnv {
name = "neovim-ruby-env"; name = "neovim-ruby-env";
@ -45,7 +45,6 @@ let
''; '';
}; };
requiredPlugins = vimUtils.requiredPlugins configure; requiredPlugins = vimUtils.requiredPlugins configure;
getDeps = attrname: map (plugin: plugin.${attrname} or (_: [ ])); getDeps = attrname: map (plugin: plugin.${attrname} or (_: [ ]));
@ -100,13 +99,15 @@ let
manifestRc = vimUtils.vimrcContent (configure // { customRC = ""; }); manifestRc = vimUtils.vimrcContent (configure // { customRC = ""; });
neovimRcContent = vimUtils.vimrcContent configure; neovimRcContent = vimUtils.vimrcContent configure;
in in
{ args // {
wrapperArgs = makeWrapperArgs; wrapperArgs = makeWrapperArgs;
inherit neovimRcContent; inherit neovimRcContent;
inherit manifestRc; inherit manifestRc;
inherit rubyEnv;
inherit python2Env; inherit python2Env;
inherit python3Env; inherit python3Env;
inherit withNodeJs;
} // lib.optionalAttrs withRuby {
inherit rubyEnv;
}; };
genProviderSettings = prog: withProg: genProviderSettings = prog: withProg:
@ -141,15 +142,15 @@ let
extraPythonPackages = compatFun extraPythonPackages; extraPythonPackages = compatFun extraPythonPackages;
inherit withPython3; inherit withPython3;
extraPython3Packages = compatFun extraPython3Packages; extraPython3Packages = compatFun extraPython3Packages;
inherit withNodeJs withRuby; inherit withNodeJs withRuby viAlias vimAlias;
inherit configure; inherit configure;
}; };
in in
wrapNeovimUnstable neovim (res // { wrapNeovimUnstable neovim (res // {
wrapperArgs = lib.escapeShellArgs ( wrapperArgs = lib.escapeShellArgs (
res.wrapperArgs ++ [ "--add-flags" "-u ${writeText "init.vim" res.neovimRcContent}" ]) res.wrapperArgs ++ lib.optionals (configure != {}) [
+ " " + extraMakeWrapperArgs "--add-flags" "-u ${writeText "init.vim" res.neovimRcContent}"
]) + " " + extraMakeWrapperArgs
; ;
}); });
in in

View file

@ -18,8 +18,8 @@ let
, manifestRc ? null , manifestRc ? null
, withPython2 ? true, python2Env ? null , withPython2 ? true, python2Env ? null
, withPython3 ? true, python3Env ? null , withPython3 ? true, python3Env ? null
, withNodeJs? false , withNodeJs ? false
, withRuby ? true, rubyEnv ? null , rubyEnv ? null
, vimAlias ? false , vimAlias ? false
, viAlias ? false , viAlias ? false
, ... , ...
@ -52,7 +52,7 @@ let
+ optionalString withPython3 '' + optionalString withPython3 ''
makeWrapper ${python3Env}/bin/python3 $out/bin/nvim-python3 --unset PYTHONPATH makeWrapper ${python3Env}/bin/python3 $out/bin/nvim-python3 --unset PYTHONPATH
'' ''
+ optionalString withRuby '' + optionalString (rubyEnv != null) ''
ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby
'' ''
+ optionalString withNodeJs '' + optionalString withNodeJs ''

View file

@ -14,8 +14,8 @@ let
else throw "ImageMagick is not supported on this platform."; else throw "ImageMagick is not supported on this platform.";
cfg = { cfg = {
version = "7.0.10-27"; version = "7.0.10-35";
sha256 = "1fqwbg2ws6ix3bymx7ncb4k4f6bg8q44n9xnlvngjapflnrmhcph"; sha256 = "0hcqvn3n3ip2fia48d1nb1m4r5ir00vbaa62xqni30kglh3n2sfh";
patches = []; patches = [];
}; };
in in

View file

@ -118,9 +118,12 @@ mkDerivation rec {
"-DENABLE_QWEBENGINE=on" "-DENABLE_QWEBENGINE=on"
]; ];
dontWrapGApps = true;
preFixup = '' preFixup = ''
gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ gnumake hugin enblend-enfuse ]}) qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
gappsWrapperArgs+=(--suffix DK_PLUGIN_PATH : ${placeholder "out"}/${qtbase.qtPluginPrefix}/${pname}) qtWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ gnumake hugin enblend-enfuse ]})
qtWrapperArgs+=(--suffix DK_PLUGIN_PATH : ${placeholder "out"}/${qtbase.qtPluginPrefix}/${pname})
substituteInPlace $out/bin/digitaglinktree \ substituteInPlace $out/bin/digitaglinktree \
--replace "/usr/bin/perl" "${perl}/bin/perl" \ --replace "/usr/bin/perl" "${perl}/bin/perl" \
--replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3" --replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3"

View file

@ -74,7 +74,7 @@ in mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "drawpile"; owner = "drawpile";
repo = "drawpile"; repo = "drawpile";
rev = "${version}"; rev = version;
sha256 = "sha256-AFFY+FcY9ExAur13OoWR9285RZtBe6jnRIrwi5raiCM="; sha256 = "sha256-AFFY+FcY9ExAur13OoWR9285RZtBe6jnRIrwi5raiCM=";
}; };

View file

@ -19,13 +19,13 @@ assert withOpenCL -> ocl-icd != null;
mkDerivation rec { mkDerivation rec {
pname = "mandelbulber"; pname = "mandelbulber";
version = "2.22"; version = "2.23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "buddhi1980"; owner = "buddhi1980";
repo = "mandelbulber2"; repo = "mandelbulber2";
rev = version; rev = version;
sha256 = "011y2nl0jakf29cxprjmj1ifqc9iva61q5f4kk47b03gq7jw8sl4"; sha256 = "08izphj7jyk3wsq3qbzaf2fplys80vr39wliqc1i4c5cr90nrq1l";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -27,7 +27,6 @@ still shows most of the available features is in `./gwenview.nix`.
{ {
lib, libsForQt5, fetchurl, lib, libsForQt5, fetchurl,
okteta
}: }:
let let
@ -210,9 +209,6 @@ let
rocs = callPackage ./rocs.nix {}; rocs = callPackage ./rocs.nix {};
spectacle = callPackage ./spectacle.nix {}; spectacle = callPackage ./spectacle.nix {};
yakuake = callPackage ./yakuake.nix {}; yakuake = callPackage ./yakuake.nix {};
# Okteta was removed from kde applications and will now be released independently
# Lets keep an alias for compatibility reasons
inherit okteta;
}; };
in lib.makeScope libsForQt5.newScope packages in lib.makeScope libsForQt5.newScope packages

View file

@ -25,9 +25,9 @@
, frei0r , frei0r
, phonon-backend-gstreamer , phonon-backend-gstreamer
, qtdeclarative , qtdeclarative
, qtmultimedia
, qtquickcontrols2 , qtquickcontrols2
, qtscript , qtscript
, qtwebkit
, rttr , rttr
, kpurpose , kpurpose
, kdeclarative , kdeclarative
@ -60,9 +60,9 @@ mkDerivation {
mlt mlt
phonon-backend-gstreamer phonon-backend-gstreamer
qtdeclarative qtdeclarative
qtmultimedia
qtquickcontrols2 qtquickcontrols2
qtscript qtscript
qtwebkit
shared-mime-info shared-mime-info
libv4l libv4l
ffmpeg-full ffmpeg-full
@ -84,12 +84,20 @@ mkDerivation {
sed -i CMakeLists.txt -e '/find_package(Qt5 REQUIRED/ s|)| Concurrent)|' sed -i CMakeLists.txt -e '/find_package(Qt5 REQUIRED/ s|)| Concurrent)|'
substituteAllInPlace src/kdenlivesettings.kcfg substituteAllInPlace src/kdenlivesettings.kcfg
''; '';
dontWrapGApps = true;
# Frei0r path needs to be set too or Kdenlive will complain. See: # Frei0r path needs to be set too or Kdenlive will complain. See:
# https://github.com/NixOS/nixpkgs/issues/83885 # https://github.com/NixOS/nixpkgs/issues/83885
# https://github.com/NixOS/nixpkgs/issues/29614#issuecomment-488849325 # https://github.com/NixOS/nixpkgs/issues/29614#issuecomment-488849325
qtWrapperArgs = [ qtWrapperArgs = [
"--set FREI0R_PATH ${frei0r}/lib/frei0r-1" "--set FREI0R_PATH ${frei0r}/lib/frei0r-1"
]; ];
preFixup = ''
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
meta = { meta = {
license = with lib.licenses; [ gpl2Plus ]; license = with lib.licenses; [ gpl2Plus ];
}; };

View file

@ -0,0 +1,46 @@
{ stdenv, mkDerivation, fetchFromGitLab, qmake, qtbase, qttools, qtserialport, libGLU }:
mkDerivation rec {
pname = "OSCAR";
version = "1.2.0";
src = fetchFromGitLab {
owner = "pholy";
repo = "OSCAR-code";
rev = "v${version}";
sha256 = "10r37d8c2avr167n2s9lhld1c9hmckm444fq163z1jsy9jpid6mg";
};
buildInputs = [ qtbase qttools qtserialport libGLU ];
nativeBuildInputs = [ qmake ];
postPatch = ''
substituteInPlace oscar/oscar.pro --replace "/bin/bash" "${stdenv.shell}"
'';
qmakeFlags = [ "OSCAR_QT.pro" ];
installPhase = ''
install -d $out/bin
install -d $out/share/OSCAR/Help
install -d $out/share/OSCAR/Html
install -d $out/share/OSCAR/Translations
install -d $out/share/icons/OSCAR
install -d $out/share/applications
install -T oscar/OSCAR $out/bin/OSCAR
# help browser was removed 'temporarily' in https://gitlab.com/pholy/OSCAR-code/-/commit/57c3e4c33ccdd2d0eddedbc24c0e4f2969da3841
# install oscar/Help/* $out/share/OSCAR/Help
install oscar/Html/* $out/share/OSCAR/Html
install oscar/Translations/* $out/share/OSCAR/Translations
install -T Building/Linux/OSCAR.png $out/share/icons/OSCAR/OSCAR.png
install -T Building/Linux/OSCAR.desktop $out/share/applications/OSCAR.desktop
'';
meta = with stdenv.lib; {
homepage = "https://www.sleepfiles.com/OSCAR/";
description = "Software for reviewing and exploring data produced by CPAP and related machines used in the treatment of sleep apnea";
license = licenses.gpl3;
maintainers = [ maintainers.roconnor ];
# Someone needs to create a suitable installPhase for Darwin and Windows.
# See https://gitlab.com/pholy/OSCAR-code/-/tree/master/Building.
broken = !stdenv.hostPlatform.isLinux;
};
}

View file

@ -8,7 +8,7 @@ mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Governikus"; owner = "Governikus";
repo = "AusweisApp2"; repo = "AusweisApp2";
rev = "${version}"; rev = version;
sha256 = "1vibk3wmn54qr2mwz537hrr959y0r1zabp0gsijhzj2mk68g9pnb"; sha256 = "1vibk3wmn54qr2mwz537hrr959y0r1zabp0gsijhzj2mk68g9pnb";
}; };

View file

@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "electrickite"; owner = "electrickite";
repo = "batsignal"; repo = "batsignal";
rev = "${version}"; rev = version;
sha256 = "12hj0j18db34x0xzgj6xmhvxm966d05z0rl3d9rlrcd2q96lilwf"; sha256 = "12hj0j18db34x0xzgj6xmhvxm966d05z0rl3d9rlrcd2q96lilwf";
}; };

View file

@ -7,8 +7,8 @@ mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "chewing"; owner = "chewing";
repo = "${pname}"; repo = pname;
rev = "${version}"; rev = version;
sha256 = "0kc2hjx1gplm3s3p1r5sn0cyxw3k1q4gyv08q9r6rs4sg7xh2w7w"; sha256 = "0kc2hjx1gplm3s3p1r5sn0cyxw3k1q4gyv08q9r6rs4sg7xh2w7w";
}; };

View file

@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "arsenetar"; owner = "arsenetar";
repo = "dupeguru"; repo = "dupeguru";
rev = "${version}"; rev = version;
sha256 = "0ma4f1c6vmpz8gi4sdy43x1ik7wh42wayvk1iq520d3i714kfcpy"; sha256 = "0ma4f1c6vmpz8gi4sdy43x1ik7wh42wayvk1iq520d3i714kfcpy";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View file

@ -13,8 +13,8 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sanpii"; owner = "sanpii";
repo = "${pname}"; repo = pname;
rev = "${version}"; rev = version;
sha256 = "09bffxdp43s8b1rpmsgqr2kyz3i4jbd2yrwbxw21fj3sf3mwb9ig"; sha256 = "09bffxdp43s8b1rpmsgqr2kyz3i4jbd2yrwbxw21fj3sf3mwb9ig";
}; };

View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, openssl }: { stdenv, fetchurl, openssl }:
let let
version = "6.4.12"; version = "6.4.13";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "fetchmail"; pname = "fetchmail";
@ -9,7 +9,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz";
sha256 = "11s83af63gs9nnrjb66yq58xriyvi8hzj4ykxp3kws5z3nby111b"; sha256 = "1qablzgwx3a516vdhckx3pv716x9r7nyfyr6fbncif861c3cya3x";
}; };
buildInputs = [ openssl ]; buildInputs = [ openssl ];

View file

@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchgit { src = fetchgit {
url = "https://codeberg.org/dnkl/fuzzel"; url = "https://codeberg.org/dnkl/fuzzel";
rev = "${version}"; rev = version;
sha256 = "0c0p9spklzmy9f7abz3mvw0vp6zgnk3ns1i6ks95ljjb3kqy9vs2"; sha256 = "0c0p9spklzmy9f7abz3mvw0vp6zgnk3ns1i6ks95ljjb3kqy9vs2";
}; };

View file

@ -3,11 +3,11 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gphoto2-2.5.23"; name = "gphoto2-2.5.26";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
sha256 = "1laqwhxr0xhbykmp0dhd3j4rr2lhj5y228s31afnqxp700hhk1yz"; sha256 = "0bxbcn31xalsvjp8fra324hf2105y3ps7zlyfz11v71j0lxj2lvn";
}; };
nativeBuildInputs = [ pkgconfig gettext libtool ]; nativeBuildInputs = [ pkgconfig gettext libtool ];

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "hr"; pname = "hr";
version = "1.2"; version = "1.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "LuRsT"; owner = "LuRsT";
repo = "hr"; repo = "hr";
rev = version; rev = version;
sha256 = "162vkip2772jl59lschpinimpg4ssiyg7fq0va5cx4d7wldpqmks"; sha256 = "068kq37lbqfjzh28rlvkprni38ii991naawylwvq6d43y9dpzs2b";
}; };
dontBuild = true; dontBuild = true;

View file

@ -8,7 +8,7 @@ let
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pfn"; owner = "pfn";
repo = "keepasshttp"; repo = "keepasshttp";
#rev = "${version}"; # rev = version;
# for 1.8.4.2 the tag is at the wrong commit (they fixed stuff # for 1.8.4.2 the tag is at the wrong commit (they fixed stuff
# afterwards and didn't move the tag), hence reference by commitid # afterwards and didn't move the tag), hence reference by commitid
rev = "c2c4eb5388a02169400cba7a67be325caabdcc37"; rev = "c2c4eb5388a02169400cba7a67be325caabdcc37";

View file

@ -3,11 +3,11 @@
with builtins; buildDotnetPackage rec { with builtins; buildDotnetPackage rec {
baseName = "keepass"; baseName = "keepass";
version = "2.45"; version = "2.46";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip";
sha256 = "07wyp3k2kiprr47mc4vxb7vmh7g5kshcqw0gq3qr87gi78c9i66m"; sha256 = "0zyclydgyg8nhwxrzw7x4f82975cqdmp12py33k6sballx6jhgiy";
}; };
sourceRoot = "."; sourceRoot = ".";

View file

@ -7,14 +7,14 @@
let let
pname = "krename"; pname = "krename";
version = "5.0.0"; version = "5.0.1";
in mkDerivation rec { in mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
sha256 = "136j1dkqrhv458rjh5v3vzjhvq6dhz7k79zk6mmx8zvqacc7cq8a"; sha256 = "0zbadxjp13jqxgb58wslhm0wy2lhpdq1bgbvyhyn21mssfppib6a";
}; };
buildInputs = [ taglib exiv2 podofo ]; buildInputs = [ taglib exiv2 podofo ];

View file

@ -8,13 +8,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "minder"; pname = "minder";
version = "1.9.2"; version = "1.11.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "phase1geo"; owner = "phase1geo";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0lhwwx515f0ycpinkhgbjnik7dj2c7fckikbgzwkzzs25xqp9ayj"; sha256 = "137kyf82n5a2v0cm9q02rhv8rmbjgnj60h64prq90h0d42prj3gd";
}; };
nativeBuildInputs = [ pkgconfig meson ninja python3 wrapGAppsHook vala shared-mime-info ]; nativeBuildInputs = [ pkgconfig meson ninja python3 wrapGAppsHook vala shared-mime-info ];

View file

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "${version}"; rev = version;
sha256 = "0nh5jnf5yls2qv5hpfhm6i854zsknyh7d93c987a0cg14sg820fv"; sha256 = "0nh5jnf5yls2qv5hpfhm6i854zsknyh7d93c987a0cg14sg820fv";
}; };

View file

@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pwr-Solaar"; owner = "pwr-Solaar";
repo = "Solaar"; repo = "Solaar";
rev = "${version}"; rev = version;
sha256 = "0k5z9dap6rawiafkg1x7zjx51ala7wra6j6lvc2nn0y8r79yp7a9"; sha256 = "0k5z9dap6rawiafkg1x7zjx51ala7wra6j6lvc2nn0y8r79yp7a9";
}; };

View file

@ -7,10 +7,10 @@ in
rec { rec {
firefox = common rec { firefox = common rec {
pname = "firefox"; pname = "firefox";
ffversion = "82.0"; ffversion = "82.0.2";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "3lbvlb6yggd5v0pkr0x6j350jc5dpclqz7bv4i06r97a5ijdgfc7c6y605966hvw24v17byxr120xc7a39ikl1wnls7a9gyzyqcwyw8"; sha512 = "25wkgsqnafmq30m1kd1axkm454dhl2bmz6100i3ccqnn31vw3nyy6k3k1apsn62siqswpm55iclzcb10y4dfyyqcszvflim47c8i37k";
}; };
patches = [ patches = [

View file

@ -2,15 +2,15 @@
buildGoModule rec { buildGoModule rec {
pname = "istioctl"; pname = "istioctl";
version = "1.7.3"; version = "1.7.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "istio"; owner = "istio";
repo = "istio"; repo = "istio";
rev = version; rev = version;
sha256 = "1w0ddz2am053bpi0jrn5v3b76jf2z4nl7zv0i1z2v9xcx59bxkac"; sha256 = "1vy6y6gk7ljnrb7cxxaa60i4ycylsrd2yszbly1aaz5vnh1vsfz9";
}; };
vendorSha256 = "02l13hzk5aikpylalsm35v27cljcl4z0qka9a4m125bc4rj2kp7k"; vendorSha256 = "0f2n8mwnj9i4qifs0f63jrgr61mjs3c1arxnny723i5pialj3zdl";
doCheck = false; doCheck = false;

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "jx"; pname = "jx";
version = "2.1.138"; version = "2.1.149";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jenkins-x"; owner = "jenkins-x";
repo = "jx"; repo = "jx";
rev = "v${version}"; rev = "v${version}";
sha256 = "1i45gzaql6rfplliky56lrzwjnm2qzv25kgyq7gvn9c7hjaaq65b"; sha256 = "0jgny09wpfab8mkxkhv9swp1baqx3lxsx75a5i78cypkj6xadc69";
}; };
vendorSha256 = "1wvggarakshpw7m8h0x2zvd6bshd2kzbrjynfa113z90pgksvjng"; vendorSha256 = "1fswrf14nwjm0z8qqgdx236w7w1m451lyfinhx9pyp89fw2h5mv6";
doCheck = false; doCheck = false;

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "k9s"; pname = "k9s";
version = "0.22.1"; version = "0.23.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "derailed"; owner = "derailed";
repo = "k9s"; repo = "k9s";
rev = "v${version}"; rev = "v${version}";
sha256 = "1qyibpvfbd8yahfmci431qd0zy4wwz03gwj1ak8rn3qxpv1cdbmk"; sha256 = "0jdrjsv6miprw0bj964rgkbci4xdwfi536z3px93i2n9zrhhawpn";
}; };
buildFlagsArray = '' buildFlagsArray = ''
@ -18,7 +18,7 @@ buildGoModule rec {
-X github.com/derailed/k9s/cmd.commit=${src.rev} -X github.com/derailed/k9s/cmd.commit=${src.rev}
''; '';
vendorSha256 = "1432ppgd3lc0h83i6vzklfhp95s2xwaf41mv4xfryzzszjfndmvl"; vendorSha256 = "105vmy8agl3ppgi28wg7djx0jrfam7nxfvvlps9ycgyrv2qpjh2n";
doCheck = false; doCheck = false;

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "kpt"; pname = "kpt";
version = "0.35.0"; version = "0.36.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "GoogleContainerTools"; owner = "GoogleContainerTools";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0pk4j809hh4hkr58wx42vyzcn2g7l2lb60f4j1837hkk3rwrxkpm"; sha256 = "0j9a7lxspgw63xzz1f8r5fb67jxm5isdvfi5450v20virxch9afi";
}; };
vendorSha256 = "0c5ycyjhzz18ny544ddrag39la0fl0d3zrbbv8szb5jx87jx67jj"; vendorSha256 = "06kx85bf8mjmyhz5gp0la4fr8psnfz6i2rchc22sz2pgmsng1dfr";
subPackages = [ "." ]; subPackages = [ "." ];

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "kubeseal"; pname = "kubeseal";
version = "0.12.6"; version = "0.13.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bitnami-labs"; owner = "bitnami-labs";
repo = "sealed-secrets"; repo = "sealed-secrets";
rev = "v${version}"; rev = "v${version}";
sha256 = "0h8v751jf8hws8zcai6vfsk5vmq6f9kwz2dg79l6xa0dfc2rv4zf"; sha256 = "1hlj7i7pjyvrf9cpx6s41sdn7wjwfk7c0akx45kw662vrxcqcgf2";
}; };
vendorSha256 = null; vendorSha256 = null;

View file

@ -7,7 +7,7 @@ buildGoModule rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "instrumenta"; owner = "instrumenta";
repo = "kubeval"; repo = "kubeval";
rev = "${version}"; rev = version;
sha256 = "05li0qv4q7fy2lr50r6c1r8dhx00jb1g01qmgc72a9zqp378yiq0"; sha256 = "05li0qv4q7fy2lr50r6c1r8dhx00jb1g01qmgc72a9zqp378yiq0";
}; };

View file

@ -2,24 +2,24 @@
buildGoModule rec { buildGoModule rec {
pname = "popeye"; pname = "popeye";
version = "0.8.10"; version = "0.9.0";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}"; rev = "v${version}";
owner = "derailed"; owner = "derailed";
repo = "popeye"; repo = "popeye";
sha256 = "1cx39xipvvhb12nhvg7kfssnqafajni662b070ynlw8p870bj0sn"; sha256 = "1rslmcdjs53zvv0xaf00vxqsfc3jh2p584j3q6nfgrghc978xmpf";
}; };
buildFlagsArray = '' buildFlagsArray = ''
-ldflags= -ldflags=
-s -w -s -w
-X github.com/derailed/popeye/cmd.version=${version} -X github.com/derailed/popeye/cmd.version=${version}
-X github.com/derailed/popeye/cmd.commit=b7a876eafd4f7ec5683808d8d6880c41c805056a -X github.com/derailed/popeye/cmd.commit=022c3104b642aab6bdb287468fb79068a33e1b0d
-X github.com/derailed/popeye/cmd.date=2020-08-25T23:02:30Z -X github.com/derailed/popeye/cmd.date=2020-10-31T16:44:45Z
''; '';
vendorSha256 = "0b2bawc9wnqwgvrv614rq5y4ns9di65zqcbb199y2ijpsaw5d9a7"; vendorSha256 = "08195dnka7rs38py3kjii9zh9nifg2fnbi1wzjl0pc38i2bbrz0k";
doCheck = false; doCheck = false;

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "compactor"; pname = "compactor";
version = "0.12.2"; version = "1.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dns-stats"; owner = "dns-stats";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "17p9wsslsh6ifnadvyygr0cgir4q4iirxfz9zpkpbhh76cx2qnay"; sha256 = "0x5rwbv0ndf9zcvnsbd78ic6shh9hd0bh3gh0lzz9wlb99lslbkk";
}; };
# cbor-diag, cddl and wireshark-cli are only used for tests. # cbor-diag, cddl and wireshark-cli are only used for tests.

View file

@ -11,11 +11,11 @@
mkDerivation rec { mkDerivation rec {
pname = "datovka"; pname = "datovka";
version = "4.15.2"; version = "4.15.5";
src = fetchurl { src = fetchurl {
url = "https://secure.nic.cz/files/datove_schranky/${version}/${pname}-${version}.tar.xz"; url = "https://secure.nic.cz/files/datove_schranky/${version}/${pname}-${version}.tar.xz";
sha256 = "0vna3vaivi6w7nlkwpqhwmyly0s1d5y2yg51br2f918pjhp2cp7q"; sha256 = "1mnw1m3wjkw8rfh6fwwrhfmkna6j19pza9cs7kyp8qj1fzzqi8my";
}; };
buildInputs = [ libisds qmake qtbase qtsvg libxml2 ]; buildInputs = [ libisds qmake qtbase qtsvg libxml2 ];

View file

@ -8,6 +8,8 @@ buildDunePackage rec {
useDune2 = true; useDune2 = true;
minimumOCamlVersion = "4.06";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "astrada"; owner = "astrada";
repo = "google-drive-ocamlfuse"; repo = "google-drive-ocamlfuse";

View file

@ -21,11 +21,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "zeek"; pname = "zeek";
version = "3.2.1"; version = "3.2.2";
src = fetchurl { src = fetchurl {
url = "https://download.zeek.org/zeek-${version}.tar.gz"; url = "https://download.zeek.org/zeek-${version}.tar.gz";
sha256 = "0rybs79h0sq12vsayah8dixqac404z84rlvqynvzf3dh2lwcgg0y"; sha256 = "00cxz7ad7p62s2glcagzcvwbnsivrv4bmz6rl1vij907jb24hmvc";
}; };
nativeBuildInputs = [ cmake flex bison file ]; nativeBuildInputs = [ cmake flex bison file ];

View file

@ -2,18 +2,18 @@
buildGoModule rec { buildGoModule rec {
pname = "cordless"; pname = "cordless";
version = "2020-08-30"; version = "2020-10-24";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Bios-Marcel"; owner = "Bios-Marcel";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-CwOI7Ah4+sxD9We+Va5a6jYat5mjOeBk2EsOfwskz6k="; sha256 = "18j8yrnipiivc49jwbb0ipgqwdi249fs9zxxz8qx8jfq77imvwbq";
}; };
subPackages = [ "." ]; subPackages = [ "." ];
vendorSha256 = "sha256-01I7GrZkaskuz20kVK2YwqvP7ViPMlQ3BFaoLHwgvOE="; vendorSha256 = "1h47aqf8bmyqvaayfj16br1402qzy7kf8rk96f3vnsyvsnkg5gw5";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://github.com/Bios-Marcel/cordless"; homepage = "https://github.com/Bios-Marcel/cordless";

View file

@ -10,7 +10,7 @@ mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "QMatrixClient"; owner = "QMatrixClient";
repo = "Quaternion"; repo = "Quaternion";
rev = "${version}"; rev = version;
sha256 = "0hqhg7l6wpkdbzrdjvrbqymmahziri07ba0hvbii7dd2p0h248fv"; sha256 = "0hqhg7l6wpkdbzrdjvrbqymmahziri07ba0hvbii7dd2p0h248fv";
}; };

View file

@ -22,12 +22,12 @@ let
in mkDerivation rec { in mkDerivation rec {
pname = "telegram-desktop"; pname = "telegram-desktop";
version = "2.4.5"; version = "2.4.6";
# Telegram-Desktop with submodules # Telegram-Desktop with submodules
src = fetchurl { src = fetchurl {
url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
sha256 = "0nhzypgc45f5gqy53azj7mljnj7p9p0m7bil02f9cih1dg5sdxx5"; sha256 = "190k9ik678br5k892gj26bx4rbj5rn5ks4qgf2nrlgww0z59fvrc";
}; };
postPatch = '' postPatch = ''

View file

@ -3,8 +3,8 @@
}: }:
let let
rev = "1d4f7d74ff1a627db6e45682efd0e3b85738e426"; rev = "e8fcae73947445db3d418fb7c20b964b59e14706";
sha256 = "1w03xmjn693ff489pg368jv21478vr4ldxyya4lsrx87fn88caj3"; sha256 = "0s2dd41r71aixhvympiqfks1liv7x78y60n0i87vmyxyfx449b5h";
in stdenv.mkDerivation { in stdenv.mkDerivation {
pname = "tg_owt"; pname = "tg_owt";

View file

@ -3,12 +3,12 @@
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "6.8.5"; version = "6.8.7";
pname = "frostwire"; pname = "frostwire";
src = fetchurl { src = fetchurl {
url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz"; url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz";
sha256 = "1zdas93w1yqg9yx8wlk7pxpdmwvg4ykg54ai7iyq9ir1zha8fyif"; sha256 = "1m9v4abm8jbyz46hin63vi6irs32n1xzg85bdyb48vpdxh6iwv04";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

View file

@ -3,7 +3,7 @@
, heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2 , heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2
, gnome2, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 , gnome2, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2
, libjpeg, libredirect, tzdata, cacert, systemd, libcxxabi, libcxx, e2fsprogs, symlinkJoin , libjpeg, libredirect, tzdata, cacert, systemd, libcxxabi, libcxx, e2fsprogs, symlinkJoin
, libpulseaudio , libpulseaudio, pcsclite
, homepage, version, prefix, hash , homepage, version, prefix, hash
@ -103,6 +103,7 @@ stdenv.mkDerivation rec {
runtimeDependencies = [ runtimeDependencies = [
glib glib
pcsclite
xorg.libX11 xorg.libX11
xorg.libXScrnSaver xorg.libXScrnSaver

View file

@ -10,7 +10,7 @@ mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "genonbeta"; owner = "genonbeta";
repo = "TrebleShot-Desktop"; repo = "TrebleShot-Desktop";
rev = "${version}"; rev = version;
sha256 = "1k8wagw6arsi1lqkhn1nl6j11mb122vi1qs0q2np6nznwfy7pn1k"; sha256 = "1k8wagw6arsi1lqkhn1nl6j11mb122vi1qs0q2np6nznwfy7pn1k";
}; };

View file

@ -15,11 +15,11 @@
mkDerivation rec { mkDerivation rec {
pname = "calligra"; pname = "calligra";
version = "3.2.0"; version = "3.2.1";
src = fetchurl { src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz"; url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-flViKGZdeeZ8Bi/RFz1mdvCw187v3W4bC8+aeB6nCVE="; sha256 = "0iqi6z6gkck2afgy200dacgcspq7i7887alcj0pklm08hbmsdy5i";
}; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];

View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeWrapper, jre }: { stdenv, fetchurl, makeWrapper, jre }:
let let
version = "2020.2.3.1"; version = "2020.2.6";
majorVersion = builtins.substring 0 6 version; majorVersion = builtins.substring 0 6 version;
in in
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "http://download.flexibee.eu/download/${majorVersion}/${version}/${pname}-${version}.tar.gz"; url = "http://download.flexibee.eu/download/${majorVersion}/${version}/${pname}-${version}.tar.gz";
sha256 = "05wzg7f6mzz7r6azzb8k2g5fakkqh6762y4q9qkmrzbixvxh4lz9"; sha256 = "0vscz24sabk9xafywnx41rqhq6300ddsw1x95ibc7ghsgbkq80ja";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

View file

@ -6,12 +6,12 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "4.0.14"; version = "4.0.17";
pname = "flmsg"; pname = "flmsg";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz";
sha256 = "0s1prawkpvr7xr7h8w7r0ly90ya3n8h6qsii0x6laqrkgjn9w9iy"; sha256 = "09xf3f65d3qi69frznf4fdznbfbc7kmgxw716q2c7ccsmh9c5q44";
}; };
buildInputs = [ buildInputs = [

View file

@ -2,10 +2,10 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "igv"; pname = "igv";
version = "2.8.9"; version = "2.8.11";
src = fetchzip { src = fetchzip {
url = "https://data.broadinstitute.org/igv/projects/downloads/2.8/IGV_${version}.zip"; url = "https://data.broadinstitute.org/igv/projects/downloads/2.8/IGV_${version}.zip";
sha256 = "1874w1xprv91caz1ymfxilq6inhj36xzx8j9m0mcyp0qfvfvyjp7"; sha256 = "1hiwnrrh42qzc7kdc7bypgcgn488pz8g462xzchbhgx7jjdbbwhm";
}; };
installPhase = '' installPhase = ''

View file

@ -17,14 +17,14 @@ let
}; };
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "14.31.3"; version = "14.31.14";
pname = "jmol"; pname = "jmol";
src = let src = let
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
in fetchurl { in fetchurl {
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
sha256 = "067051wp9kgkgcy3mvqwxhim0h1qfcf4jk8vrbzd3y9pwmjismzy"; sha256 = "1qmy4iqn5xgd4m9hs4w9cn9rzkwmpgdb5azd93cypp05s4nmjsnm";
}; };
patchPhase = '' patchPhase = ''

View file

@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec {
src = fetchFromBitbucket { src = fetchFromBitbucket {
owner = "jpcgt"; owner = "jpcgt";
repo = "${pname}"; repo = pname;
rev = "533afd6a1772857cb633c011b5e0a15b60b1e92e"; # 8.5 with Red Hat packaging. rev = "533afd6a1772857cb633c011b5e0a15b60b1e92e"; # 8.5 with Red Hat packaging.
sha256 = "199kiiml18k34z1zhk2hbhibphmnv0kb11kxiajq52alps0mjb3m"; sha256 = "199kiiml18k34z1zhk2hbhibphmnv0kb11kxiajq52alps0mjb3m";
}; };

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gtkwave"; pname = "gtkwave";
version = "3.3.106"; version = "3.3.107";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz"; url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz";
sha256 = "0ma53s27735x16dq5qi91kvlypkiwkxh2jhw0gziyccnk1mkdsji"; sha256 = "0ma30jyc94iid3v3m8aw4i2lyiqfxkpsdvdmmaibynk400cbzivl";
}; };
nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

View file

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "potassco"; owner = "potassco";
repo = "${pname}"; repo = pname;
rev = "v${version}"; rev = "v${version}";
fetchSubmodules = true; fetchSubmodules = true;
sha256 = "1q7517h10jfvjdk2czq8d6y57r8kr1j1jj2k2ip2qxkpyfigk4rs"; sha256 = "1q7517h10jfvjdk2czq8d6y57r8kr1j1jj2k2ip2qxkpyfigk4rs";

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, cln, pkgconfig, readline, gmp, python }: { stdenv, fetchurl, cln, pkgconfig, readline, gmp, python }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ginac-1.7.9"; name = "ginac-1.8.0";
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/${name}.tar.bz2"; url = "${meta.homepage}/${name}.tar.bz2";
sha256 = "08cqc87qq4w6z3l053x5gfqsa4zkgkicq8skxsbsj39nli1zzkb7"; sha256 = "0l9byzfxq3f9az5pcdldnl95ws8mpirkqky46f973mvxi5541d24";
}; };
propagatedBuildInputs = [ cln ]; propagatedBuildInputs = [ cln ];

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cytoscape"; pname = "cytoscape";
version = "3.8.1"; version = "3.8.2";
src = fetchurl { src = fetchurl {
url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${pname}-unix-${version}.tar.gz"; url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${pname}-unix-${version}.tar.gz";
sha256 = "006g0w29sccg5h0zlrxdp3lx4vx1bfdhx2cms6aah85r5b82wgkf"; sha256 = "0zgsq9qnyvmq96pgf7372r16rm034fd0r4qa72xi9zbd4f2r7z8w";
}; };
patches = [ patches = [

View file

@ -1,7 +1,7 @@
{stdenv, fetchurl, makeWrapper, flex, bison, {stdenv, fetchurl, makeWrapper, flex, bison,
asciidoc, docbook_xml_dtd_45, docbook_xsl, asciidoc, docbook_xml_dtd_45, docbook_xsl,
libxml2, libxslt, libxml2, libxslt,
python27, rcs, cvs, git, python3, rcs, cvs, git,
coreutils, rsync}: coreutils, rsync}:
with stdenv; with lib; with stdenv; with lib;
mkDerivation rec { mkDerivation rec {
@ -22,7 +22,7 @@ mkDerivation rec {
buildInputs = [ buildInputs = [
flex bison asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt flex bison asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt
python27 rcs cvs git makeWrapper python3 rcs cvs git makeWrapper
]; ];
postPatch = "patchShebangs ."; postPatch = "patchShebangs .";

View file

@ -7,7 +7,7 @@ buildPythonApplication rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "c4urself"; owner = "c4urself";
repo = "${pname}"; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "10p7rg569rk3qvzs5kjj17894bqlsg3ihhbln6ciwwfhkfq1kpja"; sha256 = "10p7rg569rk3qvzs5kjj17894bqlsg3ihhbln6ciwwfhkfq1kpja";
}; };
@ -16,12 +16,12 @@ buildPythonApplication rec {
# X's in pytest are git tests which won't run in sandbox # X's in pytest are git tests which won't run in sandbox
checkPhase = '' checkPhase = ''
pytest tests/ -k 'not usage_string_fork' pytest tests/ -k 'not usage_string_fork'
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Version-bump your software with a single command"; description = "Version-bump your software with a single command";
longDescription = '' longDescription = ''
A small command line tool to simplify releasing software by updating A small command line tool to simplify releasing software by updating
all version strings in your source code by the correct increment. all version strings in your source code by the correct increment.
''; '';
homepage = "https://github.com/c4urself/bump2version"; homepage = "https://github.com/c4urself/bump2version";

View file

@ -7,7 +7,7 @@ buildGoModule rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gabrie30"; owner = "gabrie30";
repo = "ghorg"; repo = "ghorg";
rev = "${version}"; rev = version;
sha256 = "0diwndkckv6fga45j9zngizycn5m71r67cziv0zrx6c66ssbj49w"; sha256 = "0diwndkckv6fga45j9zngizycn5m71r67cziv0zrx6c66ssbj49w";
}; };

View file

@ -2,23 +2,27 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "git-absorb"; pname = "git-absorb";
version = "0.6.5"; version = "0.6.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tummychow"; owner = "tummychow";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
sha256 = "12ih0gm07ddi86jy612f029nzav345v57pjajyy9lw017g6n6mjb"; sha256 = "04v10bn24acify34vh5ayymsr1flcyb05f3az9k1s2m6nlxy5gb9";
}; };
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
cargoSha256 = "0x2zcw0bpwqimvbb5xj8xawvl4jcvk5lj0y2mm5ncbdapzyqdsb2"; cargoSha256 = "0h0vlz4qd8i9bf1mgjr618zbdwfp6bmy7ql9a1xzjmfdpkl3cgk9";
postInstall = '' postInstall = ''
installManPage Documentation/git-absorb.1 installManPage Documentation/git-absorb.1
for shell in bash zsh fish; do
$out/bin/git-absorb --gen-completions $shell > git-absorb.$shell
installShellCompletion git-absorb.$shell
done
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "git-extras"; pname = "git-extras";
version = "6.0.0"; version = "6.1.0";
src = fetchzip { src = fetchzip {
url = "https://github.com/tj/git-extras/archive/${version}.tar.gz"; url = "https://github.com/tj/git-extras/archive/${version}.tar.gz";
sha256 = "0mxb3c5lb5n7c76bp10bw7bid564vjxi5f7cvzaj2ss93v5rr11g"; sha256 = "12ff9rhgqd71xm72r385hx0h8g75hz0ag0adzqcwfa54k0lhrrrz";
}; };
nativeBuildInputs = [ unixtools.column which ]; nativeBuildInputs = [ unixtools.column which ];

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "git-filter-repo"; pname = "git-filter-repo";
version = "2.28.0"; version = "2.29.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/newren/git-filter-repo/releases/download/v${version}/${pname}-${version}.tar.xz"; url = "https://github.com/newren/git-filter-repo/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "0sa6h6k1mnhx8p8w5d88gx7cqbnxaazfj1dv47c107fk70hqvvpx"; sha256 = "00nn7k9jqrybb762486fmigsnbcn9lbvimgpfvvarz4ikdp9y9pb";
}; };
buildInputs = [ pythonPackages.python ]; buildInputs = [ pythonPackages.python ];

View file

@ -5,10 +5,10 @@
mkDerivation rec { mkDerivation rec {
pname = "clipgrab"; pname = "clipgrab";
version = "3.8.14"; version = "3.8.15";
src = fetchurl { src = fetchurl {
sha256 = "19337qjxwlkpdnnh6q0y4b8askk17a8zb88gifznllrk06a6pgyf"; sha256 = "1anp8hhwbkirsvc7mn11k272f0d85vzb5ppiw3gg9ss2hdai563n";
# The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz! # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz!
url = "https://download.clipgrab.org/${pname}-${version}.tar.gz"; url = "https://download.clipgrab.org/${pname}-${version}.tar.gz";
}; };

View file

@ -10,11 +10,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "filebot"; pname = "filebot";
version = "4.9.1"; version = "4.9.2";
src = fetchurl { src = fetchurl {
url = "https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz"; url = "https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz";
sha256 = "0l496cz703mjymjhgmyrkqbfld1bz53pdsbkx00h9a267j22fkms"; sha256 = "0hcyam8l0fzc9fnp1dpawk0s3rwhfph78w99y7zlcv5l4l4h04lz";
}; };
unpackPhase = "tar xvf $src"; unpackPhase = "tar xvf $src";
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
cp -r filebot.sh lib/ jar/ $out/opt/ cp -r filebot.sh lib/ jar/ $out/opt/
# Filebot writes to $APP_DATA, which fails due to read-only filesystem. Using current user .local directory instead. # Filebot writes to $APP_DATA, which fails due to read-only filesystem. Using current user .local directory instead.
substituteInPlace $out/opt/filebot.sh \ substituteInPlace $out/opt/filebot.sh \
--replace 'APP_DATA="$FILEBOT_HOME/data/$USER"' 'APP_DATA=''${XDG_DATA_HOME:-$HOME/.local/share}/filebot/data' \ --replace 'APP_DATA="$FILEBOT_HOME/data/$(id -u)"' 'APP_DATA=''${XDG_DATA_HOME:-$HOME/.local/share}/filebot/data' \
--replace '$FILEBOT_HOME/data/.license' '$APP_DATA/.license' --replace '$FILEBOT_HOME/data/.license' '$APP_DATA/.license'
wrapProgram $out/opt/filebot.sh \ wrapProgram $out/opt/filebot.sh \
--prefix PATH : ${stdenv.lib.makeBinPath [ openjdk11 ]} --prefix PATH : ${stdenv.lib.makeBinPath [ openjdk11 ]}

View file

@ -2,13 +2,13 @@
buildPythonApplication rec { buildPythonApplication rec {
pname = "plex-mpv-shim"; pname = "plex-mpv-shim";
version = "1.8.0"; version = "1.9.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "iwalton3"; owner = "iwalton3";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0fi0glnl7nr6754r9jk7d7dsnjbdm7civvhcj2l009yxiv2rxzj3"; sha256 = "06i6pp4jg0f9h6ash60fj1l5mbsdw3zyx7c6anbsrn86802i7paa";
}; };
propagatedBuildInputs = [ mpv requests python-mpv-jsonipc ]; propagatedBuildInputs = [ mpv requests python-mpv-jsonipc ];

View file

@ -9,13 +9,13 @@ assert stdenv.lib.versionAtLeast mlt.version "6.22.1";
mkDerivation rec { mkDerivation rec {
pname = "shotcut"; pname = "shotcut";
version = "20.09.13"; version = "20.10.31";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mltframework"; owner = "mltframework";
repo = "shotcut"; repo = "shotcut";
rev = "v${version}"; rev = "v${version}";
sha256 = "1q7ba6j3b2yzn3y5z9s5ldh15wrvhi6vymhwm910nqa5379dcc21"; sha256 = "16ypq1v396pibhh33nm78p6hr5fz3h74l0ykg9f72b8whw23jyz6";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
@ -27,7 +27,11 @@ mkDerivation rec {
]; ];
NIX_CFLAGS_COMPILE = "-I${libmlt}/include/mlt++ -I${libmlt}/include/mlt"; NIX_CFLAGS_COMPILE = "-I${libmlt}/include/mlt++ -I${libmlt}/include/mlt";
qmakeFlags = [ "QMAKE_LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" "SHOTCUT_VERSION=${version}" ]; qmakeFlags = [
"QMAKE_LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease"
"SHOTCUT_VERSION=${version}"
"DEFINES+=SHOTCUT_NOUPGRADE"
];
prePatch = '' prePatch = ''
sed 's_shotcutPath, "qmelt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp sed 's_shotcutPath, "qmelt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp

View file

@ -2,14 +2,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.19"; version = "0.20";
pname = "charliecloud"; pname = "charliecloud";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hpc"; owner = "hpc";
repo = "charliecloud"; repo = "charliecloud";
rev = "v${version}"; rev = "v${version}";
sha256 = "1rmvm0s1jdpzfg32b3hwsbdkzws7gsy4xq227hmzv3n2dv64svm6"; sha256 = "15ihffwhpjnzgz0ir5vc9la4fwkqj91vmrcsb2r58ikq7h9sk45j";
}; };
nativeBuildInputs = [ autoreconfHook makeWrapper ]; nativeBuildInputs = [ autoreconfHook makeWrapper ];

View file

@ -12,7 +12,7 @@
let let
pname = "hikari"; pname = "hikari";
version = "2.1.2"; version = "2.2.2";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -20,7 +20,7 @@ stdenv.mkDerivation {
src = fetchzip { src = fetchzip {
url = "https://hikari.acmelabs.space/releases/${pname}-${version}.tar.gz"; url = "https://hikari.acmelabs.space/releases/${pname}-${version}.tar.gz";
sha256 = "1qzbwc8dgsvp5jb4faapcrg9npsl11gq8jvhbbk2h7hj52c5lgmv"; sha256 = "0sln1n5f67i3vxkybfi6xhzplb45djqyg272vqkv64m72rmm8875";
}; };
nativeBuildInputs = [ pkgconfig bmake ]; nativeBuildInputs = [ pkgconfig bmake ];

View file

@ -3,11 +3,11 @@
i3.overrideAttrs (oldAttrs : rec { i3.overrideAttrs (oldAttrs : rec {
name = "i3-gaps-${version}"; name = "i3-gaps-${version}";
version = "4.18.2"; version = "4.18.3";
src = fetchurl { src = fetchurl {
url = "https://github.com/Airblader/i3/releases/download/${version}/i3-${version}.tar.bz2"; url = "https://github.com/Airblader/i3/releases/download/${version}/i3-${version}.tar.bz2";
sha256 = "0lz08wf4b0yprzqsmymn94kiyg885dcwmh0p64v2rnf52s165g2g"; sha256 = "1hcakwyz78lgp8mhqv7pw86jlb3m415pfql1q19rkijnhm3fn3ci";
}; };
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ]; nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ];

View file

@ -3,11 +3,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "i3lock"; pname = "i3lock";
version = "2.12"; version = "2.13";
src = fetchurl { src = fetchurl {
url = "https://i3wm.org/i3lock/${pname}-${version}.tar.bz2"; url = "https://i3wm.org/i3lock/${pname}-${version}.tar.bz2";
sha256 = "02dwaqxpclcwiwvpvq7zwz4sxcv9c15dbf17ifalj1p8djls3cnh"; sha256 = "02szjsaz7rqrdkd0r2nwgwa85c4hwfrcskxw7ryk695kmjcfhzv3";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

View file

@ -2,7 +2,7 @@
let let
pname = "agave"; pname = "agave";
version = "22"; version = "30";
in fetchurl { in fetchurl {
name = "${pname}-${version}"; name = "${pname}-${version}";
url = "https://github.com/agarick/agave/releases/download/v${version}/Agave-Regular.ttf"; url = "https://github.com/agarick/agave/releases/download/v${version}/Agave-Regular.ttf";
@ -13,7 +13,7 @@ in fetchurl {
install -D $downloadedFile $out/share/fonts/truetype/Agave-Regular.ttf install -D $downloadedFile $out/share/fonts/truetype/Agave-Regular.ttf
''; '';
sha256 = "1jb8f0xcv5z0l5nyx733b6zclswi82vrh2nwyyhbqzgqrl4y1h6s"; sha256 = "1f2f1fycwi8xbf8x03yfq78nv11b2msl4ll9flw8rkg023h9vwg7";
meta = with lib; { meta = with lib; {
description = "truetype monospaced typeface designed for X environments"; description = "truetype monospaced typeface designed for X environments";

View file

@ -1,11 +1,11 @@
{ lib, fetchzip }: { lib, fetchzip }:
let let
version = "0.51"; version = "0.52";
in fetchzip { in fetchzip {
name = "sudo-font-${version}"; name = "sudo-font-${version}";
url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip";
sha256 = "19m132183w5hrc5qvlb6cj38hir2302cqiljlfc72qdlb8al6fwi"; sha256 = "1j5p7apclyy5gfj2kklmgcncdsp5iik4gd6mdl29anzijknd0kja";
postFetch = '' postFetch = ''
mkdir -p $out/share/fonts/ mkdir -p $out/share/fonts/

View file

@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zayronxio"; owner = "zayronxio";
repo = pname; repo = pname;
rev = "${version}"; rev = version;
sha256 = "05h8qm9izjbp8pnl9jpbw3y9sddhp0zmg94fm1k4d4hhdqnakqhv"; sha256 = "05h8qm9izjbp8pnl9jpbw3y9sddhp0zmg94fm1k4d4hhdqnakqhv";
}; };

View file

@ -1,11 +1,13 @@
{ stdenv, fetchgit, gtk-engine-murrine }: { stdenv, fetchFromGitHub, gtk-engine-murrine }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "orion-1.5"; pname = "orion";
version = "1.5";
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/shimmerproject/Orion.git"; owner = "shimmerproject";
rev = "refs/tags/v1.5"; repo = "Orion";
rev = "refs/tags/v${version}";
sha256 = "1116yawv3fspkiq1ykk2wj0gza3l04b5nhldy0bayzjaj0y6fd89"; sha256 = "1116yawv3fspkiq1ykk2wj0gza3l04b5nhldy0bayzjaj0y6fd89";
}; };

View file

@ -22,10 +22,10 @@ stdenv.mkDerivation rec {
version = "3.22.11"; version = "3.22.11";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME"; owner = "GNOME";
repo = pname; repo = pname;
domain = "gitlab.gnome.org"; rev = version;
rev = "${version}";
sha256 = "1asm0y6485xqsysdg586y3hzz8bhxqwnc82k6vhfnxpxz7l62qa1"; sha256 = "1asm0y6485xqsysdg586y3hzz8bhxqwnc82k6vhfnxpxz7l62qa1";
}; };

View file

@ -39,6 +39,7 @@ let
mate-system-monitor = callPackage ./mate-system-monitor { }; mate-system-monitor = callPackage ./mate-system-monitor { };
mate-terminal = callPackage ./mate-terminal { }; mate-terminal = callPackage ./mate-terminal { };
mate-themes = callPackage ./mate-themes { }; mate-themes = callPackage ./mate-themes { };
mate-tweak = callPackage ./mate-tweak { };
mate-user-guide = callPackage ./mate-user-guide { }; mate-user-guide = callPackage ./mate-user-guide { };
mate-user-share = callPackage ./mate-user-share { }; mate-user-share = callPackage ./mate-user-share { };
mate-utils = callPackage ./mate-utils { }; mate-utils = callPackage ./mate-utils { };

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