Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b3bacc34b0a8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 53a940431b2e
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 13, 2017

  1. audacity: delete dead patch 

    It was obsoleted by 2.2.0.
    @orivej
    orivej committed Nov 13, 2017
    Copy the full SHA
    737080f View commit details

  2. bashdb: 4.4-0.92 -> 4.4-0.94 

    Fixes broken source hash.
    @orivej
    orivej committed Nov 13, 2017
    Copy the full SHA
    53a9404 View commit details
Showing with 4 additions and 12 deletions.
  1. +1 −9 pkgs/applications/audio/audacity/default.nix
  2. +3 −3 pkgs/development/tools/misc/bashdb/default.nix
10 changes: 1 addition & 9 deletions pkgs/applications/audio/audacity/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, wxGTK30, pkgconfig, file, gettext, gtk2, glib, zlib, perl, intltool,
libogg, libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame, fetchpatch,
libogg, libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame,
expat, libid3tag, ffmpeg, soundtouch, /*, portaudio - given up fighting their portaudio.patch */
autoconf, automake, libtool
}:
@@ -14,14 +14,6 @@ stdenv.mkDerivation rec {
url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz";
sha256 = "09xpr4bjnainz1xmc35v3qg3dadjr9wv8bmn1p4y91aqyihnhjry";
};
patches = [
(fetchpatch {
name = "new-ffmpeg.patch";
url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk"
+ "/audacity-ffmpeg.patch?h=packages/audacity&id=0c1e35798d4d70692";
sha256 = "19fr674mw844zmkp1476yigkcnmb6zyn78av64ccdwi3p68i00rf";
})
];

preConfigure = /* we prefer system-wide libs */ ''
autoreconf -vi # use system libraries
6 changes: 3 additions & 3 deletions pkgs/development/tools/misc/bashdb/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, fetchurl }:

stdenv.mkDerivation rec {
name = "bashdb-4.4-0.92";
name = "bashdb-4.4-0.94";

src = fetchurl {
url = "mirror://sourceforge/bashdb/${name}.tar.bz2";
sha256 = "6a8c2655e04339b954731a0cb0d9910e2878e45b2fc08fe469b93e4f2dbaaf92";
sha256 = "01n0dml866sacls7q8h1c6mm4nc47lq3vrar9idmkajky71aycar";
};

meta = {
meta = {
description = "Bash script debugger";
homepage = http://bashdb.sourceforge.net/;
license = stdenv.lib.licenses.gpl2;