diff options
| author | Leo Famulari <leo@famulari.name> | 2016-07-21 02:35:30 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2016-07-21 18:09:40 -0400 |
| commit | de67e922885baf68a746a0484ca0b45e45b0964b (patch) | |
| tree | 4da7063f667f7ba6fd2c10355e4d067a463da04a | |
| parent | a205d3f991e07a560cebbdf6557d9d7653231bda (diff) | |
| download | guix-de67e922885baf68a746a0484ca0b45e45b0964b.tar.gz | |
gnu: Update URLs for sourceforge.net.
* gnu/packages/admin.scm: Update URLs pointing to sourceforge.net. * gnu/packages/audacity.scm: Likewise. * gnu/packages/audio.scm: Likewise. * gnu/packages/bioinformatics.scm: Likewise. * gnu/packages/boost.scm: Likewise. * gnu/packages/cdrom.scm: Likewise. * gnu/packages/code.scm: Likewise. * gnu/packages/compression.scm: Likewise. * gnu/packages/cups.scm: Likewise. * gnu/packages/djvu.scm: Likewise. * gnu/packages/docbook.scm: Likewise. * gnu/packages/documentation.scm: Likewise. * gnu/packages/flashing-tools.scm: Likewise. * gnu/packages/fonts.scm: Likewise. * gnu/packages/fontutils.scm: Likewise. * gnu/packages/games.scm: Likewise. * gnu/packages/ghostscript.scm: Likewise. * gnu/packages/gl.scm: Likewise. * gnu/packages/gnucash.scm: Likewise. * gnu/packages/graphviz.scm: Likewise. * gnu/packages/image.scm: Likewise. * gnu/packages/libreoffice.scm: Likewise. * gnu/packages/libusb.scm: Likewise. * gnu/packages/linux.scm: Likewise. * gnu/packages/lirc.scm: Likewise. * gnu/packages/maths.scm: Likewise. * gnu/packages/mcrypt.scm: Likewise. * gnu/packages/mp3.scm: Likewise. * gnu/packages/music.scm: Likewise. * gnu/packages/networking.scm: Likewise. * gnu/packages/onc-rpc.scm: Likewise. * gnu/packages/password-utils.scm: Likewise. * gnu/packages/pdf.scm: Likewise. * gnu/packages/perl.scm: Likewise. * gnu/packages/photo.scm: Likewise. * gnu/packages/popt.scm: Likewise. * gnu/packages/python.scm: Likewise. * gnu/packages/rdesktop.scm: Likewise. * gnu/packages/screen.scm: Likewise. * gnu/packages/swig.scm: Likewise. * gnu/packages/tcl.scm: Likewise. * gnu/packages/version-control.scm: Likewise. * gnu/packages/video.scm: Likewise. * gnu/packages/w3m.scm: Likewise. * gnu/packages/web.scm: Likewise. * gnu/packages/wm.scm: Likewise. * gnu/packages/xdisorg.scm: Likewise. * gnu/packages/xml.scm: Likewise.
49 files changed, 204 insertions, 190 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 1d08be9e13..a7c4892b6b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -346,8 +346,8 @@ login, passwd, su, groupadd, and useradd.") (version "1.08") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/mingetty/mingetty-" - version ".tar.gz")) + (uri (string-append "mirror://sourceforge/mingetty/mingetty/" + version "/mingetty-" version ".tar.gz")) (sha256 (base32 "05yxrp44ky2kg6qknk1ih0kvwkgbn9fbz77r3vci7agslh5wjm8g")))) @@ -440,8 +440,8 @@ ONC RPC numbers.") (version "0.7.1") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/netcat/netcat-" - version ".tar.bz2")) + (uri (string-append "mirror://sourceforge/netcat/netcat/" version + "/netcat-" version ".tar.bz2")) (sha256 (base32 "1frjcdkhkpzk0f84hx6hmw5l0ynpmji8vcbaxg8h5k2svyxz0nmm")))) @@ -705,7 +705,8 @@ by bandwidth they use.") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/clusterssh/" - "clusterssh-" version ".tar.gz")) + "1.%20ClusterSSH%20Series%203/" version + "/clusterssh-" version ".tar.gz")) (sha256 (base32 "1bwggpvaj2al5blg1ynapviv2kpydffpzq2zkhi81najnvzc1rr7")))) @@ -1112,8 +1113,8 @@ system is under heavy load.") (version "1.2.0") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/detox/detox-" - version ".tar.bz2")) + (uri (string-append "mirror://sourceforge/detox/detox/" version + "/detox-" version ".tar.bz2")) (sha256 (base32 "1y6vvjqsg54kl49cry73jbfhr04s7wjs779vrr9zrq6kww7dkymb")))) diff --git a/gnu/packages/audacity.scm b/gnu/packages/audacity.scm index 9eae6aa1aa..0f9554deba 100644 --- a/gnu/packages/audacity.scm +++ b/gnu/packages/audacity.scm @@ -42,9 +42,8 @@ (source (origin (method url-fetch) - (uri - (string-append - "mirror://sourceforge/audacity/audacity-minsrc-" version ".tar.xz")) + (uri (string-append "mirror://sourceforge/audacity/audacity/" version + "/audacity-minsrc-" version ".tar.xz")) (sha256 (base32 "1cs2w3fwqylpqmfwkvlgdx5lhclpckfil7pqibl37qlbnf4qvndh")) (patches (search-patches "audacity-fix-ffmpeg-binding.patch")))) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 144d7321b6..7bcc3c3337 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -75,8 +75,8 @@ (version "2.1.2") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/alsamodular/ams-" - version ".tar.bz2")) + (uri (string-append "mirror://sourceforge/alsamodular/alsamodular" + "/" version "/ams-" version ".tar.bz2")) (sha256 (base32 "1azbrhpfk4nnybr7kgmc7w6al6xnzppg853vas8gmkh185kk11l0")))) @@ -766,8 +766,8 @@ also play midifiles using a Soundfont.") (version "2.7") (source (origin (method url-fetch) - (uri (string-append - "mirror://sourceforge/faac/faad2-" version ".zip")) + (uri (string-append "mirror://sourceforge/faac/faad2-src/faad2-" + version "/faad2-" version ".zip")) (sha256 (base32 "16f3l16c00sg0wkrkm3vzv0gy3g97x309vw788igs0cap2x1ak3z")))) @@ -868,7 +868,7 @@ patches that can be used with softsynths such as Timidity and WildMidi.") (source (origin (method url-fetch) (uri (string-append - "mirror://sourceforge/guitarix/guitarix2-" + "mirror://sourceforge/guitarix/guitarix/guitarix2-" version ".tar.xz")) (sha256 (base32 @@ -1230,8 +1230,8 @@ connections between them.") (version "3.1.0") (source (origin (method url-fetch) - (uri (string-append - "mirror://sourceforge/bs2b/libbs2b-" version ".tar.lzma")) + (uri (string-append "mirror://sourceforge/bs2b/libbs2b/" version + "/libbs2b-" version ".tar.lzma")) (sha256 (base32 "1mcc4gjkmphczjybnsrip3gq1f974knzys7x49bv197xk3fn8wdr")))) @@ -1253,10 +1253,8 @@ essential distortions.") (version "0.28") (source (origin (method url-fetch) - (uri (string-append - "mirror://sourceforge/liblo/liblo-" - version - ".tar.gz")) + (uri (string-append "mirror://sourceforge/liblo/liblo/" version + "/liblo-" version ".tar.gz")) (sha256 (base32 "02drgnpirvl2ihvzgsmn02agr5sj3vipzzw9vma56qlkgfvak56s")))) @@ -1709,9 +1707,9 @@ Suil currently supports every combination of Gtk 2, Qt 4, and X11.") (version "2.14.0") (source (origin (method url-fetch) - (uri (string-append - "mirror://sourceforge/timidity/TiMidity++-" - version ".tar.bz2")) + (uri (string-append "mirror://sourceforge/timidity/TiMidity++" + "/TiMidity++-" version + "/TiMidity++-" version ".tar.bz2")) (sha256 (base32 "0xk41w4qbk23z1fvqdyfblbz10mmxsllw0svxzjw5sa9y11vczzr")))) @@ -1892,7 +1890,7 @@ surround and reverb.") (version "4.3.10") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/xmp/libxmp/" + (uri (string-append "mirror://sourceforge/xmp/libxmp/" version "/" name "-" version ".tar.gz")) (sha256 (base32 @@ -1912,7 +1910,7 @@ Scream Tracker 3 (S3M), Fast Tracker II (XM), and Impulse Tracker (IT).") (version "4.0.10") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/xmp/xmp/" + (uri (string-append "mirror://sourceforge/xmp/xmp/" version "/" name "-" version ".tar.gz")) (sha256 (base32 @@ -1972,8 +1970,8 @@ control functionality, or just for playing around with the sound effects.") (version "14.4.2") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/sox/sox-" - version ".tar.bz2")) + (uri (string-append "mirror://sourceforge/sox/sox/" version "/" + name "-" version ".tar.bz2")) (sha256 (base32 "170lx90r1nlnb2j6lg00524iwvqy72p48vii4xc5prrh8dnrb9l1")))) @@ -2035,8 +2033,8 @@ conversion. It may be used, for example, to resample PCM-encoded audio.") (source (origin (method url-fetch) - (uri (string-append - "mirror://sourceforge/twolame/twolame-" version ".tar.gz")) + (uri (string-append "mirror://sourceforge/twolame/twolame/" version + "/twolame-" version ".tar.gz")) (sha256 (base32 "0ahiqqng5pidwhj1wzph4vxxgxxgcfa3gl0gywipzx2ii7s35wwq")))) (build-system gnu-build-system) @@ -2102,8 +2100,8 @@ interface.") (source (origin (method url-fetch) - (uri (string-append - "mirror://sourceforge/qsynth/qsynth-" version ".tar.gz")) + (uri (string-append "mirror://sourceforge/qsynth/qsynth/" version + "/qsynth-" version ".tar.gz")) (sha256 (base32 "034p6mbwrjnxd9b6h20cidxi4ilkk3cgpjp154j0jzjs1ipf7x2h")))) (build-system gnu-build-system) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 1cbf85ff6c..5cd92b8150 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -3124,7 +3124,7 @@ BAM and Wiggle files in both transcript-coordinate and genomic-coordinate.") (method url-fetch) (uri (string-append "mirror://sourceforge/rseqc/" - version "/RSeQC-" version ".tar.gz")) + "RSeQC-" version ".tar.gz")) (sha256 (base32 "15ly0254yi032qzkdplg00q144qfdsd986gh62829rl5bkxhj330")) (modules '((guix build utils))) @@ -3235,7 +3235,7 @@ to the user's query of interest.") (origin (method url-fetch) (uri - (string-append "mirror://sourceforge/samtools/" + (string-append "mirror://sourceforge/samtools/samtools/" version "/samtools-" version ".tar.bz2")) (sha256 (base32 @@ -3295,7 +3295,7 @@ viewer.") (origin (method url-fetch) (uri - (string-append "mirror://sourceforge/samtools/" + (string-append "mirror://sourceforge/samtools/samtools/" version "/samtools-" version ".tar.bz2")) (sha256 (base32 "1m33xsfwz0s8qi45lylagfllqg7fphf4dr0780rsvw75av9wk06h")))) @@ -4022,9 +4022,8 @@ sequences.") (version "1.4.6-p2") (source (origin (method url-fetch) - (uri (string-append - "mirror://sourceforge/subread/subread-" - version "-source.tar.gz")) + (uri (string-append "mirror://sourceforge/subread/subread-" + version "/subread-" version "-source.tar.gz")) (sha256 (base32 "06sv9mpcsdj6p68y15d6gi70lca3lxmzk0dn61hg0kfsa7rxmsr3")))) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 0a644e8940..bb123d38a4 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -38,7 +38,7 @@ (source (origin (method url-fetch) (uri (string-append - "mirror://sourceforge/boost/boost_" + "mirror://sourceforge/boost/boost/" version "/boost_" (string-map (lambda (x) (if (eq? x #\.) #\_ x)) version) ".tar.bz2")) (sha256 diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 2dd84a2a17..4263cdebb7 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -51,8 +51,8 @@ (version "1.3.2") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/libcddb/libcddb-" - version ".tar.bz2")) + (uri (string-append "mirror://sourceforge/libcddb/libcddb/" version + "/libcddb-" version ".tar.bz2")) (sha256 (base32 "0fr21a7vprdyy1bq6s99m0x420c9jm5fipsd63pqv8qyfkhhxkim")))) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index c3efd15e44..233e803431 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -287,8 +287,8 @@ stack traces.") (version "1.12") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/ltp/lcov-" - version ".tar.gz")) + (uri (string-append "mirror://sourceforge/ltp/Coverage%20Analysis" + "/LCOV-" version "/lcov-" version ".tar.gz")) (sha256 (base32 "19wfifdpxxivhq9adbphanjfga9bg9spms9v7c3589wndjff8x5l")))) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 6a170031b0..a56e85c553 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -634,7 +634,8 @@ time for compression ratio.") (version "4.3") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/squashfs/" + (uri (string-append "mirror://sourceforge/squashfs/squashfs/" + "squashfs" version "/" "squashfs" version ".tar.gz")) (sha256 (base32 diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 8437170bfa..c47117bd1a 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -309,8 +309,8 @@ device-specific programs to convert and print many types of files.") (version "3.16.3") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/hplip/" - "hplip-" version ".tar.gz")) + (uri (string-append "mirror://sourceforge/hplip/hplip/" version + "/hplip-" version ".tar.gz")) (sha256 (base32 "1501qdnkjp1ybgagy5188fmf6cgmj5555ygjl3543nlbwcp31lj2")))) diff --git a/gnu/packages/djvu.scm b/gnu/packages/djvu.scm index 47a76169f6..e739df3772 100644 --- a/gnu/packages/djvu.scm +++ b/gnu/packages/djvu.scm @@ -28,8 +28,8 @@ (version "3.5.27") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/djvu/djvulibre-" - version ".tar.gz")) + (uri (string-append "mirror://sourceforge/djvu/DjVuLibre/" + version "/djvulibre-" version ".tar.gz")) (sha256 (base32 "0psh3zl9dj4n4r3lx25390nx34xz0bg0ql48zdskhq354ljni5p6")))) diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index b8a8ba69dc..3d18d459bd 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -135,8 +135,8 @@ by no means limited to these applications.) This package provides XML DTDs.") (version "1.78.1") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/docbook/docbook-xsl-" - version ".tar.bz2")) + (uri (string-append "mirror://sourceforge/docbook/docbook-xsl/" + version "/docbook-xsl-" version ".tar.bz2")) (sha256 (base32 "0rxl013ncmz1n6ymk2idvx3hix9pdabk8xn01cpcv32wmfb753y9")))) @@ -176,7 +176,8 @@ by no means limited to these applications.) This package provides XML DTDs.") (version "0.3.5") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/dblatex/dblatex-" + (uri (string-append "mirror://sourceforge/dblatex/dblatex/" + "dblatex-" version "/dblatex-" version ".tar.bz2")) (sha256 (base32 diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index 8302cc49cc..72af708dbd 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -43,8 +43,8 @@ (version "8.6.9") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/asciidoc/asciidoc-" - version ".tar.gz")) + (uri (string-append "mirror://sourceforge/asciidoc/asciidoc/" + version "/asciidoc-" version ".tar.gz")) (sha256 (base32 "1w71nk527lq504njmaf0vzr93pgahkgzzxzglrq6bay8cw2rvnvq")))) @@ -126,8 +126,8 @@ or Java class files.") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/scrollkeeper/scrollkeeper-" - version ".tar.gz")) + (uri (string-append "mirror://sourceforge/scrollkeeper/scrollkeeper/" + version "/scrollkeeper-" version ".tar.gz")) (sha256 (base32 "1bfxwxc1ngh11v36z899sz9qam366r050fhkyb5adv65lb1x62sa")))) (build-system gnu-build-system) diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm index e3f8d80c02..d0c164eff4 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -114,8 +114,8 @@ technique (ISP).") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/dfu-programmer/dfu-programmer-" - version ".tar.gz")) + (uri (string-append "mirror://sourceforge/dfu-programmer/dfu-programmer/" + version "/dfu-programmer-" version ".tar.gz")) (sha256 (base32 "15gr99y1z9vbvhrkd25zqhnzhg6zjmaam3vfjzf2mazd39mx7d0x")) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 09fda2192a..76af2de986 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -129,7 +129,7 @@ TrueType (TTF) files.") (version "2.34") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/dejavu/" + (uri (string-append "mirror://sourceforge/dejavu/dejavu/" version "/dejavu-fonts-ttf-" version ".tar.bz2")) (sha256 @@ -476,7 +476,8 @@ text in Simplified Chinese, Traditional Chinese, Japanese, and Korean.") (source (origin (method url-fetch) (uri (string-append - "mirror://sourceforge/wqy/wqy-zenhei-" + "mirror://sourceforge/wqy/wqy-zenhei/" version + "%20%28Fighting-state%20RC1%29/wqy-zenhei-" version ".tar.gz")) (file-name (string-append "wqy-zenhei-" version ".tar.gz")) (sha256 diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 73ce685d51..845e8b36c5 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -397,8 +397,8 @@ and returns a sequence of positioned glyphids from the font.") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/potrace/potrace-" - version ".tar.gz")) + (uri (string-append "mirror://sourceforge/potrace/" version + "/potrace-" version ".tar.gz")) (sha256 (base32 "115p2vgyq7p2mf4nidk2x3aa341nvv2v8ml056vbji36df5l6lk2")))) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 608c567c5c..068b7d4cf5 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1026,7 +1026,9 @@ falling, themeable graphics and sounds, and replays.") (version "1.12.5") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/wesnoth/" + (uri (string-append "mirror://sourceforge/wesnoth/wesnoth-" + (version-major+minor version) "/wesnoth-" + version "/" name "-" version ".tar.bz2")) (sha256 (base32 diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 0a65813f97..ff5a6a04f4 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -41,8 +41,8 @@ (version "2.6") (source (origin (method url-fetch) - (uri (string-append - "mirror://sourceforge/lcms/lcms2-" version ".tar.gz")) + (uri (string-append "mirror://sourceforge/lcms/lcms/" version + "/lcms2-" version ".tar.gz")) (sha256 (base32 "1c8lgq8gfs3nyplvbx9k8wzfj6r2bqi3f611vb1m8z3476454wji")))) (build-system gnu-build-system) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 7fa79bbde3..4638ea8264 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -358,10 +358,8 @@ glxgears, glxheads, and glxinfo.") (version "1.11.0") (source (origin (method url-fetch) - (uri (string-append - "mirror://sourceforge/glew/glew-" - version - ".tgz")) + (uri (string-append "mirror://sourceforge/glew/glew/" version + "/glew-" version ".tgz")) (sha256 (base32 "1mhkllxz49l1x680dmzrv2i82qjrq017sykah3xc90f2d8qcxfv9")) diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm index eaa84ccc32..bdef0b163b 100644 --- a/gnu/packages/gnucash.scm +++ b/gnu/packages/gnucash.scm @@ -46,8 +46,8 @@ (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/gnucash/gnucash-" - version ".tar.bz2")) + (uri (string-append "mirror://sourceforge/gnucash/gnucash%20%28stable%29/" + version "/gnucash-" version ".tar.bz2")) (sha256 (base32 "0x84f07p30pwhriamv8ifljgw755cj87rc12jy1xddf47spyj7rp")) diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index e4b9094632..610bd16beb 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -119,8 +119,8 @@ interfaces for other technical domains.") (version "0.7.6") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/gts/gts-" - version ".tar.gz")) + (uri (string-append "mirror://sourceforge/gts/gts/" version + "/gts-" version ".tar.gz")) (sha256 (base32 "07mqx09jxh8cv9753y2d2jsv7wp8vjmrd7zcfpbrddz3wc9kx705")))) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 0ab3f60c5e..015236e9e4 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -332,8 +332,8 @@ work.") (origin (method url-fetch) (uri - (string-append "mirror://sourceforge/openjpeg.mirror/" name "-" - version ".tar.gz")) + (string-append "mirror://sourceforge/openjpeg.mirror/" version "/" + name "-" version ".tar.gz")) (sha256 (base32 "00zzm303zvv4ijzancrsb1cqbph3pgz0nky92k9qx3fq9y0vnchj")) (patches (search-patches "openjpeg-use-after-free-fix.patch" @@ -369,8 +369,8 @@ error-resilience, a Java-viewer for j2k-images, ...") (origin (method url-fetch) (uri - (string-append "mirror://sourceforge/openjpeg.mirror/" name "-" - version ".tar.gz")) + (string-append "mirror://sourceforge/openjpeg.mirror/" version "/" + name "-" version ".tar.gz")) (sha256 (base32 "1c2xc3nl2mg511b63rk7hrckmy14681p1m44mzw3n1fyqnjm0b0z")) (patches (search-patches "openjpeg-use-after-free-fix.patch" @@ -384,8 +384,8 @@ error-resilience, a Java-viewer for j2k-images, ...") (origin (method url-fetch) (uri - (string-append "mirror://sourceforge/openjpeg.mirror/" name "-" - version ".tar.gz")) + (string-append "mirror://sourceforge/openjpeg.mirror/" version "/" + name "-" version ".tar.gz")) (sha256 (base32 "11waq9w215zvzxrpv40afyd18qf79mxc28fda80bm3ax98cpppqm")))))) @@ -396,8 +396,7 @@ error-resilience, a Java-viewer for j2k-images, ...") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/giflib/giflib-" - (first (string-split version #\.)) - ".x/giflib-" version ".tar.bz2")) + version ".tar.bz2")) (sha256 (base32 "1md83dip8rf29y40cm5r7nn19705f54iraz6545zhwa6y8zyq9yz")))) @@ -443,7 +442,8 @@ compose, and analyze GIF images.") (version "4.1.4") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/giflib/libungif-" + (uri (string-append "mirror://sourceforge/giflib/libungif-4.x/" + "libungif-" version "/libungif-" version ".tar.bz2")) (sha256 (base32 @@ -463,8 +463,8 @@ compose, and analyze GIF images.") (source (origin (method url-fetch) (uri (string-append - "mirror://sourceforge/enlightenment/imlib2-" - version ".tar.bz2")) + "mirror://sourceforge/enlightenment/imlib2-src/" version + "/imlib2-" version ".tar.bz2")) (sha256 (base32 "08809xxk2555yj6glixzw9a0x3x8cx55imd89kj3r0h152bn8a3x")))) @@ -663,8 +663,8 @@ channels.") (version "2.0.3") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/libmng/" - name "-" version ".tar.xz")) + (uri (string-append "mirror://sourceforge/libmng-devel/" version + "/" name "-" version ".tar.xz")) (sha256 (base32 "1lvxnpds0vcf0lil6ia2036ghqlbl740c4d2sz0q5g6l93fjyija")))) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 18606f96a1..8f4a6c9f61 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -127,7 +127,7 @@ CSV, CSS and XML.") (origin (method url-fetch) (uri (string-append "mirror://sourceforge/libwpd/" name "/" name "-" - version ".tar.xz")) + version "/" name "-" version ".tar.xz")) (sha256 (base32 "03ygxyb0vfjv8raif5q62sl33b54wkr5rzgadb8slijm6k281wpn")))) (build-system gnu-build-system) @@ -158,8 +158,8 @@ spreadsheets and presentations.") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/libwpd/" name "/" name "-" - version ".tar.xz")) + (uri (string-append "mirror://sourceforge/" name "/" name "/" + name "-" version "/" name "-" version ".tar.xz")) (sha256 (base32 "0b6krzr6kxzm89g6bapn805kdayq70hn16n5b5wfs2lwrf0ag2wx")))) (build-system gnu-build-system) @@ -220,8 +220,8 @@ ZVR (simple compressed text format).") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/libwpg/" name "/" name "-" - version ".tar.xz")) + (uri (string-append "mirror://sourceforge/" name "/" name "/" + name "-" version "/" name "-" version ".tar.xz")) (sha256 (base32 "097jx8a638fwwfrzf6v29r1yhc34rq9526py7wf0ck2z4fcr2w3g")))) (build-system gnu-build-system) @@ -576,8 +576,8 @@ text documents, vector drawings, presentations and spreadsheets.") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/" name "/" name "/" - name "-" version ".tar.xz")) + (uri (string-append "mirror://sourceforge/" name "/" name "/" name "-" + version "/" name "-" version ".tar.xz")) (sha256 (base32 "1vx9h419fcfcs0yj071hsg9d2qvkacgca6052m8hv3h743cdmzil")))) (build-system gnu-build-system) @@ -607,7 +607,7 @@ spreadsheet documents.") (origin (method url-fetch) (uri (string-append "mirror://sourceforge/" name "/" name "/" - name "-" version ".tar.xz")) + name "-" version "/" name "-" version ".tar.xz")) (sha256 (base32 "0nlrdk7di015l0sk0ivjdqs86zdcvf73p9z9s9ry5glyhrknzxjk")))) (build-system gnu-build-system) @@ -635,7 +635,7 @@ Works word processor file format.") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/" name "/" + (uri (string-append "mirror://sourceforge/" name "/Hunspell/" version "/" name "-" version ".tar.gz")) (sha256 (base32 "0v14ff9s37vkh45diaddndcrj0hmn67arh8xh8k79q9c1vgc1cm7")))) @@ -655,7 +655,8 @@ word compounding or character encoding.") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/hunspell/" + (uri (string-append "mirror://sourceforge/hunspell/Hyphen/" + (version-major+minor version) "/" name "-" version ".tar.gz")) (sha256 (base32 "01ap9pr6zzzbp4ky0vy7i1983fwyqy27pl0ld55s30fdxka3ciih")))) @@ -676,7 +677,7 @@ patterns, which are pre-processed by a perl script.") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/hunspell/" + (uri (string-append "mirror://sourceforge/hunspell/MyThes/" version "/" name "-" version ".tar.gz")) (sha256 (base32 "0prh19wy1c74kmzkkavm9qslk99gz8h8wmjvwzjc6lf8v2az708y")))) diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index 1f659c7594..0071f4f119 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -138,7 +138,7 @@ version of libusb to run with newer libusb.") (version "1.1.11") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/libmtp/" version + (uri (string-append "mirror://sourceforge/libmtp/libmtp/" version "/libmtp-" version ".tar.gz")) (sha256 (base32 @@ -174,7 +174,7 @@ proposed for standardization.") (version "1.3.10") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/gmtp/" version + (uri (string-append "mirror://sourceforge/gmtp/gMTP-" version "/gmtp-" version ".tar.gz")) (sha256 (base32 diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 291ae0b4df..70c18f22ff 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -709,7 +709,8 @@ from the e2fsprogs package. It is meant to be used in initrds.") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/extundelete/" - version "/extundelete-" version ".tar.bz2")) + "extundelete/" version "/extundelete-" + version ".tar.bz2")) (sha256 (base32 "1x0r7ylxlp9lbj3d7sqf6j2a222dwy2nfpff05jd6mkh4ihxvyd1")))) @@ -763,8 +764,8 @@ images more compressible.") (version "4.7") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/strace/strace-" - version ".tar.xz")) + (uri (string-append "mirror://sourceforge/strace/strace/" version + "/strace-" version ".tar.xz")) (sha256 (base32 "158iwk0pl2mfw93m1843xb7a2zb8p6lh0qim07rca6f1ff4dk764")))) @@ -1100,8 +1101,8 @@ Linux-based operating systems.") (version "1.5") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/bridge/bridge-utils-" - version ".tar.gz")) + (uri (string-append "mirror://sourceforge/bridge/bridge/" + "bridge-utils-" version ".tar.gz")) (sha256 (base32 "12367cwqmi0yqphi6j8rkx97q8hw52yq2fx4k0xfclkcizxybya2")))) @@ -2082,7 +2083,7 @@ thanks to the use of namespaces.") (version "9.45") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/" name "/" + (uri (string-append "mirror://sourceforge/" name "/" name "/" name "-" version ".tar.gz")) (sha256 (base32 @@ -2135,8 +2136,8 @@ WLAN, Bluetooth and mobile broadband.") (version "1.7") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/acpiclient/" - name "-" version ".tar.gz")) + (uri (string-append "mirror://sourceforge/acpiclient/acpiclient/" + version "/" name "-" version ".tar.gz")) (sha256 (base32 "01ahldvf0gc29dmbd5zi4rrnrw2i1ajnf30sx2vyaski3jv099fp")))) @@ -2276,7 +2277,7 @@ protocol in question.") (version "0.5.4") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/libavc1394/" + (uri (string-append "mirror://sourceforge/libavc1394/libavc1394/" name "-" version ".tar.gz")) (sha256 (base32 @@ -2648,7 +2649,7 @@ feature, and a laptop with an accelerometer. It has no effect on SSDs.") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/thinkfan/" - version "/thinkfan-" version ".tar.gz")) + "/thinkfan-" version ".tar.gz")) (sha256 (base32 "0nz4c48f0i0dljpk5y33c188dnnwg8gz82s4grfl8l64jr4n675n")) diff --git a/gnu/packages/lirc.scm b/gnu/packages/lirc.scm index 6b1eee3ef2..e3f60e33e2 100644 --- a/gnu/packages/lirc.scm +++ b/gnu/packages/lirc.scm @@ -35,8 +35,8 @@ (version "0.9.4") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/lirc/lirc-" - version ".tar.bz2")) + (uri (string-append "mirror://sourceforge/lirc/LIRC/" version + "/lirc-" version ".tar.bz2")) (sha256 (base32 "1l2xzhnm4hrla51ik09hcafki0y8wnww7svfm7j63zbl2rssc66x")) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 9f780a01d3..87b34b03c6 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2013,8 +2013,8 @@ packages.") (version "3.10.2") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/math-atlas/atlas" - version ".tar.bz2")) + (uri (string-append "mirror://sourceforge/math-atlas/Stable/" + version "/atlas" version ".tar.bz2")) (sha256 (base32 "0bqh4bdnjdyww4mcpg6kn0x7338mfqbdgysn97dzrwwb26di7ars")))) @@ -2143,8 +2143,8 @@ Failure to do so will result in a library with poor performance.") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/ogl-math/glm-" - version ".zip")) + (uri (string-append "mirror://sourceforge/ogl-math/glm-" version + "/glm-" version ".zip")) (sha256 (base32 "1cnjmi033a16a95v6xfkr1bvfmkd26hzdjka8j1819hgn5b1nr8l")))) @@ -2362,9 +2362,8 @@ FLANN is written in C++ and contains bindings for C, Octave and Python.") (source (origin (method url-fetch) - (uri - (string-append - "mirror://sourceforge/w-calc/wcalc-" version ".tar.bz2")) + (uri (string-append "mirror://sourceforge/w-calc/Wcalc/" version "/" + "wcalc-" version ".tar.bz2")) (sha256 (base32 "1vi8dl6rccqiq1apmpwawyg2ywx6a1ic1d3cvkf2hlwk1z11fb0f")))) @@ -2388,8 +2387,8 @@ evaluates expressions using the standard order of operations.") (version "3.6") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/xaos/xaos-" - version ".tar.gz")) + (uri (string-append "mirror://sourceforge/xaos/XaoS/" version + "/xaos-" version ".tar.gz")) (sha256 (base32 "15cd1cx1dyygw6g2nhjqq3bsfdj8sj8m4va9n75i0f3ryww3x7wq")))) @@ -2531,7 +2530,7 @@ structured and unstructured grid problems."))) (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/matio/" version "/" + (uri (string-append "mirror://sourceforge/matio/matio/" version "/" "matio-" version ".tar.gz")) (sha256 (base32 diff --git a/gnu/packages/mcrypt.scm b/gnu/packages/mcrypt.scm index 7ac0b92d81..fb5529382e 100644 --- a/gnu/packages/mcrypt.scm +++ b/gnu/packages/mcrypt.scm @@ -33,8 +33,8 @@ (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/mcrypt/mcrypt-" - version ".tar.gz")) + (uri (string-append "mirror://sourceforge/mcrypt/MCrypt/" + version "/" name "-" version ".tar.gz")) (sha256 (base32 "161031n1w9pb4yzz9i47szc12a4mwpcpvyxnvafsik2l9s2aliai")) @@ -66,8 +66,8 @@ them.") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/mcrypt/libmcrypt-" - version ".tar.gz")) + (uri (string-append "mirror://sourceforge/mcrypt/Libmcrypt/" version + "/libmcrypt-" version ".tar.gz")) (sha256 (base32 "0gipgb939vy9m66d3k8il98rvvwczyaw2ixr8yn6icds9c3nrsz4")))) @@ -89,9 +89,8 @@ XTEA, 3WAY, TWOFISH, BLOWFISH, ARCFOUR, WAKE and more.") (source (origin (method url-fetch) - - (uri (string-append "mirror://sourceforge/mhash/mhash-" - version ".tar.bz2")) + (uri (string-append "mirror://sourceforge/mhash/mhash/" version + "/mhash-" version ".tar.bz2")) (sha256 (base32 "1w7yiljan8gf1ibiypi6hm3r363imm3sxl1j8hapjdq3m591qljn")) diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 8451f0ac9f..37407cdc17 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -290,8 +290,8 @@ This package contains the binary.") (version "1.22.4") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/mpg123/mpg123-" - version ".tar.bz2")) + (uri (string-append "mirror://sourceforge/mpg123/mpg123/" version + "/mpg123-" version ".tar.bz2")) (sha256 (base32 "1lj0xv0b6sgqsbhx10dg60cnzgz98i76gxy51kqh11hka0pf0sah")))) @@ -314,7 +314,7 @@ command-line tool as well as a C library, libmpg123.") (version "0.3.1") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/mpg321/" + (uri (string-append "mirror://sourceforge/mpg321/mpg321/" version "/mpg321-" version ".tar.gz")) (sha256 (base32 diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 91ba4be97b..5d73790e51 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -694,8 +694,8 @@ Editor. It is compatible with Power Tab Editor 1.7 and Guitar Pro.") (source (origin (method url-fetch) (uri - (string-append "mirror://sourceforge/synthv1/synthv1-" - version ".tar.gz")) + (string-append "mirror://sourceforge/synthv1/synthv1/" version + "/synthv1-" version ".tar.gz")) (sha256 (base32 "0h5zja78phf9705i9g54zh61iczb24iv7rxhljyms30sjgajig1y")))) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 9e4f7bb010..b92ad0a36a 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -232,7 +232,8 @@ Ethernet devices.") (version "1.1.0") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/ifstatus/ifstatus-v" + (uri (string-append "mirror://sourceforge/ifstatus/ifstatus/" + "ifstatus%20v" version "/ifstatus-v" version ".tar.gz")) (sha256 (base32 @@ -271,8 +272,8 @@ intended as a substitute for the PPPStatus and EthStatus projects.") (version "0.7.4") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/nload/nload-" - version ".tar.gz")) + (uri (string-append "mirror://sourceforge/nload/nload/" version + "/nload-" version ".tar.gz")) (sha256 (base32 "1rb9skch2kgqzigf19x8bzk211jdfjfdkrcvaqyj89jy2pkm3h61")))) diff --git a/gnu/packages/onc-rpc.scm b/gnu/packages/onc-rpc.scm index 8861b0e8db..d9b2f9dda0 100644 --- a/gnu/packages/onc-rpc.scm +++ b/gnu/packages/onc-rpc.scm @@ -28,7 +28,7 @@ (version "0.2.4") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/libtirpc/" + (uri (string-append "mirror://sourceforge/libtirpc/libtirpc/" version "/libtirpc-" version ".tar.bz2")) (sha256 diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 1579821385..a03214ae6d 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -53,8 +53,8 @@ (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/pwgen/pwgen-" - version ".tar.gz")) + (uri (string-append "mirror://sourceforge/pwgen/pwgen/" version + "/pwgen-" version ".tar.gz")) (sha256 (base32 "0mhmw700kkh238fzivcwnwi94bj9f3h36yfh3k3j2v19b0zmjx7b")))) (build-system gnu-build-system) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 36d39856b0..c5cbe9862f 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -415,8 +415,8 @@ interaction.") (version "0.9.3") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/podofo/podofo-" - version ".tar.gz")) + (uri (string-append "mirror://sourceforge/podofo/podofo/" version + "/podofo-" version ".tar.gz")) (sha256 (base32 "1n12lbq9x15vqn7dc0hsccp56l5jdff1xrhvlfqlbklxx0qiw9pc")))) @@ -506,8 +506,8 @@ and examining the file structure (pdfshow).") (version "5.1.3") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/qpdf/qpdf-" - version ".tar.gz")) + (uri (string-append "mirror://sourceforge/qpdf/qpdf/" version + "/qpdf-" version ".tar.gz")) (sha256 (base32 "1lq1v7xghvl6p4hgrwbps3a13ad6lh4ib3myimb83hxgsgd4n5nm")))) (build-system gnu-build-system) @@ -547,8 +547,8 @@ program capable of converting PDF into other formats.") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/xournal/xournal-" - version ".tar.gz")) + (uri (string-append "mirror://sourceforge/xournal/xournal/" version + "/xournal-" version ".tar.gz")) (sha256 (base32 "0c7gjcqhygiyp0ypaipdaxgkbivg6q45vhsj8v5jsi9nh6iqff13")))) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index aed2a61320..f42abee3d7 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -6075,8 +6075,8 @@ as exceptions to standard program flow.") (version "20160302") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/perltidy/Perl-Tidy-" - version ".tar.gz")) + (uri (string-append "mirror://sourceforge/perltidy/" version + "/Perl-Tidy-" version ".tar.gz")) (sha256 (base32 "19yw63yh5s3pq7k3nkw6nsamg5b8vvwyhgbizslgxg0mqgc4xl3d")))) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 38bd9c3ed9..8eb5337b6a 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -73,8 +73,8 @@ cameras (CRW/CR2, NEF, RAF, DNG, and others).") (version "0.6.21") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/libexif/libexif-" - version ".tar.bz2")) + (uri (string-append "mirror://sourceforge/libexif/libexif/" + version "/libexif-" version ".tar.bz2")) (sha256 (base32 "06nlsibr3ylfwp28w8f5466l6drgrnydgxrm4jmxzrmk5svaxk8n")))) @@ -92,8 +92,8 @@ data as produced by digital cameras.") (version "2.5.2") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/gphoto/libgphoto2-" - version ".tar.bz2")) + (uri (string-append "mirror://sourceforge/gphoto/libgphoto/" + version "/libgphoto2-" version ".tar.bz2")) (sha256 (base32 "0f1818l1vs5fbmrihzyv3qasddbqi3r01jik5crrxddwalsi2bd3")))) @@ -122,8 +122,8 @@ from digital cameras.") (version "2.5.2") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/gphoto/gphoto2-" - version ".tar.bz2")) + (uri (string-append "mirror://sourceforge/gphoto/gphoto/" version + "/gphoto2-" version ".tar.bz2")) (sha256 (base32 "16c8k1cxfypg7v5h8xi87grclw7a5ayaamn548ys3zkj727r5fcf")))) diff --git a/gnu/packages/popt.scm b/gnu/packages/popt.scm index e940df1590..3200873d58 100644 --- a/gnu/packages/popt.scm +++ b/gnu/packages/popt.scm @@ -32,7 +32,8 @@ (source (origin (method url-fetch) (uri (string-append - "mirror://sourceforge/argtable/argtable" + "mirror://sourceforge/argtable/argtable/" + "argtable-" version "/argtable" (string-join (string-split version #\.) "-") ".tar.gz")) (sha256 diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 2dba8bbbb8..f534dd0e30 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1375,8 +1375,8 @@ syntax.") (version "2.3.4") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/scons/scons-" - version ".tar.gz")) + (uri (string-append "mirror://sourceforge/scons/scons/" version + "/scons-" version ".tar.gz")) (sha256 (base32 "0hdlci43wjz8maryj83mz04ir6rwcdrrzpd7cpzvdlzycqhdfmsb")))) @@ -3020,7 +3020,7 @@ writing C extensions for Python as easy as Python itself.") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/numpy" + (uri (string-append "mirror://sourceforge/numpy/NumPy/" version "/numpy-" version ".tar.gz")) (sha256 (base32 @@ -3183,7 +3183,8 @@ association studies (GWAS) on extremely large data sets.") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/pyparsing" + (uri (string-append "mirror://sourceforge/pyparsing/pyparsing" + "/pyparsing-" version "/pyparsing-" version ".tar.gz")) (sha256 (base32 @@ -3304,7 +3305,8 @@ transcendental functions).") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/matplotlib" + (uri (string-append "mirror://sourceforge/matplotlib/matplotlib" + "/matplotlib-" version "/matplotlib-" version ".tar.gz")) (sha256 (base32 @@ -3514,7 +3516,8 @@ functions.") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/scipy" +; http://downloads.sourceforge.net/project/scipy/scipy/0.16.1/scipy-0.16.1.tar.gz + (uri (string-append "mirror://sourceforge/scipy/scipy/" version "/scipy-" version ".tar.xz")) (sha256 (base32 @@ -4893,7 +4896,8 @@ as possible in order to be comprehensible and easily extensible.") (version "0.14") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/python-xlib/" + (uri (string-append "mirror://sourceforge/python-xlib/python-xlib" + "/" version "/" "python-xlib-" version ".tar.gz")) (sha256 (base32 @@ -8719,7 +8723,7 @@ the same purpose: to provide Python bindings for libmagic.") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/s3tools/" + (uri (string-append "mirror://sourceforge/s3tools/s3cmd/" version "/" "s3cmd-" version ".tar.gz")) (sha256 (base32 diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm index 39a45c5878..e40852b4ec 100644 --- a/gnu/packages/rdesktop.scm +++ b/gnu/packages/rdesktop.scm @@ -31,8 +31,8 @@ (source (origin (method url-fetch) (uri (string-append - "mirror://sourceforge/rdesktop/rdesktop-" - version ".tar.gz")) + "mirror://sourceforge/" name "/" name "/" version "/" + name "-" version ".tar.gz")) (sha256 (base32 "1r7c1rjmw2xzq8fw0scyb453gy9z19774z1z8ldmzzsfndb03cl8")))) diff --git a/gnu/packages/screen.scm b/gnu/packages/screen.scm index e3f97f4b68..8c900821be 100644 --- a/gnu/packages/screen.scm +++ b/gnu/packages/screen.scm @@ -70,8 +70,8 @@ view to show two terminals at once.") (version "0.9") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/dtach/dtach-" - version ".tar.gz")) + (uri (string-append "mirror://sourceforge/" name "/" name "/" + version "/" name "-" version ".tar.gz")) (sha256 (base32 "1wwj2hlngi8qn2pisvhyfxxs8gyqjlgrrv5lz91w8ly54dlzvs9j")))) diff --git a/gnu/packages/swig.scm b/gnu/packages/swig.scm index 273d0c48b1..01137d8d9b 100644 --- a/gnu/packages/swig.scm +++ b/gnu/packages/swig.scm @@ -35,8 +35,9 @@ (version "3.0.5") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/swig/swig-" - version ".tar.gz")) + (uri (string-append "mirror://sourceforge/" name "/" name "/" + name "-" version "/" + name "-" version ".tar.gz")) (sha256 (base32 "0g1a69vrqxgsnr1wkx851ljn73a2x3jqzxa66s2l3w0kyblbjk4z")))) diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm index 993842339b..4cd94299df 100644 --- a/gnu/packages/tcl.scm +++ b/gnu/packages/tcl.scm @@ -227,8 +227,8 @@ interfaces (GUIs) in the Tcl language.") (version "1.18") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/" name "/" - name "-" version ".tar.gz")) + (uri (string-append "mirror://sourceforge/" name "/" name "/" + version "/" name "-" version ".tar.gz")) (sha256 (base32 "05dmrk9qsryah2n17z6z85dj9l9lfyvnsd7faw0p9bs1pp5pwrkj")))) @@ -252,8 +252,8 @@ utility functions and modules all written in high-level Tcl.") (version "3.2") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/" name "/" - name "-" version ".tar.gz")) + (uri (string-append "mirror://sourceforge/" name "/TclXML/" + version "/" name "-" version ".tar.gz")) (sha256 (base32 "0ffb4aw63inig3aql33g4pk0kjk14dv238anp1scwjdjh1k6n4gl")) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 61560d5fe7..58bcaad064 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -935,8 +935,8 @@ accessed and migrated on modern systems.") (version "4.24") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/aegis/aegis-" - version ".tar.gz")) + (uri (string-append "mirror://sourceforge/aegis/aegis/" version + "/aegis-" version ".tar.gz")) (sha256 (base32 "18s86ssarfmc4l17gbpzybca29m5wa37cbaimdji8czlcry3mcjl")) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index eb0fdba9e4..d36400c7f7 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -90,8 +90,8 @@ (version "1.4rc5") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/aa-project/" - name "-" version ".tar.gz")) + (uri (string-append "mirror://sourceforge/aa-project/aa-lib/" + version "/" name "-" version ".tar.gz")) (sha256 (base32 "1vkh19gb76agvh4h87ysbrgy82hrw88lnsvhynjf4vng629dmpgv")))) @@ -308,7 +308,8 @@ streams.") (source (origin (method url-fetch) (uri (string-append - "mirror://sourceforge/libdv/libdv-" version ".tar.gz")) + "mirror://sourceforge/" name "/" name "/" + version "/" name "-" version ".tar.gz")) (sha256 (base32 "1fl96f2xh2slkv1i1ix7kqk576a0ak1d33cylm0mbhm96d0761d3")))) @@ -1094,8 +1095,8 @@ for use with HTML5 video.") (source (origin (method url-fetch) (uri (string-append - "mirror://sourceforge/avidemux/avidemux_" - version ".tar.gz")) + "mirror://sourceforge/" name "/" name "/" version "/" + name "_" version ".tar.gz")) (sha256 (base32 "0nz52yih8sff53inndkh2dba759xjzsh4b8xjww419lcpk0qp6kn")) diff --git a/gnu/packages/w3m.scm b/gnu/packages/w3m.scm index 42141fb04d..e7dd583c11 100644 --- a/gnu/packages/w3m.scm +++ b/gnu/packages/w3m.scm @@ -37,8 +37,9 @@ (version "0.5.3") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/w3m/w3m-" - version ".tar.gz")) + (uri (string-append "mirror://sourceforge/" name "/" name "/" + name "-" version "/" + name "-" version ".tar.gz")) (sha256 (base32 "1qx9f0kprf92r1wxl3sacykla0g04qsi0idypzz24b7xy9ix5579")) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 5502a0fd3c..4a52422b16 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -636,7 +636,8 @@ of people.") (origin (method url-fetch) (uri (string-append - "mirror://sourceforge/quvi/libquvi-scripts-" version ".tar.xz")) + "mirror://sourceforge/quvi/" (version-major+minor version) "/" + name "/" name "-" version ".tar.xz")) (sha256 (base32 "0d0giry6bb57pnidymvdl7i5x9bq3ljk3g4bs294hcr5mj3cq0kw")))) (build-system gnu-build-system) @@ -654,7 +655,8 @@ parse media stream properties.") (origin (method url-fetch) (uri (string-append - "mirror://sourceforge/quvi/libquvi-" version ".tar.xz")) + "mirror://sourceforge/quvi/" (version-major+minor version) "/" name "/" + name "-" version ".tar.xz")) (sha256 (base32 "00x9gbmzc5cns0gnfag0hsphcr3cb33vbbb9s7ppvvd6bxz2z1mm")))) (build-system gnu-build-system) @@ -687,7 +689,8 @@ URLs and extracting their actual media files.") (origin (method url-fetch) (uri (string-append - "mirror://sourceforge/quvi/quvi-" version ".tar.xz")) + "mirror://sourceforge/" name "/" (version-major+minor version) + "/" name "/" name "-" version ".tar.xz")) (sha256 (base32 "09lhl6dv5zpryasx7yjslfrcdcqlsbwapvd5lg7w6sm5x5n3k8ci")))) (build-system gnu-build-system) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 790c74bbfd..2cc9f44cdc 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -336,7 +336,7 @@ drags, snap-to-border support, and virtual desktops.") (synopsis "Small and fast window manager") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/fluxbox/" + (uri (string-append "mirror://sourceforge/fluxbox/fluxbox/" version "/fluxbox-" version ".tar.xz")) (sha256 (base32 diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index 3231e3d48d..c9eb1780d6 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -88,8 +88,8 @@ and many other languages.") (source (origin (method url-fetch) - (uri (string-append - "mirror://sourceforge/wxwindows/wxGTK-" version ".tar.gz")) + (uri (string-append "mirror://sourceforge/wxwindows/" version + "/wxWidgets-" version ".tar.bz2")) (sha256 (base32 "1gjs9vfga60mk4j4ngiwsk9h6c7j22pw26m3asxr1jwvqbr8kkqk")))) (inputs diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 0e16f6bcb5..54545a807c 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -108,7 +108,8 @@ program.") (origin (method url-fetch) (uri (string-append - "mirror://sourceforge/" name "/" name "-" version ".tar.gz")) + "mirror://sourceforge/" name "/" name "/" version "/" + name "-" version ".tar.gz")) (sha256 (base32 "0ibcf46rldnv0r424qcnai1fa5iq3lm5q5rdd7snsi5sb78gmixp")))) @@ -584,8 +585,8 @@ X Window System.") (source (origin (method url-fetch) (uri (string-append - "mirror://sourceforge/libxosd/xosd-" - version ".tar.gz")) + "mirror://sourceforge/libxosd/libxosd/xosd-" version "/" + name "-" version ".tar.gz")) (sha256 (base32 "025m7ha89q29swkc7s38knnbn8ysl24g2h5s7imfxflm91psj7sg")))) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 6d91e1a1a7..af597b801a 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -693,7 +693,8 @@ UTF-8 and UTF-16 encoding.") (version "2.6.2") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/tinyxml/tinyxml_" + (uri (string-append "mirror://sourceforge/tinyxml/tinyxml/" + version "/tinyxml_" (string-join (string-split version #\.) "_") ".tar.gz")) (sha256 |