commit 6ea8d5ee71793e236a19af3b5686a1ccdb0af3da · pyrox.dev/nixpkgs

+1 -1

pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix

···

       1
       1
        
       { lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:

     

       2
       2
        
       stdenv.mkDerivation rec {

     

       3
       3
       -
         name = "faustCompressors-v${version}";

     

       3
       3
       +
         pname = "faustCompressors";

     

       4
       4
        
         version = "1.2";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchFromGitHub {

+3 -3

pkgs/applications/graphics/xournal/default.nix

···

       10
       10
        
       

     

       11
       11
        
       stdenv.mkDerivation rec {

     

       12
       12
        
         version = "0.4.8.2016";

     

       13
       13
       -
         name = "xournal-" + version;

     

       13
       13
       +
         pname = "xournal";

     

       14
       14
        
         src = fetchurl {

     

       15
       15
       -
           url = "mirror://sourceforge/xournal/${name}.tar.gz";

     

       15
       15
       +
           url = "mirror://sourceforge/xournal/xournal-${version}.tar.gz";

     

       16
       16
        
           sha256 = "09i88v3wacmx7f96dmq0l3afpyv95lh6jrx16xzm0jd1szdrhn5j";

     

       17
       17
        
         };

     

       18
       18
        
       

     
···

       30
       30
        
           + lib.optionalString (!isGdkQuartzBackend) " -lX11";

     

       31
       31
        
       

     

       32
       32
        
         desktopItem = makeDesktopItem {

     

       33
       33
       -
           name = name;

     

       33
       33
       +
           name = "xournal-${version}";

     

       34
       34
        
           exec = "xournal";

     

       35
       35
        
           icon = "xournal";

     

       36
       36
        
           desktopName = "Xournal";

+2 -4

pkgs/applications/misc/gosmore/default.nix

···

       1
       1
        
       { lib, stdenv, fetchsvn, libxml2, gtk2, curl, pkg-config } :

     

       2
       2
        
       

     

       3
       3
       -
       let

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         pname = "gosmore";

     

       4
       5
        
         version = "31801";

     

       5
       5
       -
       in

     

       6
       6
       -
       stdenv.mkDerivation {

     

       7
       7
       -
         name = "gosmore-r${version}";

     

       8
       6
        
         # the gosmore svn repository does not lock revision numbers of its externals

     

       9
       7
        
         # so we explicitly disable them to avoid breaking the hash

     

       10
       8
        
         # especially as the externals appear to be unused

+2 -2

pkgs/applications/misc/lighthouse/default.nix

···

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
       -
         name = "lighthouse-${date}";

     

       7
       7
       -
         date = "2016-07-20";

     

       6
       6
       +
         pname = "lighthouse";

     

       7
       7
       +
         version = "unstable-2016-07-20";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner = "emgram769";

+4 -4

pkgs/applications/misc/mucommander/default.nix

···

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         version = "0.9.3-3";

     

       5
       5
       -
         name = "mucommander-${version}";

     

       6
       5
        
       

     

       7
       6
        
         src = fetchFromGitHub {

     

       8
       7
        
           owner = "mucommander";

     
···

       34
       33
        
       

     

       35
       34
        
         # fake build to pre-download deps into fixed-output derivation

     

       36
       35
        
         deps = stdenv.mkDerivation {

     

       37
       37
       -
           name = "${name}-deps";

     

       38
       38
       -
           inherit src postPatch;

     

       36
       36
       +
           pname = "mucommander-deps";

     

       37
       37
       +
           inherit version src postPatch;

     

       39
       38
        
           nativeBuildInputs = [ gradle_6 perl ];

     

       40
       39
        
           buildPhase = ''

     

       41
       40
        
             export GRADLE_USER_HOME=$(mktemp -d)

     
···

       53
       52
        
         };

     

       54
       53
        
       

     

       55
       54
        
       in stdenv.mkDerivation {

     

       56
       56
       -
         inherit name src postPatch;

     

       55
       55
       +
         pname = "mucommander";

     

       56
       56
       +
         inherit version src postPatch;

     

       57
       57
        
         nativeBuildInputs = [ gradle_6 perl makeWrapper ];

     

       58
       58
        
       

     

       59
       59
        
         buildPhase = ''

+3 -5

pkgs/applications/misc/pdfdiff/default.nix

···

       1
       1
        
       { lib, python2Packages, fetchurl, xpdf }:

     

       2
       2
       -
       let

     

       3
       3
       -
         py = python2Packages;

     

       4
       4
       -
       in

     

       5
       5
       -
       py.buildPythonApplication rec {

     

       6
       6
       -
         name = "pdfdiff-${version}";

     

       2
       2
       +
       

     

       3
       3
       +
       python2Packages.buildPythonApplication rec {

     

       4
       4
       +
         pname = "pdfdiff";

     

       7
       5
        
         version = "0.92";

     

       8
       6
        
       

     

       9
       7
        
         src = fetchurl {

+3 -4

pkgs/applications/misc/pdfpc/default.nix

···

       3
       3
        
       , webkitgtk, discount, json-glib }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
       -
         name = "${product}-${version}";

     

       7
       7
       -
         product = "pdfpc";

     

       6
       6
       +
         pname = "pdfpc";

     

       8
       7
        
         version = "4.5.0";

     

       9
       8
        
       

     

       10
       9
        
         src = fetchFromGitHub {

     

       11
       11
       -
           repo = product;

     

       12
       12
       -
           owner = product;

     

       10
       10
       +
           repo = "pdfpc";

     

       11
       11
       +
           owner = "pdfpc";

     

       13
       12
        
           rev = "v${version}";

     

       14
       13
        
           sha256 = "0bmy51w6ypz927hxwp5g7wapqvzqmsi3w32rch6i3f94kg1152ck";

     

       15
       14
        
         };

+2 -3

pkgs/applications/misc/qmetro/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, qmake4Hook, unzip, qt4 }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "${project}-${version}";

     

       5
       5
       -
         project = "qmetro";

     

       4
       4
       +
         pname = "qmetro";

     

       6
       5
        
         version = "0.7.1";

     

       7
       6
        
       

     

       8
       7
        
         src = fetchurl {

     

       9
       9
       -
           url = "mirror://sourceforge/${project}/${name}.zip";

     

       8
       8
       +
           url = "mirror://sourceforge/qmetro/qmetro-${version}.zip";

     

       10
       9
        
           sha256 = "1zdj87lzcr43gr2h05g17z31pd22n5kxdwbvx7rx656rmhv0sjq5";

     

       11
       10
        
         };

     

       12
       11

+2 -4

pkgs/applications/misc/sleepyhead/default.nix

···

       1
       1
        
       { lib, stdenv, mkDerivation, fetchgit, zlib, libGLU, libX11, qtbase, qtwebkit, qtserialport, wrapQtAppsHook }:

     

       2
       2
        
       

     

       3
       3
       -
       let

     

       4
       4
       -
         name = "sleepyhead-${version}";

     

       3
       3
       +
       mkDerivation {

     

       4
       4
       +
         pname = "sleepyhead";

     

       5
       5
        
         version = "1.0.0-beta-git";

     

       6
       6
       -
       in mkDerivation {

     

       7
       7
       -
         inherit name;

     

       8
       6
        
       

     

       9
       7
        
         src = fetchgit {

     

       10
       8
        
           url = "https://gitlab.com/sleepyhead/sleepyhead-code.git";

+10 -21

pkgs/applications/misc/slmenu/default.nix

···

       1
       1
        
       {lib, stdenv, fetchhg}:

     

       2
       2
       -
       let

     

       3
       3
       -
         s =

     

       4
       4
       -
         rec {

     

       5
       5
       -
           baseName = "slmenu";

     

       6
       6
       -
           version = "hg-${date}";

     

       7
       7
       -
           date = "2012-02-01";

     

       8
       8
       -
           name = "${baseName}-${version}";

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation {

     

       4
       4
       +
         pname = "slmenu";

     

       5
       5
       +
         version = "hg-2012-02-01";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchhg {

     

       9
       8
        
           url = "https://bitbucket.org/rafaelgg/slmenu/";

     

       10
       9
        
           rev = "7e74fa5db73e8b018da48d50dbbaf11cb5c62d13";

     

       11
       10
        
           sha256 = "0zb7mm8344d3xmvrl62psazcabfk75pp083jqkmywdsrikgjagv6";

     

       12
       11
        
         };

     

       13
       13
       -
         buildInputs = [

     

       14
       14
       -
         ];

     

       15
       15
       -
       in

     

       16
       16
       -
       stdenv.mkDerivation {

     

       17
       17
       -
         inherit (s) name version;

     

       18
       18
       -
         inherit buildInputs;

     

       19
       19
       -
         src = fetchhg {

     

       20
       20
       -
           inherit (s) url sha256;

     

       21
       21
       -
         };

     

       22
       12
        
         makeFlags = [ "PREFIX=$(out)" ];

     

       23
       23
       -
         meta = {

     

       24
       24
       -
           inherit (s) version;

     

       13
       13
       +
         meta = with lib; {

     

       25
       14
        
           description = "A console dmenu-like tool";

     

       26
       26
       -
           license = lib.licenses.mit;

     

       27
       27
       -
           maintainers = [lib.maintainers.raskin];

     

       28
       28
       -
           platforms = lib.platforms.linux;

     

       15
       15
       +
           license = licenses.mit;

     

       16
       16
       +
           maintainers = with maintainers; [ raskin ];

     

       17
       17
       +
           platforms = platforms.linux;

     

       29
       18
        
         };

     

       30
       19
        
       }

+3 -3

pkgs/applications/misc/tuhi/default.nix

···

       13
       13
        
       }:

     

       14
       14
        
       

     

       15
       15
        
       python3Packages.buildPythonApplication rec {

     

       16
       16
       -
         name = "tuhi";

     

       16
       16
       +
         pname = "tuhi";

     

       17
       17
        
         version = "0.5";

     

       18
       18
        
       

     

       19
       19
        
         format = "other";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchFromGitHub {

     

       22
       22
        
           owner = "tuhiproject";

     

       23
       23
       -
           repo = name;

     

       24
       24
       -
           rev = "${version}";

     

       23
       23
       +
           repo = "tuhi";

     

       24
       24
       +
           rev = version;

     

       25
       25
        
           sha256 = "17kggm9c423vj7irxx248fjc8sxvkp9w1mgawlx1snrii817p3db";

     

       26
       26
        
         };

     

       27
       27

+5 -5

pkgs/applications/misc/urlview/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, ncurses, autoreconfHook }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         version    = "0.9";

     

       4
       4
       +
         pname = "urlview";

     

       5
       5
       +
         _version    = "0.9";

     

       5
       6
        
         patchLevel = "19";

     

       6
       6
       -
       

     

       7
       7
       -
         name = "urlview-${version}-${patchLevel}";

     

       7
       7
       +
         version = "${_version}-${patchLevel}";

     

       8
       8
        
       

     

       9
       9
        
         urlBase = "mirror://debian/pool/main/u/urlview/";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchurl {

     

       12
       12
       -
           url = urlBase + "urlview_${version}.orig.tar.gz";

     

       12
       12
       +
           url = urlBase + "urlview_${_version}.orig.tar.gz";

     

       13
       13
        
           sha256 = "746ff540ccf601645f500ee7743f443caf987d6380e61e5249fc15f7a455ed42";

     

       14
       14
        
         };

     

       15
       15
        
       

     
···

       25
       25
        
         '';

     

       26
       26
        
       

     

       27
       27
        
         debianPatches = fetchurl {

     

       28
       28
       -
           url = urlBase + "urlview_${version}-${patchLevel}.diff.gz";

     

       28
       28
       +
           url = urlBase + "urlview_${_version}-${patchLevel}.diff.gz";

     

       29
       29
        
           sha256 = "056883c17756f849fb9235596d274fbc5bc0d944fcc072bdbb13d1e828301585";

     

       30
       30
        
         };

     

       31
       31

+1 -1

pkgs/applications/misc/xmr-stak/default.nix

···

       11
       11
        
       in

     

       12
       12
        
       

     

       13
       13
        
       stdenv'.mkDerivation rec {

     

       14
       14
       -
         name = "xmr-stak-${version}";

     

       14
       14
       +
         pname = "xmr-stak";

     

       15
       15
        
         version = "2.10.8";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchFromGitHub {

+3 -3

pkgs/applications/misc/zscroll/default.nix

···

       1
       1
        
       { lib, python3, python3Packages, fetchFromGitHub }:

     

       2
       2
        
       

     

       3
       3
       -
       let version = "1.0"; in

     

       3
       3
       +
       python3Packages.buildPythonApplication rec {

     

       4
       4
       +
         pname = "zscroll";

     

       5
       5
       +
         version = "1.0";

     

       4
       6
        
       

     

       5
       5
       -
       python3Packages.buildPythonApplication {

     

       6
       6
       -
         name = "zscroll-${version}";

     

       7
       7
        
         # don't prefix with python version

     

       8
       8
        
         namePrefix = "";

     

       9
       9

+6 -6

pkgs/applications/networking/p2p/frostwire/default.nix

···

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         version = "6.6.7-build-529";

     

       5
       5
       -
         name = "frostwire-desktop-${version}";

     

       6
       5
        
       

     

       7
       6
        
         src = fetchFromGitHub {

     

       8
       7
        
           owner = "frostwire";

     

       9
       8
        
           repo = "frostwire";

     

       10
       10
       -
           rev = name;

     

       9
       9
       +
           rev = "frostwire-desktop-${version}";

     

       11
       10
        
           sha256 = "03wdj2kr8akzx8m1scvg98132zbaxh81qjdsxn2645b3gahjwz0m";

     

       12
       11
        
         };

     

       13
       12
        
       

     
···

       23
       22
        
       

     

       24
       23
        
         # fake build to pre-download deps into fixed-output derivation

     

       25
       24
        
         deps = stdenv.mkDerivation {

     

       26
       26
       -
           name = "${name}-deps";

     

       27
       27
       -
           inherit src;

     

       25
       25
       +
           pname = "frostwire-desktop-deps";

     

       26
       26
       +
           inherit version src;

     

       28
       27
        
           buildInputs = [ gradle_6 perl ];

     

       29
       28
        
           buildPhase = ''

     

       30
       29
        
             export GRADLE_USER_HOME=$(mktemp -d)

     
···

       40
       39
        
           '';

     

       41
       40
        
           outputHashAlgo = "sha256";

     

       42
       41
        
           outputHashMode = "recursive";

     

       43
       43
       -
           outputHash = "11zd98g0d0fdgls4lsskkagwfxyh26spfd6c6g9cahl89czvlg3c";

     

       42
       42
       +
           outputHash = "sha256-r6YSrbSJbM3063JrX4tCVKFrJxTaLN4Trc+33jzpwcE=";

     

       44
       43
        
         };

     

       45
       44
        
       

     

       46
       45
        
       in stdenv.mkDerivation {

     

       47
       47
       -
         inherit name src;

     

       46
       46
       +
         pname = "frostwire-desktop";

     

       47
       47
       +
         inherit version src;

     

       48
       48
        
       

     

       49
       49
        
         nativeBuildInputs = [ makeWrapper ];

     

       50
       50
        
         buildInputs = [ gradle_6 ];

+2 -1

pkgs/applications/networking/remote/vmware-horizon-client/default.nix

···

       115
       115
        
       

     

       116
       116
        
       in

     

       117
       117
        
       stdenv.mkDerivation {

     

       118
       118
       -
         name = "vmware-horizon-client";

     

       118
       118
       +
         pname = "vmware-horizon-client";

     

       119
       119
       +
         inherit version;

     

       119
       120
        
       

     

       120
       121
        
         dontUnpack = true;

     

       121
       122

+6 -6

pkgs/applications/office/jameica/default.nix

···

       4
       4
        
         _version = "2.10.1";

     

       5
       5
        
         _build = "482";

     

       6
       6
        
         version = "${_version}-${_build}";

     

       7
       7
       -
         name = "jameica-${version}";

     

       8
       7
        
       

     

       9
       8
        
         swtSystem = if stdenv.hostPlatform.system == "i686-linux" then "linux"

     

       10
       9
        
         else if stdenv.hostPlatform.system == "x86_64-linux" then "linux64"

     
···

       22
       21
        
         };

     

       23
       22
        
       in

     

       24
       23
        
       stdenv.mkDerivation rec {

     

       25
       25
       -
         inherit name version;

     

       24
       24
       +
         pname = "jameica";

     

       25
       25
       +
         inherit version;

     

       26
       26
        
       

     

       27
       27
        
         nativeBuildInputs = [ ant jdk makeWrapper ];

     

       28
       28
        
         buildInputs = lib.optionals stdenv.isLinux [ gtk2 glib xorg.libXtst ]

     
···

       42
       42
        
         '';

     

       43
       43
        
       

     

       44
       44
        
         installPhase = ''

     

       45
       45
       -
           mkdir -p $out/libexec $out/lib $out/bin $out/share/{applications,${name},java}/

     

       45
       45
       +
           mkdir -p $out/libexec $out/lib $out/bin $out/share/{applications,jameica-${version},java}/

     

       46
       46
        
       

     

       47
       47
        
           # copy libraries except SWT

     

       48
       48
       -
           cp $(find lib -type f -iname '*.jar' | grep -ve 'swt/.*/swt.jar') $out/share/${name}/

     

       48
       48
       +
           cp $(find lib -type f -iname '*.jar' | grep -ve 'swt/.*/swt.jar') $out/share/jameica-${version}/

     

       49
       49
        
           # copy platform-specific SWT

     

       50
       50
       -
           cp lib/swt/${swtSystem}/swt.jar $out/share/${name}/

     

       50
       50
       +
           cp lib/swt/${swtSystem}/swt.jar $out/share/jameica-${version}/

     

       51
       51
        
       

     

       52
       52
        
           install -Dm644 releases/${_version}-*/jameica/jameica.jar $out/share/java/

     

       53
       53
        
           install -Dm644 plugin.xml $out/share/java/

     
···

       55
       55
        
           cp ${desktopItem}/share/applications/* $out/share/applications/

     

       56
       56
        
       

     

       57
       57
        
           makeWrapper ${jre}/bin/java $out/bin/jameica \

     

       58
       58
       -
             --add-flags "-cp $out/share/java/jameica.jar:$out/share/${name}/* ${

     

       58
       58
       +
             --add-flags "-cp $out/share/java/jameica.jar:$out/share/jameica-${version}/* ${

     

       59
       59
        
               lib.optionalString stdenv.isDarwin ''-Xdock:name="Jameica" -XstartOnFirstThread''

     

       60
       60
        
             } de.willuhn.jameica.Main" \

     

       61
       61
        
             --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath buildInputs} \

+1 -1

pkgs/applications/radio/rtl-ais/default.nix

···

       1
       1
        
       { lib, stdenv, fetchFromGitHub, pkg-config, libusb1, rtl-sdr }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
       -
         name = "rtl-ais";

     

       4
       4
       +
         pname = "rtl-ais";

     

       5
       5
        
         version = "0.8.1";

     

       6
       6
        
         buildInputs = [ pkg-config rtl-sdr libusb1 ];

     

       7
       7

+1 -1

pkgs/applications/radio/sdrplay/default.nix

···

       4
       4
        
           else if stdenv.isi686    then "i686"

     

       5
       5
        
           else throw "unsupported architecture";

     

       6
       6
        
       in stdenv.mkDerivation rec {

     

       7
       7
       -
         name = "sdrplay";

     

       7
       7
       +
         pname = "sdrplay";

     

       8
       8
        
         version = "3.07.1";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchurl {

+2 -2

pkgs/applications/radio/soapysdrplay/default.nix

···

       1
       1
        
       { stdenv, lib, fetchFromGitHub, cmake, pkg-config, soapysdr, sdrplay }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
       -
         name = "soapysdr-sdrplay3";

     

       5
       5
       -
         version = "20210425";

     

       4
       4
       +
         pname = "soapysdr-sdrplay3";

     

       5
       5
       +
         version = "unstable-2021-04-25";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "pothosware";

+3 -3

pkgs/applications/radio/soundmodem/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, pkg-config, alsa-lib, audiofile, gtk2, libxml2 }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "soundmodem";

     

       4
       4
       +
         pname = "soundmodem";

     

       5
       5
        
         version = "0.20";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
       -
           url = "https://archive.org/download/${name}-${version}/${name}-${version}.tar.gz";

     

       8
       8
       +
           url = "https://archive.org/download/soundmodem-${version}/soundmodem-${version}.tar.gz";

     

       9
       9
        
           sha256 = "156l3wjnh5rcisxb42kcmlf74swf679v4xnj09zy5j74rd4h721z";

     

       10
       10
        
         };

     

       11
       11
        
       

     
···

       28
       28
        
           '';

     

       29
       29
        
           #homepage = "http://gna.org/projects/soundmodem"; # official, but "Connection refused"

     

       30
       30
        
           homepage = "http://soundmodem.vk4msl.id.au/";

     

       31
       31
       -
           downloadPage = "https://archive.org/download/${name}-${version}/${name}-${version}.tar.gz";

     

       31
       31
       +
           downloadPage = "https://archive.org/download/${pname}-${version}/${pname}-${version}.tar.gz";

     

       32
       32
        
           license = licenses.gpl2Only;

     

       33
       33
        
           maintainers = with maintainers; [ ymarkus ];

     

       34
       34
        
           platforms = platforms.all;

+3 -3

pkgs/applications/science/biology/ncbi-tools/default.nix

···

       8
       8
        
       # Another note: you may want the older and deprecated C-libs at ftp://ftp.ncbi.nih.gov/toolbox/ncbi_tools++/2008/Mar_17_2008/NCBI_C_Toolkit/ncbi_c--Mar_17_2008.tar.gz

     

       9
       9
        
       

     

       10
       10
        
       stdenv.mkDerivation rec {

     

       11
       11
       -
         name = "ncbi_tools";

     

       12
       12
       -
         ncbi_version = "Dec_31_2008";

     

       11
       11
       +
         pname = "ncbi_tools";

     

       12
       12
       +
         version = "Dec_31_2008";

     

       13
       13
        
         src = fetchurl {

     

       14
       14
       -
           url = "ftp://ftp.ncbi.nih.gov/toolbox/ncbi_tools++/2008/${ncbi_version}/ncbi_cxx--${ncbi_version}.tar.gz";

     

       14
       14
       +
           url = "ftp://ftp.ncbi.nih.gov/toolbox/ncbi_tools++/2008/${version}/ncbi_cxx--${version}.tar.gz";

     

       15
       15
        
           sha256 = "1b2v0dcdqn3bysgdkj57sxmd6s0hc9wpnxssviz399g6plhxggbr";

     

       16
       16
        
         };

     

       17
       17

+4 -8

pkgs/applications/science/electronics/xcircuit/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, autoreconfHook, automake, pkg-config

     

       2
       2
        
       , cairo, ghostscript, ngspice, tcl, tk, xorg, zlib }:

     

       3
       3
        
       

     

       4
       4
       -
       let

     

       4
       4
       +
       stdenv.mkDerivation rec {

     

       5
       5
        
         version = "3.10.12";

     

       6
       6
       -
         name = "xcircuit-${version}";

     

       7
       7
       -
         inherit (lib) getBin;

     

       8
       8
       -
       

     

       9
       9
       -
       in stdenv.mkDerivation {

     

       10
       10
       -
         inherit name version;

     

       6
       6
       +
         pname = "xcircuit";

     

       11
       7
        
       

     

       12
       8
        
         src = fetchurl {

     

       13
       13
       -
           url = "http://opencircuitdesign.com/xcircuit/archive/${name}.tgz";

     

       9
       9
       +
           url = "http://opencircuitdesign.com/xcircuit/archive/xcircuit-${version}.tgz";

     

       14
       10
        
           sha256 = "1h1ywc3mr7plvwnhdii2zgnnv5ih2nhyl4qbdjpi83dq0aq1s2mn";

     

       15
       11
        
         };

     

       16
       12
        
       

     
···

       20
       16
        
         configureFlags = [

     

       21
       17
        
           "--with-tcl=${tcl}/lib"

     

       22
       18
        
           "--with-tk=${tk}/lib"

     

       23
       23
       -
           "--with-ngspice=${getBin ngspice}/bin/ngspice"

     

       19
       19
       +
           "--with-ngspice=${lib.getBin ngspice}/bin/ngspice"

     

       24
       20
        
         ];

     

       25
       21
        
       

     

       26
       22
        
         buildInputs = with xorg; [ cairo ghostscript libSM libXt libICE libX11 libXpm tcl tk zlib ];

+1 -1

pkgs/applications/science/logic/z3/4.4.0.nix

···

       1
       1
        
       { lib, stdenv, fetchFromGitHub, python }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "z3-${version}";

     

       4
       4
       +
         pname = "z3";

     

       5
       5
        
         version = "4.4.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

+3 -6

pkgs/applications/science/math/fricas/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, sbcl, libX11, libXpm, libICE, libSM, libXt, libXau, libXdmcp }:

     

       2
       2
        
       

     

       3
       3
       -
       let

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         pname = "fricas";

     

       4
       5
        
         version = "1.3.7";

     

       5
       5
       -
         name = "fricas-" + version;

     

       6
       6
       -
       in

     

       7
       7
       -
       stdenv.mkDerivation {

     

       8
       8
       -
         inherit name;

     

       9
       6
        
       

     

       10
       7
        
         src = fetchurl {

     

       11
       11
       -
           url = "mirror://sourceforge/fricas/fricas/${version}/${name}-full.tar.bz2";

     

       8
       8
       +
           url = "mirror://sourceforge/fricas/fricas/${version}/fricas-${version}-full.tar.bz2";

     

       12
       9
        
           sha256 = "sha256-cOqMvSe3ef/ZeVy5cj/VU/aTRtxgfxZfRbE4lWE5TU4=";

     

       13
       10
        
         };

     

       14
       11

+17 -20

pkgs/applications/science/math/scilab-bin/default.nix

···

       1
       1
        
       { stdenv, fetchurl, lib, xorg }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
       -
         name = "scilab-bin-${ver}";

     

       5
       5
       -
       

     

       6
       6
       -
         ver = "6.1.1";

     

       7
       7
       -
       

     

       8
       8
       -
         badArch = throw "${name} requires i686-linux or x86_64-linux";

     

       4
       4
       +
         badArch = throw "scilab-bin requires i686-linux or x86_64-linux";

     

       9
       5
        
       

     

       10
       6
        
         architecture =

     

       11
       7
        
           if stdenv.hostPlatform.system == "i686-linux" then

     
···

       15
       11
        
           else

     

       16
       12
        
             badArch;

     

       17
       13
        
       in

     

       18
       18
       -
       stdenv.mkDerivation {

     

       19
       19
       -
         inherit name;

     

       14
       14
       +
       stdenv.mkDerivation rec {

     

       15
       15
       +
         pname = "scilab-bin";

     

       16
       16
       +
         version = "6.1.1";

     

       20
       17
        
       

     

       21
       18
        
         src = fetchurl {

     

       22
       22
       -
           url = "https://www.scilab.org/download/${ver}/scilab-${ver}.bin.linux-${architecture}.tar.gz";

     

       19
       19
       +
           url = "https://www.scilab.org/download/${version}/scilab-${version}.bin.linux-${architecture}.tar.gz";

     

       23
       20
        
           sha256 =

     

       24
       21
        
             if stdenv.hostPlatform.system == "i686-linux" then

     

       25
       22
        
               "0fgjc2ak3b2qi6yin3fy50qwk2bcj0zbz1h4lyyic9n1n1qcliib"

     
···

       43
       40
        
           sed -i 's|\$(/bin/|$(|g' bin/scilab

     

       44
       41
        
           sed -i 's|/usr/bin/||g' bin/scilab

     

       45
       42
        
       

     

       46
       46
       -
           sci="$out/opt/scilab-${ver}"

     

       43
       43
       +
           sci="$out/opt/scilab-${version}"

     

       47
       44
        
           fullLibPath="$sci/lib/scilab:$sci/lib/thirdparty:$libPath"

     

       48
       45
        
           fullLibPath="$fullLibPath:$sci/lib/thirdparty/redist"

     

       49
       46
        
       

     
···

       55
       52
        
         '';

     

       56
       53
        
       

     

       57
       54
        
         installPhase = ''

     

       58
       58
       -
           mkdir -p "$out/opt/scilab-${ver}"

     

       59
       59
       -
           cp -r . "$out/opt/scilab-${ver}/"

     

       55
       55
       +
           mkdir -p "$out/opt/scilab-${version}"

     

       56
       56
       +
           cp -r . "$out/opt/scilab-${version}/"

     

       60
       57
        
       

     

       61
       58
        
           # Create bin/ dir

     

       62
       59
        
           mkdir "$out/bin"

     

       63
       60
        
       

     

       64
       61
        
           # Creating executable symlinks

     

       65
       65
       -
           ln -s "$out/opt/scilab-${ver}/bin/scilab" "$out/bin/scilab"

     

       66
       66
       -
           ln -s "$out/opt/scilab-${ver}/bin/scilab-cli" "$out/bin/scilab-cli"

     

       67
       67
       -
           ln -s "$out/opt/scilab-${ver}/bin/scilab-adv-cli" "$out/bin/scilab-adv-cli"

     

       62
       62
       +
           ln -s "$out/opt/scilab-${version}/bin/scilab" "$out/bin/scilab"

     

       63
       63
       +
           ln -s "$out/opt/scilab-${version}/bin/scilab-cli" "$out/bin/scilab-cli"

     

       64
       64
       +
           ln -s "$out/opt/scilab-${version}/bin/scilab-adv-cli" "$out/bin/scilab-adv-cli"

     

       68
       65
        
       

     

       69
       66
        
           # Creating desktop config dir

     

       70
       67
        
           mkdir -p "$out/share/applications"

     

       71
       68
        
       

     

       72
       69
        
           # Moving desktop config files

     

       73
       73
       -
           mv $out/opt/scilab-${ver}/share/applications/*.desktop $out/share/applications

     

       70
       70
       +
           mv $out/opt/scilab-${version}/share/applications/*.desktop $out/share/applications

     

       74
       71
        
       

     

       75
       72
        
           # Fixing Exec paths and launching each app with a terminal

     

       76
       76
       -
           sed -i -e "s|Exec=|Exec=$out/opt/scilab-${ver}/bin/|g" \

     

       73
       73
       +
           sed -i -e "s|Exec=|Exec=$out/opt/scilab-${version}/bin/|g" \

     

       77
       74
        
                  -e "s|Terminal=.*$|Terminal=true|g" $out/share/applications/*.desktop

     

       78
       75
        
       

     

       79
       76
        
           # Moving icons to the appropriate locations

     

       80
       80
       -
           for path in $out/opt/scilab-${ver}/share/icons/hicolor/*/*/*

     

       77
       77
       +
           for path in $out/opt/scilab-${version}/share/icons/hicolor/*/*/*

     

       81
       78
        
           do

     

       82
       82
       -
             newpath=$(echo $path | sed 's|/opt/scilab-${ver}||g')

     

       79
       79
       +
             newpath=$(echo $path | sed 's|/opt/scilab-${version}||g')

     

       83
       80
        
             filename=$(echo $path | sed 's|.*/||g')

     

       84
       81
        
             dir=$(echo $newpath | sed "s|$filename||g")

     

       85
       82
        
             mkdir -p $dir

     
···

       87
       84
        
           done

     

       88
       85
        
       

     

       89
       86
        
           # Removing emptied folders

     

       90
       90
       -
           rm -rf $out/opt/scilab-${ver}/share/{applications,icons}

     

       87
       87
       +
           rm -rf $out/opt/scilab-${version}/share/{applications,icons}

     

       91
       88
        
       

     

       92
       89
        
           # Moving other share/ folders

     

       93
       93
       -
           mv $out/opt/scilab-${ver}/share/{appdata,locale,mime} $out/share

     

       90
       90
       +
           mv $out/opt/scilab-${version}/share/{appdata,locale,mime} $out/share

     

       94
       91
        
         '';

     

       95
       92
        
       

     

       96
       93
        
         meta = {

+2 -5

pkgs/applications/science/misc/fityk/default.nix

···

       1
       1
        
       { lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, boost, lua, zlib, bzip2

     

       2
       2
        
       , xylib, readline, gnuplot, swig3 }:

     

       3
       3
        
       

     

       4
       4
       -
       let

     

       5
       5
       -
         name    = "fityk";

     

       4
       4
       +
       stdenv.mkDerivation rec {

     

       5
       5
       +
         pname = "fityk";

     

       6
       6
        
         version = "1.3.1";

     

       7
       7
       -
       in

     

       8
       8
       -
       stdenv.mkDerivation {

     

       9
       9
       -
         name = "${name}-${version}";

     

       10
       7
        
       

     

       11
       8
        
         src = fetchFromGitHub {

     

       12
       9
        
           owner = "wojdyr";

+1 -1

pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix

···

       1
       1
        
       { lib, stdenv, fetchFromGitHub, xrdb, xlsfonts }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "urxvt-font-size";

     

       4
       4
       +
         pname = "urxvt-font-size";

     

       5
       5
        
         version = "1.3";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

+2 -1

pkgs/applications/terminal-emulators/termonad/default.nix

···

       3
       3
        
       let

     

       4
       4
        
         termonadEnv = haskellPackages.ghcWithPackages (self: [ self.termonad ] ++ packages self);

     

       5
       5
        
       in stdenv.mkDerivation {

     

       6
       6
       -
         name = "termonad-with-packages-${termonadEnv.version}";

     

       6
       6
       +
         pname = "termonad-with-packages";

     

       7
       7
       +
         inherit (termonadEnv) version;

     

       7
       8
        
       

     

       8
       9
        
         nativeBuildInputs = [ makeWrapper ];

     

       9
       10

+35 -39

pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, jre, makeWrapper }:

     

       2
       2
        
       

     

       3
       3
       -
       let

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         pname = "bfg-repo-cleaner";

     

       4
       5
        
         version = "1.13.0";

     

       6
       6
       +
       

     

       5
       7
        
         jarName = "bfg-${version}.jar";

     

       6
       6
       -
         mavenUrl = "mirror://maven/com/madgag/bfg/${version}/${jarName}";

     

       7
       7
       -
       in

     

       8
       8
       -
         stdenv.mkDerivation {

     

       9
       9
       -
           inherit version jarName;

     

       10
       8
        
       

     

       11
       11
       -
           name = "bfg-repo-cleaner-${version}";

     

       9
       9
       +
         src = fetchurl {

     

       10
       10
       +
           url = "mirror://maven/com/madgag/bfg/${version}/${jarName}";

     

       11
       11
       +
           sha256 = "1kn84rsvms1v5l1j2xgrk7dc7mnsmxkc6sqd94mnim22vnwvl8mz";

     

       12
       12
       +
         };

     

       12
       13
        
       

     

       13
       13
       -
           src = fetchurl {

     

       14
       14
       -
             url = mavenUrl;

     

       15
       15
       -
             sha256 = "1kn84rsvms1v5l1j2xgrk7dc7mnsmxkc6sqd94mnim22vnwvl8mz";

     

       16
       16
       -
           };

     

       14
       14
       +
         nativeBuildInputs = [ makeWrapper ];

     

       15
       15
       +
         buildInputs = [ jre ];

     

       17
       16
        
       

     

       18
       18
       -
           nativeBuildInputs = [ makeWrapper ];

     

       19
       19
       -
           buildInputs = [ jre ];

     

       20
       20
       -
       

     

       21
       21
       -
           dontUnpack = true;

     

       17
       17
       +
         dontUnpack = true;

     

       22
       18
        
       

     

       23
       23
       -
           installPhase = ''

     

       24
       24
       -
             mkdir -p $out/share/java

     

       25
       25
       -
             mkdir -p $out/bin

     

       26
       26
       -
             cp $src $out/share/java/$jarName

     

       27
       27
       -
             makeWrapper "${jre}/bin/java" $out/bin/bfg --add-flags "-cp $out/share/java/$jarName com.madgag.git.bfg.cli.Main"

     

       28
       28
       -
           '';

     

       19
       19
       +
         installPhase = ''

     

       20
       20
       +
           mkdir -p $out/share/java

     

       21
       21
       +
           mkdir -p $out/bin

     

       22
       22
       +
           cp $src $out/share/java/$jarName

     

       23
       23
       +
           makeWrapper "${jre}/bin/java" $out/bin/bfg --add-flags "-cp $out/share/java/$jarName com.madgag.git.bfg.cli.Main"

     

       24
       24
       +
         '';

     

       29
       25
        
       

     

       30
       30
       -
           meta = with lib; {

     

       31
       31
       -
             homepage = "https://rtyley.github.io/bfg-repo-cleaner/";

     

       32
       32
       -
             # Descriptions taken with minor modification from the homepage of bfg-repo-cleaner

     

       33
       33
       -
             description = "Removes large or troublesome blobs in a git repository like git-filter-branch does, but faster";

     

       34
       34
       -
             longDescription = ''

     

       35
       35
       -
               The BFG is a simpler, faster alternative to git-filter-branch for

     

       36
       36
       -
               cleansing bad data out of your Git repository history, in particular removing

     

       37
       37
       -
               crazy big files and removing passwords, credentials, and other private data.

     

       26
       26
       +
         meta = with lib; {

     

       27
       27
       +
           homepage = "https://rtyley.github.io/bfg-repo-cleaner/";

     

       28
       28
       +
           # Descriptions taken with minor modification from the homepage of bfg-repo-cleaner

     

       29
       29
       +
           description = "Removes large or troublesome blobs in a git repository like git-filter-branch does, but faster";

     

       30
       30
       +
           longDescription = ''

     

       31
       31
       +
             The BFG is a simpler, faster alternative to git-filter-branch for

     

       32
       32
       +
             cleansing bad data out of your Git repository history, in particular removing

     

       33
       33
       +
             crazy big files and removing passwords, credentials, and other private data.

     

       38
       34
        
       

     

       39
       39
       -
               The git-filter-branch command is enormously powerful and can do things

     

       40
       40
       -
               that the BFG can't - but the BFG is much better for the tasks above, because

     

       41
       41
       -
               it's faster (10-720x), simpler (dedicated to just removing things), and

     

       42
       42
       -
               beautiful (can use Scala instead of bash to script customizations).

     

       43
       43
       -
             '';

     

       44
       44
       -
             license = licenses.gpl3;

     

       45
       45
       -
             maintainers = [ maintainers.changlinli ];

     

       46
       46
       -
             platforms = platforms.unix;

     

       47
       47
       -
             downloadPage = "https://mvnrepository.com/artifact/com.madgag/bfg/${version}";

     

       48
       48
       -
           };

     

       35
       35
       +
             The git-filter-branch command is enormously powerful and can do things

     

       36
       36
       +
             that the BFG can't - but the BFG is much better for the tasks above, because

     

       37
       37
       +
             it's faster (10-720x), simpler (dedicated to just removing things), and

     

       38
       38
       +
             beautiful (can use Scala instead of bash to script customizations).

     

       39
       39
       +
           '';

     

       40
       40
       +
           license = licenses.gpl3;

     

       41
       41
       +
           maintainers = [ maintainers.changlinli ];

     

       42
       42
       +
           platforms = platforms.unix;

     

       43
       43
       +
           downloadPage = "https://mvnrepository.com/artifact/com.madgag/bfg/${version}";

     

       44
       44
       +
         };

     

       49
       45
        
       

     

       50
       50
       -
         }

     

       46
       46
       +
       }

+3 -6

pkgs/applications/version-management/git-and-tools/git-secret/default.nix

···

       1
       1
        
       { stdenv, lib, fetchFromGitHub, makeWrapper, git, gnupg, gawk }:

     

       2
       2
        
       

     

       3
       3
       -
       let

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         pname = "git-secret";

     

       4
       5
        
         version = "0.4.0";

     

       5
       5
       -
         repo = "git-secret";

     

       6
       6
       -
       

     

       7
       7
       -
       in stdenv.mkDerivation {

     

       8
       8
       -
         name = "${repo}-${version}";

     

       9
       6
        
       

     

       10
       7
        
         src = fetchFromGitHub {

     

       11
       11
       -
           inherit repo;

     

       8
       8
       +
           repo = "git-secret";

     

       12
       9
        
           owner = "sobolevn";

     

       13
       10
        
           rev = "v${version}";

     

       14
       11
        
           sha256 = "sha256-Mtuj+e/yCDr4XkmYkWUFJB3cqOT5yOMOq9P/QJV1S80=";

+2 -1

pkgs/applications/video/p2pvc/default.nix

···

       1
       1
        
       { lib, stdenv, pkg-config, fetchFromGitHub, opencv2, ncurses, portaudio }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
       -
         name = "p2pvc";

     

       4
       4
       +
         pname = "p2pvc";

     

       5
       5
       +
         version = "unstable-2015-02-12";

     

       5
       6
        
       

     

       6
       7
        
         nativeBuildInputs = [ pkg-config ];

     

       7
       8
        
         buildInputs = [ opencv2 ncurses portaudio ];

+2 -1

pkgs/applications/virtualization/OVMF/default.nix

···

       22
       22
        
       in

     

       23
       23
        
       

     

       24
       24
        
       edk2.mkDerivation projectDscPath {

     

       25
       25
       -
         name = "OVMF-${version}";

     

       25
       25
       +
         pname = "OVMF";

     

       26
       26
       +
         inherit version;

     

       26
       27
        
       

     

       27
       28
        
         outputs = [ "out" "fd" ];

     

       28
       29

+3 -3

pkgs/applications/virtualization/docker/gc.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
       -
         name = "docker-gc-${rev}";

     

       7
       7
       -
         rev = "b0cc52aa3da2e2ac0080794e0be6e674b1f063fc";

     

       6
       6
       +
         pname = "docker-gc";

     

       7
       7
       +
         version = "unstable-2015-10-5";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
       -
           inherit rev;

     

       11
       10
        
           owner = "spotify";

     

       12
       11
        
           repo = "docker-gc";

     

       12
       12
       +
           rev = "b0cc52aa3da2e2ac0080794e0be6e674b1f063fc";

     

       13
       13
        
           sha256 = "07wf9yn0f771xkm3x12946x5rp83hxjkd70xgfgy35zvj27wskzm";

     

       14
       14
        
         };

     

       15
       15

+3 -3

pkgs/applications/virtualization/docker/proxy.nix

···

       1
       1
        
       { lib, buildGoPackage, fetchFromGitHub }:

     

       2
       2
        
       

     

       3
       3
        
       buildGoPackage rec {

     

       4
       4
       -
         name = "docker-proxy-${rev}";

     

       5
       5
       -
         rev = "fa125a3512ee0f6187721c88582bf8c4378bd4d7";

     

       4
       4
       +
         pname = "docker-proxy";

     

       5
       5
       +
         version = "unstable-2020-12-15";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
       -
           inherit rev;

     

       9
       8
        
           owner = "docker";

     

       10
       9
        
           repo = "libnetwork";

     

       10
       10
       +
           rev = "fa125a3512ee0f6187721c88582bf8c4378bd4d7";

     

       11
       11
        
           sha256 = "1r47y0gww3j7fas4kgiqbhrz5fazsx1c6sxnccdfhj8fzik77s9y";

     

       12
       12
        
         };

     

       13
       13

+2 -2

pkgs/applications/virtualization/gvisor/containerd-shim.nix

···

       1
       1
        
       { lib, fetchFromGitHub, buildGoModule }:

     

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
       -
         name = "gvisor-containerd-shim-${version}";

     

       5
       5
       -
         version = "2019-10-09";

     

       4
       4
       +
         pname = "gvisor-containerd-shim";

     

       5
       5
       +
         version = "unstable-2019-10-09";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner  = "google";

+1 -1

pkgs/applications/virtualization/gvisor/default.nix

···

       52
       52
        
         };

     

       53
       53
        
       

     

       54
       54
        
       in buildBazelPackage rec {

     

       55
       55
       -
         name = "gvisor-${version}";

     

       55
       55
       +
         pname = "gvisor";

     

       56
       56
        
         version = "20210518.0";

     

       57
       57
        
       

     

       58
       58
        
         src = fetchFromGitHub {

+2 -2

pkgs/applications/virtualization/qemu/utils.nix

···

       1
       1
        
       { stdenv, installShellFiles, qemu }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "qemu-utils-${version}";

     

       5
       5
       -
         version = qemu.version;

     

       4
       4
       +
         pname = "qemu-utils";

     

       5
       5
       +
         inherit (qemu) version;

     

       6
       6
        
       

     

       7
       7
        
         nativeBuildInputs = [ installShellFiles ];

     

       8
       8
        
         buildInputs = [ qemu ];

+2 -3

pkgs/applications/virtualization/virt-viewer/default.nix

···

       35
       35
        
       with lib;

     

       36
       36
        
       

     

       37
       37
        
       stdenv.mkDerivation rec {

     

       38
       38
       -
         baseName = "virt-viewer";

     

       38
       38
       +
         pname = "virt-viewer";

     

       39
       39
        
         version = "11.0";

     

       40
       40
       -
         name = "${baseName}-${version}";

     

       41
       40
        
       

     

       42
       41
        
         src = fetchurl {

     

       43
       43
       -
           url = "http://virt-manager.org/download/sources/${baseName}/${name}.tar.xz";

     

       42
       42
       +
           url = "https://releases.pagure.org/virt-viewer/virt-viewer-${version}.tar.xz";

     

       44
       43
        
           sha256 = "sha256-pD+iMlxMHHelyMmAZaww7wURohrJjlkPIjQIabrZq9A=";

     

       45
       44
        
         };

     

       46
       45

+3 -2

pkgs/applications/window-managers/clfswm/default.nix

···

       2
       2
        
       , makeWrapper }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation {

     

       5
       5
       -
         name = "clfswm";

     

       5
       5
       +
         pname = "clfswm";

     

       6
       6
       +
         version = "unstable-2016-11-12";

     

       6
       7
        
       

     

       7
       8
        
         src = fetchgit {

     

       8
       9
        
           url = "https://gitlab.common-lisp.net/clfswm/clfswm.git";

     

       9
       9
       -
           rev = "refs/heads/master";

     

       10
       10
       +
           rev = "3c7721dba6339ebb4f8c8d7ce2341740fa86f837";

     

       10
       11
        
           sha256 = "0hynzh3a1zr719cxfb0k4cvh5lskzs616hwn7p942isyvhwzhynd";

     

       11
       12
        
         };

     

       12
       13

+2 -1

pkgs/applications/window-managers/taffybar/default.nix

···

       5
       5
        
           self.taffybar

     

       6
       6
        
         ] ++ packages self);

     

       7
       7
        
       in stdenv.mkDerivation {

     

       8
       8
       -
         name = "taffybar-with-packages-${taffybarEnv.version}";

     

       8
       8
       +
         pname = "taffybar-with-packages";

     

       9
       9
       +
         inherit (taffybarEnv) version;

     

       9
       10
        
       

     

       10
       11
        
         nativeBuildInputs = [ makeWrapper ];

     

       11
       12

+2 -1

pkgs/applications/window-managers/xmonad/wrapper.nix

···

       3
       3
        
       let

     

       4
       4
        
       xmonadEnv = ghcWithPackages (self: [ self.xmonad ] ++ packages self);

     

       5
       5
        
       in stdenv.mkDerivation {

     

       6
       6
       -
         name = "xmonad-with-packages-${xmonadEnv.version}";

     

       6
       6
       +
         pname = "xmonad-with-packages";

     

       7
       7
       +
         inherit (xmonadEnv) version;

     

       7
       8
        
       

     

       8
       9
        
         nativeBuildInputs = [ makeWrapper ];

     

       9
       10

+4 -3

pkgs/data/documentation/std-man-pages/default.nix

···

       1
       1
        
       { stdenv, lib, fetchurl }:

     

       2
       2
        
       

     

       3
       3
       -
       stdenv.mkDerivation {

     

       4
       4
       -
         name = "std-man-pages-4.4.0";

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         pname = "std-man-pages";

     

       5
       5
       +
         version = "4.4.0";

     

       5
       6
        
       

     

       6
       7
        
         src = fetchurl {

     

       7
       7
       -
           url = "mirror://gcc/libstdc++/doxygen/libstdc++-man.4.4.0.tar.bz2";

     

       8
       8
       +
           url = "mirror://gcc/libstdc++/doxygen/libstdc++-man.${version}.tar.bz2";

     

       8
       9
        
           sha256 = "0153py77ll759jacq41dp2z2ksr08pdcfic0rwjd6pr84dk89y9v";

     

       9
       10
        
         };

     

       10
       11

+2 -3

pkgs/data/icons/faba-icon-theme/default.nix

···

       1
       1
        
       { lib, stdenv, fetchFromGitHub, meson, ninja, python3, gtk3, pantheon, gnome-icon-theme, hicolor-icon-theme }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "${package-name}-${version}";

     

       5
       5
       -
         package-name = "faba-icon-theme";

     

       4
       4
       +
         pname = "faba-icon-theme";

     

       6
       5
        
         version = "4.3";

     

       7
       6
        
       

     

       8
       7
        
         src = fetchFromGitHub {

     

       9
       8
        
           owner = "moka-project";

     

       10
       10
       -
           repo = package-name;

     

       9
       9
       +
           repo = "faba-icon-theme";

     

       11
       10
        
           rev = "v${version}";

     

       12
       11
        
           sha256 = "0xh6ppr73p76z60ym49b4d0liwdc96w41cc5p07d48hxjsa6qd6n";

     

       13
       12
        
         };

+3 -2

pkgs/data/icons/tango-icon-theme/default.nix

···

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
       -
         name = "tango-icon-theme-0.8.90";

     

       6
       6
       +
         pname = "tango-icon-theme";

     

       7
       7
       +
         version = "0.8.90";

     

       7
       8
        
       

     

       8
       9
        
         src = fetchurl {

     

       9
       9
       -
           url = "http://tango.freedesktop.org/releases/${name}.tar.gz";

     

       10
       10
       +
           url = "http://tango.freedesktop.org/releases/tango-icon-theme-${version}.tar.gz";

     

       10
       11
        
           sha256 = "13n8cpml71w6zfm2jz5fa7r1z18qlzk4gv07r6n1in2p5l1xi63f";

     

       11
       12
        
         };

     

       12
       13

+2 -1

pkgs/data/misc/brise/default.nix

···

       1
       1
        
       { lib, stdenv, fetchFromGitHub, librime }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
       -
         name = "brise-unstable-2017-09-16";

     

       4
       4
       +
         pname = "brise";

     

       5
       5
       +
         version = "unstable-2017-09-16";

     

       5
       6
        
       

     

       6
       7
        
         src = fetchFromGitHub {

     

       7
       8
        
           owner = "rime";

+3 -2

pkgs/data/misc/miscfiles/default.nix

···

       1
       1
        
       {lib, stdenv, fetchurl}:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "miscfiles-1.5";

     

       4
       4
       +
         pname = "miscfiles";

     

       5
       5
       +
         version = "1.5";

     

       5
       6
        
       

     

       6
       7
        
         src = fetchurl {

     

       7
       7
       -
           url = "mirror://gnu/miscfiles/${name}.tar.gz";

     

       8
       8
       +
           url = "mirror://gnu/miscfiles/miscfiles-${version}.tar.gz";

     

       8
       9
        
           sha256 = "005588vfrwx8ghsdv9p7zczj9lbc9a3r4m5aphcaqv8gif4siaka";

     

       9
       10
        
         };

     

       10
       11

+3 -2

pkgs/data/misc/shared-desktop-ontologies/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, cmake }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "shared-desktop-ontologies-0.11.0";

     

       4
       4
       +
         pname = "shared-desktop-ontologies";

     

       5
       5
       +
         version = "0.11.0";

     

       5
       6
        
       

     

       6
       7
        
         src = fetchurl {

     

       7
       7
       -
           url = "mirror://sourceforge/oscaf/${name}.tar.bz2";

     

       8
       8
       +
           url = "mirror://sourceforge/oscaf/shared-desktop-ontologies-${version}.tar.bz2";

     

       8
       9
        
           sha256 = "1m5vnijg7rnwg41vig2ckg632dlczzdab1gsq51g4x7m9k1fdbw2";

     

       9
       10
        
         };

     

       10
       11