gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-07-31 18:01:07 +00:00
committed by GitHub
parent e591a6235d e276c3b9c2
commit 2c7184fae9
91 changed files with 289 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
+11
View File
@@ -570,6 +570,17 @@
6.0.0 to 9.0.0
</para>
</listitem>
<listitem>
<para>
<literal>tt-rss</literal> was upgraded to the commit on
2021-06-21, which has breaking changes. If you use
<literal>services.tt-rss.extraConfig</literal> you should
migrate to the <literal>putenv</literal>-style configuration.
See
<link xlink:href="https://community.tt-rss.org/t/rip-config-php-hello-classes-config-php/4337">this
Discourse post</link> in the tt-rss forums for more details.
</para>
</listitem>
<listitem>
<para>
The following Visual Studio Code extensions were renamed to
nixos/doc/manual/release-notes/rl-2111.section.md
+2
View File
@@ -146,6 +146,8 @@ pt-services.clipcat.enable).
- the `mingw-64` package has been upgraded from 6.0.0 to 9.0.0
- `tt-rss` was upgraded to the commit on 2021-06-21, which has breaking changes. If you use `services.tt-rss.extraConfig` you should migrate to the `putenv`-style configuration. See [this Discourse post](https://community.tt-rss.org/t/rip-config-php-hello-classes-config-php/4337) in the tt-rss forums for more details.
- The following Visual Studio Code extensions were renamed to keep the naming convention uniform.
- `bbenoist.Nix` -> `bbenoist.nix`
- `CoenraadS.bracket-pair-colorizer` -> `coenraads.bracket-pair-colorizer`
nixos/modules/services/web-apps/tt-rss.nix
+68 -59
View File
@@ -19,82 +19,84 @@ let
mysqlLocal = cfg.database.createLocally && cfg.database.type == "mysql";
pgsqlLocal = cfg.database.createLocally && cfg.database.type == "pgsql";
tt-rss-config = pkgs.writeText "config.php" ''
tt-rss-config = let
password =
if (cfg.database.password != null) then
"${(escape ["'" "\\"] cfg.database.password)}"
else if (cfg.database.passwordFile != null) then
"file_get_contents('${cfg.database.passwordFile}'"
else
""
;
in pkgs.writeText "config.php" ''
<?php
putenv('TTRSS_PHP_EXECUTABLE=${pkgs.php}/bin/php');
define('PHP_EXECUTABLE', '${pkgs.php}/bin/php');
putenv('TTRSS_LOCK_DIRECTORY=${lockDir}');
putenv('TTRSS_CACHE_DIR=${cacheDir}');
putenv('TTRSS_ICONS_DIR=${feedIconsDir}');
putenv('TTRSS_ICONS_URL=${feedIconsDir}');
putenv('TTRSS_SELF_URL_PATH=${cfg.selfUrlPath}');
define('LOCK_DIRECTORY', '${lockDir}');
define('CACHE_DIR', '${cacheDir}');
define('ICONS_DIR', '${feedIconsDir}');
define('ICONS_URL', '${feedIconsDir}');
define('SELF_URL_PATH', '${cfg.selfUrlPath}');
putenv('TTRSS_MYSQL_CHARSET=UTF8');
define('MYSQL_CHARSET', 'UTF8');
putenv('TTRSS_DB_TYPE=${cfg.database.type}');
putenv('TTRSS_DB_HOST=${optionalString (cfg.database.host != null) cfg.database.host}');
putenv('TTRSS_DB_USER=${cfg.database.user}');
putenv('TTRSS_DB_NAME=${cfg.database.name}');
putenv('TTRSS_DB_PASS=${password}');
putenv('TTRSS_DB_PORT=${toString dbPort}');
define('DB_TYPE', '${cfg.database.type}');
define('DB_HOST', '${optionalString (cfg.database.host != null) cfg.database.host}');
define('DB_USER', '${cfg.database.user}');
define('DB_NAME', '${cfg.database.name}');
define('DB_PASS', ${
if (cfg.database.password != null) then
"'${(escape ["'" "\\"] cfg.database.password)}'"
else if (cfg.database.passwordFile != null) then
"file_get_contents('${cfg.database.passwordFile}')"
else
"''"
});
define('DB_PORT', '${toString dbPort}');
putenv('TTRSS_AUTH_AUTO_CREATE=${boolToString cfg.auth.autoCreate}');
putenv('TTRSS_AUTH_AUTO_LOGIN=${boolToString cfg.auth.autoLogin}');
define('AUTH_AUTO_CREATE', ${boolToString cfg.auth.autoCreate});
define('AUTH_AUTO_LOGIN', ${boolToString cfg.auth.autoLogin});
define('FEED_CRYPT_KEY', '${escape ["'" "\\"] cfg.feedCryptKey}');
putenv('TTRSS_FEED_CRYPT_KEY=${escape ["'" "\\"] cfg.feedCryptKey}');
define('SINGLE_USER_MODE', ${boolToString cfg.singleUserMode});
putenv('TTRSS_SINGLE_USER_MODE=${boolToString cfg.singleUserMode}');
define('SIMPLE_UPDATE_MODE', ${boolToString cfg.simpleUpdateMode});
putenv('TTRSS_SIMPLE_UPDATE_MODE=${boolToString cfg.simpleUpdateMode}');
// Never check for updates - the running version of the code should be
// controlled entirely by the version of TT-RSS active in the current Nix
// profile. If TT-RSS updates itself to a version requiring a database
// schema upgrade, and then the SystemD tt-rss.service is restarted, the
// old code copied from the Nix store will overwrite the updated version,
// causing the code to detect the need for a schema "upgrade" (since the
// schema version in the database is different than in the code), but the
// update schema operation in TT-RSS will do nothing because the schema
// version in the database is newer than that in the code.
define('CHECK_FOR_UPDATES', false);
# Never check for updates - the running version of the code should
# be controlled entirely by the version of TT-RSS active in the
# current Nix profile. If TT-RSS updates itself to a version
# requiring a database schema upgrade, and then the SystemD
# tt-rss.service is restarted, the old code copied from the Nix
# store will overwrite the updated version, causing the code to
# detect the need for a schema "upgrade" (since the schema version
# in the database is different than in the code), but the update
# schema operation in TT-RSS will do nothing because the schema
# version in the database is newer than that in the code.
putenv('TTRSS_CHECK_FOR_UPDATES=false');
define('FORCE_ARTICLE_PURGE', ${toString cfg.forceArticlePurge});
define('SESSION_COOKIE_LIFETIME', ${toString cfg.sessionCookieLifetime});
define('ENABLE_GZIP_OUTPUT', ${boolToString cfg.enableGZipOutput});
putenv('TTRSS_FORCE_ARTICLE_PURGE=${toString cfg.forceArticlePurge}');
putenv('TTRSS_SESSION_COOKIE_LIFETIME=${toString cfg.sessionCookieLifetime}');
putenv('TTRSS_ENABLE_GZIP_OUTPUT=${boolToString cfg.enableGZipOutput}');
define('PLUGINS', '${builtins.concatStringsSep "," cfg.plugins}');
putenv('TTRSS_PLUGINS=${builtins.concatStringsSep "," cfg.plugins}');
define('LOG_DESTINATION', '${cfg.logDestination}');
define('CONFIG_VERSION', ${toString configVersion});
putenv('TTRSS_LOG_DESTINATION=${cfg.logDestination}');
putenv('TTRSS_CONFIG_VERSION=${toString configVersion}');
define('PUBSUBHUBBUB_ENABLED', ${boolToString cfg.pubSubHubbub.enable});
define('PUBSUBHUBBUB_HUB', '${cfg.pubSubHubbub.hub}');
putenv('TTRSS_PUBSUBHUBBUB_ENABLED=${boolToString cfg.pubSubHubbub.enable}');
putenv('TTRSS_PUBSUBHUBBUB_HUB=${cfg.pubSubHubbub.hub}');
define('SPHINX_SERVER', '${cfg.sphinx.server}');
define('SPHINX_INDEX', '${builtins.concatStringsSep "," cfg.sphinx.index}');
putenv('TTRSS_SPHINX_SERVER=${cfg.sphinx.server}');
putenv('TTRSS_SPHINX_INDEX=${builtins.concatStringsSep "," cfg.sphinx.index}');
define('ENABLE_REGISTRATION', ${boolToString cfg.registration.enable});
define('REG_NOTIFY_ADDRESS', '${cfg.registration.notifyAddress}');
define('REG_MAX_USERS', ${toString cfg.registration.maxUsers});
putenv('TTRSS_ENABLE_REGISTRATION=${boolToString cfg.registration.enable}');
putenv('TTRSS_REG_NOTIFY_ADDRESS=${cfg.registration.notifyAddress}');
putenv('TTRSS_REG_MAX_USERS=${toString cfg.registration.maxUsers}');
define('SMTP_SERVER', '${cfg.email.server}');
define('SMTP_LOGIN', '${cfg.email.login}');
define('SMTP_PASSWORD', '${escape ["'" "\\"] cfg.email.password}');
define('SMTP_SECURE', '${cfg.email.security}');
putenv('TTRSS_SMTP_SERVER=${cfg.email.server}');
putenv('TTRSS_SMTP_LOGIN=${cfg.email.login}');
putenv('TTRSS_SMTP_PASSWORD=${escape ["'" "\\"] cfg.email.password}');
putenv('TTRSS_SMTP_SECURE=${cfg.email.security}');
define('SMTP_FROM_NAME', '${escape ["'" "\\"] cfg.email.fromName}');
define('SMTP_FROM_ADDRESS', '${escape ["'" "\\"] cfg.email.fromAddress}');
define('DIGEST_SUBJECT', '${escape ["'" "\\"] cfg.email.digestSubject}');
putenv('TTRSS_SMTP_FROM_NAME=${escape ["'" "\\"] cfg.email.fromName}');
putenv('TTRSS_SMTP_FROM_ADDRESS=${escape ["'" "\\"] cfg.email.fromAddress}');
putenv('TTRSS_DIGEST_SUBJECT=${escape ["'" "\\"] cfg.email.digestSubject}');
${cfg.extraConfig}
'';
@@ -564,9 +566,12 @@ let
"Z '${cfg.root}' 0755 ${cfg.user} tt_rss - -"
];
systemd.services.tt-rss =
{
systemd.services = {
phpfpm-tt-rss = mkIf (cfg.pool == "${poolName}") {
restartTriggers = [ tt-rss-config pkgs.tt-rss ];
};
tt-rss = {
description = "Tiny Tiny RSS feeds update daemon";
preStart = let
@@ -604,6 +609,9 @@ let
''}
ln -sf "${tt-rss-config}" "${cfg.root}/config.php"
chmod -R 755 "${cfg.root}"
chmod -R ug+rwX "${cfg.root}/${lockDir}"
chmod -R ug+rwX "${cfg.root}/${cacheDir}"
chmod -R ug+rwX "${cfg.root}/${feedIconsDir}"
''
+ (optionalString (cfg.database.type == "pgsql") ''
@@ -640,6 +648,7 @@ let
wantedBy = [ "multi-user.target" ];
requires = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service";
after = [ "network.target" ] ++ optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service";
};
};
services.mysql = mkIf mysqlLocal {
pkgs/applications/audio/friture/default.nix
+1 -1
View File
@@ -38,7 +38,7 @@ in py.buildPythonApplication rec {
meta = with lib; {
description = "A real-time audio analyzer";
homepage = "http://friture.org/";
homepage = "https://friture.org/";
license = licenses.gpl3;
platforms = platforms.linux; # fails on Darwin
maintainers = [ maintainers.laikq ];
pkgs/applications/audio/spectmorph/default.nix
+1 -1
View File
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
pname = "spectmorph";
version = "0.5.2";
src = fetchurl {
url = "http://spectmorph.org/files/releases/${pname}-${version}.tar.bz2";
url = "https://spectmorph.org/files/releases/${pname}-${version}.tar.bz2";
sha256 = "0yrq7mknhk096wfsx0q3b6wwa2w5la0rxa113di26rrrw136xl1f";
};
pkgs/applications/editors/ne/default.nix
+1 -1
View File
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "The nice editor";
homepage = "http://ne.di.unimi.it/";
homepage = "https://ne.di.unimi.it/";
longDescription = ''
ne is a free (GPL'd) text editor based on the POSIX standard that runs
(we hope) on almost any UN*X machine. ne is easy to use for the beginner,
pkgs/applications/graphics/scantailor/default.nix
+1 -1
View File
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
buildInputs = [ qt4 libjpeg libtiff boost ];
meta = {
homepage = "http://scantailor.org/";
homepage = "https://scantailor.org/";
description = "Interactive post-processing tool for scanned pages";
license = lib.licenses.gpl3Plus;
pkgs/applications/misc/audio/wavesurfer/default.nix
+1 -1
View File
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
meta = {
description = "Tool for recording, playing, editing, viewing and labeling of audio";
homepage = "http://www.speech.kth.se/wavesurfer/";
homepage = "https://www.speech.kth.se/wavesurfer/";
license = lib.licenses.bsd0;
};
}
pkgs/applications/misc/bibletime/default.nix
+2 -2
View File
@@ -4,14 +4,14 @@
mkDerivation rec {
version = "3.0";
version = "3.0.1";
pname = "bibletime";
src = fetchurl {
url =
"https://github.com/bibletime/bibletime/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "08i6nb9a7z0jpsq76q0kr62hw6ph9chqjpjcvkimbcj4mmifzgnn";
sha256 = "sha256-ay4o8mfgj/m3BBoBMXVgw0NTlaFgJQvLlNYvEZRXSiA=";
};
nativeBuildInputs = [ cmake pkg-config docbook_xml_dtd_45 ];
pkgs/applications/misc/hugo/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "hugo";
version = "0.86.0";
version = "0.86.1";
src = fetchFromGitHub {
owner = "gohugoio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-1ELOQT4zLjtsLKyAsfSIUGGW4wH5+kpw33Fw5hCPR50=";
sha256 = "sha256-2tCR4iabTLD9SynXjUM7+zNsFCCAa/n88brPnZ1DQ0Q=";
};
vendorSha256 = "sha256-ZIGw349m6k8qqrzUN/oYV/HrgBvfOo/ovjo1SUDRmyk=";
pkgs/applications/misc/mkgmap/default.nix
+2 -2
View File
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
version = "4608";
src = fetchurl {
url = "http://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz";
url = "https://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz";
sha256 = "uj/iZZHML4nqEKdFBQSDdegkalZFJdzEE4xQrOruEp0=";
};
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Create maps for Garmin GPS devices from OpenStreetMap (OSM) data";
homepage = "http://www.mkgmap.org.uk";
downloadPage = "http://www.mkgmap.org.uk/download/mkgmap.html";
downloadPage = "https://www.mkgmap.org.uk/download/mkgmap.html";
license = licenses.gpl2Only;
maintainers = with maintainers; [ sikmir ];
platforms = platforms.all;
pkgs/applications/misc/mkgmap/splitter/default.nix
+2 -2
View File
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
version = "598";
src = fetchurl {
url = "http://www.mkgmap.org.uk/download/splitter-r${version}-src.tar.gz";
url = "https://www.mkgmap.org.uk/download/splitter-r${version}-src.tar.gz";
sha256 = "gpbJpDBXA9tmSmx9oKLa7xWtIOHBTYd1iPPgNTC2C2M=";
};
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Utility for splitting OpenStreetMap maps into tiles";
homepage = "http://www.mkgmap.org.uk";
downloadPage = "http://www.mkgmap.org.uk/download/splitter.html";
downloadPage = "https://www.mkgmap.org.uk/download/splitter.html";
license = licenses.gpl2Only;
maintainers = with maintainers; [ sikmir ];
platforms = platforms.all;
pkgs/applications/misc/mkgmap/splitter/testinputs.nix
+1 -1
View File
@@ -2,7 +2,7 @@
let
fetchTestInput = { res, sha256 }: fetchurl {
inherit sha256;
url = "http://www.mkgmap.org.uk/testinput/${res}";
url = "https://www.mkgmap.org.uk/testinput/${res}";
name = builtins.replaceStrings [ "/" ] [ "__" ] res;
};
in
pkgs/applications/misc/mkgmap/testinputs.nix
+1 -1
View File
@@ -2,7 +2,7 @@
let
fetchTestInput = { res, sha256 }: fetchurl {
inherit sha256;
url = "http://www.mkgmap.org.uk/testinput/${res}";
url = "https://www.mkgmap.org.uk/testinput/${res}";
name = builtins.replaceStrings [ "/" ] [ "__" ] res;
};
in
pkgs/applications/networking/cluster/hadoop/default.nix
+1 -1
View File
@@ -109,7 +109,7 @@ let
'';
meta = with lib; {
homepage = "http://hadoop.apache.org/";
homepage = "https://hadoop.apache.org/";
description = "Framework for distributed processing of large data sets across clusters of computers";
license = licenses.asl20;
pkgs/applications/networking/hydroxide/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "hydroxide";
version = "0.2.19";
version = "0.2.20";
src = fetchFromGitHub {
owner = "emersion";
repo = pname;
rev = "v${version}";
sha256 = "sha256-FKZdsFEUlXk0w11v7Y6sKiu4bOjmau2yAifcTpN0J+U=";
sha256 = "sha256-VTUpiuSsI795XDSxJJvLQlVNPLiekHyKcCazRBky9nU=";
};
vendorSha256 = "sha256-jkiTpDsJN628YKkFZcng9P05hmNUc3UeFsanLf+QtJY=";
vendorSha256 = "sha256-AuZnHpJ1Xel/L9dG3ATdXnoTeUxtieah/ea+0svw3oA=";
doCheck = false;
pkgs/applications/networking/ipget/default.nix
+8 -3
View File
@@ -2,16 +2,21 @@
buildGoModule rec {
pname = "ipget";
version = "0.6.0";
version = "0.7.0";
src = fetchFromGitHub {
owner = "ipfs";
repo = "ipget";
rev = "v${version}";
sha256 = "14ygij6hj6bd4g4aw6jgfbi1fgpal0jgf1hr22zxm16dpx3vva6b";
sha256 = "sha256-YD05HIVr99b8VmEJgzY2ClNv31I98d0NbfCk3XcB+xk=";
};
vendorSha256 = "0vy21pdqk6q5fw7wlcv51myhh9y79n2qhvy61rmblwhxlrkh6sdv";
vendorSha256 = "sha256-bymHVWskCt7bf02CveMXl1VhZYhRSEH7xIoESh31iGg=";
postPatch = ''
# main module (github.com/ipfs/ipget) does not contain package github.com/ipfs/ipget/sharness/dependencies
rm -r sharness/dependencies/
'';
doCheck = false;
pkgs/applications/office/osmo/default.nix
+1 -1
View File
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A handy personal organizer";
homepage = "http://clayo.org/osmo/";
homepage = "https://clayo.org/osmo/";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ pSub ];
pkgs/applications/science/logic/verifast/default.nix
+1 -1
View File
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Verification for C and Java programs via separation logic";
homepage = "http://people.cs.kuleuven.be/~bart.jacobs/verifast/";
homepage = "https://people.cs.kuleuven.be/~bart.jacobs/verifast/";
license = lib.licenses.mit;
platforms = [ "x86_64-linux" ];
maintainers = [ lib.maintainers.thoughtpolice ];
pkgs/applications/science/math/nauty/default.nix
+3 -3
View File
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
pname = "nauty";
version = "27r1";
src = fetchurl {
url = "http://pallini.di.uniroma1.it/nauty${version}.tar.gz";
url = "https://pallini.di.uniroma1.it/nauty${version}.tar.gz";
sha256 = "0xsfqfcknbd6g6wzpa5l7crmmk3bf3zjh37rhylq6b20dqcmvjkn";
};
outputs = [ "out" "dev" ];
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
# I'm not sure if the filename will remain the same for future changelog or
# if it will track changes to minor releases. Lets see. Better than nothing
# in any case.
changelog = "http://pallini.di.uniroma1.it/changes24-27.txt";
homepage = "http://pallini.di.uniroma1.it/";
changelog = "https://pallini.di.uniroma1.it/changes24-27.txt";
homepage = "https://pallini.di.uniroma1.it/";
};
}
pkgs/applications/video/droidcam/default.nix
+2 -2
View File
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "droidcam";
version = "1.7.3";
version = "1.8.0";
src = fetchFromGitHub {
owner = "aramg";
repo = "droidcam";
rev = "v${version}";
sha256 = "sha256-Ok8FJweSzmewjYzfBJQ28xGHKK/Y32ng1hOCPVwc8eU=";
sha256 = "sha256-A8FHTAeDFaSDp5Bnfv5NmCC7xIFAw3IcHSD4hZp4vwU=";
};
nativeBuildInputs = [
pkgs/applications/video/kazam/default.nix
+35 -20
View File
@@ -1,24 +1,44 @@
{ lib, fetchurl, substituteAll, python3, gst_all_1, wrapGAppsHook, gobject-introspection
, gtk3, libwnck, keybinder3, intltool, libcanberra-gtk3, libappindicator-gtk3, libpulseaudio
, fetchpatch }:
{ lib
, fetchFromGitHub
, substituteAll
, python3Packages
, gst_all_1
, wrapGAppsHook
, gobject-introspection
, gtk3
, libwnck
, keybinder3
, intltool
, libcanberra-gtk3
, libappindicator-gtk3
, libpulseaudio
, libgudev
}:
python3.pkgs.buildPythonApplication rec {
name = "kazam-${version}";
version = "1.4.5";
namePrefix = "";
python3Packages.buildPythonApplication rec {
pname = "kazam";
version = "unstable-2021-06-22";
src = fetchurl {
url = "https://launchpad.net/kazam/stable/${version}/+download/kazam-${version}.tar.gz";
sha256 = "1qygnrvm6aqixbyivhssp70hs0llxwk7lh3j7idxa2jbkk06hj4f";
src = fetchFromGitHub {
owner = "niknah";
repo = "kazam";
rev = "13f6ce124e5234348f56358b9134a87121f3438c";
sha256 = "1jk6khwgdv3nmagdgp5ivz3156pl0ljhf7b6i4b52w1h5ywsg9ah";
};
nativeBuildInputs = [ gobject-introspection python3.pkgs.distutils_extra intltool wrapGAppsHook ];
nativeBuildInputs = [ gobject-introspection python3Packages.distutils_extra intltool wrapGAppsHook ];
buildInputs = [
gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gtk3 libwnck
keybinder3 libappindicator-gtk3
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
gtk3
libwnck
keybinder3
libappindicator-gtk3
libgudev
];
propagatedBuildInputs = with python3.pkgs; [ pygobject3 pyxdg pycairo dbus-python ];
propagatedBuildInputs = with python3Packages; [ pygobject3 pyxdg pycairo dbus-python xlib ];
# workaround https://github.com/NixOS/nixpkgs/issues/56943
strictDeps = false;
@@ -30,11 +50,6 @@ python3.pkgs.buildPythonApplication rec {
libcanberra = libcanberra-gtk3;
inherit libpulseaudio;
})
# https://github.com/hzbd/kazam/pull/21
(fetchpatch {
url = "https://github.com/hzbd/kazam/commit/37e53a5aa61f4223a9ea03ceeda26eeba2b9d37b.patch";
sha256 = "1q5dpmdm6cvgzw8xa7bwclnqa05xc73ja1lszwmwv5glyik0fk4z";
})
];
# no tests
@@ -42,7 +57,7 @@ python3.pkgs.buildPythonApplication rec {
meta = with lib; {
description = "A screencasting program created with design in mind";
homepage = "https://code.launchpad.net/kazam";
homepage = "https://github.com/niknah/kazam";
license = licenses.lgpl3;
platforms = platforms.linux;
maintainers = [ maintainers.domenkozar ];
pkgs/applications/virtualization/bochs/default.nix
+1 -1
View File
@@ -134,7 +134,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with lib; {
homepage = "http://bochs.sourceforge.io/";
homepage = "https://bochs.sourceforge.io/";
description = "An open-source IA-32 (x86) PC emulator";
longDescription = ''
Bochs is an open-source (LGPL), highly portable IA-32 PC emulator, written
pkgs/applications/virtualization/docker/buildx.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "docker-buildx";
version = "0.6.0";
version = "0.6.1";
src = fetchFromGitHub {
owner = "docker";
repo = "buildx";
rev = "v${version}";
sha256 = "sha256-5j1+3FlLc0gYDnYvDsAdmILxgjHCU1bTVOytfaF03iU=";
sha256 = "sha256-BzF0SvXMFlQ/pvwNJ04C4hx3xc0T3E4zeAlSctPKfcE=";
};
vendorSha256 = null;
pkgs/data/documentation/stdman/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "stdman";
version = "2018.03.11";
version = "2020.11.17";
src = fetchFromGitHub {
owner = "jeaye";
repo = "stdman";
rev = version;
sha256 = "1017vwhcwlwi5sa8h6pkhj048in826wxnhl6qarykmzksvidff3r";
sha256 = "sha256-pzAVuXSuUfwI7gQpFqmH/+klSUH3KipZup2TgZs8XsY=";
};
outputDevdoc = "out";
pkgs/data/fonts/terminus-font-ttf/default.nix
+2 -2
View File
@@ -5,7 +5,7 @@ let
in fetchzip {
name = "terminus-font-ttf-${version}";
url = "http://files.ax86.net/terminus-ttf/files/${version}/terminus-ttf-${version}.zip";
url = "https://files.ax86.net/terminus-ttf/files/${version}/terminus-ttf-${version}.zip";
postFetch = ''
unzip -j $downloadedFile
@@ -26,7 +26,7 @@ in fetchzip {
Monospaced bitmap font designed for long work with computers
(TTF version, mainly for Java applications)
'';
homepage = "http://files.ax86.net/terminus-ttf";
homepage = "https://files.ax86.net/terminus-ttf";
license = licenses.ofl;
maintainers = with maintainers; [ okasu ];
};
pkgs/development/compilers/terra/default.nix
+1 -1
View File
@@ -81,7 +81,7 @@ in stdenv.mkDerivation rec {
meta = with lib; {
description = "A low-level counterpart to Lua";
homepage = "http://terralang.org/";
homepage = "https://terralang.org/";
platforms = platforms.x86_64;
maintainers = with maintainers; [ jb55 seylerius thoughtpolice ];
license = licenses.mit;
pkgs/development/interpreters/io/default.nix
+1 -1
View File
@@ -59,7 +59,7 @@ stdenv.mkDerivation {
meta = with lib; {
description = "Io programming language";
homepage = "http://iolanguage.org/";
homepage = "https://iolanguage.org/";
license = licenses.bsd3;
maintainers = with maintainers; [
pkgs/development/libraries/libebur128/default.nix
+2 -2
View File
@@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, cmake, speexdsp, pkg-config }:
stdenv.mkDerivation rec {
version = "1.2.5";
version = "1.2.6";
pname = "libebur128";
src = fetchFromGitHub {
owner = "jiixyj";
repo = "libebur128";
rev = "v${version}";
sha256 = "sha256-B6MOSbLfPvadXtXHSvxZCIpAH1Bnj6sItYRp+xH5HDA=";
sha256 = "sha256-UKO2k+kKH/dwt2xfaYMrH/GXjEkIrnxh1kGG/3P5d3Y=";
};
nativeBuildInputs = [ cmake pkg-config ];
pkgs/development/libraries/libhdhomerun/default.nix
+2 -2
View File
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "libhdhomerun";
version = "20210224";
version = "20210624";
src = fetchurl {
url = "https://download.silicondust.com/hdhomerun/libhdhomerun_${version}.tgz";
sha256 = "sha256:1y1kwv34qg8nayfkbrxkw8163l46krsfqx8yvkcsc97ilsd3i5mr";
sha256 = "sha256-3q9GO7zD7vpy+XGZ77YhP3sOLI6R8bPSy/UgVqhxXRU=";
};
patchPhase = lib.optionalString stdenv.isDarwin ''
pkgs/development/libraries/libnetfilter_acct/default.nix
+1 -1
View File
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libmnl ];
meta = with lib; {
homepage = "http://www.netfilter.org/projects/libnetfilter_acct/";
homepage = "https://www.netfilter.org/projects/libnetfilter_acct/";
description = "Userspace library providing interface to extended accounting infrastructure";
license = licenses.gpl2;
platforms = platforms.linux;
pkgs/development/libraries/libnetfilter_cthelper/default.nix
+1 -1
View File
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
library, you register, configure, enable and disable user-space helpers. This library
is used by conntrack-tools.
'';
homepage = "http://www.netfilter.org/projects/libnetfilter_cthelper/";
homepage = "https://www.netfilter.org/projects/libnetfilter_cthelper/";
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.linux;
};
pkgs/development/libraries/libnetfilter_queue/default.nix
+1 -1
View File
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libmnl libnfnetlink ];
meta = with lib; {
homepage = "http://www.netfilter.org/projects/libnetfilter_queue/";
homepage = "https://www.netfilter.org/projects/libnetfilter_queue/";
description = "Userspace API to packets queued by the kernel packet filter";
license = licenses.gpl2;
platforms = platforms.linux;
pkgs/development/libraries/libnfnetlink/default.nix
+1 -1
View File
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
This library is not meant as a public API for application developers.
It is only used by other netfilter.org projects, like the aforementioned ones.
'';
homepage = "http://www.netfilter.org/projects/libnfnetlink/index.html";
homepage = "https://www.netfilter.org/projects/libnfnetlink/index.html";
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
pkgs/development/libraries/librdf/raptor.nix
+1 -1
View File
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
meta = {
description = "The RDF Parser Toolkit";
homepage = "http://librdf.org/raptor";
homepage = "https://librdf.org/raptor";
license = with lib.licenses; [ lgpl21 asl20 ];
maintainers = [ lib.maintainers.marcweber ];
platforms = lib.platforms.linux;
pkgs/development/libraries/librdf/raptor2.nix
+1 -1
View File
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = {
description = "The RDF Parser Toolkit";
homepage = "http://librdf.org/raptor";
homepage = "https://librdf.org/raptor";
license = with lib.licenses; [ lgpl21 asl20 ];
maintainers = with lib.maintainers; [ marcweber ];
platforms = lib.platforms.unix;
pkgs/development/libraries/librdf/rasqal.nix
+1 -1
View File
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Library that handles Resource Description Framework (RDF)";
homepage = "http://librdf.org/rasqal";
homepage = "https://librdf.org/rasqal";
license = with lib.licenses; [ lgpl21 asl20 ];
maintainers = with lib.maintainers; [ marcweber ];
platforms = lib.platforms.unix;
pkgs/development/libraries/librdf/redland.nix
+1 -1
View File
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "C libraries that provide support for the Resource Description Framework (RDF)";
homepage = "http://librdf.org/";
homepage = "https://librdf.org/";
platforms = platforms.unix;
license = licenses.asl20;
};
pkgs/development/libraries/librelp/default.nix
+2 -2
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "librelp";
version = "1.9.0";
version = "1.10.0";
src = fetchFromGitHub {
owner = "rsyslog";
repo = "librelp";
rev = "v${version}";
sha256 = "sha256-nE7YavjZj+nHcTNkcl/xVAaP+9XfHlTEsW18aPO/ABY=";
sha256 = "sha256-aJLsUtik5aXfsdi+8QoDgbi4VUZ8gV3YPA6kIY6wzs4=";
};
nativeBuildInputs = [ pkg-config autoreconfHook ];
pkgs/development/libraries/libroxml/default.nix
+1 -1
View File
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
sha256 = "0y0vc9n4rfbimjp28nx4kdfzz08j5xymh5xjy84l9fhfac5z5a0x";
};
meta = with lib; {
homepage = "http://www.libroxml.net/";
homepage = "https://www.libroxml.net/";
description = "This library is minimum, easy-to-use, C implementation for xml file parsing";
license = licenses.lgpl3;
platforms = platforms.unix;
pkgs/development/libraries/libvmi/default.nix
+1 -1
View File
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
homepage = "http://libvmi.com/";
homepage = "https://libvmi.com/";
description = "A C library for virtual machine introspection";
longDescription = ''
LibVMI is a C library with Python bindings that makes it easy to monitor the low-level
pkgs/development/libraries/qt-4.x/4.8/default.nix
+1 -1
View File
@@ -229,7 +229,7 @@ stdenv.mkDerivation rec {
dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;
meta = {
homepage = "http://qt-project.org/";
homepage = "https://qt-project.org/";
description = "A cross-platform application framework for C++";
license = lib.licenses.lgpl21Plus; # or gpl3
maintainers = with lib.maintainers; [ orivej lovek323 phreedom sander ];
pkgs/development/libraries/raylib/default.nix
+1 -1
View File
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A simple and easy-to-use library to enjoy videogames programming";
homepage = "http://www.raylib.com/";
homepage = "https://www.raylib.com/";
license = licenses.zlib;
maintainers = with maintainers; [ adamlwgriffiths ];
platforms = platforms.linux;
pkgs/development/libraries/science/math/petsc/default.nix
+2 -2
View File
@@ -18,11 +18,11 @@ assert petsc-withp4est -> p4est.mpiSupport;
stdenv.mkDerivation rec {
pname = "petsc";
version = "3.14.2";
version = "3.14.3";
src = fetchurl {
url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz";
sha256 = "04vy3qyakikslc58qyv8c9qrwlivix3w6znc993i37cvfg99dch9";
sha256 = "sha256-1rdyLNSH8jMkmIg88uHMN3ZXqTHAtzU1adybJEZzJ9M=";
};
mpiSupport = !withp4est || p4est.mpiSupport;
pkgs/development/libraries/snack/default.nix
+1 -1
View File
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
meta = {
description = "The Snack Sound Toolkit (Tcl)";
homepage = "http://www.speech.kth.se/snack/";
homepage = "https://www.speech.kth.se/snack/";
license = lib.licenses.gpl2;
broken = true;
};
pkgs/development/node-packages/node-packages.nix
Generated
+3 -3
View File
@@ -89128,7 +89128,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Utility to inline images, CSS and JavaScript for a web page - useful for mobile sites";
homepage = "http://github.com/remy/inliner";
homepage = "https://github.com/remy/inliner";
license = "MIT";
};
production = true;
@@ -90816,7 +90816,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Static analysis tool for JavaScript";
homepage = "http://jshint.com/";
homepage = "https://jshint.com/";
license = "MIT";
};
production = true;
@@ -103950,7 +103950,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Production process manager for Node.JS applications with a built-in load balancer.";
homepage = "http://pm2.keymetrics.io/";
homepage = "https://pm2.keymetrics.io/";
license = "AGPL-3.0";
};
production = true;
pkgs/development/ocaml-modules/cudf/default.nix
+1 -1
View File
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
meta = with lib; {
description = "A library for CUDF format";
homepage = "http://www.mancoosi.org/cudf/";
homepage = "https://www.mancoosi.org/cudf/";
downloadPage = "https://gforge.inria.fr/projects/cudf/";
license = licenses.lgpl3;
maintainers = with maintainers; [ superherointj ];
pkgs/development/ocaml-modules/dose3/default.nix
+1 -1
View File
@@ -46,7 +46,7 @@ buildDunePackage rec {
meta = with lib; {
description = "Dose library (part of Mancoosi tools)";
downloadPage = "https://gitlab.com/irill/dose3/";
homepage = "http://www.mancoosi.org/software/";
homepage = "https://www.mancoosi.org/software/";
license = licenses.lgpl3Plus;
longDescription = ''
The dose suite provides libraries for handling package meta-data, and various tools for analyzing package relationships in a large package repository.
pkgs/development/python-modules/autologging/default.nix
+1 -1
View File
@@ -11,7 +11,7 @@ buildPythonPackage rec {
};
meta = with lib; {
homepage = "http://ninthtest.info/python-autologging/";
homepage = "https://ninthtest.info/python-autologging/";
description = "Easier logging and tracing for Python classes";
license = licenses.mit;
maintainers = with maintainers; [ twey ];
pkgs/development/python-modules/buildbot/default.nix
+3 -16
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, buildPythonPackage, fetchPypi, fetchpatch, makeWrapper, isPy3k
{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k
, python, twisted, jinja2, zope_interface, sqlalchemy
, sqlalchemy_migrate, python-dateutil, txaio, autobahn, pyjwt, pyyaml, unidiff, treq
, txrequests, pypugjs, boto3, moto, mock, lz4, setuptoolsTrial
@@ -26,11 +26,11 @@ let
package = buildPythonPackage rec {
pname = "buildbot";
version = "3.2.0";
version = "3.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Ji/1anphYaGoP0kaOpArKDKPe9YUFTU1Zd9O4g6V9OA=";
sha256 = "sha256-FST+mCIQpzxc/5iQdsSNBlKxY985v+z6Xeh8ZQRu2FE=";
};
propagatedBuildInputs = [
@@ -78,19 +78,6 @@ let
# This patch disables the test that tries to read /etc/os-release which
# is not accessible in sandboxed builds.
./skip_test_linux_distro.patch
# Fix compatibility with SQLAlchemy 1.4
(fetchpatch {
url = "https://github.com/buildbot/buildbot/pull/6156.patch";
sha256 = "10pg3wcdy85vymn6hprm7rh68zkz818m2vy6v4s2hi2l189wh5my";
stripLen = 1;
excludes = [
".bbtravis.yml"
"buildbot/test/unit/db/test_enginestrategy.py"
"buildbot/test/unit/db_migrate/test_versions_045_worker_transition.py"
"requirements-ci.txt"
"requirements-cidb.txt"
];
})
];
postPatch = ''
pkgs/development/python-modules/buildbot/pkg.nix
+1 -1
View File
@@ -6,7 +6,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "sha256-6PpR/zDy1ZZWFN2qzIeNWk9kmDpecZH40IEMoqyprnk=";
sha256 = "sha256-PVmDJN3/PMsvZrrwSNaUUQLPkOMWO6edIEEfZSwspTs=";
};
postPatch = ''
pkgs/development/python-modules/buildbot/plugins.nix
+5 -5
View File
@@ -7,7 +7,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "sha256-6dG8yCHmysQELodaPXOrI8J8Uc1/7YHwplnvYZyeuo0=";
sha256 = "sha256-KFGTNudUxjSV6406NV4QJP8t9t5p2ckMlntkqsf1x2U=";
};
# Remove unneccessary circular dependency on buildbot
@@ -34,7 +34,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "sha256-bjDVA5478pHtBXIVPSZJURRqU9EVFVXG/933oDQZCpk=";
sha256 = "sha256-UoKCRAnPAQjb7Fgm+YkGv1boXY+xSDkYA3E2EiEkNGE=";
};
buildInputs = [ buildbot-pkg ];
@@ -56,7 +56,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "sha256-I31sryOUW6JVsWpkgvQe9ICyoDZUVewRPtG0JdIVJo8=";
sha256 = "sha256-Ccmk8TPtMfGrlNaBKhos1s/G1pHzf+zSD+A88F+/8+c=";
};
buildInputs = [ buildbot-pkg ];
@@ -78,7 +78,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "sha256-FWi67S3wXuISLP0f4VzXisEWXN60xlgU4I946QkX9Eo=";
sha256 = "sha256-oHvn7E4NS0RhTU2hDn1GgFjalYCoXUNCtGEz2lHel+M=";
};
buildInputs = [ buildbot-pkg ];
@@ -100,7 +100,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "sha256-6kXB+hu75V59KMo7tIHbE2Wvig6raTbPc7vYVVl/1y0=";
sha256 = "sha256-HoiR2WF6EWebbb9c3WcLU2H17HMqkrF6JNOwpUk9CbU=";
};
buildInputs = [ buildbot-pkg ];
pkgs/development/python-modules/buildbot/worker.nix
+1 -1
View File
@@ -7,7 +7,7 @@ buildPythonPackage (rec {
src = fetchPypi {
inherit pname version;
sha256 = "sha256-pIXdqahCWJGRiXKDyih2UjGYdyzwhxnYgMwCzdQfYUo=";
sha256 = "sha256-nDP46rLWYXXKJktR6NTWLb0erC6FU8fXe9FAIX+MWuU=";
};
propagatedBuildInputs = [ twisted future ];
pkgs/development/python-modules/pweave/default.nix
+1 -1
View File
@@ -28,7 +28,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Scientific reports with embedded python computations with reST, LaTeX or markdown";
homepage = "http://mpastell.com/pweave/";
homepage = "https://mpastell.com/pweave/";
license = licenses.bsd3;
};
pkgs/development/python-modules/pyfantom/default.nix
+1 -1
View File
@@ -16,7 +16,7 @@ buildPythonPackage {
doCheck = false;
meta = with lib; {
homepage = "http://pyfantom.ni.fr.eu.org/";
homepage = "https://pyfantom.ni.fr.eu.org/";
description = "Wrapper for the LEGO Mindstorms Fantom Driver";
license = licenses.gpl2;
};
pkgs/development/python-modules/pyqtgraph/default.nix
+1 -1
View File
@@ -55,7 +55,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Scientific Graphics and GUI Library for Python";
homepage = "http://www.pyqtgraph.org/";
homepage = "https://www.pyqtgraph.org/";
changelog = "https://github.com/pyqtgraph/pyqtgraph/blob/master/CHANGELOG";
license = licenses.mit;
platforms = platforms.unix;
pkgs/development/python-modules/pytesseract/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pytesseract";
version = "0.3.7";
version = "0.3.8";
src = fetchPypi {
inherit pname version;
sha256 = "4ecfc898d00a70fcc38d2bce729de1597c67e7bc5d2fa26094714c9f5b573645";
sha256 = "sha256-YUigHkN1dghi6PVupxjiK10TsoFFTfRuqNrJgHeT/Fo=";
};
patches = [
pkgs/development/python-modules/pytesseract/tesseract-binary.patch
+3 -3
View File
@@ -1,7 +1,7 @@
diff --git a/src/pytesseract.py b/src/pytesseract.py
diff --git a/pytesseract/pytesseract.py b/pytesseract/pytesseract.py
index 132f59b..f161e5c 100755
--- a/src/pytesseract.py
+++ b/src/pytesseract.py
--- a/pytesseract/pytesseract.py
+++ b/pytesseract/pytesseract.py
@@ -23,7 +23,7 @@ except ImportError:
import Image
pkgs/development/python-modules/python-uinput/default.nix
+1 -1
View File
@@ -16,7 +16,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Pythonic API to Linux uinput kernel module";
homepage = "http://tjjr.fi/sw/python-uinput/";
homepage = "https://tjjr.fi/sw/python-uinput/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ abbradar ];
};
pkgs/development/python-modules/vispy/default.nix
+1 -1
View File
@@ -32,7 +32,7 @@ buildPythonPackage rec {
pythonImportsCheck = [ "vispy" ];
meta = with lib; {
homepage = "http://vispy.org/index.html";
homepage = "https://vispy.org/index.html";
description = "Interactive scientific visualization in Python";
license = licenses.bsd3;
maintainers = with maintainers; [ goertzenator ];
pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix
+1 -1
View File
@@ -19,7 +19,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ xstatic-jquery ];
meta = with lib;{
homepage = "http://plugins.jquery.com/project/jQuery-File-Upload";
homepage = "https://plugins.jquery.com/project/jQuery-File-Upload";
description = "jquery-file-upload packaged static files for python";
license = licenses.mit;
maintainers = with maintainers; [ makefu ];
pkgs/development/tools/ammonite/default.nix
+1 -1
View File
@@ -66,7 +66,7 @@ let
with a lot of ergonomic improvements and configurability
that may be familiar to people coming from IDEs or other REPLs such as IPython or Zsh.
'';
homepage = "http://www.lihaoyi.com/Ammonite/";
homepage = "https://www.lihaoyi.com/Ammonite/";
license = licenses.mit;
platforms = platforms.all;
maintainers = [ maintainers.nequissimus ];
pkgs/development/tools/gore/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gore";
version = "0.5.2";
version = "0.5.3";
src = fetchFromGitHub {
owner = "motemen";
repo = pname;
rev = "v${version}";
sha256 = "sha256-oiaZvoCxA69slNb3LArLJfaqzfQ1YImxLuQHzW5tibo=";
sha256 = "sha256-uLU4uZaQA9u6BUQZ0Rb4Yqg/oJOZ529gIiOwmmyg05A=";
};
vendorSha256 = "sha256-vJG7sc+ngagtrYvTwO3OrCSFUgAA7zhaXHkU97nIhcY=";
vendorSha256 = "sha256-/yggEibpQK9Uk116RkE5XbbJe6j4WsIC3GtKPU/P2hU=";
doCheck = false;
pkgs/development/tools/lattice-diamond/default.nix
+1 -1
View File
@@ -109,7 +109,7 @@ stdenv.mkDerivation {
for cost- sensitive, low-power Lattice FPGA architectures. It is the
next-generation replacement for ispLEVER.
'';
homepage = "http://www.latticesemi.com/latticediamond";
homepage = "https://www.latticesemi.com/latticediamond";
license = lib.licenses.unfree;
maintainers = with lib.maintainers; [ q3k ];
platforms = [ "x86_64-linux" ];
pkgs/development/tools/ocaml/camlidl/default.nix
+1 -1
View File
@@ -2,7 +2,7 @@
let
pname = "camlidl";
webpage = "http://caml.inria.fr/pub/old_caml_site/camlidl/";
webpage = "https://caml.inria.fr/pub/old_caml_site/camlidl/";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pkgs/development/tools/rust/cargo-watch/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-watch";
version = "7.8.1";
version = "8.0.0";
src = fetchFromGitHub {
owner = "passcod";
repo = pname;
rev = "v${version}";
sha256 = "sha256-g6k/7jo8pvTn5snU05uSGzprNMt8/x+bJsLb/y0jHRg=";
sha256 = "sha256-3IgzMUCkcKUkhTb/ZNRONdvB6Ci0OBB1dcjtc65U8xE=";
};
cargoSha256 = "sha256-pfjWTkDw4D7eMADkPX01vapka8I6o0ZvkNjQt5X2pUk=";
cargoSha256 = "sha256-Xp/pxPKs41TXO/EUY5x8Bha7NUioMabbb73///fFr6U=";
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices libiconv ];
pkgs/development/web/remarkjs/node-packages.nix
Generated
+1 -1
View File
@@ -3674,7 +3674,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Static analysis tool for JavaScript";
homepage = "http://jshint.com/";
homepage = "https://jshint.com/";
license = "MIT";
};
production = true;
pkgs/games/crawl/default.nix
+2 -2
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
name = "crawl-${version}${lib.optionalString tileMode "-tiles"}";
version = "0.26.1";
version = "0.27.0";
src = fetchFromGitHub {
owner = "crawl";
repo = "crawl";
rev = version;
sha256 = "sha256-lh0lCMZRH+c6jSHjLFDU3wjy6Oyp59ZcPaqg5PWVrkk=";
sha256 = "sha256-TTdzFWoWn9OfxosEsxUjmDtPmtHukpT0J/0y4kUvBvo=";
};
# Patch hard-coded paths and remove force library builds
pkgs/games/freedroidrpg/default.nix
+1 -1
View File
@@ -53,7 +53,7 @@ in stdenv.mkDerivation {
</para>
'';
homepage = "http://www.freedroid.org/";
homepage = "https://www.freedroid.org/";
license = licenses.gpl2Plus;
pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix
+1 -1
View File
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Firmware for Broadcom WIDCOMM® Bluetooth devices";
homepage = "http://www.catalog.update.microsoft.com/Search.aspx?q=Broadcom+bluetooth";
homepage = "https://www.catalog.update.microsoft.com/Search.aspx?q=Broadcom+bluetooth";
license = licenses.unfree;
platforms = platforms.linux;
maintainers = with maintainers; [ zraexy ];
pkgs/os-specific/linux/ipset/default.nix
+2 -2
View File
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "7.14";
src = fetchurl {
url = "http://ipset.netfilter.org/${pname}-${version}.tar.bz2";
url = "https://ipset.netfilter.org/${pname}-${version}.tar.bz2";
sha256 = "sha256-JwMcNtNVkHAxzOQeZVU+mbsBPXYvzVU5L2PX6Edg+QA=";
};
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-kmod=no" ];
meta = with lib; {
homepage = "http://ipset.netfilter.org/";
homepage = "https://ipset.netfilter.org/";
description = "Administration tool for IP sets";
license = licenses.gpl2;
platforms = platforms.linux;
pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
+1 -1
View File
@@ -520,7 +520,7 @@ if [ "$action" = switch -o "$action" = boot -o "$action" = test -o "$action" = d
fi
if [ "$action" = build-vm ]; then
if [ "$action" = build-vm -o "$action" = build-vm-with-bootloader ]; then
cat >&2 <<EOF
Done. The virtual machine can be started by running $(echo $pathToConfig/bin/run-*-vm)
pkgs/os-specific/windows/jom/default.nix
+1 -1
View File
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
'';
meta = {
homepage = "http://qt-project.org/wiki/jom";
homepage = "https://qt-project.org/wiki/jom";
description = "Clone of nmake supporting multiple independent commands in parallel";
license = lib.licenses.gpl2Plus; # Explicitly, GPLv2 or GPLv3, but not later.
};
pkgs/servers/heisenbridge/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
python3Packages.buildPythonPackage rec {
pname = "heisenbridge";
version = "0.99.1";
version = "0.99.8";
src = fetchFromGitHub {
owner = "hifi";
repo = "heisenbridge";
rev = "v${version}";
sha256 = "sha256-v3ji450YFxMiyBOb4DuDJDvAGKhWYSSQ8kBB51r97PE=";
sha256 = "sha256-NUSAOixU93z77QeVAua6yNk+/eDRreS5Hv1btBWh3gs=";
};
propagatedBuildInputs = with python3Packages; [
pkgs/servers/keycloak/default.nix
+2 -2
View File
@@ -18,11 +18,11 @@ let
in
stdenv.mkDerivation rec {
pname = "keycloak";
version = "14.0.0";
version = "15.0.0";
src = fetchzip {
url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip";
sha256 = "sha256-NH2uNiYZZrEYE5DG2kDXzLN7/GgXR8IfBqRb6EoKA9s=";
sha256 = "sha256-DOqqf4RWA2eo4m60tzs4HgKktci0fIV7CiJekDcjCXE=";
};
nativeBuildInputs = [ makeWrapper ];
pkgs/servers/monitoring/munin/default.nix
+2 -2
View File
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
# needs to find a local perl module during build
PERL_USE_UNSAFE_INC = "1";
# TODO: tests are failing http://munin-monitoring.org/ticket/1390#comment:1
# TODO: tests are failing https://munin-monitoring.org/ticket/1390#comment:1
# NOTE: important, test command always exits with 0, think of a way to abort the build once tests pass
doCheck = false;
@@ -134,7 +134,7 @@ stdenv.mkDerivation rec {
interface. Munin can help analyze resource trends and 'what just happened
to kill our performance?' problems.
'';
homepage = "http://munin-monitoring.org/";
homepage = "https://munin-monitoring.org/";
license = licenses.gpl2;
maintainers = [ maintainers.bjornfor ];
platforms = platforms.linux;
pkgs/servers/nosql/aerospike/default.nix
+1 -1
View File
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Flash-optimized, in-memory, NoSQL database";
homepage = "http://aerospike.com/";
homepage = "https://aerospike.com/";
license = licenses.agpl3;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ kalbasit ];
pkgs/servers/tt-rss/default.nix
+14 -3
View File
@@ -2,17 +2,28 @@
stdenv.mkDerivation rec {
pname = "tt-rss";
version = "2021-01-29";
rev = "6d8f2221b82b6a31becbeed8baf5e05ad9e053fe";
year = "21";
month = "06";
day = "21";
version = "20${year}-${month}-${day}";
rev = "cd26dbe64c9b14418f0b2d826a38a35c6bf8a270";
src = fetchurl {
url = "https://git.tt-rss.org/fox/tt-rss/archive/${rev}.tar.gz";
sha256 = "124c62hck631xlq5aa1miz9rbg711ygk7z1yx92m5dfcy630l7x5";
sha256 = "1dpmzi7hknv5rk2g1iw13r8zcxcwrhkd5hhf292ml0dw3cwki0gm";
};
installPhase = ''
runHook preInstall
mkdir $out
cp -ra * $out/
# see the code of Config::get_version(). you can check that the version in
# the footer of the preferences pages is not UNKNOWN
echo "${year}.${month}" > $out/version_static.txt
runHook postInstall
'';
meta = with lib; {
pkgs/tools/filesystems/ceph-csi/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "ceph-csi";
version = "3.3.1";
version = "3.4.0";
nativeBuildInputs = [ go ];
buildInputs = [ ceph ];
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
owner = "ceph";
repo = "ceph-csi";
rev = "v${version}";
sha256 = "16nh4bh8a9s2zbxnnhq1ldww4dzp2fmf5idgq99vkyw2kfp017lf";
sha256 = "sha256-5+eK+iN6ecWtcmNPjiThCj1rwFaHX3rVCW9lmUCWhU0=";
};
preConfigure = ''
pkgs/tools/filesystems/mtools/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mtools";
version = "4.0.33";
version = "4.0.34";
src = fetchurl {
url = "mirror://gnu/mtools/${pname}-${version}.tar.bz2";
sha256 = "0m5rx8djvg4jfvdgs4dxjkfd2na55wkdpid9xa32yc103s70zc8w";
sha256 = "1aqc6qncpd8dlndwk05vgrnjh7pa151n6hpfsi059zhg3gml79dd";
};
patches = lib.optional stdenv.isDarwin ./UNUSED-darwin.patch;
pkgs/tools/graphics/agi/default.nix
+2 -2
View File
@@ -14,11 +14,11 @@
stdenv.mkDerivation rec {
pname = "agi";
version = "2.1.0-dev-20210726";
version = "2.1.0-dev-20210729";
src = fetchzip {
url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip";
sha256 = "sha256-1joE2+lNFs0VmglqLsbyqhj16tfCZ+saQmy1XP3ATBo=";
sha256 = "sha256-CrGZf+EiJfgPYOdz7NYSc6B/hpVpgNMCdRl1jd/nJ2o=";
};
nativeBuildInputs = [
pkgs/tools/misc/diffoscope/default.nix
+6 -2
View File
@@ -9,11 +9,11 @@
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
python3Packages.buildPythonApplication rec {
pname = "diffoscope";
version = "178";
version = "179";
src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
sha256 = "sha256-uJbTQshf7vRd6EyaaV0itJVrMc/6o+pPXhtUgrjFnzM=";
sha256 = "sha256-SIFLWlmENuhgwG0YbIDTWG6uCHEfuoc0IMVz4cp5NX4=";
};
outputs = [ "out" "man" ];
@@ -66,6 +66,10 @@ python3Packages.buildPythonApplication rec {
"test_diff_meta"
"test_diff_meta2"
"test_obj_no_differences"
# Failing because of file-v5.40 has a slightly different output.
# Upstream issue: https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/271
"test_text_proper_indentation"
];
meta = with lib; {
pkgs/tools/misc/kermit/default.nix
+1 -1
View File
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
'';
meta = with lib; {
homepage = "http://www.kermitproject.org/ck90.html";
homepage = "https://www.kermitproject.org/ck90.html";
description = "Portable Scriptable Network and Serial Communication Software";
license = licenses.bsd3;
maintainers = with maintainers; [ pSub ];
pkgs/tools/misc/linuxquota/default.nix
+2 -2
View File
@@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, e2fsprogs, openldap, pkg-config }:
stdenv.mkDerivation rec {
version = "4.05";
version = "4.06";
pname = "quota";
src = fetchurl {
url = "mirror://sourceforge/linuxquota/quota-${version}.tar.gz";
sha256 = "1fbsrxhhf1ls7i025db7p66yzjr0bqa2c63cni217v8l21fmnfzg";
sha256 = "sha256-Lz4DA583jU8Nl6zbSdr1gdyq1k0uHd8SlJX9V5+9Jo0=";
};
outputs = [ "out" "dev" "doc" "man" ];
pkgs/tools/misc/yubikey-manager/default.nix
+11 -6
View File
@@ -1,15 +1,20 @@
{ python3Packages, fetchurl, lib,
yubikey-personalization, libu2f-host, libusb1 }:
{ python3Packages, fetchFromGitHub, lib, yubikey-personalization, libu2f-host, libusb1 }:
python3Packages.buildPythonPackage rec {
pname = "yubikey-manager";
version = "4.0.3";
version = "4.0.5";
srcs = fetchurl {
url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz";
hash = "sha256-p7tv/bj6PMCnCU5j8Vhi60LxLiPmR1Cuf8xVdDVtZvQ=";
src = fetchFromGitHub {
repo = "yubikey-manager";
rev = version;
owner = "Yubico";
sha256 = "sha256:0ycp7k6lkxzqwkc16fifhyqaqi7hl3351pwddsn18r5l83jnzdn2";
};
format = "pyproject";
nativeBuildInputs = with python3Packages; [ poetry-core ];
propagatedBuildInputs =
with python3Packages; [
click
pkgs/tools/networking/sshpass/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "sshpass";
version = "1.06";
version = "1.09";
src = fetchurl {
url = "mirror://sourceforge/sshpass/sshpass-${version}.tar.gz";
sha256 = "0q7fblaczb7kwbsz0gdy9267z0sllzgmf0c7z5c9mf88wv74ycn6";
sha256 = "sha256-cXRuXgV//psAtErEBFO/RwkZMMupa76o3Ehxfe3En7c=";
};
meta = with lib; {
pkgs/tools/package-management/holo-build/default.nix
+1 -1
View File
@@ -52,7 +52,7 @@ buildGoModule rec {
meta = with lib; {
description = "Cross-distribution system package compiler";
homepage = "http://holocm.org/";
homepage = "https://holocm.org/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ SuperSandro2000 ];
};
pkgs/tools/text/jumanpp/default.nix
+1 -1
View File
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
plausibility of word sequences by using a recurrent neural network
language model (RNNLM).
'';
homepage = "http://nlp.ist.i.kyoto-u.ac.jp/index.php?JUMAN++";
homepage = "https://nlp.ist.i.kyoto-u.ac.jp/index.php?JUMAN++";
license = licenses.asl20;
maintainers = with maintainers; [ mt-caret ];
platforms = platforms.all;
pkgs/tools/text/popfile/default.nix
+3 -3
View File
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
name = "${appname}-${version}";
src = fetchzip {
url = "http://getpopfile.org/downloads/${appname}-${version}.zip";
url = "https://getpopfile.org/downloads/${appname}-${version}.zip";
sha256 = "0gcib9j7zxk8r2vb5dbdz836djnyfza36vi8215nxcdfx1xc7l63";
stripRoot = false;
};
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ];
buildInputs = (with perlPackages; [
## These are all taken from the popfile documentation as applicable to Linux
## http://getpopfile.org/docs/howtos:allplatformsrequireperl
## https://getpopfile.org/docs/howtos:allplatformsrequireperl
perl
DBI
DBDSQLite
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
# Should work on macOS, but havent tested it.
# Windows support is more complicated.
# http://getpopfile.org/docs/faq:systemrequirements
# https://getpopfile.org/docs/faq:systemrequirements
platforms = lib.platforms.linux;
};
}
pkgs/tools/text/transifex-client/default.nix
+9 -9
View File
@@ -1,23 +1,23 @@
{ lib, buildPythonApplication, fetchPypi
, python-slugify, requests, urllib3, six, setuptools }:
, python-slugify, requests, urllib3, six, setuptools, GitPython }:
buildPythonApplication rec {
pname = "transifex-client";
version = "0.13.9";
version = "0.14.3";
propagatedBuildInputs = [
urllib3 requests python-slugify six setuptools
urllib3 requests python-slugify six setuptools GitPython
];
src = fetchPypi {
inherit pname version;
sha256 = "0lgd77vrddvyn8afkxr7a7hblmp4k5sr0i9i1032xdih2bipdd9f";
sha256 = "sha256-sKol67lRaYPFa7Bg9KNa1rDrNoT9DtUd48NY8jqK1iw=";
};
# https://github.com/transifex/transifex-client/issues/323
prePatch = ''
substituteInPlace requirements.txt --replace "urllib3<1.24" "urllib3>=1.24" \
--replace "six==1.11.0" "six>=1.11.0" \
--replace "python-slugify<2.0.0" "python-slugify>2.0.0"
substituteInPlace requirements.txt \
--replace "python-slugify<5.0.0" "python-slugify"
'';
# Requires external resources
@@ -25,8 +25,8 @@ buildPythonApplication rec {
meta = with lib; {
homepage = "https://www.transifex.com/";
license = licenses.gpl2;
license = licenses.gpl2Only;
description = "Transifex translation service client";
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ sikmir ];
};
}
pkgs/tools/video/vnc2flv/default.nix
+1 -1
View File
@@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec {
meta = {
description = "Tool to record VNC sessions to Flash Video";
homepage = "http://www.unixuser.org/~euske/python/vnc2flv/";
homepage = "https://www.unixuser.org/~euske/python/vnc2flv/";
license = lib.licenses.mit;
};
}