Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

treewide: fix and improve some srcs #391262

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/applications/misc/devilspie2/default.nix
Original file line number Diff line number Diff line change
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
version = "0.44";

src = fetchurl {
url = "https://download.savannah.gnu.org/releases/devilspie2/devilspie2-${version}.tar.xz";
sha256 = "Cp8erdKyKjGBY+QYAGXUlSIboaQ60gIepoZs0RgEJkA=";
url = "mirror://savannah/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-Cp8erdKyKjGBY+QYAGXUlSIboaQ60gIepoZs0RgEJkA=";
};

nativeBuildInputs = [
2 changes: 1 addition & 1 deletion pkgs/applications/radio/klog/default.nix
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
version = "1.3.2";

src = fetchurl {
url = "https://download.savannah.nongnu.org/releases/klog/${pname}-${version}.tar.gz";
url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
sha256 = "1d5x7rq0mgfrqws3q1y4z8wh2qa3gvsmd0ssf2yqgkyq3fhdrb5c";
};

12 changes: 9 additions & 3 deletions pkgs/build-support/fetchurl/mirrors.nix
Original file line number Diff line number Diff line change
@@ -215,13 +215,19 @@

# SAMBA
samba = [
"https://www.samba.org/ftp/"
"http://www.samba.org/ftp/"
"https://download.samba.org/pub/"
"http://download.samba.org/pub/"
];

# GNU Savannah
savannah = [
# Mirrors from https://download-mirror.savannah.gnu.org/releases/00_MIRRORS.html
# Try the official HTTP(S) dispatchers first.
# These generate redirects to mirrors appropriate for the user.
"https://download.savannah.gnu.org/releases/"
"https://download.savannah.nongnu.org/releases/"

# If the above fail, try some individual mirrors.
# These are taken from https://download-mirror.savannah.gnu.org/releases/00_MIRRORS.html
"https://mirror.easyname.at/nongnu/"
"https://savannah.c3sl.ufpr.br/"
"https://mirror.csclub.uwaterloo.ca/nongnu/"
2 changes: 1 addition & 1 deletion pkgs/by-name/cu/cuyo/package.nix
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
version = "2.1.0";

src = fetchurl {
url = "https://download.savannah.gnu.org/releases/cuyo/cuyo-2.1.0.tar.gz";
url = "mirror://savannah/cuyo/cuyo-2.1.0.tar.gz";
sha256 = "17yqv924x7yvwix7yz9jdhgyar8lzdhqvmpvv0any8rdkajhj23c";
};

2 changes: 1 addition & 1 deletion pkgs/by-name/fa/fastjar/package.nix
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchzip {
pname = "fastjar-source";
inherit (finalAttrs) version;
url = "https://download.savannah.gnu.org/releases/fastjar/fastjar-${finalAttrs.version}.tar.gz";
url = "mirror://savannah/fastjar/fastjar-${finalAttrs.version}.tar.gz";
hash = "sha256-8VyKNQaPLrXAy/UEm2QkBx56SSSoLdU/7w4IwrxbsQc=";
};

2 changes: 1 addition & 1 deletion pkgs/by-name/gu/guile-reader/package.nix
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
version = "0.6.3";

src = fetchurl {
url = "http://download.savannah.nongnu.org/releases/${pname}/${pname}-${version}.tar.gz";
url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
hash = "sha256-OMK0ROrbuMDKt42QpE7D6/9CvUEMW4SpEBjO5+tk0rs=";
};

4 changes: 2 additions & 2 deletions pkgs/by-name/m1/m17n_db/package.nix
Original file line number Diff line number Diff line change
@@ -5,8 +5,8 @@ stdenv.mkDerivation rec {
version = "1.8.9";

src = fetchurl {
url = "https://download.savannah.gnu.org/releases/m17n/m17n-db-${version}.tar.gz";
sha256 = "sha256-SBJUo4CqnGbX9Ow6o3Kn4dL+R/w53252BEvUQBfEJKQ=";
url = "mirror://savannah/m17n/${pname}-${version}.tar.gz";
hash = "sha256-SBJUo4CqnGbX9Ow6o3Kn4dL+R/w53252BEvUQBfEJKQ=";
};

nativeBuildInputs = [ gettext ];
4 changes: 2 additions & 2 deletions pkgs/by-name/mi/mi2ly/package.nix
Original file line number Diff line number Diff line change
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
version = "0.12";

src = fetchurl {
url = "https://download.savannah.gnu.org/releases/mi2ly/mi2ly.${version}.tar.bz2";
sha256 = "sha256-lFbqH+syFaQDMbXfb+OUcWnyKnjfVz9yl7DbTTn7JKw=";
url = "mirror://savannah/${pname}/${pname}.${version}.tar.bz2";
hash = "sha256-lFbqH+syFaQDMbXfb+OUcWnyKnjfVz9yl7DbTTn7JKw=";
};

sourceRoot = ".";
4 changes: 2 additions & 2 deletions pkgs/by-name/nm/nmh/package.nix
Original file line number Diff line number Diff line change
@@ -60,8 +60,8 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "New MH Mail Handling System";
homepage = "https://nmh.nongnu.org/";
downloadPage = "http://download.savannah.nongnu.org/releases/nmh/";
changelog = "http://savannah.nongnu.org/news/?group=nmh";
downloadPage = "https://download.savannah.nongnu.org/releases/nmh/";
changelog = "https://savannah.nongnu.org/news/?group=nmh";
license = [ lib.licenses.bsd3 ];
longDescription = ''
This is the nmh mail user agent (reader/sender), a command-line based
2 changes: 1 addition & 1 deletion pkgs/by-name/sk/skribilo/package.nix
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "0.10.0";

src = fetchurl {
url = "http://download.savannah.nongnu.org/releases/skribilo/skribilo-${finalAttrs.version}.tar.gz";
url = "mirror://savannah/skribilo/skribilo-${finalAttrs.version}.tar.gz";
hash = "sha256-jP9I7hds7f1QMmSaNJpGlSvqUOwGcg+CnBzMopIS9Q4=";
};

2 changes: 1 addition & 1 deletion pkgs/by-name/st/storeBackup/package.nix
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
buildInputs = [ perl ];

src = fetchurl {
url = "https://download.savannah.gnu.org/releases/storebackup/storeBackup-${version}.tar.bz2";
url = "mirror://savannah/storebackup/storeBackup-${version}.tar.bz2";
hash = "sha256-Ki1DT2zypFFiiMVd9Y8eSX7T+yr8moWMoALmAexjqWU=";
};

4 changes: 2 additions & 2 deletions pkgs/by-name/xl/xlog/package.nix
Original file line number Diff line number Diff line change
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
version = "2.0.25";

src = fetchurl {
url = "https://download.savannah.gnu.org/releases/xlog/${pname}-${version}.tar.gz";
sha256 = "sha256-NYC3LgoLXnJQURcZTc2xHOzOleotrWtOETMBgadf2qU=";
url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
hash = "sha256-NYC3LgoLXnJQURcZTc2xHOzOleotrWtOETMBgadf2qU=";
};

# glib-2.62 deprecations
9 changes: 7 additions & 2 deletions pkgs/by-name/xm/xmlsec/package.nix
Original file line number Diff line number Diff line change
@@ -7,8 +7,13 @@ stdenv.mkDerivation rec {
version = "1.3.7";

src = fetchurl {
url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz";
sha256 = "sha256-2C6TtpuKogWmFrYpF6JpMiv2Oj6q+zd1AU5hdSsgE+o=";
urls = [
"https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"

# for when the ${version} gets older than the last two
"https://www.aleksey.com/xmlsec/download/older-releases/xmlsec1-${version}.tar.gz"
];
hash = "sha256-2C6TtpuKogWmFrYpF6JpMiv2Oj6q+zd1AU5hdSsgE+o=";
};

patches = [
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/matplotlib/default.nix
Original file line number Diff line number Diff line change
@@ -192,8 +192,8 @@ buildPythonPackage rec {
doCheck = true;
freetype = freetype.overrideAttrs (_: {
src = fetchurl {
url = "https://download.savannah.gnu.org/releases/freetype/freetype-old/freetype-2.6.1.tar.gz";
sha256 = "sha256-Cjx9+9ptoej84pIy6OltmHq6u79x68jHVlnkEyw2cBQ=";
url = "mirror://savannah/freetype/freetype-old/freetype-2.6.1.tar.gz";
hash = "sha256-Cjx9+9ptoej84pIy6OltmHq6u79x68jHVlnkEyw2cBQ=";
};
patches = [ ];
});
2 changes: 1 addition & 1 deletion pkgs/tools/inputmethods/m17n-lib/default.nix
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
version = "1.8.4";

src = fetchurl {
url = "https://download.savannah.gnu.org/releases/m17n/m17n-lib-${version}.tar.gz";
url = "mirror://savannah/m17n/${pname}-${version}.tar.gz";
hash = "sha256-xqJYLG5PKowueihE+lx+s2Oq0lOLBS8gPHEGSd1CHMg=";
};

2 changes: 1 addition & 1 deletion pkgs/tools/inputmethods/m17n-lib/otf.nix
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
version = "0.9.16";

src = fetchurl {
url = "https://download.savannah.gnu.org/releases/m17n/${pname}-${version}.tar.gz";
url = "mirror://savannah/m17n/${pname}-${version}.tar.gz";
sha256 = "0sq6g3xaxw388akws6qrllp3kp2sxgk2dv4j79k6mm52rnihrnv8";
};