commit 4e1852096f34f3de5ad64b262c969bdcd7f4bfc7 · pyrox.dev/nixpkgs

+1 -1

.github/PULL_REQUEST_TEMPLATE.md

···

       26
        
         - and/or [package tests](https://nixos.org/manual/nixpkgs/unstable/#sec-package-tests)

     

       27
        
         - or, for functions and "core" functionality, tests in [lib/tests](https://github.com/NixOS/nixpkgs/blob/master/lib/tests) or [pkgs/test](https://github.com/NixOS/nixpkgs/blob/master/pkgs/test)

     

       28
        
         - made sure NixOS tests are [linked](https://nixos.org/manual/nixpkgs/unstable/#ssec-nixos-tests-linking) to the relevant packages

     

       29
       -
       - [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review wip"`

     

       30
        
       - [ ] Tested basic functionality of all binary files (usually in `./result/bin/`)

     

       31
        
       - [21.11 Release Notes (or backporting 21.05 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2111-release-notes)

     

       32
        
         - [ ] (Package updates) Added a release notes entry if the change is major or breaking

···

       26
        
         - and/or [package tests](https://nixos.org/manual/nixpkgs/unstable/#sec-package-tests)

     

       27
        
         - or, for functions and "core" functionality, tests in [lib/tests](https://github.com/NixOS/nixpkgs/blob/master/lib/tests) or [pkgs/test](https://github.com/NixOS/nixpkgs/blob/master/pkgs/test)

     

       28
        
         - made sure NixOS tests are [linked](https://nixos.org/manual/nixpkgs/unstable/#ssec-nixos-tests-linking) to the relevant packages

     

       29
       +
       - [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"`. Note: all changes have to be committed, also see [nixpkgs-review usage](https://github.com/Mic92/nixpkgs-review#usage)

     

       30
        
       - [ ] Tested basic functionality of all binary files (usually in `./result/bin/`)

     

       31
        
       - [21.11 Release Notes (or backporting 21.05 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2111-release-notes)

     

       32
        
         - [ ] (Package updates) Added a release notes entry if the change is major or breaking

+26

maintainers/maintainer-list.nix

···

       2810
        
           githubId = 2439413;

     

       2811
        
           name = "Derek Gonyeo";

     

       2812
        
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       2813
        
         dhkl = {

     

       2814
        
           email = "david@davidslab.com";

     

       2815
        
           github = "dhl";

     
···

       6507
        
           github = "legendofmiracles";

     

       6508
        
           githubId = 30902201;

     

       6509
        
           name = "legendofmiracles";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       6510
        
         };

     

       6511
        
         lejonet = {

     

       6512
        
           email = "daniel@kuehn.se";

     
···

       9644
        
           githubId = 500703;

     

       9645
        
           name = "Tadas Barzdžius";

     

       9646
        
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       9647
        
         rexim = {

     

       9648
        
           email = "reximkut@gmail.com";

     

       9649
        
           github = "rexim";

     
···

       13145
        
           email = "nejczupan+nix@gmail.com";

     

       13146
        
           github = "zupo";

     

       13147
        
           githubId = 311580;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       13148
        
         };

     

       13149
        
       }

···

       2810
        
           githubId = 2439413;

     

       2811
        
           name = "Derek Gonyeo";

     

       2812
        
         };

     

       2813
       +
         dguenther = {

     

       2814
       +
           email = "dguenther9@gmail.com";

     

       2815
       +
           github = "dguenther";

     

       2816
       +
           githubId = 767083;

     

       2817
       +
           name = "Derek Guenther";

     

       2818
       +
         };

     

       2819
        
         dhkl = {

     

       2820
        
           email = "david@davidslab.com";

     

       2821
        
           github = "dhl";

     
···

       6513
        
           github = "legendofmiracles";

     

       6514
        
           githubId = 30902201;

     

       6515
        
           name = "legendofmiracles";

     

       6516
       +
           keys = [{

     

       6517
       +
             longkeyid = "rsa4096/0x19B082B3DEFE5451";

     

       6518
       +
             fingerprint = "CC50 F82C 985D 2679 0703  AF15 19B0 82B3 DEFE 5451";

     

       6519
       +
           }];

     

       6520
        
         };

     

       6521
        
         lejonet = {

     

       6522
        
           email = "daniel@kuehn.se";

     
···

       9654
        
           githubId = 500703;

     

       9655
        
           name = "Tadas Barzdžius";

     

       9656
        
         };

     

       9657
       +
         revol-xut = {

     

       9658
       +
           email = "revol-xut@protonmail.com";

     

       9659
       +
           name = "Tassilo Tanneberger";

     

       9660
       +
           github = "revol-xut";

     

       9661
       +
           githubId = 32239737;

     

       9662
       +
           keys = [{

     

       9663
       +
             longkeyid = "rsa4096/B966009D57E69CC6";

     

       9664
       +
             fingerprint = "91EB E870 1639 1323 642A  6803 B966 009D 57E6 9CC6";

     

       9665
       +
           }];

     

       9666
       +
         };

     

       9667
        
         rexim = {

     

       9668
        
           email = "reximkut@gmail.com";

     

       9669
        
           github = "rexim";

     
···

       13165
        
           email = "nejczupan+nix@gmail.com";

     

       13166
        
           github = "zupo";

     

       13167
        
           githubId = 311580;

     

       13168
       +
         };

     

       13169
       +
         sei40kr = {

     

       13170
       +
           name = "Seong Yong-ju";

     

       13171
       +
           email = "sei40kr@gmail.com";

     

       13172
       +
           github = "sei40kr";

     

       13173
       +
           githubId = 11665236;

     

       13174
        
         };

     

       13175
        
       }

+2

nixos/modules/services/cluster/kubernetes/kubelet.nix

···

       258
        
               "net.bridge.bridge-nf-call-ip6tables" = 1;

     

       259
        
             };

     

       260
        
       

     

       0
        
       
     

       0
        
       
     

       261
        
             systemd.services.kubelet = {

     

       262
        
               description = "Kubernetes Kubelet Service";

     

       263
        
               wantedBy = [ "kubernetes.target" ];

···

       258
        
               "net.bridge.bridge-nf-call-ip6tables" = 1;

     

       259
        
             };

     

       260
        
       

     

       261
       +
             systemd.enableUnifiedCgroupHierarchy = false; # true breaks node memory metrics

     

       262
       +
       

     

       263
        
             systemd.services.kubelet = {

     

       264
        
               description = "Kubernetes Kubelet Service";

     

       265
        
               wantedBy = [ "kubernetes.target" ];

+1

nixos/tests/all-tests.nix

···

       109
        
         docker-tools-overlay = handleTestOn ["x86_64-linux"] ./docker-tools-overlay.nix {};

     

       110
        
         documize = handleTest ./documize.nix {};

     

       111
        
         dokuwiki = handleTest ./dokuwiki.nix {};

     

       0
        
       
     

       112
        
         dovecot = handleTest ./dovecot.nix {};

     

       113
        
         ec2-config = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-config or {};

     

       114
        
         ec2-nixops = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-nixops or {};

···

       109
        
         docker-tools-overlay = handleTestOn ["x86_64-linux"] ./docker-tools-overlay.nix {};

     

       110
        
         documize = handleTest ./documize.nix {};

     

       111
        
         dokuwiki = handleTest ./dokuwiki.nix {};

     

       112
       +
         domination = handleTest ./domination.nix {};

     

       113
        
         dovecot = handleTest ./dovecot.nix {};

     

       114
        
         ec2-config = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-config or {};

     

       115
        
         ec2-nixops = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-nixops or {};

+26

nixos/tests/domination.nix

···

       1
       +
       import ./make-test-python.nix ({ pkgs, ... }: {

     

       2
       +
         name = "domination";

     

       3
       +
         meta = with pkgs.lib.maintainers; {

     

       4
       +
           maintainers = [ fgaz ];

     

       5
       +
         };

     

       6
       +
       

     

       7
       +
         machine = { config, pkgs, ... }: {

     

       8
       +
           imports = [

     

       9
       +
             ./common/x11.nix

     

       10
       +
           ];

     

       11
       +
       

     

       12
       +
           services.xserver.enable = true;

     

       13
       +
           environment.systemPackages = [ pkgs.domination ];

     

       14
       +
         };

     

       15
       +
       

     

       16
       +
         enableOCR = true;

     

       17
       +
       

     

       18
       +
         testScript =

     

       19
       +
           ''

     

       20
       +
             machine.wait_for_x()

     

       21
       +
             machine.execute("domination >&2 &")

     

       22
       +
             machine.wait_for_window("Menu")

     

       23
       +
             machine.wait_for_text("New Game")

     

       24
       +
             machine.screenshot("screen")

     

       25
       +
           '';

     

       26
       +
       })

+7 -1

pkgs/applications/audio/bespokesynth/default.nix

···

       106
        
         meta = with lib; {

     

       107
        
           description = "Software modular synth with controllers support, scripting and VST";

     

       108
        
           homepage = "https://github.com/awwbees/BespokeSynth";

     

       109
       -
           license = licenses.gpl3Plus;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       110
        
           maintainers = with maintainers; [ astro ];

     

       111
        
           platforms = platforms.all;

     

       112
        
         };

···

       106
        
         meta = with lib; {

     

       107
        
           description = "Software modular synth with controllers support, scripting and VST";

     

       108
        
           homepage = "https://github.com/awwbees/BespokeSynth";

     

       109
       +
           license = with licenses; [

     

       110
       +
             gpl3Plus

     

       111
       +
       

     

       112
       +
             # This package is unfree and not distributable due to the license of VST2.

     

       113
       +
             # see #145607

     

       114
       +
             unfree

     

       115
       +
           ];

     

       116
        
           maintainers = with maintainers; [ astro ];

     

       117
        
           platforms = platforms.all;

     

       118
        
         };

+2 -2

pkgs/applications/blockchains/lightwalletd/default.nix

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "lightwalletd";

     

       5
       -
         version = "0.4.7";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "zcash";

     

       9
        
           repo  = "lightwalletd";

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "0dwam3fhc4caga7kjg6cc06sz47g4ii7n3sa4j2ac4aiy21hsbjk";

     

       12
        
         };

     

       13
        
       

     

       14
        
         vendorSha256 = null;

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "lightwalletd";

     

       5
       +
         version = "0.4.8";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "zcash";

     

       9
        
           repo  = "lightwalletd";

     

       10
        
           rev = "v${version}";

     

       11
       +
           sha256 = "sha256-3cjXQXJqdmAMc+APybAKbpBhTy8Pk/QyBygSa8pGGAs=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         vendorSha256 = null;

+2 -2

pkgs/applications/editors/leo-editor/default.nix

···

       2
        
       

     

       3
        
       mkDerivation rec {

     

       4
        
         pname = "leo-editor";

     

       5
       -
         version = "6.2.1";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "leo-editor";

     

       9
        
           repo = "leo-editor";

     

       10
        
           rev = version;

     

       11
       -
           sha256 = "1s9jvxwzsl32clp78g92nq9p2byf08libr5widl1jnkv1cpkbvh9";

     

       12
        
         };

     

       13
        
       

     

       14
        
         dontBuild = true;

···

       2
        
       

     

       3
        
       mkDerivation rec {

     

       4
        
         pname = "leo-editor";

     

       5
       +
         version = "6.5";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "leo-editor";

     

       9
        
           repo = "leo-editor";

     

       10
        
           rev = version;

     

       11
       +
           sha256 = "sha256-f237oXhnu6OtGVhIFDswFwfjcLgYWvLNRtVW4SChFzU=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         dontBuild = true;

+11 -1

pkgs/applications/misc/lifelines/default.nix

···

       1
       -
       { lib, stdenv, fetchFromGitHub, gettext, libiconv, bison, ncurses, perl, autoreconfHook }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "lifelines";

     
···

       10
        
           rev = "43f29285ed46fba322b6a14322771626e6b02c59";

     

       11
        
           sha256 = "1agszzlmkxmznpc1xj0vzxkskrcfagfjvqsdyw1yp5yg6bsq272y";

     

       12
        
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       13
        
       

     

       14
        
         buildInputs = [

     

       15
        
           gettext

···

       1
       +
       { lib, stdenv, fetchFromGitHub, fetchpatch, gettext, libiconv, bison, ncurses, perl, autoreconfHook }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "lifelines";

     
···

       10
        
           rev = "43f29285ed46fba322b6a14322771626e6b02c59";

     

       11
        
           sha256 = "1agszzlmkxmznpc1xj0vzxkskrcfagfjvqsdyw1yp5yg6bsq272y";

     

       12
        
         };

     

       13
       +
       

     

       14
       +
         patches = [

     

       15
       +
           # Fix pending upstream inclusion for ncurses-6.3 support:

     

       16
       +
           #  https://github.com/lifelines/lifelines/pull/437

     

       17
       +
           (fetchpatch {

     

       18
       +
             name = "ncurses-6.3.patch";

     

       19
       +
             url = "https://github.com/lifelines/lifelines/commit/e04ce2794d458c440787c191877fbbc0784447bd.patch";

     

       20
       +
             sha256 = "1smnz4z5hfjas79bfvlnpw9x8199a5g0p9cvhf17zpcnz1432kg7";

     

       21
       +
           })

     

       22
       +
         ];

     

       23
        
       

     

       24
        
         buildInputs = [

     

       25
        
           gettext

+2 -2

pkgs/applications/misc/mkgmap/default.nix

···

       14
        
       in

     

       15
        
       stdenv.mkDerivation rec {

     

       16
        
         pname = "mkgmap";

     

       17
       -
         version = "4810";

     

       18
        
       

     

       19
        
         src = fetchurl {

     

       20
        
           url = "https://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz";

     

       21
       -
           sha256 = "j21WTEu+MTmnFrRH5B8Eb1tS2elFR715R8jhgKZ5Gmw=";

     

       22
        
         };

     

       23
        
       

     

       24
        
         patches = [

···

       14
        
       in

     

       15
        
       stdenv.mkDerivation rec {

     

       16
        
         pname = "mkgmap";

     

       17
       +
         version = "4813";

     

       18
        
       

     

       19
        
         src = fetchurl {

     

       20
        
           url = "https://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz";

     

       21
       +
           sha256 = "Zx3j3ITsL3eOMVYxKLnfzwPMkr+BQ+soK+zhzYbnnak=";

     

       22
        
         };

     

       23
        
       

     

       24
        
         patches = [

+2 -2

pkgs/applications/misc/mkgmap/splitter/default.nix

···

       13
        
       in

     

       14
        
       stdenv.mkDerivation rec {

     

       15
        
         pname = "splitter";

     

       16
       -
         version = "642";

     

       17
        
       

     

       18
        
         src = fetchurl {

     

       19
        
           url = "https://www.mkgmap.org.uk/download/splitter-r${version}-src.tar.gz";

     

       20
       -
           sha256 = "zMuMutkk0RsbEH+5undcMmZRCGYJ7LRvdK1pxAgQRYk=";

     

       21
        
         };

     

       22
        
       

     

       23
        
         patches = [

···

       13
        
       in

     

       14
        
       stdenv.mkDerivation rec {

     

       15
        
         pname = "splitter";

     

       16
       +
         version = "643";

     

       17
        
       

     

       18
        
         src = fetchurl {

     

       19
        
           url = "https://www.mkgmap.org.uk/download/splitter-r${version}-src.tar.gz";

     

       20
       +
           sha256 = "gyMCQAKnP4FDcHEgJiiftKhBEG9N92etpwKBnmIbzhU=";

     

       21
        
         };

     

       22
        
       

     

       23
        
         patches = [

+2 -2

pkgs/applications/misc/nwg-wrapper/default.nix

···

       2
        
       

     

       3
        
       python3Packages.buildPythonPackage rec {

     

       4
        
         pname = "nwg-wrapper";

     

       5
       -
         version = "0.0.2";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "nwg-piotr";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "sha256-LkAB0MrwQxP3X7glfSnI0GZMv8tjaeSOz7WSOW33wuo=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         nativeBuildInputs = [ gobject-introspection wrapGAppsHook ];

···

       2
        
       

     

       3
        
       python3Packages.buildPythonPackage rec {

     

       4
        
         pname = "nwg-wrapper";

     

       5
       +
         version = "0.1.0";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "nwg-piotr";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       +
           sha256 = "0xkxyfbj8zljx7k5wbniz3x9jg0l4jnbbjv8hy5y5p4l10m0vpjs";

     

       12
        
         };

     

       13
        
       

     

       14
        
         nativeBuildInputs = [ gobject-introspection wrapGAppsHook ];

+10 -1

pkgs/applications/networking/browsers/firefox/common.nix

···

       110
        
         # When LTO for Darwin is fixed, the following will need updating as lld

     

       111
        
         # doesn't work on it. For now it is fine since ltoSupport implies no Darwin.

     

       112
        
         buildStdenv = if ltoSupport

     

       113
       -
                       then overrideCC stdenv llvmPackages.clangUseLLVM

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       114
        
                       else stdenv;

     

       115
        
       

     

       116
        
         # --enable-release adds -ffunction-sections & LTO that require a big amount of

     
···

       131
        
         ] ++

     

       132
        
         lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch ++

     

       133
        
         lib.optional (lib.versionAtLeast version "90") ./no-buildconfig-ffx90.patch ++

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       134
        
         patches;

     

       135
        
       

     

       136
        
         # Ignore trivial whitespace changes in patches, this fixes compatibility of

···

       110
        
         # When LTO for Darwin is fixed, the following will need updating as lld

     

       111
        
         # doesn't work on it. For now it is fine since ltoSupport implies no Darwin.

     

       112
        
         buildStdenv = if ltoSupport

     

       113
       +
                       # LTO requires LLVM bintools including ld.lld and llvm-ar.

     

       114
       +
                       then overrideCC llvmPackages.stdenv (llvmPackages.stdenv.cc.override {

     

       115
       +
                         inherit (llvmPackages) bintools;

     

       116
       +
                       })

     

       117
        
                       else stdenv;

     

       118
        
       

     

       119
        
         # --enable-release adds -ffunction-sections & LTO that require a big amount of

     
···

       134
        
         ] ++

     

       135
        
         lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch ++

     

       136
        
         lib.optional (lib.versionAtLeast version "90") ./no-buildconfig-ffx90.patch ++

     

       137
       +
         # This fixes a race condition causing deadlock.

     

       138
       +
         # https://phabricator.services.mozilla.com/D128657

     

       139
       +
         lib.optional (lib.versionAtLeast version "94") (fetchpatch {

     

       140
       +
           url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/9c7f25d45bb1dd6b1a865780bc249cdaa619aa83/trunk/0002-Bug-1735905-Upgrade-cubeb-pulse-to-fix-a-race-condit.patch";

     

       141
       +
           sha256 = "l4bMK/YDXcDpIjPy9DPuUSFyDpzVQca201A4h9eav5g=";

     

       142
       +
         }) ++

     

       143
        
         patches;

     

       144
        
       

     

       145
        
         # Ignore trivial whitespace changes in patches, this fixes compatibility of

+4 -4

pkgs/applications/networking/cluster/fluxcd/default.nix

···

       1
        
       { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:

     

       2
        
       

     

       3
        
       let

     

       4
       -
         version = "0.21.1";

     

       5
       -
         sha256 = "1sb3912h28z097n7mn3hlh33hnxr9978h04py2m7gh27hmygscj3";

     

       6
       -
         manifestsSha256 = "1rrnz50jfn3zgaz5hn7ghmgc31ahm4q49f0rxfagfygvks1h4910";

     

       7
        
       

     

       8
        
         manifests = fetchzip {

     

       9
        
           url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";

     
···

       23
        
           inherit sha256;

     

       24
        
         };

     

       25
        
       

     

       26
       -
         vendorSha256 = "sha256-m0uVatnV4GIyllZTOkLxXGEiAWXGloFfxSJn51y0AQo=";

     

       27
        
       

     

       28
        
         postUnpack = ''

     

       29
        
           cp -r ${manifests} source/cmd/flux/manifests

···

       1
        
       { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:

     

       2
        
       

     

       3
        
       let

     

       4
       +
         version = "0.23.0";

     

       5
       +
         sha256 = "15j4r43hy3slyahx4am7lj7jns4x3axrcbr9qwiznmk8qbvrzrdy";

     

       6
       +
         manifestsSha256 = "10rh0q1la5dq6n9y1yvw9ilj5lhzx8vh1zi2lznfjsvc5niwx7wf";

     

       7
        
       

     

       8
        
         manifests = fetchzip {

     

       9
        
           url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";

     
···

       23
        
           inherit sha256;

     

       24
        
         };

     

       25
        
       

     

       26
       +
         vendorSha256 = "sha256-vFm9ai+VWOPLRckKJ7gfD/0iQ8b4o5HNQE4cekb0vA0=";

     

       27
        
       

     

       28
        
         postUnpack = ''

     

       29
        
           cp -r ${manifests} source/cmd/flux/manifests

+2 -2

pkgs/applications/networking/cluster/kn/default.nix

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "kn";

     

       5
       -
         version = "0.26.0";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "knative";

     

       9
        
           repo = "client";

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "sha256-hquxv1BluR535WvMtJlVyP7JuARDNGDjPAbdSSj2juo=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         vendorSha256 = null;

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "kn";

     

       5
       +
         version = "0.27.0";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "knative";

     

       9
        
           repo = "client";

     

       10
        
           rev = "v${version}";

     

       11
       +
           sha256 = "sha256-nuSx+JKXBgkVwuy6RMZc8pxDv5WjXN3+5pIudazTttc=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         vendorSha256 = null;

+2 -2

pkgs/applications/networking/cluster/kubecfg/default.nix

···

       2
        
       

     

       3
        
       buildGoPackage rec {

     

       4
        
         pname = "kubecfg";

     

       5
       -
         version = "0.21.0";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "bitnami";

     

       9
        
           repo = "kubecfg";

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "sha256-Wu7+Xmb7ha3OG37DzLg2+/Sr9hB5oD3OIkC9h9Fa4QA=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         goPackagePath = "github.com/bitnami/kubecfg";

···

       2
        
       

     

       3
        
       buildGoPackage rec {

     

       4
        
         pname = "kubecfg";

     

       5
       +
         version = "0.22.0";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "bitnami";

     

       9
        
           repo = "kubecfg";

     

       10
        
           rev = "v${version}";

     

       11
       +
           sha256 = "sha256-8U/A4F4DboS46ftpuk5fQGT2Y0V+X0y0L3/o4x8qpnY=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         goPackagePath = "github.com/bitnami/kubecfg";

+2 -2

pkgs/applications/networking/cluster/kubedb-cli/default.nix

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "kubedb-cli";

     

       5
       -
         version = "0.21.0";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "kubedb";

     

       9
        
           repo = "cli";

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "sha256-7e1VQ9uXNj6Lmnl1IXHLcADSLuK7Jgiww8acxtD4xFM=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         vendorSha256 = null;

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "kubedb-cli";

     

       5
       +
         version = "0.22.0";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "kubedb";

     

       9
        
           repo = "cli";

     

       10
        
           rev = "v${version}";

     

       11
       +
           sha256 = "sha256-pAvaScbwGJMW3iFS26D71nImWsXcEVx7ONUP82f6QDQ=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         vendorSha256 = null;

+7 -2

pkgs/applications/networking/cluster/popeye/default.nix

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "popeye";

     

       5
       -
         version = "0.9.7";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           rev = "v${version}";

     

       9
        
           owner = "derailed";

     

       10
        
           repo = "popeye";

     

       11
       -
           sha256 = "sha256-oft1zLLd5TP8S9GMjp5kYaoPoOYnbhJwL2wBerkhp+c=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         ldflags = [

     
···

       20
        
         vendorSha256 = "sha256-vUUDLMicop5QzZmAHi5qrc0hx8oV2xWNFHvCWioLhl8=";

     

       21
        
       

     

       22
        
         doCheck = true;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       23
        
       

     

       24
        
         meta = with lib; {

     

       25
        
           description = "A Kubernetes cluster resource sanitizer";

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "popeye";

     

       5
       +
         version = "0.9.8";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           rev = "v${version}";

     

       9
        
           owner = "derailed";

     

       10
        
           repo = "popeye";

     

       11
       +
           sha256 = "sha256-uGy2BbZS4SGT0w9ICYPUIfFawSvIVMsEezPfPAPQU/Q=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         ldflags = [

     
···

       20
        
         vendorSha256 = "sha256-vUUDLMicop5QzZmAHi5qrc0hx8oV2xWNFHvCWioLhl8=";

     

       21
        
       

     

       22
        
         doCheck = true;

     

       23
       +
       

     

       24
       +
         doInstallCheck = true;

     

       25
       +
         installCheckPhase = ''

     

       26
       +
           $out/bin/popeye version | grep ${version} > /dev/null

     

       27
       +
         '';

     

       28
        
       

     

       29
        
         meta = with lib; {

     

       30
        
           description = "A Kubernetes cluster resource sanitizer";

+4 -32

pkgs/applications/networking/instant-messengers/psi-plus/default.nix

···

       40
        
       

     

       41
        
       assert enablePsiMedia -> enablePlugins;

     

       42
        
       

     

       43
       -
       mkDerivation {

     

       44
        
         pname = "psi-plus";

     

       45
       -
       

     

       46
       -
         # Version mask is “X.X.XXXX-R” where “X.X.XXXX” is a mandatory version of Psi

     

       47
       -
         # and “-R” ending is optional revision number.

     

       48
       -
         #

     

       49
       -
         # The “psi-plus-snapshots” generally provides snapshots of these separate

     

       50
       -
         # repositories glued together (there are also dependencies/libraries):

     

       51
       -
         #

     

       52
       -
         # 1. Psi

     

       53
       -
         # 2. Plugins pack for Psi

     

       54
       -
         # 3. “psimedia” plugin

     

       55
       -
         # 4. Resources for Psi (icons, skins, sounds)

     

       56
       -
         #

     

       57
       -
         # “X.X.XXXX” is literally a version of Psi.

     

       58
       -
         # So often when for instance plugins are updated separately a new snapshot is

     

       59
       -
         # created. And that snapshot would also be linked to “X.X.XXXX” version.

     

       60
       -
         # So many commits may have the same associated version of the snapshot.

     

       61
       -
         # But mind that only one Git tag is created for “X.X.XXXX” version.

     

       62
       -
         #

     

       63
       -
         # It’s not yet defined in the Psi+ project what value to use as a version for

     

       64
       -
         # any further releases that don’t change Psi version.

     

       65
       -
         #

     

       66
       -
         # Let’s do what Debian does for instance (appends “-R” where “R” is a revision

     

       67
       -
         # number).

     

       68
       -
         # E.g. https://tracker.debian.org/news/1226321/psi-plus-14554-5-migrated-to-testing/

     

       69
       -
         #

     

       70
       -
         # This has been communicated with the Psi+ main devs in this XMPP MUC chat:

     

       71
       -
         # psi-dev@conference.jabber.ru

     

       72
       -
         #

     

       73
       -
         version = "1.5.1556-2";

     

       74
        
       

     

       75
        
         src = fetchFromGitHub {

     

       76
        
           owner = "psi-plus";

     

       77
        
           repo = "psi-plus-snapshots";

     

       78
       -
           rev = "635879010b6697f7041a7bbea1853a1f4673c7f7";

     

       79
       -
           sha256 = "18xvljcm0a9swkyz4diwxi4xaj0w27jnhfgpi8fv5fj11j0g1b3a";

     

       80
        
         };

     

       81
        
       

     

       82
        
         cmakeFlags = [

···

       40
        
       

     

       41
        
       assert enablePsiMedia -> enablePlugins;

     

       42
        
       

     

       43
       +
       mkDerivation rec {

     

       44
        
         pname = "psi-plus";

     

       45
       +
         version = "1.5.1576";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       46
        
       

     

       47
        
         src = fetchFromGitHub {

     

       48
        
           owner = "psi-plus";

     

       49
        
           repo = "psi-plus-snapshots";

     

       50
       +
           rev = version;

     

       51
       +
           sha256 = "15iqa8hd4p968sp79zsi32g7bhamgg267pk2bxspl646viv91f6g";

     

       52
        
         };

     

       53
        
       

     

       54
        
         cmakeFlags = [

+2

pkgs/applications/office/libreoffice/default.nix

···

       78
        
           tar -xf ${srcs.translations}

     

       79
        
         '';

     

       80
        
       

     

       0
        
       
     

       0
        
       
     

       81
        
         ### QT/KDE

     

       82
        
         #

     

       83
        
         # We have to resort to the ugly patching of configure.ac as it assumes that

···

       78
        
           tar -xf ${srcs.translations}

     

       79
        
         '';

     

       80
        
       

     

       81
       +
         patches = [ ./skip-failed-test-with-icu70.patch ];

     

       82
       +
       

     

       83
        
         ### QT/KDE

     

       84
        
         #

     

       85
        
         # We have to resort to the ugly patching of configure.ac as it assumes that

+29

pkgs/applications/office/libreoffice/skip-failed-test-with-icu70.patch

···

       1
       +
       --- a/i18npool/qa/cppunit/test_breakiterator.cxx

     

       2
       +
       +++ b/i18npool/qa/cppunit/test_breakiterator.cxx

     

       3
       +
       @@ -35,7 +35,7 @@ public:

     

       4
       +
            void testWeak();

     

       5
       +
            void testAsian();

     

       6
       +
            void testThai();

     

       7
       +
       -#if (U_ICU_VERSION_MAJOR_NUM > 51)

     

       8
       +
       +#if (U_ICU_VERSION_MAJOR_NUM > 51 && U_ICU_VERSION_MAJOR_NUM < 70)

     

       9
       +
            void testLao();

     

       10
       +
        #ifdef TODO

     

       11
       +
            void testNorthernThai();

     

       12
       +
       @@ -52,7 +52,7 @@ public:

     

       13
       +
            CPPUNIT_TEST(testWeak);

     

       14
       +
            CPPUNIT_TEST(testAsian);

     

       15
       +
            CPPUNIT_TEST(testThai);

     

       16
       +
       -#if (U_ICU_VERSION_MAJOR_NUM > 51)

     

       17
       +
       +#if (U_ICU_VERSION_MAJOR_NUM > 51 && U_ICU_VERSION_MAJOR_NUM < 70)

     

       18
       +
            CPPUNIT_TEST(testLao);

     

       19
       +
        #ifdef TODO

     

       20
       +
            CPPUNIT_TEST(testKhmer);

     

       21
       +
       @@ -843,7 +843,7 @@ void TestBreakIterator::testAsian()

     

       22
       +
            }

     

       23
       +
        }

     

       24
       +
        

     

       25
       +
       -#if (U_ICU_VERSION_MAJOR_NUM > 51)

     

       26
       +
       +#if (U_ICU_VERSION_MAJOR_NUM > 51 && U_ICU_VERSION_MAJOR_NUM < 70)

     

       27
       +
        //A test to ensure that our Lao word boundary detection is useful

     

       28
       +
        void TestBreakIterator::testLao()

     

       29
       +
        {

+1 -1

pkgs/applications/office/libreoffice/src-still/override.nix

···

       9
        
           "--with-commons-logging-jar=${commonsLogging}/share/java/commons-logging-1.2.jar"

     

       10
        
           "--without-system-qrcodegen"

     

       11
        
         ];

     

       12
       -
         patches = [ ../xdg-open-brief.patch ]; # drop this when switching to 7.2

     

       13
        
       }

···

       9
        
           "--with-commons-logging-jar=${commonsLogging}/share/java/commons-logging-1.2.jar"

     

       10
        
           "--without-system-qrcodegen"

     

       11
        
         ];

     

       12
       +
         patches = attrs.patches or [] ++ [ ../xdg-open-brief.patch ]; # drop this when switching to 7.2

     

       13
        
       }

+4 -4

pkgs/applications/office/libreoffice/src-still/primary.nix

···

       8
        
       

     

       9
        
         major = "7";

     

       10
        
         minor = "1";

     

       11
       -
         patch = "6";

     

       12
        
         tweak = "2";

     

       13
        
       

     

       14
        
         subdir = "${major}.${minor}.${patch}";

     
···

       17
        
       

     

       18
        
         src = fetchurl {

     

       19
        
           url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";

     

       20
       -
           sha256 = "1g1nlnmgxka1xj3800ra7j28y08k1irz7a24awx1gyjs9fci58qq";

     

       21
        
         };

     

       22
        
       

     

       23
        
         # FIXME rename

     

       24
        
         translations = fetchSrc {

     

       25
        
           name = "translations";

     

       26
       -
           sha256 = "0kblfwcnsc0pz96wxmkghmchjd31h0w1wjxlqxqbqqpz3vbr61k3";

     

       27
        
         };

     

       28
        
       

     

       29
        
         # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from

     
···

       31
        
       

     

       32
        
         help = fetchSrc {

     

       33
        
           name = "help";

     

       34
       -
           sha256 = "1b28xqgvfnx62zgnxfisi58r7nhixvz35pmq8cb20ayxhdfg6v31";

     

       35
        
         };

     

       36
        
       }

···

       8
        
       

     

       9
        
         major = "7";

     

       10
        
         minor = "1";

     

       11
       +
         patch = "7";

     

       12
        
         tweak = "2";

     

       13
        
       

     

       14
        
         subdir = "${major}.${minor}.${patch}";

     
···

       17
        
       

     

       18
        
         src = fetchurl {

     

       19
        
           url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";

     

       20
       +
           sha256 = "T98ICdiAM4i9E6zis0V/Cmq5+e98mNb0bMZA//xelLo=";

     

       21
        
         };

     

       22
        
       

     

       23
        
         # FIXME rename

     

       24
        
         translations = fetchSrc {

     

       25
        
           name = "translations";

     

       26
       +
           sha256 = "g8skm02R5nRyF09ZbL9kJqMxRqaQ0AfpletDK3AAggk=";

     

       27
        
         };

     

       28
        
       

     

       29
        
         # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from

     
···

       31
        
       

     

       32
        
         help = fetchSrc {

     

       33
        
           name = "help";

     

       34
       +
           sha256 = "jAFrO4RyONhPH3H5QW0SL8Id53bBvJ7AYxSNtLhG4rQ=";

     

       35
        
         };

     

       36
        
       }

+10 -1

pkgs/applications/science/logic/boolector/default.nix

···

       1
       -
       { stdenv, fetchFromGitHub, lib, python3

     

       2
        
       , cmake, lingeling, btor2tools, gtest, gmp

     

       3
        
       }:

     

       4
        
       

     
···

       12
        
           rev    = version;

     

       13
        
           sha256 = "1smcy6yp8wvnw2brgnv5bf40v87k4v4fbdbrhi7987vja632k50z";

     

       14
        
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       15
        
       

     

       16
        
         postPatch = ''

     

       17
        
           sed s@REPLACEME@file://${gtest.src}@ ${./cmake-gtest.patch} | patch -p1

···

       1
       +
       { stdenv, fetchFromGitHub, lib, python3, fetchpatch

     

       2
        
       , cmake, lingeling, btor2tools, gtest, gmp

     

       3
        
       }:

     

       4
        
       

     
···

       12
        
           rev    = version;

     

       13
        
           sha256 = "1smcy6yp8wvnw2brgnv5bf40v87k4v4fbdbrhi7987vja632k50z";

     

       14
        
         };

     

       15
       +
       

     

       16
       +
         patches = [

     

       17
       +
           # present in master - remove after 3.2.2

     

       18
       +
           (fetchpatch {

     

       19
       +
             name = "fix-parser-getc-char-casts.patch";

     

       20
       +
             url = "https://github.com/Boolector/boolector/commit/cc3a70918538c1e71ea5e7273fa1ac098da37c1b.patch";

     

       21
       +
             sha256 = "0pjvagcy74vxa2q75zbshcz8j7rvhl98549xfcf5y8yyxf5h8hyq";

     

       22
       +
           })

     

       23
       +
         ];

     

       24
        
       

     

       25
        
         postPatch = ''

     

       26
        
           sed s@REPLACEME@file://${gtest.src}@ ${./cmake-gtest.patch} | patch -p1

+4 -5

pkgs/applications/science/logic/lingeling/default.nix

···

       4
        
       

     

       5
        
       stdenv.mkDerivation {

     

       6
        
         pname = "lingeling";

     

       7
       -
         # This is the version used in satcomp2018, which was

     

       8
       -
         # relicensed, and also known as version 'bcj'

     

       9
       -
         version = "pre1_03b4860d";

     

       10
        
       

     

       11
        
         src = fetchFromGitHub {

     

       12
        
           owner  = "arminbiere";

     

       13
        
           repo   = "lingeling";

     

       14
       -
           rev    = "03b4860d14016f42213ea271014f2f13d181f504";

     

       15
       -
           sha256 = "1lw1yfy219p7rrk88sbq4zl24b70040zapbjdrpv5a6i0jsblksx";

     

       16
        
         };

     

       17
        
       

     

       18
        
         configurePhase = ''

···

       4
        
       

     

       5
        
       stdenv.mkDerivation {

     

       6
        
         pname = "lingeling";

     

       7
       +
         # This is the version used in satcomp2020

     

       8
       +
         version = "pre1_708beb26";

     

       0
        
       
     

       9
        
       

     

       10
        
         src = fetchFromGitHub {

     

       11
        
           owner  = "arminbiere";

     

       12
        
           repo   = "lingeling";

     

       13
       +
           rev    = "708beb26a7d5b5d5e7abd88d6f552fb1946b07c1";

     

       14
       +
           sha256 = "1lb2g37nd8qq5hw5g6l691nx5095336yb2zlbaw43mg56hkj8357";

     

       15
        
         };

     

       16
        
       

     

       17
        
         configurePhase = ''

+2 -2

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

···

       11
        
       

     

       12
        
       buildPythonApplication rec {

     

       13
        
         pname = "git-machete";

     

       14
       -
         version = "3.4.1";

     

       15
        
       

     

       16
        
         src = fetchFromGitHub {

     

       17
        
           owner = "virtuslab";

     

       18
        
           repo = pname;

     

       19
        
           rev = "v${version}";

     

       20
       -
           sha256 = "sha256-drfMD9tQe1dc61MH3Cxu9oin137f4FsZJY3X2kDHdh4=";

     

       21
        
         };

     

       22
        
       

     

       23
        
         nativeBuildInputs = [ installShellFiles ];

···

       11
        
       

     

       12
        
       buildPythonApplication rec {

     

       13
        
         pname = "git-machete";

     

       14
       +
         version = "3.5.0";

     

       15
        
       

     

       16
        
         src = fetchFromGitHub {

     

       17
        
           owner = "virtuslab";

     

       18
        
           repo = pname;

     

       19
        
           rev = "v${version}";

     

       20
       +
           sha256 = "sha256-kR37TClFMkoe4e46g/omfwZCrQFr7gukW7I70WI9+dw=";

     

       21
        
         };

     

       22
        
       

     

       23
        
         nativeBuildInputs = [ installShellFiles ];

+3 -3

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

···

       2
        
       

     

       3
        
       rustPlatform.buildRustPackage rec {

     

       4
        
         pname = "glitter";

     

       5
       -
         version = "1.5.3";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "milo123459";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "sha256-esrN6VH+ayc9DIhOLGR5oOaMjSBAc7u7fr8L1kSh4Gk=";

     

       12
        
         };

     

       13
        
       

     

       14
       -
         cargoSha256 = "sha256-0ugr9HcJLsV34kKJs1E+n10tdOv09wkaYmkIodLhyLk=";

     

       15
        
       

     

       16
        
         # tests require it to be in a git repository

     

       17
        
         preCheck = ''

···

       2
        
       

     

       3
        
       rustPlatform.buildRustPackage rec {

     

       4
        
         pname = "glitter";

     

       5
       +
         version = "1.5.4";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "milo123459";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       +
           sha256 = "sha256-SJp/iRF5os0f+WsHnLtcqmj0uD7fe8iODJ4F+gpWtJo=";

     

       12
        
         };

     

       13
        
       

     

       14
       +
         cargoSha256 = "sha256-CVqLwXgoHQjJ6NMyiZkxVaTO6qgzBQz8mH/6dsyhhYY=";

     

       15
        
       

     

       16
        
         # tests require it to be in a git repository

     

       17
        
         preCheck = ''

+2 -2

pkgs/applications/video/dvd-slideshow/default.nix

···

       1
       -
       { stdenv, lib, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg_3, imagemagick, lame, mjpegtools, sox, transcode, vorbis-tools, runtimeShell }:

     

       2
        
       

     

       3
        
       let

     

       4
       -
         binPath = lib.makeBinPath [ cdrtools dvdauthor ffmpeg_3 imagemagick lame mjpegtools sox transcode vorbis-tools ];

     

       5
        
       

     

       6
        
         wrapper = writeScript "dvd-slideshow.sh" ''

     

       7
        
             #!${runtimeShell}

···

       1
       +
       { stdenv, lib, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg, imagemagick, lame, mjpegtools, sox, transcode, vorbis-tools, runtimeShell }:

     

       2
        
       

     

       3
        
       let

     

       4
       +
         binPath = lib.makeBinPath [ cdrtools dvdauthor ffmpeg imagemagick lame mjpegtools sox transcode vorbis-tools ];

     

       5
        
       

     

       6
        
         wrapper = writeScript "dvd-slideshow.sh" ''

     

       7
        
             #!${runtimeShell}

+9 -7

pkgs/applications/video/obs-studio/default.nix

···

       21
        
       , curl

     

       22
        
       , wayland

     

       23
        
       , xorg

     

       24
       -
       , makeWrapper

     

       25
        
       , pkg-config

     

       26
        
       , libvlc

     

       27
        
       , mbedtls

     

       28
       -
       

     

       29
        
       , scriptingSupport ? true

     

       30
        
       , luajit

     

       31
        
       , swig

     

       32
        
       , python3

     

       33
       -
       

     

       34
        
       , alsaSupport ? stdenv.isLinux

     

       35
        
       , alsa-lib

     

       36
        
       , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux

     
···

       68
        
           addOpenGLRunpath

     

       69
        
           cmake

     

       70
        
           pkg-config

     

       71
       -
           makeWrapper

     

       72
        
         ]

     

       73
        
         ++ optional scriptingSupport swig;

     

       74
        
       

     
···

       121
        
           "-DCEF_ROOT_DIR=../../cef"

     

       122
        
         ];

     

       123
        
       

     

       124
       -
         qtWrapperArgs = [

     

       125
       -
           "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ xorg.libX11 libvlc ]}"

     

       126
       -
         ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       127
        
       

     

       128
        
         postFixup = lib.optionalString stdenv.isLinux ''

     

       129
        
           addOpenGLRunpath $out/lib/lib*.so

···

       21
        
       , curl

     

       22
        
       , wayland

     

       23
        
       , xorg

     

       0
        
       
     

       24
        
       , pkg-config

     

       25
        
       , libvlc

     

       26
        
       , mbedtls

     

       27
       +
       , wrapGAppsHook

     

       28
        
       , scriptingSupport ? true

     

       29
        
       , luajit

     

       30
        
       , swig

     

       31
        
       , python3

     

       0
        
       
     

       32
        
       , alsaSupport ? stdenv.isLinux

     

       33
        
       , alsa-lib

     

       34
        
       , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux

     
···

       66
        
           addOpenGLRunpath

     

       67
        
           cmake

     

       68
        
           pkg-config

     

       69
       +
           wrapGAppsHook

     

       70
        
         ]

     

       71
        
         ++ optional scriptingSupport swig;

     

       72
        
       

     
···

       119
        
           "-DCEF_ROOT_DIR=../../cef"

     

       120
        
         ];

     

       121
        
       

     

       122
       +
         dontWrapGApps = true;

     

       123
       +
         preFixup = ''

     

       124
       +
           qtWrapperArgs+=(

     

       125
       +
             --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ xorg.libX11 libvlc ]}"

     

       126
       +
             ''${gappsWrapperArgs[@]}

     

       127
       +
           )

     

       128
       +
         '';

     

       129
        
       

     

       130
        
         postFixup = lib.optionalString stdenv.isLinux ''

     

       131
        
           addOpenGLRunpath $out/lib/lib*.so

+2 -2

pkgs/applications/video/vdr/plugins.nix

···

       1
        
       { lib, stdenv, fetchurl, fetchgit, vdr, alsa-lib, fetchFromGitHub

     

       2
       -
       , libvdpau, libxcb, xcbutilwm, graphicsmagick, libav, pcre, xorgserver, ffmpeg_3

     

       3
        
       , libiconv, boost, libgcrypt, perl, util-linux, groff, libva, xorg, ncurses

     

       4
        
       , callPackage

     

       5
        
       }: let

     
···

       52
        
           version = "20190525";

     

       53
        
       

     

       54
        
           buildInputs = [

     

       55
       -
             vdr libxcb xcbutilwm ffmpeg_3

     

       56
        
             alsa-lib

     

       57
        
             libvdpau # vdpau

     

       58
        
             libva # va-api

···

       1
        
       { lib, stdenv, fetchurl, fetchgit, vdr, alsa-lib, fetchFromGitHub

     

       2
       +
       , libvdpau, libxcb, xcbutilwm, graphicsmagick, libav, pcre, xorgserver, ffmpeg

     

       3
        
       , libiconv, boost, libgcrypt, perl, util-linux, groff, libva, xorg, ncurses

     

       4
        
       , callPackage

     

       5
        
       }: let

     
···

       52
        
           version = "20190525";

     

       53
        
       

     

       54
        
           buildInputs = [

     

       55
       +
             vdr libxcb xcbutilwm ffmpeg

     

       56
        
             alsa-lib

     

       57
        
             libvdpau # vdpau

     

       58
        
             libva # va-api

+2 -2

pkgs/desktops/enlightenment/terminology/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "terminology";

     

       5
       -
         version = "1.10.0";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz";

     

       9
       -
           sha256 = "0imk7cjkcjss3zf4hjwmy54pbizm6l6pq553jcx7bpsnhs56bbsz";

     

       10
        
         };

     

       11
        
       

     

       12
        
         nativeBuildInputs = [

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "terminology";

     

       5
       +
         version = "1.11.0";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz";

     

       9
       +
           sha256 = "0bbav27p1xni7kidgf3vn42bwsfrzds301k3f7c8dg7v5yyq9n2g";

     

       10
        
         };

     

       11
        
       

     

       12
        
         nativeBuildInputs = [

+2 -2

pkgs/desktops/gnome/apps/gnome-calendar/default.nix

···

       24
        
       

     

       25
        
       stdenv.mkDerivation rec {

     

       26
        
         pname = "gnome-calendar";

     

       27
       -
         version = "41.0";

     

       28
        
       

     

       29
        
         src = fetchurl {

     

       30
        
           url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";

     

       31
       -
           sha256 = "0gqrxcn7fcvlh5c9691lx5zgdgs71ah15h5psrbhkg8qcqy95b3k";

     

       32
        
         };

     

       33
        
       

     

       34
        
         patches = [

···

       24
        
       

     

       25
        
       stdenv.mkDerivation rec {

     

       26
        
         pname = "gnome-calendar";

     

       27
       +
         version = "41.1";

     

       28
        
       

     

       29
        
         src = fetchurl {

     

       30
        
           url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";

     

       31
       +
           sha256 = "m1EmsjPhuPic9MIyYIlXHYKakwPsieplz2IWTmp0IuE=";

     

       32
        
         };

     

       33
        
       

     

       34
        
         patches = [

+9 -1

pkgs/development/compilers/dev86/default.nix

···

       13
        
       

     

       14
        
         makeFlags = [ "PREFIX=$(out)" ];

     

       15
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       16
        
         meta = {

     

       17
        
           description = "Linux 8086 development environment";

     

       18
       -
           homepage = "http://v3.sk/~lkundrak/dev86/";

     

       19
        
           platforms = lib.platforms.linux;

     

       20
        
         };

     

       21
        
       }

···

       13
        
       

     

       14
        
         makeFlags = [ "PREFIX=$(out)" ];

     

       15
        
       

     

       16
       +
         # Parallel builds are not supported due to build process structure:

     

       17
       +
         # tools are built sequentially in submakefiles and are reusing the

     

       18
       +
         # same targets as dependencies. Building dependencies in parallel

     

       19
       +
         # from different submakes is not synchronized and fails:

     

       20
       +
         #     make[3]: Entering directory '/build/dev86-0.16.21/libc'

     

       21
       +
         #     Unable to execute as86.

     

       22
       +
         enableParallelBuilding = false;

     

       23
       +
       

     

       24
        
         meta = {

     

       25
        
           description = "Linux 8086 development environment";

     

       26
       +
           homepage = "https://github.com/lkundrak/dev86";

     

       27
        
           platforms = lib.platforms.linux;

     

       28
        
         };

     

       29
        
       }

+41

pkgs/development/compilers/lingua-franca/default.nix

···

       1
       +
       { lib, pkgs, stdenv, fetchFromGitHub, jdk11_headless }:

     

       2
       +
       

     

       3
       +
       stdenv.mkDerivation {

     

       4
       +
         pname = "lfc";

     

       5
       +
         version = "0.1.0";

     

       6
       +
       

     

       7
       +
         src = fetchFromGitHub {

     

       8
       +
           owner = "revol-xut";

     

       9
       +
           repo = "lingua-franca-nix-releases";

     

       10
       +
           rev = "11c6d5297cd63bf0b365a68c5ca31ec80083bd05";

     

       11
       +
           sha256 = "DgxunzC8Ep0WdwChDHWgG5QJbJZ8UgQRXtP1HZqL9Jg=";

     

       12
       +
         };

     

       13
       +
       

     

       14
       +
         buildInputs = [ jdk11_headless ];

     

       15
       +
       

     

       16
       +
         _JAVA_HOME = "${jdk11_headless}/";

     

       17
       +
       

     

       18
       +
         postPatch = ''

     

       19
       +
           substituteInPlace bin/lfc \

     

       20
       +
             --replace 'base=`dirname $(dirname ''${abs_path})`' "base='$out'" \

     

       21
       +
             --replace "run_lfc_with_args" "${jdk11_headless}/bin/java -jar $out/lib/jars/org.lflang.lfc-0.1.0-SNAPSHOT-all.jar"

     

       22
       +
         '';

     

       23
       +
       

     

       24
       +
         installPhase = ''

     

       25
       +
           cp -r ./ $out/

     

       26
       +
           chmod +x $out/bin/lfc

     

       27
       +
         '';

     

       28
       +
       

     

       29
       +
         meta = with lib; {

     

       30
       +
           description = "Polyglot coordination language";

     

       31
       +
           longDescription = ''

     

       32
       +
             Lingua Franca (LF) is a polyglot coordination language for concurrent

     

       33
       +
             and possibly time-sensitive applications ranging from low-level

     

       34
       +
             embedded code to distributed cloud and edge applications.

     

       35
       +
           '';

     

       36
       +
           homepage = "https://github.com/lf-lang/lingua-franca";

     

       37
       +
           license = licenses.bsd2;

     

       38
       +
           platforms = platforms.linux;

     

       39
       +
           maintainers = with maintainers; [ revol-xut ];

     

       40
       +
         };

     

       41
       +
       }

+6

pkgs/development/embedded/fpga/trellis/default.nix

···

       41
        
           cd libtrellis

     

       42
        
         '';

     

       43
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       44
        
         doInstallCheck = true;

     

       45
        
       

     

       46
        
         installCheckPhase = ''

···

       41
        
           cd libtrellis

     

       42
        
         '';

     

       43
        
       

     

       44
       +
         postInstall = lib.optionalString stdenv.isDarwin ''

     

       45
       +
           for f in $out/bin/* ; do

     

       46
       +
             install_name_tool -change "$out/lib/libtrellis.dylib" "$out/lib/trellis/libtrellis.dylib" "$f"

     

       47
       +
           done

     

       48
       +
         '';

     

       49
       +
       

     

       50
        
         doInstallCheck = true;

     

       51
        
       

     

       52
        
         installCheckPhase = ''

+2 -2

pkgs/development/interpreters/octave/default.nix

···

       114
        
         };

     

       115
        
       

     

       116
        
         self = mkDerivation rec {

     

       117
       -
           version = "6.3.0";

     

       118
        
           pname = "octave";

     

       119
        
       

     

       120
        
           src = fetchurl {

     

       121
        
             url = "mirror://gnu/octave/${pname}-${version}.tar.gz";

     

       122
       -
             sha256 = "sha256-IyBl86cvwwE/6fF/Qpo99p1nLB9rYHcCmjHI881Ypm4=";

     

       123
        
           };

     

       124
        
       

     

       125
        
           buildInputs = [

···

       114
        
         };

     

       115
        
       

     

       116
        
         self = mkDerivation rec {

     

       117
       +
           version = "6.4.0";

     

       118
        
           pname = "octave";

     

       119
        
       

     

       120
        
           src = fetchurl {

     

       121
        
             url = "mirror://gnu/octave/${pname}-${version}.tar.gz";

     

       122
       +
             sha256 = "sha256-tI8z1Pzq85TPvqc6jIUAAJNtg6QXOaJPdWi1sKezms0=";

     

       123
        
           };

     

       124
        
       

     

       125
        
           buildInputs = [

+2

pkgs/development/libraries/boxfort/default.nix

···

       29
        
           license = licenses.mit;

     

       30
        
           maintainers = with maintainers; [ thesola10 Yumasi ];

     

       31
        
           platforms = platforms.unix;

     

       0
        
       
     

       0
        
       
     

       32
        
         };

     

       33
        
       }

···

       29
        
           license = licenses.mit;

     

       30
        
           maintainers = with maintainers; [ thesola10 Yumasi ];

     

       31
        
           platforms = platforms.unix;

     

       32
       +
           # Upstream currently broken for macOS https://cirrus-ci.com/build/5624937369042944

     

       33
       +
           broken = stdenv.targetPlatform.isDarwin;

     

       34
        
         };

     

       35
        
       }

+3

pkgs/development/libraries/freeimage/default.nix

···

       24
        
             --replace "pkg-config" "$PKG_CONFIG"

     

       25
        
           substituteInPlace Makefile.gnu \

     

       26
        
             --replace "pkg-config" "$PKG_CONFIG"

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       27
        
         '';

     

       28
        
       

     

       29
        
         nativeBuildInputs = [

···

       24
        
             --replace "pkg-config" "$PKG_CONFIG"

     

       25
        
           substituteInPlace Makefile.gnu \

     

       26
        
             --replace "pkg-config" "$PKG_CONFIG"

     

       27
       +
         '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) ''

     

       28
       +
           # Upstream Makefile hardcodes i386 and x86_64 architectures only

     

       29
       +
           substituteInPlace Makefile.osx --replace "x86_64" "arm64"

     

       30
        
         '';

     

       31
        
       

     

       32
        
         nativeBuildInputs = [

+2 -2

pkgs/development/libraries/hiredis/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "hiredis";

     

       5
       -
         version = "1.0.0";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "redis";

     

       9
        
           repo = "hiredis";

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "01xnynm9d56a0alb5wxbfayakybm5pnr12icj9mqkn4xxihbnbgr";

     

       12
        
         };

     

       13
        
       

     

       14
        
         PREFIX = "\${out}";

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "hiredis";

     

       5
       +
         version = "1.0.2";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "redis";

     

       9
        
           repo = "hiredis";

     

       10
        
           rev = "v${version}";

     

       11
       +
           sha256 = "0a55zk3qrw9yl27i87h3brg2hskmmzbfda77dhq9a4if7y70xnfb";

     

       12
        
         };

     

       13
        
       

     

       14
        
         PREFIX = "\${out}";

+4 -1

pkgs/development/libraries/isl/0.14.1.nix

···

       4
        
         name = "isl-0.14.1";

     

       5
        
       

     

       6
        
         src = fetchurl {

     

       7
       -
           url = "http://isl.gforge.inria.fr/${name}.tar.xz";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       8
        
           sha256 = "0xa6xagah5rywkywn19rzvbvhfvkmylhcxr6z9z7bz29cpiwk0l8";

     

       9
        
         };

     

       10

···

       4
        
         name = "isl-0.14.1";

     

       5
        
       

     

       6
        
         src = fetchurl {

     

       7
       +
           urls = [

     

       8
       +
             "mirror://sourceforge/libisl/${name}.tar.xz"

     

       9
       +
             "https://libisl.sourceforge.io/${name}.tar.xz"

     

       10
       +
           ];

     

       11
        
           sha256 = "0xa6xagah5rywkywn19rzvbvhfvkmylhcxr6z9z7bz29cpiwk0l8";

     

       12
        
         };

     

       13

+4 -1

pkgs/development/libraries/isl/0.17.1.nix

···

       4
        
         name = "isl-0.17.1";

     

       5
        
       

     

       6
        
         src = fetchurl {

     

       7
       -
           url = "http://isl.gforge.inria.fr/${name}.tar.xz";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       8
        
           sha256 = "be152e5c816b477594f4c6194b5666d8129f3a27702756ae9ff60346a8731647";

     

       9
        
         };

     

       10

···

       4
        
         name = "isl-0.17.1";

     

       5
        
       

     

       6
        
         src = fetchurl {

     

       7
       +
           urls = [

     

       8
       +
             "mirror://sourceforge/libisl/${name}.tar.xz"

     

       9
       +
             "https://libisl.sourceforge.io/${name}.tar.xz"

     

       10
       +
           ];

     

       11
        
           sha256 = "be152e5c816b477594f4c6194b5666d8129f3a27702756ae9ff60346a8731647";

     

       12
        
         };

     

       13

+5 -1

pkgs/development/libraries/isl/0.20.0.nix

···

       4
        
         name = "isl-0.20";

     

       5
        
       

     

       6
        
         src = fetchurl {

     

       7
       -
           url = "http://isl.gforge.inria.fr/${name}.tar.xz";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       8
        
           sha256 = "1akpgq0rbqbah5517blg2zlnfvjxfcl9cjrfc75nbcx5p2gnlnd5";

     

       9
        
         };

     

       10

···

       4
        
         name = "isl-0.20";

     

       5
        
       

     

       6
        
         src = fetchurl {

     

       7
       +
           urls = [

     

       8
       +
             "mirror://sourceforge/libisl/${name}.tar.xz"

     

       9
       +
             "https://libisl.sourceforge.io/${name}.tar.xz"

     

       10
       +
           ];

     

       11
       +
       

     

       12
        
           sha256 = "1akpgq0rbqbah5517blg2zlnfvjxfcl9cjrfc75nbcx5p2gnlnd5";

     

       13
        
         };

     

       14

+36

pkgs/development/libraries/libsbsms/common.nix

···

       1
       +
       { lib

     

       2
       +
       , stdenv

     

       3
       +
       , fetchurl

     

       4
       +
       , substituteAll

     

       5
       +
       , pname

     

       6
       +
       , version

     

       7
       +
       , url

     

       8
       +
       , sha256

     

       9
       +
       , homepage

     

       10
       +
       }:

     

       11
       +
       

     

       12
       +
       stdenv.mkDerivation rec {

     

       13
       +
         inherit pname version;

     

       14
       +
       

     

       15
       +
         src = fetchurl {

     

       16
       +
           inherit url sha256;

     

       17
       +
         };

     

       18
       +
       

     

       19
       +
         patches = [

     

       20
       +
           # Fix buidling on platforms other than x86

     

       21
       +
           (substituteAll {

     

       22
       +
             src = ./configure.patch;

     

       23
       +
             msse = lib.optionalString stdenv.isx86_64 "-msse";

     

       24
       +
           })

     

       25
       +
         ];

     

       26
       +
       

     

       27
       +
         doCheck = true;

     

       28
       +
       

     

       29
       +
         meta = {

     

       30
       +
           inherit homepage;

     

       31
       +
           description = "Subband sinusoidal modeling library for time stretching and pitch scaling audio";

     

       32
       +
           maintainers =  with lib.maintainers; [ yuu ];

     

       33
       +
           license = lib.licenses.gpl2;

     

       34
       +
           platforms = lib.platforms.all;

     

       35
       +
         };

     

       36
       +
       }

+22

pkgs/development/libraries/libsbsms/configure.patch

···

       1
       +
       diff --git a/configure b/configure

     

       2
       +
       index 3d40335..faa3ac6 100755

     

       3
       +
       --- a/configure

     

       4
       +
       +++ b/configure

     

       5
       +
       @@ -14722,7 +14722,7 @@ if ${ax_cv_cxx_flags__msse+:} false; then :

     

       6
       +
        else

     

       7
       +
        

     

       8
       +
              ax_save_FLAGS=$CXXFLAGS

     

       9
       +
       -      CXXFLAGS="-msse"

     

       10
       +
       +      CXXFLAGS="@msse@"

     

       11
       +
              cat confdefs.h - <<_ACEOF >conftest.$ac_ext

     

       12
       +
        /* end confdefs.h.  */

     

       13
       +
        

     

       14
       +
       @@ -14747,7 +14747,7 @@ eval ax_check_compiler_flags=$ax_cv_cxx_flags__msse

     

       15
       +
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5

     

       16
       +
        $as_echo "$ax_check_compiler_flags" >&6; }

     

       17
       +
        if test "x$ax_check_compiler_flags" = xyes; then

     

       18
       +
       -	SBSMS_CFLAGS="$SBSMS_CFLAGS -msse"

     

       19
       +
       +	SBSMS_CFLAGS="$SBSMS_CFLAGS @msse@"

     

       20
       +
        else

     

       21
       +
        	as_fn_error $? "Need a version of gcc with -msse" "$LINENO" 5

     

       22
       +
        fi

+22

pkgs/development/libraries/libsbsms/default.nix

···

       1
       +
       let

     

       2
       +
         pname = "libsbsms";

     

       3
       +
       in

     

       4
       +
       pkgs: rec {

     

       5
       +
         libsbsms_2_0_2 = pkgs.callPackage ./common.nix rec {

     

       6
       +
           inherit pname;

     

       7
       +
           version = "2.0.2";

     

       8
       +
           url = "mirror://sourceforge/sbsms/${pname}-${version}.tar.gz";

     

       9
       +
           sha256 = "sha256-zqs9lwZkszcFe0a89VKD1Q0ynaY2v4PQ7nw24iNBru4=";

     

       10
       +
           homepage = "https://sourceforge.net/projects/sbsms/files/sbsms";

     

       11
       +
         };

     

       12
       +
       

     

       13
       +
         libsbsms_2_3_0 = pkgs.callPackage ./common.nix rec {

     

       14
       +
           inherit pname;

     

       15
       +
           version = "2.3.0";

     

       16
       +
           url = "https://github.com/claytonotey/${pname}/archive/refs/tags/${version}.tar.gz";

     

       17
       +
           sha256 = "sha256-T4jRUrwG/tvanV1lUX1AJUpzEMkFBgGpMSIwnUWv0sk=";

     

       18
       +
           homepage = "https://github.com/claytonotey/libsbsms";

     

       19
       +
         };

     

       20
       +
       

     

       21
       +
         libsbsms = libsbsms_2_0_2;

     

       22
       +
       }

+9 -6

pkgs/development/libraries/luabind/default.nix

···

       1
       -
       {lib, stdenv, fetchurl, boost-build, lua, boost}:

     

       2
        
       

     

       3
       -
       stdenv.mkDerivation {

     

       4
       -
         name = "luabind-0.9.1";

     

       0
        
       
     

       5
        
       

     

       6
       -
         src = fetchurl {

     

       7
       -
           url = "https://github.com/luabind/luabind/archive/v0.9.1.tar.gz";

     

       8
       -
           sha256 = "0e5ead50a07668d29888f2fa6f53220f900c886e46a2c99c7e8656842f05ff2d";

     

       0
        
       
     

       0
        
       
     

       9
        
         };

     

       10
        
       

     

       11
        
         patches = [ ./0.9.1_modern_boost_fix.patch ./0.9.1_boost_1.57_fix.patch ./0.9.1_discover_luajit.patch ];

···

       1
       +
       { lib, stdenv, fetchFromGitHub, boost-build, lua, boost }:

     

       2
        
       

     

       3
       +
       stdenv.mkDerivation rec {

     

       4
       +
         pname = "luabind";

     

       5
       +
         version = "0.9.1";

     

       6
        
       

     

       7
       +
         src = fetchFromGitHub {

     

       8
       +
           owner = "luabind";

     

       9
       +
           repo = "luabind";

     

       10
       +
           rev = version;

     

       11
       +
           sha256 = "sha256-sK1ca2Oj9yXdmxyXeDO3k8YZ1g+HxIXLhvdTWdPDdag=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         patches = [ ./0.9.1_modern_boost_fix.patch ./0.9.1_boost_1.57_fix.patch ./0.9.1_discover_luajit.patch ];

+5 -3

pkgs/development/libraries/nco/default.nix

···

       1
       -
       { lib, stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr2, which, curl, flex, coreutils }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "nco";

     

       5
        
         version = "5.0.3";

     

       6
        
       

     

       7
       -
         src = fetchzip {

     

       8
       -
           url = "https://github.com/nco/nco/archive/${version}.tar.gz";

     

       0
        
       
     

       0
        
       
     

       9
        
           sha256 = "sha256-KrFRBlD3z/sjKIvxmE0s/xCILQmESecilnlUGzDDICw=";

     

       10
        
         };

     

       11

···

       1
       +
       { lib, stdenv, fetchFromGitHub, netcdf, netcdfcxx4, gsl, udunits, antlr2, which, curl, flex, coreutils }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "nco";

     

       5
        
         version = "5.0.3";

     

       6
        
       

     

       7
       +
         src = fetchFromGitHub {

     

       8
       +
           owner = "nco";

     

       9
       +
           repo = "nco";

     

       10
       +
           rev = version;

     

       11
        
           sha256 = "sha256-KrFRBlD3z/sjKIvxmE0s/xCILQmESecilnlUGzDDICw=";

     

       12
        
         };

     

       13

+6 -4

pkgs/development/libraries/netcdf-cxx4/default.nix

···

       1
       -
       { lib, stdenv, fetchzip, netcdf, hdf5, curl, cmake, ninja }:

     

       2
        
       stdenv.mkDerivation rec {

     

       3
        
         pname = "netcdf-cxx4";

     

       4
        
         version = "4.3.1";

     

       5
        
       

     

       6
       -
         src = fetchzip {

     

       7
       -
           url = "https://github.com/Unidata/netcdf-cxx4/archive/v${version}.tar.gz";

     

       8
       -
           sha256 = "05kydd5z9iil5iv4fp7l11cicda5n5lsg5sdmsmc55xpspnsg7hr";

     

       0
        
       
     

       0
        
       
     

       9
        
         };

     

       10
        
       

     

       11
        
         preConfigure = ''

···

       1
       +
       { lib, stdenv, fetchFromGitHub, netcdf, hdf5, curl, cmake, ninja }:

     

       2
        
       stdenv.mkDerivation rec {

     

       3
        
         pname = "netcdf-cxx4";

     

       4
        
         version = "4.3.1";

     

       5
        
       

     

       6
       +
         src = fetchFromGitHub {

     

       7
       +
           owner = "Unidata";

     

       8
       +
           repo = "netcdf-cxx4";

     

       9
       +
           rev = "v${version}";

     

       10
       +
           sha256 = "sha256-GZ6n7dW3l8Kqrk2Xp2mxRTUWWQj0XEd2LDTG9EtrfhY=";

     

       11
        
         };

     

       12
        
       

     

       13
        
         preConfigure = ''

+6 -4

pkgs/development/libraries/netcdf-fortran/default.nix

···

       1
       -
       { lib, stdenv, fetchurl, netcdf, hdf5, curl, gfortran }:

     

       2
        
       stdenv.mkDerivation rec {

     

       3
        
         pname = "netcdf-fortran";

     

       4
        
         version = "4.4.5";

     

       5
        
       

     

       6
       -
         src = fetchurl {

     

       7
       -
           url = "https://github.com/Unidata/netcdf-fortran/archive/v${version}.tar.gz";

     

       8
       -
           sha256 = "00qwg4v250yg8kxp68srrnvfbfim241fnlm071p9ila2mihk8r01";

     

       0
        
       
     

       0
        
       
     

       9
        
         };

     

       10
        
       

     

       11
        
         nativeBuildInputs = [ gfortran ];

···

       1
       +
       { lib, stdenv, fetchFromGitHub, netcdf, hdf5, curl, gfortran }:

     

       2
        
       stdenv.mkDerivation rec {

     

       3
        
         pname = "netcdf-fortran";

     

       4
        
         version = "4.4.5";

     

       5
        
       

     

       6
       +
         src = fetchFromGitHub {

     

       7
       +
           owner = "Unidata";

     

       8
       +
           repo = "netcdf-fortran";

     

       9
       +
           rev = "v${version}";

     

       10
       +
           sha256 = "sha256-nC93NcA4VJbrqaLwyhjP10j/t6rQSYcAzKBxclpZVe0=";

     

       11
        
         };

     

       12
        
       

     

       13
        
         nativeBuildInputs = [ gfortran ];

+8

pkgs/development/libraries/ogre/1.10.x.nix

···

       16
        
            sha256 = "1zwvlx5dz9nwjazhnrhzb0w8ilpa84r0hrxrmmy69pgr1p1yif5a";

     

       17
        
         };

     

       18
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       19
        
         cmakeFlags = [ "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ]

     

       20
        
           ++ map (x: "-DOGRE_BUILD_PLUGIN_${x}=on")

     

       21
        
                  ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG")

···

       16
        
            sha256 = "1zwvlx5dz9nwjazhnrhzb0w8ilpa84r0hrxrmmy69pgr1p1yif5a";

     

       17
        
         };

     

       18
        
       

     

       19
       +
         # fix for ARM. sys/sysctl.h has moved in later glibcs, and

     

       20
       +
         # https://github.com/OGRECave/ogre-next/issues/132 suggests it isn't

     

       21
       +
         # needed anyway.

     

       22
       +
         postPatch = ''

     

       23
       +
           substituteInPlace OgreMain/src/OgrePlatformInformation.cpp \

     

       24
       +
             --replace '#include <sys/sysctl.h>' ""

     

       25
       +
         '';

     

       26
       +
       

     

       27
        
         cmakeFlags = [ "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ]

     

       28
        
           ++ map (x: "-DOGRE_BUILD_PLUGIN_${x}=on")

     

       29
        
                  ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG")

+8

pkgs/development/libraries/ogre/1.9.x.nix

···

       19
        
           sha256 = "11lfgzqaps3728dswrq3cbwk7aicigyz08q4hfyy6ikc6m35r4wg";

     

       20
        
         };

     

       21
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       22
        
         cmakeFlags = [ "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ]

     

       23
        
           ++ map (x: "-DOGRE_BUILD_PLUGIN_${x}=on")

     

       24
        
                  ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG")

···

       19
        
           sha256 = "11lfgzqaps3728dswrq3cbwk7aicigyz08q4hfyy6ikc6m35r4wg";

     

       20
        
         };

     

       21
        
       

     

       22
       +
         # fix for ARM. sys/sysctl.h has moved in later glibcs, and

     

       23
       +
         # https://github.com/OGRECave/ogre-next/issues/132 suggests it isn't

     

       24
       +
         # needed anyway.

     

       25
       +
         postPatch = ''

     

       26
       +
           substituteInPlace OgreMain/src/OgrePlatformInformation.cpp \

     

       27
       +
             --replace '#include <sys/sysctl.h>' ""

     

       28
       +
         '';

     

       29
       +
       

     

       30
        
         cmakeFlags = [ "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ]

     

       31
        
           ++ map (x: "-DOGRE_BUILD_PLUGIN_${x}=on")

     

       32
        
                  ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG")

+64 -20

pkgs/development/libraries/ogre/default.nix

···

       1
       -
       { fetchurl, stdenv, lib

     

       2
       -
       , cmake, libGLU, libGL

     

       3
       -
       , freetype, freeimage, zziplib, xorgproto, libXrandr

     

       4
       -
       , libXaw, freeglut, libXt, libpng, boost, ois

     

       5
       -
       , libX11, libXmu, libSM, pkg-config

     

       6
       -
       , libXxf86vm, libICE

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       7
        
       , unzip

     

       8
        
       , libXrender

     

       9
        
       , SDL2

     

       10
       -
       , withNvidiaCg ? false, nvidia_cg_toolkit

     

       11
       -
       , withSamples ? false }:

     

       0
        
       
     

       0
        
       
     

       12
        
       

     

       13
        
       stdenv.mkDerivation rec {

     

       14
        
         pname = "ogre";

     

       15
        
         version = "1.12.1";

     

       16
        
       

     

       17
       -
         src = fetchurl {

     

       18
       -
            url = "https://github.com/OGRECave/ogre/archive/v${version}.zip";

     

       19
       -
            sha256 = "1iv6k0dwdzg5nnzw2mcgcl663q4f7p2kj7nhs8afnsikrzxxgsi4";

     

       0
        
       
     

       0
        
       
     

       20
        
         };

     

       21
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       22
        
         cmakeFlags = [ "-DOGRE_BUILD_DEPENDENCIES=OFF" "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ]

     

       23
        
           ++ map (x: "-DOGRE_BUILD_PLUGIN_${x}=on")

     

       24
       -
                  ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG")

     

       25
        
           ++ map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ];

     

       26
        
       

     

       27
        
       

     

       28
        
         nativeBuildInputs = [ cmake unzip pkg-config ];

     

       29
        
         buildInputs =

     

       30
       -
          [ cmake libGLU libGL

     

       31
       -
            freetype freeimage zziplib xorgproto libXrandr

     

       32
       -
            libXaw freeglut libXt libpng boost ois

     

       33
       -
            libX11 libXmu libSM

     

       34
       -
            libXxf86vm libICE

     

       35
       -
            libXrender

     

       36
       -
            SDL2

     

       37
       -
          ] ++ lib.optional withNvidiaCg nvidia_cg_toolkit;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       38
        
       

     

       39
        
         meta = {

     

       40
        
           description = "A 3D engine";

···

       1
       +
       { fetchFromGitHub

     

       2
       +
       , stdenv

     

       3
       +
       , lib

     

       4
       +
       , cmake

     

       5
       +
       , libGLU

     

       6
       +
       , libGL

     

       7
       +
       , freetype

     

       8
       +
       , freeimage

     

       9
       +
       , zziplib

     

       10
       +
       , xorgproto

     

       11
       +
       , libXrandr

     

       12
       +
       , libXaw

     

       13
       +
       , freeglut

     

       14
       +
       , libXt

     

       15
       +
       , libpng

     

       16
       +
       , boost

     

       17
       +
       , ois

     

       18
       +
       , libX11

     

       19
       +
       , libXmu

     

       20
       +
       , libSM

     

       21
       +
       , pkg-config

     

       22
       +
       , libXxf86vm

     

       23
       +
       , libICE

     

       24
        
       , unzip

     

       25
        
       , libXrender

     

       26
        
       , SDL2

     

       27
       +
       , withNvidiaCg ? false

     

       28
       +
       , nvidia_cg_toolkit

     

       29
       +
       , withSamples ? false

     

       30
       +
       }:

     

       31
        
       

     

       32
        
       stdenv.mkDerivation rec {

     

       33
        
         pname = "ogre";

     

       34
        
         version = "1.12.1";

     

       35
        
       

     

       36
       +
         src = fetchFromGitHub {

     

       37
       +
           owner = "OGRECave";

     

       38
       +
           repo = "ogre";

     

       39
       +
           rev = "v${version}";

     

       40
       +
           sha256 = "sha256-FHW0+DZhw6MLlhjh4DRYhA+6vBBXMN9K6GEVoR6P5kM=";

     

       41
        
         };

     

       42
        
       

     

       43
       +
         # fix for ARM. sys/sysctl.h has moved in later glibcs, and

     

       44
       +
         # https://github.com/OGRECave/ogre-next/issues/132 suggests it isn't

     

       45
       +
         # needed anyway.

     

       46
       +
         postPatch = ''

     

       47
       +
           substituteInPlace OgreMain/src/OgrePlatformInformation.cpp \

     

       48
       +
             --replace '#include <sys/sysctl.h>' ""

     

       49
       +
         '';

     

       50
       +
       

     

       51
        
         cmakeFlags = [ "-DOGRE_BUILD_DEPENDENCIES=OFF" "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ]

     

       52
        
           ++ map (x: "-DOGRE_BUILD_PLUGIN_${x}=on")

     

       53
       +
           ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG")

     

       54
        
           ++ map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ];

     

       55
        
       

     

       56
        
       

     

       57
        
         nativeBuildInputs = [ cmake unzip pkg-config ];

     

       58
        
         buildInputs =

     

       59
       +
           [

     

       60
       +
             cmake

     

       61
       +
             libGLU

     

       62
       +
             libGL

     

       63
       +
             freetype

     

       64
       +
             freeimage

     

       65
       +
             zziplib

     

       66
       +
             xorgproto

     

       67
       +
             libXrandr

     

       68
       +
             libXaw

     

       69
       +
             freeglut

     

       70
       +
             libXt

     

       71
       +
             libpng

     

       72
       +
             boost

     

       73
       +
             ois

     

       74
       +
             libX11

     

       75
       +
             libXmu

     

       76
       +
             libSM

     

       77
       +
             libXxf86vm

     

       78
       +
             libICE

     

       79
       +
             libXrender

     

       80
       +
             SDL2

     

       81
       +
           ] ++ lib.optional withNvidiaCg nvidia_cg_toolkit;

     

       82
        
       

     

       83
        
         meta = {

     

       84
        
           description = "A 3D engine";

+6 -4

pkgs/development/libraries/ogrepaged/default.nix

···

       1
       -
       { lib, stdenv, fetchurl, fetchpatch, cmake, pkg-config, ois, ogre, libX11, boost }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "ogre-paged";

     

       5
        
         version = "1.2.0";

     

       6
        
       

     

       7
       -
         src = fetchurl {

     

       8
       -
           url = "https://github.com/RigsOfRods/ogre-pagedgeometry/archive/v${version}.tar.gz";

     

       9
       -
           sha256 = "17j7rw9wbkynxbhm2lay3qgjnnagb2vd5jn9iijnn2lf8qzbgy82";

     

       0
        
       
     

       0
        
       
     

       10
        
         };

     

       11
        
       

     

       12
        
         patches = [

···

       1
       +
       { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, ois, ogre, libX11, boost }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "ogre-paged";

     

       5
        
         version = "1.2.0";

     

       6
        
       

     

       7
       +
         src = fetchFromGitHub {

     

       8
       +
           owner = "RigsOfRods";

     

       9
       +
           repo = "ogre-pagedgeometry";

     

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

     

       11
       +
           sha256 = "sha256-EwtTV8cbhDv0Bgj7i3qgq4hLETwd5B2GFEegwozlY9U=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         patches = [

+7 -7

pkgs/development/libraries/openbabel/default.nix

···

       1
       -
       {stdenv, lib, fetchurl, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkg-config, swig, rapidjson }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "openbabel";

     

       5
        
         version = "3.1.1";

     

       6
        
       

     

       7
       -
         src = fetchurl {

     

       8
       -
           url = "https://github.com/openbabel/openbabel/archive/openbabel-${lib.replaceStrings ["."] ["-"] version}.tar.gz";

     

       9
       -
           sha256 = "c97023ac6300d26176c97d4ef39957f06e68848d64f1a04b0b284ccff2744f02";

     

       0
        
       
     

       0
        
       
     

       10
        
         };

     

       11
       -
       

     

       12
        
       

     

       13
        
         buildInputs = [ zlib libxml2 eigen python cairo pcre swig rapidjson ];

     

       14
        
       

     
···

       21
        
           "-DPYTHON_BINDINGS=ON"

     

       22
        
         ];

     

       23
        
       

     

       24
       -
       

     

       25
        
         postFixup = ''

     

       26
        
           cat <<EOF > $out/lib/python$pythonMajorMinor/site-packages/setup.py

     

       27
        
           from distutils.core import setup

     
···

       33
        
               package_data = {'openbabel' : ['_openbabel.so']}

     

       34
        
           )

     

       35
        
           EOF

     

       36
       -
           '';

     

       37
        
       

     

       38
        
         meta = with lib; {

     

       39
        
           description = "A toolbox designed to speak the many languages of chemical data";

···

       1
       +
       { stdenv, lib, fetchFromGitHub, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkg-config, swig, rapidjson }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "openbabel";

     

       5
        
         version = "3.1.1";

     

       6
        
       

     

       7
       +
         src = fetchFromGitHub {

     

       8
       +
           owner = "openbabel";

     

       9
       +
           repo = "openbabel";

     

       10
       +
           rev = "openbabel-${lib.replaceStrings ["."] ["-"] version}";

     

       11
       +
           sha256 = "sha256-wQpgdfCyBAoh4pmj9j7wPTlMtraJ62w/EShxi/olVMY=";

     

       12
        
         };

     

       0
        
       
     

       13
        
       

     

       14
        
         buildInputs = [ zlib libxml2 eigen python cairo pcre swig rapidjson ];

     

       15
        
       

     
···

       22
        
           "-DPYTHON_BINDINGS=ON"

     

       23
        
         ];

     

       24
        
       

     

       0
        
       
     

       25
        
         postFixup = ''

     

       26
        
           cat <<EOF > $out/lib/python$pythonMajorMinor/site-packages/setup.py

     

       27
        
           from distutils.core import setup

     
···

       33
        
               package_data = {'openbabel' : ['_openbabel.so']}

     

       34
        
           )

     

       35
        
           EOF

     

       36
       +
         '';

     

       37
        
       

     

       38
        
         meta = with lib; {

     

       39
        
           description = "A toolbox designed to speak the many languages of chemical data";

+2 -2

pkgs/development/libraries/physics/rivet/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "rivet";

     

       5
       -
         version = "3.1.4";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";

     

       9
       -
           sha256 = "sha256-N+3ICilozhAxWJ5DumtJKHfKeQG+o4+Lt1NqXIz4EA0=";

     

       10
        
         };

     

       11
        
       

     

       12
        
         latex = texlive.combine { inherit (texlive)

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "rivet";

     

       5
       +
         version = "3.1.5";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";

     

       9
       +
           hash = "sha256-YhcXW3gab7z3EJd3qGePeplVEapV4a5WKIc151hQXZo=";

     

       10
        
         };

     

       11
        
       

     

       12
        
         latex = texlive.combine { inherit (texlive)

+16 -12

pkgs/development/libraries/physics/yoda/default.nix

···

       1
       -
       { lib, stdenv, fetchurl, python, root, makeWrapper, zlib, withRootSupport ? false }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "yoda";

     

       5
       -
         version = "1.9.1";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2";

     

       9
       -
           sha256 = "sha256-xhagWmVlvlsayL0oWTihoxhq0ejejEACCsdQqFN1HUw=";

     

       10
        
         };

     

       11
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       12
        
         nativeBuildInputs = with python.pkgs; [ cython makeWrapper ];

     

       13
        
         buildInputs = [ python ]

     

       14
        
           ++ (with python.pkgs; [ numpy matplotlib ])

     
···

       32
        
       

     

       33
        
         doInstallCheck = true;

     

       34
        
         installCheckTarget = "check";

     

       35
       -
       

     

       36
       -
         # Workaround for https://gitlab.com/hepcedar/yoda/-/merge_requests/49

     

       37
       -
         preInstallCheck = ''

     

       38
       -
           cp tests/test{1,}.yoda

     

       39
       -
           gzip -c tests/test.yoda > tests/test.yoda.gz

     

       40
       -
         '';

     

       41
        
       

     

       42
        
         meta = {

     

       43
        
           description = "Provides small set of data analysis (specifically histogramming) classes";

     

       44
       -
           license     = lib.licenses.gpl3;

     

       45
       -
           homepage    = "https://yoda.hepforge.org";

     

       46
       -
           platforms   = lib.platforms.unix;

     

       47
        
           maintainers = with lib.maintainers; [ veprbl ];

     

       48
        
         };

     

       49
        
       }

···

       1
       +
       { lib, stdenv, fetchurl, fetchpatch, python, root, makeWrapper, zlib, withRootSupport ? false }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "yoda";

     

       5
       +
         version = "1.9.2";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2";

     

       9
       +
           hash = "sha256-zb7j7fBMv2brJ+gUMMDTKFEJDC2embENe3wXdx0VTOA=";

     

       10
        
         };

     

       11
        
       

     

       12
       +
         patches = [

     

       13
       +
           # Prevent ROOT from initializing X11 or Cocoa (helps with sandboxing)

     

       14
       +
           (fetchpatch {

     

       15
       +
             url = "https://gitlab.com/hepcedar/yoda/-/commit/36c035f4f0385dec58702f09564ca66a14ca2c3e.diff";

     

       16
       +
             sha256 = "sha256-afB+y33TVNJtxY5As18EcutJEGDE4g0UzMxzA+YgICk=";

     

       17
       +
             excludes = [ "ChangeLog" ];

     

       18
       +
           })

     

       19
       +
         ];

     

       20
       +
       

     

       21
        
         nativeBuildInputs = with python.pkgs; [ cython makeWrapper ];

     

       22
        
         buildInputs = [ python ]

     

       23
        
           ++ (with python.pkgs; [ numpy matplotlib ])

     
···

       41
        
       

     

       42
        
         doInstallCheck = true;

     

       43
        
         installCheckTarget = "check";

     

       44
       +
         enableParallelChecking = false; # testreader consumes output of testwriter

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       45
        
       

     

       46
        
         meta = {

     

       47
        
           description = "Provides small set of data analysis (specifically histogramming) classes";

     

       48
       +
           license = lib.licenses.gpl3;

     

       49
       +
           homepage = "https://yoda.hepforge.org";

     

       50
       +
           platforms = lib.platforms.unix;

     

       51
        
           maintainers = with lib.maintainers; [ veprbl ];

     

       52
        
         };

     

       53
        
       }

+1

pkgs/development/libraries/qt-5/modules/qtwebengine.nix

···

       239
        
           platforms = platforms.unix;

     

       240
        
           # This build takes a long time; particularly on slow architectures

     

       241
        
           timeout = 24 * 3600;

     

       0
        
       
     

       242
        
         };

     

       243
        
       }

···

       239
        
           platforms = platforms.unix;

     

       240
        
           # This build takes a long time; particularly on slow architectures

     

       241
        
           timeout = 24 * 3600;

     

       242
       +
           broken = stdenv.isDarwin && (lib.versionAtLeast qtCompatVersion "5.14"); # requires a newer SDK

     

       243
        
         };

     

       244
        
       }

+7 -4

pkgs/development/libraries/science/math/openlibm/default.nix

···

       1
       -
       { lib, stdenv, fetchurl }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "openlibm";

     

       5
        
         version = "0.8.0";

     

       6
       -
         src = fetchurl {

     

       7
       -
           url = "https://github.com/JuliaLang/openlibm/archive/v${version}.tar.gz";

     

       8
       -
           sha256 = "sha256-A2IHaN9MpSamPdZ1xt6VpcnRZ/9ZVVzlemHGv0nkAO4=";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       9
        
         };

     

       10
        
       

     

       11
        
         makeFlags = [ "prefix=$(out)" ];

···

       1
       +
       { lib, stdenv, fetchFromGitHub }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "openlibm";

     

       5
        
         version = "0.8.0";

     

       6
       +
       

     

       7
       +
         src = fetchFromGitHub {

     

       8
       +
           owner = "JuliaLang";

     

       9
       +
           repo = "openlibm";

     

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

     

       11
       +
           sha256 = "sha256-dEM10picZXiPokzSHCfxhS7fwZ0sMjil4bni+PHBCeI=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         makeFlags = [ "prefix=$(out)" ];

+7 -5

pkgs/development/libraries/science/math/primesieve/default.nix

···

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

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "primesieve";

     

       5
        
         version = "7.6";

     

       6
        
       

     

       7
       -
         nativeBuildInputs = [cmake];

     

       8
        
       

     

       9
       -
         src = fetchurl {

     

       10
       -
           url = "https://github.com/kimwalisch/primesieve/archive/v${version}.tar.gz";

     

       11
       -
           sha256 = "sha256-SFZp6Pmmx05SiUfSdN9wXxPKrydtRg0PA3uNvAycCpk=";

     

       0
        
       
     

       0
        
       
     

       12
        
         };

     

       13
        
       

     

       14
        
         meta = with lib; {

···

       1
       +
       { lib, stdenv, fetchFromGitHub, cmake }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "primesieve";

     

       5
        
         version = "7.6";

     

       6
        
       

     

       7
       +
         nativeBuildInputs = [ cmake ];

     

       8
        
       

     

       9
       +
         src = fetchFromGitHub {

     

       10
       +
           owner = "kimwalisch";

     

       11
       +
           repo = "primesieve";

     

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

     

       13
       +
           sha256 = "sha256-rSNYoWBy80BgPi1c+BSKbWTyGGb7/fxmu+mq1DXakHY=";

     

       14
        
         };

     

       15
        
       

     

       16
        
         meta = with lib; {

+30 -10

pkgs/development/libraries/sfml/default.nix

···

       1
       -
       { lib, stdenv, fetchzip, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis

     

       2
       -
       , glew, libXrandr, libXrender, udev, xcbutilimage

     

       3
       -
       , IOKit, Foundation, AppKit, OpenAL

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       4
        
       }:

     

       5
        
       

     

       6
        
       stdenv.mkDerivation rec {

     

       7
        
         pname = "sfml";

     

       8
        
         version = "2.5.1";

     

       9
        
       

     

       10
       -
         src = fetchzip {

     

       11
       -
           url = "https://github.com/SFML/SFML/archive/${version}.tar.gz";

     

       12
       -
           sha256 = "0abr8ri2ssfy9ylpgjrr43m6rhrjy03wbj9bn509zqymifvq5pay";

     

       0
        
       
     

       0
        
       
     

       13
        
         };

     

       14
        
       

     

       15
        
         nativeBuildInputs = [ cmake ];

     
···

       18
        
           ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXrandr libXrender xcbutilimage ]

     

       19
        
           ++ lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL ];

     

       20
        
       

     

       21
       -
         cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes"

     

       22
       -
                        "-DSFML_MISC_INSTALL_PREFIX=share/SFML"

     

       23
       -
                        "-DSFML_BUILD_FRAMEWORKS=no"

     

       24
       -
                        "-DSFML_USE_SYSTEM_DEPS=yes" ];

     

       0
        
       
     

       0
        
       
     

       25
        
       

     

       26
        
         meta = with lib; {

     

       27
        
           homepage = "https://www.sfml-dev.org/";

···

       1
       +
       { lib

     

       2
       +
       , stdenv

     

       3
       +
       , fetchFromGitHub

     

       4
       +
       , cmake

     

       5
       +
       , libX11

     

       6
       +
       , freetype

     

       7
       +
       , libjpeg

     

       8
       +
       , openal

     

       9
       +
       , flac

     

       10
       +
       , libvorbis

     

       11
       +
       , glew

     

       12
       +
       , libXrandr

     

       13
       +
       , libXrender

     

       14
       +
       , udev

     

       15
       +
       , xcbutilimage

     

       16
       +
       , IOKit

     

       17
       +
       , Foundation

     

       18
       +
       , AppKit

     

       19
       +
       , OpenAL

     

       20
        
       }:

     

       21
        
       

     

       22
        
       stdenv.mkDerivation rec {

     

       23
        
         pname = "sfml";

     

       24
        
         version = "2.5.1";

     

       25
        
       

     

       26
       +
         src = fetchFromGitHub {

     

       27
       +
           owner = "SFML";

     

       28
       +
           repo = "SFML";

     

       29
       +
           rev = version;

     

       30
       +
           sha256 = "sha256-Xt2Ct4vV459AsSvJxQfwMsNs6iA5y3epT95pLWJGeSk=";

     

       31
        
         };

     

       32
        
       

     

       33
        
         nativeBuildInputs = [ cmake ];

     
···

       36
        
           ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXrandr libXrender xcbutilimage ]

     

       37
        
           ++ lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL ];

     

       38
        
       

     

       39
       +
         cmakeFlags = [

     

       40
       +
           "-DSFML_INSTALL_PKGCONFIG_FILES=yes"

     

       41
       +
           "-DSFML_MISC_INSTALL_PREFIX=share/SFML"

     

       42
       +
           "-DSFML_BUILD_FRAMEWORKS=no"

     

       43
       +
           "-DSFML_USE_SYSTEM_DEPS=yes"

     

       44
       +
         ];

     

       45
        
       

     

       46
        
         meta = with lib; {

     

       47
        
           homepage = "https://www.sfml-dev.org/";

+3 -3

pkgs/development/libraries/stb/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation {

     

       4
        
         pname = "stb";

     

       5
       -
         version = "20180211";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "nothings";

     

       9
        
           repo = "stb";

     

       10
       -
           rev = "e6afb9cbae4064da8c3e69af3ff5c4629579c1d2";

     

       11
       -
           sha256 = "079nsn9bnb8c0vfq26g5l53q6gzx19a5x9q2nb55mpcljxsgxnmf";

     

       12
        
         };

     

       13
        
       

     

       14
        
         dontBuild = true;

···

       2
        
       

     

       3
        
       stdenv.mkDerivation {

     

       4
        
         pname = "stb";

     

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

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "nothings";

     

       9
        
           repo = "stb";

     

       10
       +
           rev = "af1a5bc352164740c1cc1354942b1c6b72eacb8a";

     

       11
       +
           sha256 = "0qq35cd747lll4s7bmnxb3pqvyp2hgcr9kyf758fax9lx76iwjhr";

     

       12
        
         };

     

       13
        
       

     

       14
        
         dontBuild = true;

+9 -4

pkgs/development/libraries/stxxl/default.nix

···

       1
       -
       { lib, stdenv, fetchurl, cmake

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       2
        
       , parallel ? true

     

       3
        
       }:

     

       4
        
       

     
···

       10
        
         pname = "stxxl";

     

       11
        
         version = "1.4.1";

     

       12
        
       

     

       13
       -
         src = fetchurl {

     

       14
       -
           url = "https://github.com/stxxl/stxxl/archive/${version}.tar.gz";

     

       15
       -
           sha256 = "54006a5fccd1435abc2f3ec201997a4d7dacddb984d2717f62191798e5372f6c";

     

       0
        
       
     

       0
        
       
     

       16
        
         };

     

       17
        
       

     

       18
        
         nativeBuildInputs = [ cmake ];

···

       1
       +
       { lib

     

       2
       +
       , stdenv

     

       3
       +
       , fetchFromGitHub

     

       4
       +
       , cmake

     

       5
        
       , parallel ? true

     

       6
        
       }:

     

       7
        
       

     
···

       13
        
         pname = "stxxl";

     

       14
        
         version = "1.4.1";

     

       15
        
       

     

       16
       +
         src = fetchFromGitHub {

     

       17
       +
           owner = "stxxl";

     

       18
       +
           repo = "stxxl";

     

       19
       +
           rev = version;

     

       20
       +
           sha256 = "sha256-U6DQ5mI83pyTmq5/ga5rI8v0h2/iEnNl8mxhIOpbF1I=";

     

       21
        
         };

     

       22
        
       

     

       23
        
         nativeBuildInputs = [ cmake ];

+6 -4

pkgs/development/libraries/vaapi-intel-hybrid/default.nix

···

       1
       -
       { lib, stdenv, fetchurl, autoreconfHook, pkg-config, cmrt, libdrm, libva, libX11, libGL, wayland }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "intel-hybrid-driver";

     

       5
        
         version = "1.0.2";

     

       6
        
       

     

       7
       -
         src = fetchurl {

     

       8
       -
           url = "https://github.com/01org/intel-hybrid-driver/archive/${version}.tar.gz";

     

       9
       -
           sha256 = "0ywdhbvzwzzrq4qhylnw1wc8l3j67h26l0cs1rncwhw05s3ndk8n";

     

       0
        
       
     

       0
        
       
     

       10
        
         };

     

       11
        
       

     

       12
        
         patches = [

···

       1
       +
       { lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook, pkg-config, cmrt, libdrm, libva, libX11, libGL, wayland }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "intel-hybrid-driver";

     

       5
        
         version = "1.0.2";

     

       6
        
       

     

       7
       +
         src = fetchFromGitHub {

     

       8
       +
           owner = "01org";

     

       9
       +
           repo = "intel-hybrid-driver";

     

       10
       +
           rev = version;

     

       11
       +
           sha256 = "sha256-uYX7RoU1XVzcC2ea3z/VBjmT47xmzK67Y4LaiFXyJZ8=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         patches = [

+42 -12

pkgs/development/libraries/vigra/default.nix

···

       1
       -
       { lib, stdenv, fetchurl, boost, cmake, fftw, fftwSinglePrec, hdf5, ilmbase

     

       2
       -
       , libjpeg, libpng, libtiff, openexr, python2Packages }:

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       3
        
       

     

       4
        
       let

     

       5
        
         inherit (python2Packages) python numpy;

     

       6
        
         # Might want to use `python2.withPackages(ps: [ps.numpy]);` here...

     

       7
       -
       in stdenv.mkDerivation rec {

     

       0
        
       
     

       8
        
         pname = "vigra";

     

       9
        
         version = "1.11.1";

     

       10
        
       

     

       11
       -
         src = fetchurl {

     

       12
       -
           url = "https://github.com/ukoethe/vigra/archive/Version-${lib.replaceChars ["."] ["-"] version}.tar.gz";

     

       13
       -
           sha256 = "03i5wfscv83jb8vnwwhfmm8yfiniwkvk13myzhr1kbwbs9884wdj";

     

       0
        
       
     

       0
        
       
     

       14
        
         };

     

       15
        
       

     

       16
        
         NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";

     

       17
        
       

     

       18
        
         # Fixes compilation with clang (on darwin) see https://github.com/ukoethe/vigra/issues/414

     

       19
        
         patches =

     

       20
       -
           let clangPatch = fetchurl { url = "https://github.com/ukoethe/vigra/commit/81958d302494e137f98a8b1d7869841532f90388.patch";

     

       21
       -
                                       sha256 = "1i1w6smijgb5z8bg9jaq84ccy00k2sxm87s37lgjpyix901gjlgi"; };

     

       0
        
       
     

       0
        
       
     

       22
        
           in [ clangPatch ];

     

       23
        
       

     

       24
        
         nativeBuildInputs = [ cmake ];

     

       25
       -
         buildInputs = [ boost fftw fftwSinglePrec hdf5 ilmbase libjpeg libpng

     

       26
       -
                         libtiff numpy openexr python ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       27
        
       

     

       28
        
         preConfigure = "cmakeFlags+=\" -DVIGRANUMPY_INSTALL_DIR=$out/lib/${python.libPrefix}/site-packages\"";

     

       29
        
       

     

       30
        
         cmakeFlags = [ "-DWITH_OPENEXR=1" ]

     

       31
       -
                   ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux")

     

       32
       -
                         [ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ];

     

       33
        
       

     

       34
        
         # fails with "./test_watersheds3d: error while loading shared libraries: libvigraimpex.so.11: cannot open shared object file: No such file or directory"

     

       35
        
         doCheck = false;

···

       1
       +
       { lib

     

       2
       +
       , stdenv

     

       3
       +
       , fetchFromGitHub

     

       4
       +
       , fetchurl

     

       5
       +
       , boost

     

       6
       +
       , cmake

     

       7
       +
       , fftw

     

       8
       +
       , fftwSinglePrec

     

       9
       +
       , hdf5

     

       10
       +
       , ilmbase

     

       11
       +
       , libjpeg

     

       12
       +
       , libpng

     

       13
       +
       , libtiff

     

       14
       +
       , openexr

     

       15
       +
       , python2Packages

     

       16
       +
       }:

     

       17
        
       

     

       18
        
       let

     

       19
        
         inherit (python2Packages) python numpy;

     

       20
        
         # Might want to use `python2.withPackages(ps: [ps.numpy]);` here...

     

       21
       +
       in

     

       22
       +
       stdenv.mkDerivation rec {

     

       23
        
         pname = "vigra";

     

       24
        
         version = "1.11.1";

     

       25
        
       

     

       26
       +
         src = fetchFromGitHub {

     

       27
       +
           owner = "ukoethe";

     

       28
       +
           repo = "vigra";

     

       29
       +
           rev = "Version-${lib.replaceChars ["."] ["-"] version}";

     

       30
       +
           sha256 = "sha256-tD6tdoT4mWBtzkn4Xv3nNIkBQmeqNqzI1AVxUbP76Mk=";

     

       31
        
         };

     

       32
        
       

     

       33
        
         NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";

     

       34
        
       

     

       35
        
         # Fixes compilation with clang (on darwin) see https://github.com/ukoethe/vigra/issues/414

     

       36
        
         patches =

     

       37
       +
           let clangPatch = fetchurl {

     

       38
       +
             url = "https://github.com/ukoethe/vigra/commit/81958d302494e137f98a8b1d7869841532f90388.patch";

     

       39
       +
             sha256 = "1i1w6smijgb5z8bg9jaq84ccy00k2sxm87s37lgjpyix901gjlgi";

     

       40
       +
           };

     

       41
        
           in [ clangPatch ];

     

       42
        
       

     

       43
        
         nativeBuildInputs = [ cmake ];

     

       44
       +
         buildInputs = [

     

       45
       +
           boost

     

       46
       +
           fftw

     

       47
       +
           fftwSinglePrec

     

       48
       +
           hdf5

     

       49
       +
           ilmbase

     

       50
       +
           libjpeg

     

       51
       +
           libpng

     

       52
       +
           libtiff

     

       53
       +
           numpy

     

       54
       +
           openexr

     

       55
       +
           python

     

       56
       +
         ];

     

       57
        
       

     

       58
        
         preConfigure = "cmakeFlags+=\" -DVIGRANUMPY_INSTALL_DIR=$out/lib/${python.libPrefix}/site-packages\"";

     

       59
        
       

     

       60
        
         cmakeFlags = [ "-DWITH_OPENEXR=1" ]

     

       61
       +
           ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux")

     

       62
       +
           [ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ];

     

       63
        
       

     

       64
        
         # fails with "./test_watersheds3d: error while loading shared libraries: libvigraimpex.so.11: cannot open shared object file: No such file or directory"

     

       65
        
         doCheck = false;

+11 -10

pkgs/development/libraries/vo-amrwbenc/default.nix

···

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

     

       2
        
       

     

       3
       -
       let

     

       4
       -
           version = "0.1.3";

     

       5
       -
       in

     

       6
       -
       stdenv.mkDerivation {

     

       7
       -
         name = "vo-amrwbenc-${version}";

     

       8
        
         version = "0.1.3";

     

       9
       -
         buildInputs = [ autoreconfHook ];

     

       10
       -
         src = fetchurl {

     

       11
       -
           url = "https://github.com/mstorsjo/vo-amrwbenc/archive/v${version}.tar.gz";

     

       12
       -
           sha256 = "85c79997ba7ddb9c95b5ddbe9ea032e27595390f3cbd686ed46a69e485cc053c";

     

       0
        
       
     

       0
        
       
     

       13
        
         };

     

       0
        
       
     

       0
        
       
     

       14
        
       

     

       15
        
         meta = {

     

       16
        
           homepage = "https://sourceforge.net/projects/opencore-amr/";

···

       1
       +
       { lib, stdenv, fetchFromGitHub, autoreconfHook }:

     

       2
        
       

     

       3
       +
       stdenv.mkDerivation rec{

     

       4
       +
         pname = "vo-amrwbenc";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       5
        
         version = "0.1.3";

     

       6
       +
       

     

       7
       +
         src = fetchFromGitHub {

     

       8
       +
           owner = "mstorsjo";

     

       9
       +
           repo = "vo-amrwbenc";

     

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

     

       11
       +
           sha256 = "sha256-oHhoJAI47VqBGk9cO3G5oqnHpWxA2jnJs103MwcYj+w=";

     

       12
        
         };

     

       13
       +
       

     

       14
       +
         nativeBuildInputs = [ autoreconfHook ];

     

       15
        
       

     

       16
        
         meta = {

     

       17
        
           homepage = "https://sourceforge.net/projects/opencore-amr/";

+6 -4

pkgs/development/mobile/imgpatchtools/default.nix

···

       1
       -
       { lib, stdenv, fetchzip, bzip2, openssl, zlib }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "imgpatchtools";

     

       5
        
         version = "0.3";

     

       6
        
       

     

       7
       -
         src = fetchzip {

     

       8
       -
           url = "https://github.com/erfanoabdi/imgpatchtools/archive/${version}.tar.gz";

     

       9
       -
           sha256 = "1cwp1hfhip252dz0mbkhrsrkws6m15k359n4amw2vfnglnls8czd";

     

       0
        
       
     

       0
        
       
     

       10
        
         };

     

       11
        
       

     

       12
        
         buildInputs = [ bzip2 openssl zlib ];

···

       1
       +
       { lib, stdenv, fetchFromGitHub, bzip2, openssl, zlib }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "imgpatchtools";

     

       5
        
         version = "0.3";

     

       6
        
       

     

       7
       +
         src = fetchFromGitHub {

     

       8
       +
           owner = "erfanoabdi";

     

       9
       +
           repo = "imgpatchtools";

     

       10
       +
           rev = version;

     

       11
       +
           sha256 = "sha256-7TOkqaXPui14VcSmMmYJ1Wg+s85wrgp+E0XcCB0Ml7M=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         buildInputs = [ bzip2 openssl zlib ];

+2 -2

pkgs/development/python-modules/aiohttp-remotes/default.nix

···

       4
        
       

     

       5
        
       buildPythonPackage rec {

     

       6
        
         pname = "aiohttp_remotes";

     

       7
       -
         version = "1.0.0";

     

       8
        
       

     

       9
        
         src = fetchPypi {

     

       10
        
           inherit pname version;

     

       11
       -
           sha256 = "1vv2ancxsaxlls9sinigjnrqyx95n7cphq37m8nwifkhvs0idv6a";

     

       12
        
         };

     

       13
        
       

     

       14
        
         propagatedBuildInputs = [ aiohttp ];

···

       4
        
       

     

       5
        
       buildPythonPackage rec {

     

       6
        
         pname = "aiohttp_remotes";

     

       7
       +
         version = "1.1.0";

     

       8
        
       

     

       9
        
         src = fetchPypi {

     

       10
        
           inherit pname version;

     

       11
       +
           sha256 = "e44f2c5fd5fc3305477c89bb25f14570589100cc58c48b36745d4239839d3174";

     

       12
        
         };

     

       13
        
       

     

       14
        
         propagatedBuildInputs = [ aiohttp ];

+2 -2

pkgs/development/python-modules/aws-lambda-builders/default.nix

···

       12
        
       

     

       13
        
       buildPythonPackage rec {

     

       14
        
         pname = "aws-lambda-builders";

     

       15
       -
         version = "1.8.1";

     

       16
        
       

     

       17
        
         # No tests available in PyPI tarball

     

       18
        
         src = fetchFromGitHub {

     

       19
        
           owner = "awslabs";

     

       20
        
           repo = "aws-lambda-builders";

     

       21
        
           rev = "v${version}";

     

       22
       -
           sha256 = "1avq04hmps2cd33dd5n4bc3lclqg0hv6khn804fbv0hmy7lywp8b";

     

       23
        
         };

     

       24
        
       

     

       25
        
         # Package is not compatible with Python 3.5

···

       12
        
       

     

       13
        
       buildPythonPackage rec {

     

       14
        
         pname = "aws-lambda-builders";

     

       15
       +
         version = "1.9.0";

     

       16
        
       

     

       17
        
         # No tests available in PyPI tarball

     

       18
        
         src = fetchFromGitHub {

     

       19
        
           owner = "awslabs";

     

       20
        
           repo = "aws-lambda-builders";

     

       21
        
           rev = "v${version}";

     

       22
       +
           sha256 = "1ff1hr282snpjs5ggf7agxk5y6nr4xjdahmzq6hv56gj4lcfsq7c";

     

       23
        
         };

     

       24
        
       

     

       25
        
         # Package is not compatible with Python 3.5

+2 -2

pkgs/development/python-modules/awscrt/default.nix

···

       2
        
       

     

       3
        
       buildPythonPackage rec {

     

       4
        
         pname = "awscrt";

     

       5
       -
         version = "0.12.5";

     

       6
        
       

     

       7
        
         buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation Security ];

     

       8
        
       

     
···

       22
        
       

     

       23
        
         src = fetchPypi {

     

       24
        
           inherit pname version;

     

       25
       -
           sha256 = "8bb80b37ebfd01f6078c60bb3231118380ac06842de692f6e37b6f8643e15a1d";

     

       26
        
         };

     

       27
        
       

     

       28
        
         meta = with lib; {

···

       2
        
       

     

       3
        
       buildPythonPackage rec {

     

       4
        
         pname = "awscrt";

     

       5
       +
         version = "0.12.6";

     

       6
        
       

     

       7
        
         buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation Security ];

     

       8
        
       

     
···

       22
        
       

     

       23
        
         src = fetchPypi {

     

       24
        
           inherit pname version;

     

       25
       +
           sha256 = "65d71b4cd78165bea962dfbda361b47b9b5a6198d8074046b8667da9653d0752";

     

       26
        
         };

     

       27
        
       

     

       28
        
         meta = with lib; {

+2 -2

pkgs/development/python-modules/azure-appconfiguration/default.nix

···

       4
        
       

     

       5
        
       buildPythonPackage rec {

     

       6
        
         pname = "azure-appconfiguration";

     

       7
       -
         version = "1.2.0";

     

       8
        
       

     

       9
        
         src = fetchPypi {

     

       10
        
           inherit pname version;

     

       11
        
           extension = "zip";

     

       12
       -
           sha256 = "85c9c25612f160897ae212532ec7c19c94b0f4463f4830d0ee08cb2d296df407";

     

       13
        
         };

     

       14
        
       

     

       15
        
         propagatedBuildInputs = [

···

       4
        
       

     

       5
        
       buildPythonPackage rec {

     

       6
        
         pname = "azure-appconfiguration";

     

       7
       +
         version = "1.3.0";

     

       8
        
       

     

       9
        
         src = fetchPypi {

     

       10
        
           inherit pname version;

     

       11
        
           extension = "zip";

     

       12
       +
           sha256 = "9372467c74930d20827135d468b7fcaa1ad42e4673a4591ceadbb6ad8e1b7e07";

     

       13
        
         };

     

       14
        
       

     

       15
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/azure-identity/default.nix

···

       16
        
       

     

       17
        
       buildPythonPackage rec {

     

       18
        
         pname = "azure-identity";

     

       19
       -
         version = "1.7.0";

     

       20
        
       

     

       21
        
         src = fetchPypi {

     

       22
        
           inherit pname version;

     

       23
        
           extension = "zip";

     

       24
       -
           sha256 = "3faaecb645e3b2300648a4a452458ec0e31e13d9dc928e710992e43ef4694205";

     

       25
        
         };

     

       26
        
       

     

       27
        
         propagatedBuildInputs = [

···

       16
        
       

     

       17
        
       buildPythonPackage rec {

     

       18
        
         pname = "azure-identity";

     

       19
       +
         version = "1.7.1";

     

       20
        
       

     

       21
        
         src = fetchPypi {

     

       22
        
           inherit pname version;

     

       23
        
           extension = "zip";

     

       24
       +
           sha256 = "7f22cd0c7a9b92ed297dd67ae79d9bb9a866e404061c02cec709ad10c4c88e19";

     

       25
        
         };

     

       26
        
       

     

       27
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/azure-loganalytics/default.nix

···

       6
        
       }:

     

       7
        
       

     

       8
        
       buildPythonPackage rec {

     

       9
       -
         version = "0.1.0";

     

       10
        
         pname = "azure-loganalytics";

     

       11
        
       

     

       12
        
         src = fetchPypi {

     

       13
        
           inherit pname version;

     

       14
        
           extension = "zip";

     

       15
       -
           sha256 = "3ceb350def677a351f34b0a0d1637df6be0c6fe87ff32a5270b17f540f6da06e";

     

       16
        
         };

     

       17
        
       

     

       18
        
         propagatedBuildInputs = [

···

       6
        
       }:

     

       7
        
       

     

       8
        
       buildPythonPackage rec {

     

       9
       +
         version = "0.1.1";

     

       10
        
         pname = "azure-loganalytics";

     

       11
        
       

     

       12
        
         src = fetchPypi {

     

       13
        
           inherit pname version;

     

       14
        
           extension = "zip";

     

       15
       +
           sha256 = "68ffb9a2206e06b9672100a8e6351cc04f75bb81867f30d416c68b55d624d793";

     

       16
        
         };

     

       17
        
       

     

       18
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix

···

       11
        
       

     

       12
        
       buildPythonPackage rec {

     

       13
        
         pname = "azure-mgmt-eventgrid";

     

       14
       -
         version = "9.0.0";

     

       15
        
       

     

       16
        
         src = fetchPypi {

     

       17
        
           inherit pname version;

     

       18
        
           extension = "zip";

     

       19
       -
           sha256 = "aecbb69ecb010126c03668ca7c9a2be8e965568f5b560f0e7b5bc152b157b510";

     

       20
        
         };

     

       21
        
       

     

       22
        
         propagatedBuildInputs = [

···

       11
        
       

     

       12
        
       buildPythonPackage rec {

     

       13
        
         pname = "azure-mgmt-eventgrid";

     

       14
       +
         version = "10.0.0";

     

       15
        
       

     

       16
        
         src = fetchPypi {

     

       17
        
           inherit pname version;

     

       18
        
           extension = "zip";

     

       19
       +
           sha256 = "582e314ca05a9be0cd391c64689e6a5332d5bbad76c2ea751b727cfe99a2a3d2";

     

       20
        
         };

     

       21
        
       

     

       22
        
         propagatedBuildInputs = [

+4

pkgs/development/python-modules/build/default.nix

···

       1
        
       { lib

     

       0
        
       
     

       2
        
       , buildPythonPackage

     

       3
        
       , fetchFromGitHub

     

       4
        
       , filelock

     
···

       56
        
           "test_default_pip_is_never_too_old"

     

       57
        
           "test_build"

     

       58
        
           "test_init"

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       59
        
         ];

     

       60
        
       

     

       61
        
         pythonImportsCheck = [ "build" ];

···

       1
        
       { lib

     

       2
       +
       , stdenv

     

       3
        
       , buildPythonPackage

     

       4
        
       , fetchFromGitHub

     

       5
        
       , filelock

     
···

       57
        
           "test_default_pip_is_never_too_old"

     

       58
        
           "test_build"

     

       59
        
           "test_init"

     

       60
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       61
       +
           # expects Apple's python and its quirks

     

       62
       +
           "test_can_get_venv_paths_with_conflicting_default_scheme"

     

       63
        
         ];

     

       64
        
       

     

       65
        
         pythonImportsCheck = [ "build" ];

-1

pkgs/development/python-modules/cirq-core/default.nix

···

       1
        
       { lib

     

       2
       -
       , stdenv

     

       3
        
       , buildPythonPackage

     

       4
        
       , pythonOlder

     

       5
        
       , fetchFromGitHub

···

       1
        
       { lib

     

       0
        
       
     

       2
        
       , buildPythonPackage

     

       3
        
       , pythonOlder

     

       4
        
       , fetchFromGitHub

+37

pkgs/development/python-modules/docstring-to-markdown/default.nix

···

       1
       +
       { lib

     

       2
       +
       , buildPythonPackage

     

       3
       +
       , fetchFromGitHub

     

       4
       +
       , pytestCheckHook

     

       5
       +
       }:

     

       6
       +
       

     

       7
       +
       buildPythonPackage rec {

     

       8
       +
         pname = "docstring-to-markdown";

     

       9
       +
         version = "0.9";

     

       10
       +
       

     

       11
       +
         src = fetchFromGitHub {

     

       12
       +
           owner = "python-lsp";

     

       13
       +
           repo = pname;

     

       14
       +
           rev = "v${version}";

     

       15
       +
           sha256 = "sha256-XVTlSqqWmvnB5nvjvgGDJmg71KKTq2hHB4//QW7ugvA=";

     

       16
       +
         };

     

       17
       +
       

     

       18
       +
         patches = [

     

       19
       +
           # So pytest-flake8 and pytest-cov won't be needed

     

       20
       +
           ./remove-coverage-tests.patch

     

       21
       +
         ];

     

       22
       +
       

     

       23
       +
         checkInputs = [

     

       24
       +
           pytestCheckHook

     

       25
       +
         ];

     

       26
       +
       

     

       27
       +
         pythonImportsCheck = [

     

       28
       +
           "docstring_to_markdown"

     

       29
       +
         ];

     

       30
       +
       

     

       31
       +
         meta = with lib; {

     

       32
       +
           homepage = "https://github.com/python-lsp/docstring-to-markdown";

     

       33
       +
           description = "On the fly conversion of Python docstrings to markdown";

     

       34
       +
           license = licenses.lgpl2Plus;

     

       35
       +
           maintainers = with maintainers; [ doronbehar ];

     

       36
       +
         };

     

       37
       +
       }

+16

pkgs/development/python-modules/docstring-to-markdown/remove-coverage-tests.patch

···

       1
       +
       diff --git i/setup.cfg w/setup.cfg

     

       2
       +
       index e880e74..e77133e 100644

     

       3
       +
       --- i/setup.cfg

     

       4
       +
       +++ w/setup.cfg

     

       5
       +
       @@ -34,11 +34,7 @@ docstring-to-markdown = py.typed

     

       6
       +
        [tool:pytest]

     

       7
       +
        addopts =

     

       8
       +
            --pyargs tests

     

       9
       +
       -    --cov docstring_to_markdown

     

       10
       +
       -    --cov-fail-under=98

     

       11
       +
       -    --cov-report term-missing:skip-covered

     

       12
       +
            -p no:warnings

     

       13
       +
       -    --flake8

     

       14
       +
            -vv

     

       15
       +
        

     

       16
       +
        [flake8]

+2 -2

pkgs/development/python-modules/h5py/default.nix

···

       1
       -
       { lib, fetchPypi, isPy27, python, buildPythonPackage, pythonOlder

     

       2
       -
       , numpy, hdf5, cython, six, pkgconfig, unittest2, fetchpatch

     

       3
        
       , mpi4py ? null, openssh, pytestCheckHook, cached-property }:

     

       4
        
       

     

       5
        
       assert hdf5.mpiSupport -> mpi4py != null && hdf5.mpi == mpi4py.mpi;

···

       1
       +
       { lib, fetchPypi, isPy27, buildPythonPackage, pythonOlder

     

       2
       +
       , numpy, hdf5, cython, six, pkgconfig, unittest2

     

       3
        
       , mpi4py ? null, openssh, pytestCheckHook, cached-property }:

     

       4
        
       

     

       5
        
       assert hdf5.mpiSupport -> mpi4py != null && hdf5.mpi == mpi4py.mpi;

+1 -1

pkgs/development/python-modules/jaxlib/default.nix

···

       13
        
       #   * https://github.com/google/jax/issues/971#issuecomment-508216439

     

       14
        
       #   * https://github.com/google/jax/issues/5723#issuecomment-913038780

     

       15
        
       

     

       16
       -
       { addOpenGLRunpath, autoPatchelfHook, buildPythonPackage, config, fetchPypi

     

       17
        
       , fetchurl, isPy39, lib, stdenv

     

       18
        
       # propagatedBuildInputs

     

       19
        
       , absl-py, flatbuffers, scipy, cudatoolkit_11

···

       13
        
       #   * https://github.com/google/jax/issues/971#issuecomment-508216439

     

       14
        
       #   * https://github.com/google/jax/issues/5723#issuecomment-913038780

     

       15
        
       

     

       16
       +
       { addOpenGLRunpath, autoPatchelfHook, buildPythonPackage, config

     

       17
        
       , fetchurl, isPy39, lib, stdenv

     

       18
        
       # propagatedBuildInputs

     

       19
        
       , absl-py, flatbuffers, scipy, cudatoolkit_11

+56

pkgs/development/python-modules/jedi-language-server/default.nix

···

       1
       +
       { lib

     

       2
       +
       , buildPythonPackage

     

       3
       +
       , fetchPypi

     

       4
       +
       , fetchFromGitHub

     

       5
       +
       , poetry

     

       6
       +
       , docstring-to-markdown

     

       7
       +
       , jedi

     

       8
       +
       , pygls

     

       9
       +
       , pytestCheckHook

     

       10
       +
       , pyhamcrest

     

       11
       +
       , python-jsonrpc-server

     

       12
       +
       }:

     

       13
       +
       

     

       14
       +
       buildPythonPackage rec {

     

       15
       +
         pname = "jedi-language-server";

     

       16
       +
         version = "0.34.8";

     

       17
       +
         format = "pyproject";

     

       18
       +
       

     

       19
       +
         src = fetchFromGitHub {

     

       20
       +
           owner = "pappasam";

     

       21
       +
           repo = pname;

     

       22
       +
           rev = "v${version}";

     

       23
       +
           sha256 = "sha256-mJGgDDjPZXde4M4OHwj81KYoaFXFAwOZ+v18YE+arFE=";

     

       24
       +
         };

     

       25
       +
       

     

       26
       +
         nativeBuildInputs = [

     

       27
       +
           poetry

     

       28
       +
         ];

     

       29
       +
       

     

       30
       +
         propagatedBuildInputs = [

     

       31
       +
           docstring-to-markdown

     

       32
       +
           jedi

     

       33
       +
           pygls

     

       34
       +
         ];

     

       35
       +
       

     

       36
       +
         checkInputs = [

     

       37
       +
           pytestCheckHook

     

       38
       +
           pyhamcrest

     

       39
       +
           python-jsonrpc-server

     

       40
       +
         ];

     

       41
       +
       

     

       42
       +
         preCheck = ''

     

       43
       +
           HOME="$(mktemp -d)"

     

       44
       +
         '';

     

       45
       +
       

     

       46
       +
         pythonImportsCheck = [

     

       47
       +
           "jedi_language_server"

     

       48
       +
         ];

     

       49
       +
       

     

       50
       +
         meta = with lib; {

     

       51
       +
           homepage = "https://github.com/pappasam/jedi-language-server";

     

       52
       +
           description = "A Language Server for the latest version(s) of Jedi";

     

       53
       +
           license = licenses.mit;

     

       54
       +
           maintainers = with maintainers; [ doronbehar ];

     

       55
       +
         };

     

       56
       +
       }

-2

pkgs/development/python-modules/jupyter-repo2docker/default.nix

···

       1
        
       { lib

     

       2
       -
       , bash

     

       3
        
       , buildPythonPackage

     

       4
       -
       , chardet

     

       5
        
       , docker

     

       6
        
       , entrypoints

     

       7
        
       , escapism

···

       1
        
       { lib

     

       0
        
       
     

       2
        
       , buildPythonPackage

     

       0
        
       
     

       3
        
       , docker

     

       4
        
       , entrypoints

     

       5
        
       , escapism

+1 -1

pkgs/development/python-modules/lexid/default.nix

···

       1
       -
       { lib, python, pythonOlder, buildPythonPackage, fetchPypi, pytestCheckHook, click }:

     

       2
        
       

     

       3
        
       buildPythonPackage rec {

     

       4
        
         pname = "lexid";

···

       1
       +
       { lib, pythonOlder, buildPythonPackage, fetchPypi, pytestCheckHook, click }:

     

       2
        
       

     

       3
        
       buildPythonPackage rec {

     

       4
        
         pname = "lexid";

+2 -2

pkgs/development/python-modules/pg8000/default.nix

···

       8
        
       

     

       9
        
       buildPythonPackage rec {

     

       10
        
         pname = "pg8000";

     

       11
       -
         version = "1.22.1";

     

       12
        
         format = "setuptools";

     

       13
        
       

     

       14
        
         disabled = pythonOlder "3.6";

     

       15
        
       

     

       16
        
         src = fetchPypi {

     

       17
        
           inherit pname version;

     

       18
       -
           sha256 = "sha256-/WmtWvJ4HllgjLP02WayNNlhxi8JPt0xlKxF32W40dQ=";

     

       19
        
         };

     

       20
        
       

     

       21
        
         propagatedBuildInputs = [

···

       8
        
       

     

       9
        
       buildPythonPackage rec {

     

       10
        
         pname = "pg8000";

     

       11
       +
         version = "1.23.0";

     

       12
        
         format = "setuptools";

     

       13
        
       

     

       14
        
         disabled = pythonOlder "3.6";

     

       15
        
       

     

       16
        
         src = fetchPypi {

     

       17
        
           inherit pname version;

     

       18
       +
           sha256 = "sha256-pBPgAUE0KBOiykfot7BUn/M4zKAryBkHa21w8S11XHk=";

     

       19
        
         };

     

       20
        
       

     

       21
        
         propagatedBuildInputs = [

+9 -4

pkgs/development/python-modules/phonenumbers/default.nix

···

       6
        
       

     

       7
        
       buildPythonPackage rec {

     

       8
        
         pname = "phonenumbers";

     

       9
       -
         version = "8.12.36";

     

       0
        
       
     

       10
        
       

     

       11
        
         src = fetchPypi {

     

       12
        
           inherit pname version;

     

       13
       -
           sha256 = "e29717fcf86d68082fc6e42ca07e52bff863b6e0b354edd1644ba15c35ef213d";

     

       14
        
         };

     

       15
        
       

     

       16
        
         checkInputs = [

     

       17
        
           pytestCheckHook

     

       18
        
         ];

     

       19
        
       

     

       20
       -
         pytestFlagsArray = [ "tests/*.py" ];

     

       0
        
       
     

       0
        
       
     

       21
        
       

     

       22
       -
         pythonImportsCheck = [ "phonenumbers" ];

     

       0
        
       
     

       0
        
       
     

       23
        
       

     

       24
        
         meta = with lib; {

     

       25
        
           description = "Python module for handling international phone numbers";

···

       6
        
       

     

       7
        
       buildPythonPackage rec {

     

       8
        
         pname = "phonenumbers";

     

       9
       +
         version = "8.12.37";

     

       10
       +
         format = "setuptools";

     

       11
        
       

     

       12
        
         src = fetchPypi {

     

       13
        
           inherit pname version;

     

       14
       +
           sha256 = "sha256-28VgmShEoFn1bHwMalh5BOZdlWdAu/t+OViZgLyQVbg=";

     

       15
        
         };

     

       16
        
       

     

       17
        
         checkInputs = [

     

       18
        
           pytestCheckHook

     

       19
        
         ];

     

       20
        
       

     

       21
       +
         pytestFlagsArray = [

     

       22
       +
           "tests/*.py"

     

       23
       +
         ];

     

       24
        
       

     

       25
       +
         pythonImportsCheck = [

     

       26
       +
           "phonenumbers"

     

       27
       +
         ];

     

       28
        
       

     

       29
        
         meta = with lib; {

     

       30
        
           description = "Python module for handling international phone numbers";

+1 -1

pkgs/development/python-modules/pynest2d/default.nix

···

       1
        
       { lib, buildPythonPackage, fetchFromGitHub, python3, cmake

     

       2
       -
       , pythonOlder, libnest2d, sip_4, clipper }:

     

       3
        
       

     

       4
        
       buildPythonPackage rec {

     

       5
        
         version = "4.10.0";

···

       1
        
       { lib, buildPythonPackage, fetchFromGitHub, python3, cmake

     

       2
       +
       , libnest2d, sip_4, clipper }:

     

       3
        
       

     

       4
        
       buildPythonPackage rec {

     

       5
        
         version = "4.10.0";

+1 -1

pkgs/development/python-modules/pytest-trio/default.nix

···

       1
        
       { lib, buildPythonPackage, fetchFromGitHub, pythonOlder

     

       2
       -
       , trio, python, async_generator, hypothesis, outcome, pytest }:

     

       3
        
       

     

       4
        
       buildPythonPackage rec {

     

       5
        
         pname = "pytest-trio";

···

       1
        
       { lib, buildPythonPackage, fetchFromGitHub, pythonOlder

     

       2
       +
       , trio, async_generator, hypothesis, outcome, pytest }:

     

       3
        
       

     

       4
        
       buildPythonPackage rec {

     

       5
        
         pname = "pytest-trio";

-3

pkgs/development/python-modules/pytest/5.nix

···

       1
        
       { lib, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy

     

       2
        
       , atomicwrites

     

       3
        
       , attrs

     

       4
       -
       , funcsigs

     

       5
        
       , hypothesis

     

       6
       -
       , mock

     

       7
        
       , more-itertools

     

       8
        
       , packaging

     

       9
        
       , pathlib2

     

       10
        
       , pluggy

     

       11
        
       , py

     

       12
        
       , pygments

     

       13
       -
       , python

     

       14
        
       , setuptools

     

       15
        
       , setuptools-scm

     

       16
        
       , six

···

       1
        
       { lib, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy

     

       2
        
       , atomicwrites

     

       3
        
       , attrs

     

       0
        
       
     

       4
        
       , hypothesis

     

       0
        
       
     

       5
        
       , more-itertools

     

       6
        
       , packaging

     

       7
        
       , pathlib2

     

       8
        
       , pluggy

     

       9
        
       , py

     

       10
        
       , pygments

     

       0
        
       
     

       11
        
       , setuptools

     

       12
        
       , setuptools-scm

     

       13
        
       , six

+8

pkgs/development/python-modules/python-jenkins/default.nix

···

       1
        
       { lib

     

       0
        
       
     

       2
        
       , buildPythonPackage

     

       3
        
       , fetchPypi

     

       4
        
       , mock

     
···

       21
        
           inherit pname version;

     

       22
        
           sha256 = "01jid5s09lr3kayr2h1z9n8h9nhyw3jxv9c4b5hrlxijknkqzvfy";

     

       23
        
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       24
        
       

     

       25
        
         buildInputs = [ mock ];

     

       26
        
         propagatedBuildInputs = [ pbr pyyaml setuptools six multi_key_dict requests ];

···

       1
        
       { lib

     

       2
       +
       , stdenv

     

       3
        
       , buildPythonPackage

     

       4
        
       , fetchPypi

     

       5
        
       , mock

     
···

       22
        
           inherit pname version;

     

       23
        
           sha256 = "01jid5s09lr3kayr2h1z9n8h9nhyw3jxv9c4b5hrlxijknkqzvfy";

     

       24
        
         };

     

       25
       +
       

     

       26
       +
         # test uses timeout mechanism unsafe for use with the "spawn"

     

       27
       +
         # multiprocessing backend used on macos

     

       28
       +
         postPatch = lib.optionalString stdenv.isDarwin ''

     

       29
       +
           substituteInPlace tests/test_jenkins_sockets.py \

     

       30
       +
             --replace test_jenkins_open_no_timeout dont_test_jenkins_open_no_timeout

     

       31
       +
         '';

     

       32
        
       

     

       33
        
         buildInputs = [ mock ];

     

       34
        
         propagatedBuildInputs = [ pbr pyyaml setuptools six multi_key_dict requests ];

+1 -1

pkgs/development/python-modules/python-nest/default.nix

···

       1
       -
       { buildPythonPackage, fetchPypi, lib, python, python-dateutil, requests

     

       2
        
       , six, sseclient-py }:

     

       3
        
       

     

       4
        
       buildPythonPackage rec {

···

       1
       +
       { buildPythonPackage, fetchPypi, lib, python-dateutil, requests

     

       2
        
       , six, sseclient-py }:

     

       3
        
       

     

       4
        
       buildPythonPackage rec {

+23 -14

pkgs/development/python-modules/qiskit-aer/default.nix

···

       8
        
       , catch2

     

       9
        
       , cmake

     

       10
        
       , cython

     

       0
        
       
     

       11
        
       , muparserx

     

       12
        
       , ninja

     

       13
        
       , nlohmann_json

     
···

       23
        
       , fixtures

     

       24
        
       , pytest-timeout

     

       25
        
       , qiskit-terra

     

       0
        
       
     

       0
        
       
     

       26
        
       }:

     

       27
        
       

     

       28
        
       buildPythonPackage rec {

     

       29
        
         pname = "qiskit-aer";

     

       30
       -
         version = "0.8.2";

     

       31
        
         format = "pyproject";

     

       32
        
       

     

       33
        
         disabled = pythonOlder "3.6";

     
···

       36
        
           owner = "Qiskit";

     

       37
        
           repo = "qiskit-aer";

     

       38
        
           rev = version;

     

       39
       -
           hash = "sha256-7NWM7qpMQ3vA6p0dhEPnkBjsPMdhceYTYcAD4tsClf0=";

     

       40
        
         };

     

       41
        
       

     

       42
       -
         patches = [

     

       43
       -
           (fetchpatch {

     

       44
       -
             # https://github.com/Qiskit/qiskit-aer/pull/1250

     

       45
       -
             name = "qiskit-aer-pr-1250-native-cmake_dl_libs.patch";

     

       46
       -
             url = "https://github.com/Qiskit/qiskit-aer/commit/2bf04ade3e5411776817706cf82cc67a3b3866f6.patch";

     

       47
       -
             sha256 = "0ldwzxxfgaad7ifpci03zfdaj0kqj0p3h94qgshrd2953mf27p6z";

     

       48
       -
           })

     

       49
       -
         ];

     

       50
       -
         # Remove need for cmake python package

     

       51
       -
         # pybind11 shouldn't be an install requirement, just build requirement.

     

       52
        
         postPatch = ''

     

       53
        
           substituteInPlace setup.py \

     

       54
        
             --replace "'cmake!=3.17,!=3.17.0'," "" \

     

       55
       -
             --replace "'pybind11>=2.6'" ""

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       56
        
         '';

     

       57
        
       

     

       58
        
         nativeBuildInputs = [

     
···

       65
        
         buildInputs = [

     

       66
        
           blas

     

       67
        
           catch2

     

       0
        
       
     

       68
        
           muparserx

     

       69
        
           nlohmann_json

     

       70
        
           spdlog

     
···

       76
        
           numpy

     

       77
        
         ];

     

       78
        
       

     

       79
       -
         # Disable using conan for build

     

       80
        
         preBuild = ''

     

       81
        
           export DISABLE_CONAN=1

     

       82
        
         '';

     
···

       92
        
         ];

     

       93
        
         # Slow tests

     

       94
        
         disabledTests = [

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       95
        
           "test_paulis_1_and_2_qubits"

     

       96
        
           "test_3d_oscillator"

     

       97
        
           "_057"

     
···

       105
        
           "_144"

     

       106
        
           "test_sparse_output_probabilities"

     

       107
        
           "test_reset_2_qubit"

     

       0
        
       
     

       108
        
         ];

     

       109
        
         checkInputs = [

     

       110
        
           pytestCheckHook

     
···

       112
        
           fixtures

     

       113
        
           pytest-timeout

     

       114
        
           qiskit-terra

     

       0
        
       
     

       0
        
       
     

       115
        
         ];

     

       116
        
         pytestFlagsArray = [

     

       117
        
           "--timeout=30"

···

       8
        
       , catch2

     

       9
        
       , cmake

     

       10
        
       , cython

     

       11
       +
       , fmt

     

       12
        
       , muparserx

     

       13
        
       , ninja

     

       14
        
       , nlohmann_json

     
···

       24
        
       , fixtures

     

       25
        
       , pytest-timeout

     

       26
        
       , qiskit-terra

     

       27
       +
       , setuptools

     

       28
       +
       , testtools

     

       29
        
       }:

     

       30
        
       

     

       31
        
       buildPythonPackage rec {

     

       32
        
         pname = "qiskit-aer";

     

       33
       +
         version = "0.9.1";

     

       34
        
         format = "pyproject";

     

       35
        
       

     

       36
        
         disabled = pythonOlder "3.6";

     
···

       39
        
           owner = "Qiskit";

     

       40
        
           repo = "qiskit-aer";

     

       41
        
           rev = version;

     

       42
       +
           sha256 = "sha256-SAJjU2zYz6UabOPV1KI2JB7CbJfUJcjbPKbo6iiCk/g=";

     

       43
        
         };

     

       44
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       45
        
         postPatch = ''

     

       46
        
           substituteInPlace setup.py \

     

       47
        
             --replace "'cmake!=3.17,!=3.17.0'," "" \

     

       48
       +
             --replace "'pybind11', min_version='2.6'" "'pybind11'" \

     

       49
       +
             --replace "pybind11>=2.6" "pybind11" \

     

       50
       +
             --replace "scikit-build>=0.11.0" "scikit-build" \

     

       51
       +
             --replace "min_version='0.11.0'" ""

     

       52
        
         '';

     

       53
        
       

     

       54
        
         nativeBuildInputs = [

     
···

       61
        
         buildInputs = [

     

       62
        
           blas

     

       63
        
           catch2

     

       64
       +
           fmt

     

       65
        
           muparserx

     

       66
        
           nlohmann_json

     

       67
        
           spdlog

     
···

       73
        
           numpy

     

       74
        
         ];

     

       75
        
       

     

       0
        
       
     

       76
        
         preBuild = ''

     

       77
        
           export DISABLE_CONAN=1

     

       78
        
         '';

     
···

       88
        
         ];

     

       89
        
         # Slow tests

     

       90
        
         disabledTests = [

     

       91
       +
           "test_snapshot" # TODO: these ~30 tests fail on setup due to pytest fixture issues?

     

       92
       +
           "test_initialize_2" # TODO: simulations appear incorrect, off by >10%.

     

       93
       +
       

     

       94
       +
           # these fail for some builds. Haven't been able to reproduce error locally.

     

       95
       +
           "test_kraus_gate_noise"

     

       96
       +
           "test_backend_method_clifford_circuits_and_kraus_noise"

     

       97
       +
           "test_backend_method_nonclifford_circuit_and_kraus_noise"

     

       98
       +
           "test_kraus_noise_fusion"

     

       99
       +
       

     

       100
       +
           # Slow tests

     

       101
        
           "test_paulis_1_and_2_qubits"

     

       102
        
           "test_3d_oscillator"

     

       103
        
           "_057"

     
···

       111
        
           "_144"

     

       112
        
           "test_sparse_output_probabilities"

     

       113
        
           "test_reset_2_qubit"

     

       114
       +
           # "test_clifford"

     

       115
        
         ];

     

       116
        
         checkInputs = [

     

       117
        
           pytestCheckHook

     
···

       119
        
           fixtures

     

       120
        
           pytest-timeout

     

       121
        
           qiskit-terra

     

       122
       +
           setuptools  # temporary workaround for pbr missing setuptools, see https://github.com/NixOS/nixpkgs/pull/132614

     

       123
       +
           testtools

     

       124
        
         ];

     

       125
        
         pytestFlagsArray = [

     

       126
        
           "--timeout=30"

+20 -8

pkgs/development/python-modules/qiskit-aqua/default.nix

···

       19
        
       , withTorch ? false

     

       20
        
       , pytorch

     

       21
        
       , withPyscf ? false

     

       22
       -
       , pyscf ? null

     

       23
        
       , withScikitQuant ? false

     

       24
        
       , scikit-quant ? null

     

       25
        
       , withCplex ? false

     
···

       33
        
       

     

       34
        
       buildPythonPackage rec {

     

       35
        
         pname = "qiskit-aqua";

     

       36
       -
         version = "0.9.1";

     

       37
        
       

     

       38
        
         disabled = pythonOlder "3.6";

     

       39
        
       

     
···

       42
        
           owner = "Qiskit";

     

       43
        
           repo = "qiskit-aqua";

     

       44
        
           rev = version;

     

       45
       -
           hash = "sha256-fptyqPrkUgl3UjtlEmDYORdX/SsONxWozQGEs/EahmU=";

     

       46
        
         };

     

       47
        
       

     

       48
        
         # Optional packages: pyscf (see below NOTE) & pytorch. Can install via pip/nix if needed.

     
···

       113
        
         pytestFlagsArray = [

     

       114
        
           "--timeout=30"

     

       115
        
           "--durations=10"

     

       116
       -
         ] ++ lib.optionals (!withPyscf) [

     

       117
       -
           "--ignore=test/chemistry/test_qeom_ee.py"

     

       118
       -
           "--ignore=test/chemistry/test_qeom_vqe.py"

     

       119
       -
           "--ignore=test/chemistry/test_vqe_uccsd_adapt.py"

     

       120
       -
           "--ignore=test/chemistry/test_bopes_sampler.py"

     

       0
        
       
     

       121
        
         ];

     

       122
        
         disabledTests = [

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       123
        
           # Online tests

     

       124
        
           "test_exchangedata"

     

       125
        
           "test_yahoo"

···

       19
        
       , withTorch ? false

     

       20
        
       , pytorch

     

       21
        
       , withPyscf ? false

     

       22
       +
       , pyscf

     

       23
        
       , withScikitQuant ? false

     

       24
        
       , scikit-quant ? null

     

       25
        
       , withCplex ? false

     
···

       33
        
       

     

       34
        
       buildPythonPackage rec {

     

       35
        
         pname = "qiskit-aqua";

     

       36
       +
         version = "0.9.5";

     

       37
        
       

     

       38
        
         disabled = pythonOlder "3.6";

     

       39
        
       

     
···

       42
        
           owner = "Qiskit";

     

       43
        
           repo = "qiskit-aqua";

     

       44
        
           rev = version;

     

       45
       +
           sha256 = "sha256-7QmRwlbAVAR5KfM7tuObkb6+UgiuIm82iGWBuqfve08=";

     

       46
        
         };

     

       47
        
       

     

       48
        
         # Optional packages: pyscf (see below NOTE) & pytorch. Can install via pip/nix if needed.

     
···

       113
        
         pytestFlagsArray = [

     

       114
        
           "--timeout=30"

     

       115
        
           "--durations=10"

     

       116
       +
         ];

     

       117
       +
         disabledTestPaths = lib.optionals (!withPyscf) [

     

       118
       +
           "test/chemistry/test_qeom_ee.py"

     

       119
       +
           "test/chemistry/test_qeom_vqe.py"

     

       120
       +
           "test/chemistry/test_vqe_uccsd_adapt.py"

     

       121
       +
           "test/chemistry/test_bopes_sampler.py"

     

       122
        
         ];

     

       123
        
         disabledTests = [

     

       124
       +
           # TODO: figure out why failing, only fail with upgrade to qiskit-terra > 0.16.1 & qiskit-aer > 0.7.2

     

       125
       +
           # In test.aqua.test_amplitude_estimation.TestSineIntegral

     

       126
       +
           "test_confidence_intervals_1"

     

       127
       +
           "test_statevector_1"

     

       128
       +
       

     

       129
       +
           # fails due to approximation error with latest qiskit-aer?

     

       130
       +
           "test_application"

     

       131
       +
       

     

       132
       +
           # Fail on CI for some reason, not locally

     

       133
       +
           "test_binary"

     

       134
       +
       

     

       135
        
           # Online tests

     

       136
        
           "test_exchangedata"

     

       137
        
           "test_yahoo"

+78

pkgs/development/python-modules/qiskit-finance/default.nix

···

       1
       +
       { lib

     

       2
       +
       , pythonOlder

     

       3
       +
       , buildPythonPackage

     

       4
       +
       , fetchFromGitHub

     

       5
       +
         # Python Inputs

     

       6
       +
       , fastdtw

     

       7
       +
       , numpy

     

       8
       +
       , pandas

     

       9
       +
       , psutil

     

       10
       +
       , qiskit-terra

     

       11
       +
       , qiskit-optimization

     

       12
       +
       , scikit-learn

     

       13
       +
       , scipy

     

       14
       +
       , quandl

     

       15
       +
       , yfinance

     

       16
       +
         # Check Inputs

     

       17
       +
       , pytestCheckHook

     

       18
       +
       , ddt

     

       19
       +
       , pytest-timeout

     

       20
       +
       , qiskit-aer

     

       21
       +
       }:

     

       22
       +
       

     

       23
       +
       buildPythonPackage rec {

     

       24
       +
         pname = "qiskit-finance";

     

       25
       +
         version = "0.2.1";

     

       26
       +
       

     

       27
       +
         disabled = pythonOlder "3.6";

     

       28
       +
       

     

       29
       +
         src = fetchFromGitHub {

     

       30
       +
           owner = "qiskit";

     

       31
       +
           repo = pname;

     

       32
       +
           rev = version;

     

       33
       +
           sha256 = "sha256-fEhc/01j6iYYwS6mLle+TpX9j0DVn12oPUFamEecoAY=";

     

       34
       +
         };

     

       35
       +
       

     

       36
       +
         propagatedBuildInputs = [

     

       37
       +
           fastdtw

     

       38
       +
           numpy

     

       39
       +
           pandas

     

       40
       +
           psutil

     

       41
       +
           qiskit-terra

     

       42
       +
           qiskit-optimization

     

       43
       +
           quandl

     

       44
       +
           scikit-learn

     

       45
       +
           scipy

     

       46
       +
           yfinance

     

       47
       +
         ];

     

       48
       +
       

     

       49
       +
         checkInputs = [

     

       50
       +
           pytestCheckHook

     

       51
       +
           pytest-timeout

     

       52
       +
           ddt

     

       53
       +
           qiskit-aer

     

       54
       +
         ];

     

       55
       +
       

     

       56
       +
         pythonImportsCheck = [ "qiskit_finance" ];

     

       57
       +
         disabledTests = [

     

       58
       +
           # Fail due to approximation error, ~1-2%

     

       59
       +
           "test_application"

     

       60
       +
       

     

       61
       +
           # Tests fail b/c require internet connection. Stalls tests if enabled.

     

       62
       +
           "test_exchangedata"

     

       63
       +
           "test_yahoo"

     

       64
       +
           "test_wikipedia"

     

       65
       +
         ];

     

       66
       +
         pytestFlagsArray = [

     

       67
       +
           "--durations=10"

     

       68
       +
         ];

     

       69
       +
       

     

       70
       +
         meta = with lib; {

     

       71
       +
           description = "Software for developing quantum computing programs";

     

       72
       +
           homepage = "https://qiskit.org";

     

       73
       +
           downloadPage = "https://github.com/QISKit/qiskit-optimization/releases";

     

       74
       +
           changelog = "https://qiskit.org/documentation/release_notes.html";

     

       75
       +
           license = licenses.asl20;

     

       76
       +
           maintainers = with maintainers; [ drewrisinger ];

     

       77
       +
         };

     

       78
       +
       }

+12 -5

pkgs/development/python-modules/qiskit-ibmq-provider/default.nix

···

       7
        
       , qiskit-terra

     

       8
        
       , requests

     

       9
        
       , requests_ntlm

     

       10
       -
       , websockets

     

       11
        
         # Visualization inputs

     

       12
       -
       , withVisualization ? false

     

       13
        
       , ipython

     

       14
        
       , ipyvuetify

     

       15
        
       , ipywidgets

     
···

       23
        
       , nbformat

     

       24
        
       , pproxy

     

       25
        
       , qiskit-aer

     

       0
        
       
     

       26
        
       , vcrpy

     

       27
        
       }:

     

       28
        
       

     
···

       39
        
       in

     

       40
        
       buildPythonPackage rec {

     

       41
        
         pname = "qiskit-ibmq-provider";

     

       42
       -
         version = "0.13.1";

     

       43
        
       

     

       44
        
         disabled = pythonOlder "3.6";

     

       45
        
       

     
···

       47
        
           owner = "Qiskit";

     

       48
        
           repo = pname;

     

       49
        
           rev = version;

     

       50
       -
           hash = "sha256-DlHlXncttzGo4uVoh2aQ7urW6krN3ej2sJ/EwuxeF2I=";

     

       51
        
         };

     

       52
        
       

     

       53
        
         propagatedBuildInputs = [

     
···

       56
        
           qiskit-terra

     

       57
        
           requests

     

       58
        
           requests_ntlm

     

       59
       -
           websockets

     

       60
        
         ] ++ lib.optionals withVisualization visualizationPackages;

     

       61
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       62
        
         # Most tests require credentials to run on IBMQ

     

       63
        
         checkInputs = [

     

       64
        
           pytestCheckHook

     
···

       67
        
           pproxy

     

       68
        
           qiskit-aer

     

       69
        
           vcrpy

     

       0
        
       
     

       70
        
         ] ++ lib.optionals (!withVisualization) visualizationPackages;

     

       71
        
       

     

       72
        
         pythonImportsCheck = [ "qiskit.providers.ibmq" ];

     
···

       75
        
           "test_old_api_url"

     

       76
        
           "test_non_auth_url"

     

       77
        
           "test_non_auth_url_with_hub"

     

       0
        
       
     

       78
        
       

     

       79
        
           # slow tests

     

       80
        
           "test_websocket_retry_failure"

···

       7
        
       , qiskit-terra

     

       8
        
       , requests

     

       9
        
       , requests_ntlm

     

       10
       +
       , websocket-client

     

       11
        
         # Visualization inputs

     

       12
       +
       , withVisualization ? true

     

       13
        
       , ipython

     

       14
        
       , ipyvuetify

     

       15
        
       , ipywidgets

     
···

       23
        
       , nbformat

     

       24
        
       , pproxy

     

       25
        
       , qiskit-aer

     

       26
       +
       , websockets

     

       27
        
       , vcrpy

     

       28
        
       }:

     

       29
        
       

     
···

       40
        
       in

     

       41
        
       buildPythonPackage rec {

     

       42
        
         pname = "qiskit-ibmq-provider";

     

       43
       +
         version = "0.18.0";

     

       44
        
       

     

       45
        
         disabled = pythonOlder "3.6";

     

       46
        
       

     
···

       48
        
           owner = "Qiskit";

     

       49
        
           repo = pname;

     

       50
        
           rev = version;

     

       51
       +
           sha256 = "sha256-mVgR9vq9UpM/3VED4hpEev8YAoZY1URAxu7pVv+cjU8=";

     

       52
        
         };

     

       53
        
       

     

       54
        
         propagatedBuildInputs = [

     
···

       57
        
           qiskit-terra

     

       58
        
           requests

     

       59
        
           requests_ntlm

     

       60
       +
           websocket-client

     

       61
        
         ] ++ lib.optionals withVisualization visualizationPackages;

     

       62
        
       

     

       63
       +
         postPatch = ''

     

       64
       +
           substituteInPlace setup.py --replace "websocket-client>=1.0.1" "websocket-client"

     

       65
       +
         '';

     

       66
       +
       

     

       67
        
         # Most tests require credentials to run on IBMQ

     

       68
        
         checkInputs = [

     

       69
        
           pytestCheckHook

     
···

       72
        
           pproxy

     

       73
        
           qiskit-aer

     

       74
        
           vcrpy

     

       75
       +
           websockets

     

       76
        
         ] ++ lib.optionals (!withVisualization) visualizationPackages;

     

       77
        
       

     

       78
        
         pythonImportsCheck = [ "qiskit.providers.ibmq" ];

     
···

       81
        
           "test_old_api_url"

     

       82
        
           "test_non_auth_url"

     

       83
        
           "test_non_auth_url_with_hub"

     

       84
       +
           "test_coder_optimizers" # TODO: reenable when package scikit-quant is packaged, either in NUR or nixpkgs

     

       85
        
       

     

       86
        
           # slow tests

     

       87
        
           "test_websocket_retry_failure"

+87

pkgs/development/python-modules/qiskit-machine-learning/default.nix

···

       1
       +
       { lib

     

       2
       +
       , pythonOlder

     

       3
       +
       , pythonAtLeast

     

       4
       +
       , buildPythonPackage

     

       5
       +
       , fetchFromGitHub

     

       6
       +
       , fetchpatch

     

       7
       +
         # Python Inputs

     

       8
       +
       , fastdtw

     

       9
       +
       , numpy

     

       10
       +
       , psutil

     

       11
       +
       , qiskit-terra

     

       12
       +
       , scikit-learn

     

       13
       +
       , sparse

     

       14
       +
         # Optional inputs

     

       15
       +
       , withTorch ? true

     

       16
       +
       , pytorch

     

       17
       +
         # Check Inputs

     

       18
       +
       , pytestCheckHook

     

       19
       +
       , ddt

     

       20
       +
       , pytest-timeout

     

       21
       +
       , qiskit-aer

     

       22
       +
       }:

     

       23
       +
       

     

       24
       +
       buildPythonPackage rec {

     

       25
       +
         pname = "qiskit-machine-learning";

     

       26
       +
         version = "0.2.1";

     

       27
       +
       

     

       28
       +
         disabled = pythonOlder "3.6";

     

       29
       +
       

     

       30
       +
         src = fetchFromGitHub {

     

       31
       +
           owner = "qiskit";

     

       32
       +
           repo = pname;

     

       33
       +
           rev = version;

     

       34
       +
           sha256 = "sha256-2dfrkNZYSaXwiOCaRrPckq4BllANgc6BogyBcP0vosY=";

     

       35
       +
         };

     

       36
       +
       

     

       37
       +
         propagatedBuildInputs = [

     

       38
       +
           fastdtw

     

       39
       +
           numpy

     

       40
       +
           psutil

     

       41
       +
           qiskit-terra

     

       42
       +
           scikit-learn

     

       43
       +
           sparse

     

       44
       +
         ] ++ lib.optional withTorch pytorch;

     

       45
       +
       

     

       46
       +
         doCheck = false;  # TODO: enable. Tests fail on unstable due to some multithreading issue?

     

       47
       +
         checkInputs = [

     

       48
       +
           pytestCheckHook

     

       49
       +
           pytest-timeout

     

       50
       +
           ddt

     

       51
       +
           qiskit-aer

     

       52
       +
         ];

     

       53
       +
       

     

       54
       +
         pythonImportsCheck = [ "qiskit_machine_learning" ];

     

       55
       +
       

     

       56
       +
         pytestFlagsArray = [

     

       57
       +
           "--durations=10"

     

       58
       +
           "--showlocals"

     

       59
       +
           "-vv"

     

       60
       +
           "--ignore=test/connectors/test_torch_connector.py"  # TODO: fix, get multithreading errors with python3.9, segfaults

     

       61
       +
         ];

     

       62
       +
         disabledTests = [

     

       63
       +
           # Slow tests >10 s

     

       64
       +
           "test_readme_sample"

     

       65
       +
           "test_vqr_8"

     

       66
       +
           "test_vqr_7"

     

       67
       +
           "test_qgan_training_cg"

     

       68
       +
           "test_vqc_4"

     

       69
       +
           "test_classifier_with_circuit_qnn_and_cross_entropy_4"

     

       70
       +
           "test_vqr_4"

     

       71
       +
           "test_regressor_with_opflow_qnn_4"

     

       72
       +
           "test_qgan_save_model"

     

       73
       +
           "test_qgan_training_analytic_gradients"

     

       74
       +
           "test_qgan_training_run_algo_numpy"

     

       75
       +
           "test_ad_hoc_data"

     

       76
       +
           "test_qgan_training"

     

       77
       +
         ];

     

       78
       +
       

     

       79
       +
         meta = with lib; {

     

       80
       +
           description = "Software for developing quantum computing programs";

     

       81
       +
           homepage = "https://qiskit.org";

     

       82
       +
           downloadPage = "https://github.com/QISKit/qiskit-optimization/releases";

     

       83
       +
           changelog = "https://qiskit.org/documentation/release_notes.html";

     

       84
       +
           license = licenses.asl20;

     

       85
       +
           maintainers = with maintainers; [ drewrisinger ];

     

       86
       +
         };

     

       87
       +
       }

+80

pkgs/development/python-modules/qiskit-nature/default.nix

···

       1
       +
       { lib

     

       2
       +
       , pythonOlder

     

       3
       +
       , buildPythonPackage

     

       4
       +
       , fetchFromGitHub

     

       5
       +
         # Python Inputs

     

       6
       +
       , h5py

     

       7
       +
       , numpy

     

       8
       +
       , psutil

     

       9
       +
       , qiskit-terra

     

       10
       +
       , retworkx

     

       11
       +
       , scikit-learn

     

       12
       +
       , scipy

     

       13
       +
       , withPyscf ? false

     

       14
       +
       , pyscf

     

       15
       +
         # Check Inputs

     

       16
       +
       , pytestCheckHook

     

       17
       +
       , ddt

     

       18
       +
       , pylatexenc

     

       19
       +
       }:

     

       20
       +
       

     

       21
       +
       buildPythonPackage rec {

     

       22
       +
         pname = "qiskit-nature";

     

       23
       +
         version = "0.2.2";

     

       24
       +
       

     

       25
       +
         disabled = pythonOlder "3.6";

     

       26
       +
       

     

       27
       +
         src = fetchFromGitHub {

     

       28
       +
           owner = "qiskit";

     

       29
       +
           repo = pname;

     

       30
       +
           rev = version;

     

       31
       +
           sha256 = "sha256-nQbvH911Gt4KddG23qwmiXfRJTWwVEsrzPvuTQfy4FY=";

     

       32
       +
         };

     

       33
       +
       

     

       34
       +
         postPatch = ''

     

       35
       +
           substituteInPlace requirements.txt --replace "h5py<3.3" "h5py"

     

       36
       +
         '';

     

       37
       +
       

     

       38
       +
         propagatedBuildInputs = [

     

       39
       +
           h5py

     

       40
       +
           numpy

     

       41
       +
           psutil

     

       42
       +
           qiskit-terra

     

       43
       +
           retworkx

     

       44
       +
           scikit-learn

     

       45
       +
           scipy

     

       46
       +
         ] ++ lib.optional withPyscf pyscf;

     

       47
       +
       

     

       48
       +
         checkInputs = [

     

       49
       +
           pytestCheckHook

     

       50
       +
           ddt

     

       51
       +
           pylatexenc

     

       52
       +
         ];

     

       53
       +
       

     

       54
       +
         pythonImportsCheck = [ "qiskit_nature" ];

     

       55
       +
       

     

       56
       +
         pytestFlagsArray = [

     

       57
       +
           "--durations=10"

     

       58
       +
         ] ++ lib.optionals (!withPyscf) [

     

       59
       +
           "--ignore=test/algorithms/excited_state_solvers/test_excited_states_eigensolver.py"

     

       60
       +
         ];

     

       61
       +
       

     

       62
       +
         disabledTests = [

     

       63
       +
           # small math error < 0.05 (< 9e-6 %)

     

       64
       +
           "test_vqe_uvccsd_factory"

     

       65
       +
           # unsure of failure reason. Might be related to recent cvxpy update?

     

       66
       +
           "test_two_qubit_reduction"

     

       67
       +
         ] ++ lib.optionals (!withPyscf) [

     

       68
       +
           "test_h2_bopes_sampler"

     

       69
       +
           "test_potential_interface"

     

       70
       +
         ];

     

       71
       +
       

     

       72
       +
         meta = with lib; {

     

       73
       +
           description = "Software for developing quantum computing programs";

     

       74
       +
           homepage = "https://qiskit.org";

     

       75
       +
           downloadPage = "https://github.com/QISKit/qiskit-optimization/releases";

     

       76
       +
           changelog = "https://qiskit.org/documentation/release_notes.html";

     

       77
       +
           license = licenses.asl20;

     

       78
       +
           maintainers = with maintainers; [ drewrisinger ];

     

       79
       +
         };

     

       80
       +
       }

+63

pkgs/development/python-modules/qiskit-optimization/default.nix

···

       1
       +
       { lib

     

       2
       +
       , pythonOlder

     

       3
       +
       , buildPythonPackage

     

       4
       +
       , fetchFromGitHub

     

       5
       +
         # Python Inputs

     

       6
       +
       , decorator

     

       7
       +
       , docplex

     

       8
       +
       , networkx

     

       9
       +
       , numpy

     

       10
       +
       , qiskit-terra

     

       11
       +
       , scipy

     

       12
       +
         # Check Inputs

     

       13
       +
       , pytestCheckHook

     

       14
       +
       , ddt

     

       15
       +
       , pylatexenc

     

       16
       +
       , qiskit-aer

     

       17
       +
       }:

     

       18
       +
       

     

       19
       +
       buildPythonPackage rec {

     

       20
       +
         pname = "qiskit-optimization";

     

       21
       +
         version = "0.2.3";

     

       22
       +
       

     

       23
       +
         disabled = pythonOlder "3.6";

     

       24
       +
       

     

       25
       +
         src = fetchFromGitHub {

     

       26
       +
           owner = "qiskit";

     

       27
       +
           repo = pname;

     

       28
       +
           rev = version;

     

       29
       +
           sha256 = "sha256-y/j/cerzMAKVjehh1LUqYe1Juoa4lIxH2qS165S9img=";

     

       30
       +
         };

     

       31
       +
       

     

       32
       +
         postPatch = ''

     

       33
       +
           substituteInPlace requirements.txt --replace "networkx>=2.2,<2.6" "networkx"

     

       34
       +
         '';

     

       35
       +
       

     

       36
       +
         propagatedBuildInputs = [

     

       37
       +
           docplex

     

       38
       +
           decorator

     

       39
       +
           networkx

     

       40
       +
           numpy

     

       41
       +
           qiskit-terra

     

       42
       +
           scipy

     

       43
       +
         ];

     

       44
       +
       

     

       45
       +
         checkInputs = [

     

       46
       +
           pytestCheckHook

     

       47
       +
           ddt

     

       48
       +
           pylatexenc

     

       49
       +
           qiskit-aer

     

       50
       +
         ];

     

       51
       +
       

     

       52
       +
         pythonImportsCheck = [ "qiskit_optimization" ];

     

       53
       +
         pytestFlagsArray = [ "--durations=10" ];

     

       54
       +
       

     

       55
       +
         meta = with lib; {

     

       56
       +
           description = "Software for developing quantum computing programs";

     

       57
       +
           homepage = "https://qiskit.org";

     

       58
       +
           downloadPage = "https://github.com/QISKit/qiskit-optimization/releases";

     

       59
       +
           changelog = "https://qiskit.org/documentation/release_notes.html";

     

       60
       +
           license = licenses.asl20;

     

       61
       +
           maintainers = with maintainers; [ drewrisinger ];

     

       62
       +
         };

     

       63
       +
       }

+27 -20

pkgs/development/python-modules/qiskit-terra/default.nix

···

       16
        
       , python-dateutil

     

       17
        
       , retworkx

     

       18
        
       , scipy

     

       0
        
       
     

       0
        
       
     

       19
        
       , sympy

     

       0
        
       
     

       20
        
       , withVisualization ? false

     

       21
        
         # Python visualization requirements, optional

     

       22
        
       , ipywidgets

     
···

       29
        
         # Crosstalk-adaptive layout pass

     

       30
        
       , withCrosstalkPass ? false

     

       31
        
       , z3

     

       32
       -
         # Classical function -> Quantum Circuit compiler

     

       33
       -
       , withClassicalFunctionCompiler ? true

     

       34
       -
       , tweedledum

     

       35
        
         # test requirements

     

       36
        
       , ddt

     

       37
        
       , hypothesis

     
···

       52
        
           seaborn

     

       53
        
         ];

     

       54
        
         crosstalkPackages = [ z3 ];

     

       55
       -
         classicalCompilerPackages = [ tweedledum ];

     

       56
        
       in

     

       57
        
       

     

       58
        
       buildPythonPackage rec {

     

       59
        
         pname = "qiskit-terra";

     

       60
       -
         version = "0.17.4";

     

       61
        
       

     

       62
        
         disabled = pythonOlder "3.6";

     

       63
        
       

     
···

       65
        
           owner = "Qiskit";

     

       66
        
           repo = pname;

     

       67
        
           rev = version;

     

       68
       -
           hash = "sha256-JyNuke+XPqjLVZbvPud9Y7k0+EmvETVKcOYcDldBiVo=";

     

       69
        
         };

     

       70
        
       

     

       71
        
         nativeBuildInputs = [ cython ];

     
···

       82
        
           python-dateutil

     

       83
        
           retworkx

     

       84
        
           scipy

     

       0
        
       
     

       0
        
       
     

       85
        
           sympy

     

       0
        
       
     

       86
        
         ] ++ lib.optionals withVisualization visualizationPackages

     

       87
       -
         ++ lib.optionals withCrosstalkPass crosstalkPackages

     

       88
       -
         ++ lib.optionals withClassicalFunctionCompiler classicalCompilerPackages;

     

       89
        
       

     

       90
        
         # *** Tests ***

     

       91
        
         checkInputs = [

     
···

       103
        
       

     

       104
        
         disabledTestPaths = [

     

       105
        
           "test/randomized/test_transpiler_equivalence.py" # collection requires qiskit-aer, which would cause circular dependency

     

       106
       -
         ] ++ lib.optionals (!withClassicalFunctionCompiler) [

     

       107
       -
           "test/python/classical_function_compiler/"

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       108
        
         ];

     

       0
        
       
     

       109
        
         disabledTests = [

     

       110
       -
           # Not working on matplotlib >= 3.4.0, checks images match.

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       111
        
           "test_plot_circuit_layout"

     

       112
       -
       

     

       113
       -
           # Flaky tests

     

       114
       -
           "test_cx_equivalence"

     

       115
       -
           "test_pulse_limits"

     

       116
       -
           "test_1q_random"

     

       117
       -
         ] ++ lib.optionals (!withClassicalFunctionCompiler) [

     

       118
       -
           "TestPhaseOracle"

     

       119
       -
         ] ++ lib.optionals stdenv.isAarch64 [

     

       120
       -
           "test_circuit_init" # failed on aarch64, https://gist.github.com/r-rmcgibbo/c2e173d43ced4f6954811004f6b5b842

     

       121
        
         ]

     

       122
        
         # Disabling slow tests for build constraints

     

       123
        
         ++ [

     
···

       147
        
           "test_qaoa_qc_mixer_4"

     

       148
        
           "test_abelian_grouper_random_2"

     

       149
        
           "test_pauli_two_design"

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       150
        
         ];

     

       151
        
       

     

       152
        
         # Moves tests to $PACKAGEDIR/test. They can't be run from /build because of finding

···

       16
        
       , python-dateutil

     

       17
        
       , retworkx

     

       18
        
       , scipy

     

       19
       +
       , scikit-quant ? null

     

       20
       +
       , symengine

     

       21
        
       , sympy

     

       22
       +
       , tweedledum

     

       23
        
       , withVisualization ? false

     

       24
        
         # Python visualization requirements, optional

     

       25
        
       , ipywidgets

     
···

       32
        
         # Crosstalk-adaptive layout pass

     

       33
        
       , withCrosstalkPass ? false

     

       34
        
       , z3

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       35
        
         # test requirements

     

       36
        
       , ddt

     

       37
        
       , hypothesis

     
···

       52
        
           seaborn

     

       53
        
         ];

     

       54
        
         crosstalkPackages = [ z3 ];

     

       0
        
       
     

       55
        
       in

     

       56
        
       

     

       57
        
       buildPythonPackage rec {

     

       58
        
         pname = "qiskit-terra";

     

       59
       +
         version = "0.18.3";

     

       60
        
       

     

       61
        
         disabled = pythonOlder "3.6";

     

       62
        
       

     
···

       64
        
           owner = "Qiskit";

     

       65
        
           repo = pname;

     

       66
        
           rev = version;

     

       67
       +
           sha256 = "sha256-w/EnkdlC1hvmLqm4I8ajEYADxqMYGdHKrySLcb/yWGs=";

     

       68
        
         };

     

       69
        
       

     

       70
        
         nativeBuildInputs = [ cython ];

     
···

       81
        
           python-dateutil

     

       82
        
           retworkx

     

       83
        
           scipy

     

       84
       +
           scikit-quant

     

       85
       +
           symengine

     

       86
        
           sympy

     

       87
       +
           tweedledum

     

       88
        
         ] ++ lib.optionals withVisualization visualizationPackages

     

       89
       +
         ++ lib.optionals withCrosstalkPass crosstalkPackages;

     

       0
        
       
     

       90
        
       

     

       91
        
         # *** Tests ***

     

       92
        
         checkInputs = [

     
···

       104
        
       

     

       105
        
         disabledTestPaths = [

     

       106
        
           "test/randomized/test_transpiler_equivalence.py" # collection requires qiskit-aer, which would cause circular dependency

     

       107
       +
           # These tests are nondeterministic and can randomly fail.

     

       108
       +
           # We ignore them here for deterministic building.

     

       109
       +
           "test/randomized/"

     

       110
       +
           # These tests consistently fail on GitHub Actions build

     

       111
       +
           "test/python/quantum_info/operators/test_random.py"

     

       112
        
         ];

     

       113
       +
         pytestFlagsArray = [ "--durations=10" ];

     

       114
        
         disabledTests = [

     

       115
       +
           # Flaky tests

     

       116
       +
           "test_pulse_limits" # Fails on GitHub Actions, probably due to minor floating point arithmetic error.

     

       117
       +
           "test_cx_equivalence"  # Fails due to flaky test

     

       118
       +
           "test_two_qubit_synthesis_not_pulse_optimal" # test of random circuit, seems to randomly fail depending on seed

     

       119
       +
           "test_qv_natural" # fails due to sign error. Not sure why

     

       120
       +
         ] ++ lib.optionals (lib.versionAtLeast matplotlib.version "3.4.0") [

     

       121
        
           "test_plot_circuit_layout"

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       122
        
         ]

     

       123
        
         # Disabling slow tests for build constraints

     

       124
        
         ++ [

     
···

       148
        
           "test_qaoa_qc_mixer_4"

     

       149
        
           "test_abelian_grouper_random_2"

     

       150
        
           "test_pauli_two_design"

     

       151
       +
           "test_shor_factoring"

     

       152
       +
           "test_sample_counts_memory_ghz"

     

       153
       +
           "test_two_qubit_weyl_decomposition_ab0"

     

       154
       +
           "test_sample_counts_memory_superposition"

     

       155
       +
           "test_piecewise_polynomial_function"

     

       156
       +
           "test_vqe_qasm"

     

       157
        
         ];

     

       158
        
       

     

       159
        
         # Moves tests to $PACKAGEDIR/test. They can't be run from /build because of finding

+17 -3

pkgs/development/python-modules/qiskit/default.nix

···

       8
        
       , qiskit-ibmq-provider

     

       9
        
       , qiskit-ignis

     

       10
        
       , qiskit-terra

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       11
        
         # Check Inputs

     

       12
        
       , pytestCheckHook

     

       13
        
       }:

     

       14
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       15
        
       buildPythonPackage rec {

     

       16
        
         pname = "qiskit";

     

       17
        
         # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history

     

       18
       -
         version = "0.26.2";

     

       19
        
       

     

       20
        
         disabled = pythonOlder "3.6";

     

       21
        
       

     
···

       23
        
           owner = "qiskit";

     

       24
        
           repo = "qiskit";

     

       25
        
           rev = version;

     

       26
       -
           hash = "sha256-QYWKKS7e/uCt5puWV4jA9Emp7M4Cyv2RUCxilbChWhw=";

     

       27
        
         };

     

       28
        
       

     

       29
        
         propagatedBuildInputs = [

     
···

       32
        
           qiskit-ibmq-provider

     

       33
        
           qiskit-ignis

     

       34
        
           qiskit-terra

     

       35
       -
         ];

     

       36
        
       

     

       37
        
         checkInputs = [ pytestCheckHook ];

     

       38

···

       8
        
       , qiskit-ibmq-provider

     

       9
        
       , qiskit-ignis

     

       10
        
       , qiskit-terra

     

       11
       +
         # Optional inputs

     

       12
       +
       , withOptionalPackages ? true

     

       13
       +
       , qiskit-finance

     

       14
       +
       , qiskit-machine-learning

     

       15
       +
       , qiskit-nature

     

       16
       +
       , qiskit-optimization

     

       17
        
         # Check Inputs

     

       18
        
       , pytestCheckHook

     

       19
        
       }:

     

       20
        
       

     

       21
       +
       let

     

       22
       +
         optionalQiskitPackages = [

     

       23
       +
           qiskit-finance

     

       24
       +
           qiskit-machine-learning

     

       25
       +
           qiskit-nature

     

       26
       +
           qiskit-optimization

     

       27
       +
         ];

     

       28
       +
       in

     

       29
        
       buildPythonPackage rec {

     

       30
        
         pname = "qiskit";

     

       31
        
         # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history

     

       32
       +
         version = "0.32.0";

     

       33
        
       

     

       34
        
         disabled = pythonOlder "3.6";

     

       35
        
       

     
···

       37
        
           owner = "qiskit";

     

       38
        
           repo = "qiskit";

     

       39
        
           rev = version;

     

       40
       +
           sha256 = "sha256-fKR072hOD0a9TtWulqyKUT3Riwq+NHTtciR+NN5JC1Y=";

     

       41
        
         };

     

       42
        
       

     

       43
        
         propagatedBuildInputs = [

     
···

       46
        
           qiskit-ibmq-provider

     

       47
        
           qiskit-ignis

     

       48
        
           qiskit-terra

     

       49
       +
         ] ++ lib.optionals withOptionalPackages optionalQiskitPackages;

     

       50
        
       

     

       51
        
         checkInputs = [ pytestCheckHook ];

     

       52

+1 -1

pkgs/development/python-modules/sh/default.nix

···

       1
       -
       { lib, buildPythonPackage, fetchPypi, fetchpatch, python, coverage, lsof, glibcLocales, coreutils }:

     

       2
        
       

     

       3
        
       buildPythonPackage rec {

     

       4
        
         pname = "sh";

···

       1
       +
       { lib, buildPythonPackage, fetchPypi, python, coverage, lsof, glibcLocales, coreutils }:

     

       2
        
       

     

       3
        
       buildPythonPackage rec {

     

       4
        
         pname = "sh";

-1

pkgs/development/python-modules/spacy/default.nix

···

       11
        
       , jsonschema

     

       12
        
       , murmurhash

     

       13
        
       , numpy

     

       14
       -
       , pathlib

     

       15
        
       , preshed

     

       16
        
       , requests

     

       17
        
       , setuptools

···

       11
        
       , jsonschema

     

       12
        
       , murmurhash

     

       13
        
       , numpy

     

       0
        
       
     

       14
        
       , preshed

     

       15
        
       , requests

     

       16
        
       , setuptools

+1 -5

pkgs/development/python-modules/stestr/tests.nix

···

       1
       -
       { stdenv

     

       2
       -
       , buildPythonPackage

     

       3
       -
       , ddt

     

       4
       -
       , sqlalchemy

     

       5
        
       , stestr

     

       6
       -
       , subunit2sql

     

       7
        
       }:

     

       8
        
       

     

       9
        
       buildPythonPackage rec {

···

       1
       +
       {  buildPythonPackage

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       2
        
       , stestr

     

       0
        
       
     

       3
        
       }:

     

       4
        
       

     

       5
        
       buildPythonPackage rec {

+6 -6

pkgs/development/python-modules/tweedledum/default.nix

···

       4
        
       , cmake

     

       5
        
       , ninja

     

       6
        
       , scikit-build

     

       0
        
       
     

       0
        
       
     

       7
        
       }:

     

       8
        
       

     

       9
        
       buildPythonPackage rec {

     

       10
        
         pname = "tweedledum";

     

       11
       -
         version = "1.0.0";

     

       12
        
         format = "pyproject";

     

       13
        
       

     

       14
        
         src = fetchFromGitHub{

     

       15
        
           owner = "boschmitt";

     

       16
        
           repo = "tweedledum";

     

       17
        
           rev = "v${version}";

     

       18
       -
           hash = "sha256-59lJzdw9HLJ9ADxp/a3KW4v5aU/dYm27NSYoz9D49i4=";

     

       19
        
         };

     

       20
        
       

     

       21
        
         nativeBuildInputs = [ cmake ninja scikit-build ];

     
···

       23
        
       

     

       24
        
         pythonImportsCheck = [ "tweedledum" ];

     

       25
        
       

     

       26
       -
         # TODO: use pytest, but had issues with finding the correct directories

     

       27
       -
         checkPhase = ''

     

       28
       -
           python -m unittest discover -s ./python/test -t .

     

       29
       -
         '';

     

       30
        
       

     

       31
        
         meta = with lib; {

     

       32
        
           description = "A library for synthesizing and manipulating quantum circuits";

···

       4
        
       , cmake

     

       5
        
       , ninja

     

       6
        
       , scikit-build

     

       7
       +
         # Check Inputs

     

       8
       +
       , pytestCheckHook

     

       9
        
       }:

     

       10
        
       

     

       11
        
       buildPythonPackage rec {

     

       12
        
         pname = "tweedledum";

     

       13
       +
         version = "1.1.1";

     

       14
        
         format = "pyproject";

     

       15
        
       

     

       16
        
         src = fetchFromGitHub{

     

       17
        
           owner = "boschmitt";

     

       18
        
           repo = "tweedledum";

     

       19
        
           rev = "v${version}";

     

       20
       +
           sha256 = "sha256-wgrY5ajaMYxznyNvlD0ul1PFr3W8oV9I/OVsStlZEBM=";

     

       21
        
         };

     

       22
        
       

     

       23
        
         nativeBuildInputs = [ cmake ninja scikit-build ];

     
···

       25
        
       

     

       26
        
         pythonImportsCheck = [ "tweedledum" ];

     

       27
        
       

     

       28
       +
         checkInputs = [ pytestCheckHook ];

     

       29
       +
         pytestFlagsArray = [ "python/test" ];

     

       0
        
       
     

       0
        
       
     

       30
        
       

     

       31
        
         meta = with lib; {

     

       32
        
           description = "A library for synthesizing and manipulating quantum circuits";

+64

pkgs/development/python-modules/wavefile/default.nix

···

       1
       +
       { lib

     

       2
       +
       , stdenv

     

       3
       +
       , buildPythonPackage

     

       4
       +
       , fetchFromGitHub

     

       5
       +
       , setuptools

     

       6
       +
       , pyaudio

     

       7
       +
       , numpy

     

       8
       +
       , libsndfile

     

       9
       +
       , substituteAll

     

       10
       +
       }:

     

       11
       +
       

     

       12
       +
       buildPythonPackage rec {

     

       13
       +
         pname = "wavefile";

     

       14
       +
         version = "1.5";

     

       15
       +
       

     

       16
       +
         src = fetchFromGitHub {

     

       17
       +
           owner = "vokimon";

     

       18
       +
           repo = "python-wavefile";

     

       19
       +
           rev = "python-wavefile-${version}";

     

       20
       +
           sha256 = "9sHj1gb93mCVpejRGSdLJzeFDCeTflZctE7kMWfqFrE=";

     

       21
       +
         };

     

       22
       +
       

     

       23
       +
         nativeBuildInputs = [

     

       24
       +
           setuptools

     

       25
       +
         ];

     

       26
       +
       

     

       27
       +
         buildInputs = [

     

       28
       +
           pyaudio

     

       29
       +
           libsndfile

     

       30
       +
         ];

     

       31
       +
       

     

       32
       +
         propagatedBuildInputs = [

     

       33
       +
           numpy

     

       34
       +
         ];

     

       35
       +
       

     

       36
       +
         checkInputs = [

     

       37
       +
           pyaudio

     

       38
       +
           numpy

     

       39
       +
           libsndfile

     

       40
       +
         ];

     

       41
       +
       

     

       42
       +
         patches = [

     

       43
       +
           # Fix check error

     

       44
       +
           # OSError: libsndfile.so.1: cannot open shared object file: No such file or directory

     

       45
       +
           (substituteAll {

     

       46
       +
             src = ./libsndfile.py.patch;

     

       47
       +
             libsndfile = "${lib.getLib libsndfile}/lib/libsndfile${stdenv.hostPlatform.extensions.sharedLibrary}";

     

       48
       +
           })

     

       49
       +
         ];

     

       50
       +
       

     

       51
       +
         doCheck = false; # all test files (test/wavefileTest.py) are failing

     

       52
       +
       

     

       53
       +
         pythonImportsCheck = [

     

       54
       +
           "wavefile"

     

       55
       +
         ];

     

       56
       +
       

     

       57
       +
         meta = with lib; {

     

       58
       +
           description = "Pythonic libsndfile wrapper to read and write audio files";

     

       59
       +
           homepage = "https://github.com/vokimon/python-wavefile";

     

       60
       +
           changelog = "https://github.com/vokimon/python-wavefile#version-history";

     

       61
       +
           maintainers = with maintainers; [ yuu ];

     

       62
       +
           license = licenses.gpl3Plus;

     

       63
       +
         };

     

       64
       +
       }

+18

pkgs/development/python-modules/wavefile/libsndfile.py.patch

···

       1
       +
       diff --git a/wavefile/libsndfile.py b/wavefile/libsndfile.py

     

       2
       +
       index 67f0a46..ce066ee 100644

     

       3
       +
       --- a/wavefile/libsndfile.py

     

       4
       +
       +++ b/wavefile/libsndfile.py

     

       5
       +
       @@ -19,11 +19,11 @@ import numpy as np

     

       6
       +
        if sys.platform == "win32":

     

       7
       +
            dllName = 'libsndfile-1'

     

       8
       +
        elif "linux" in sys.platform:

     

       9
       +
       -    dllName = 'libsndfile.so.1'

     

       10
       +
       +    dllName = '@libsndfile@'

     

       11
       +
        elif "cygwin" in sys.platform:

     

       12
       +
            dllName = 'libsndfile-1.dll'

     

       13
       +
        elif "darwin" in sys.platform:

     

       14
       +
       -    dllName = 'libsndfile.dylib'

     

       15
       +
       +    dllName = '@libsndfile@'

     

       16
       +
        else:

     

       17
       +
            dllName = 'libsndfile'

     

       18
       +

+6 -18

pkgs/development/tools/ammonite/default.nix

···

       1
       -
       { lib

     

       2
       -
       , stdenv

     

       3
       -
       , fetchurl

     

       4
       -
       , jre

     

       5
       -
       , writeScript

     

       6
       -
       , common-updater-scripts

     

       7
       -
       , git

     

       8
       -
       , nixfmt

     

       9
       -
       , nix

     

       10
       -
       , coreutils

     

       11
       -
       , gnused

     

       12
       -
       , disableRemoteLogging ? true

     

       13
       -
       }:

     

       14
        
       

     

       15
        
       with lib;

     

       16
        
       

     
···

       20
        
         common = { scalaVersion, sha256 }:

     

       21
        
           stdenv.mkDerivation rec {

     

       22
        
             pname = "ammonite";

     

       23
       -
             version = "2.4.0";

     

       24
        
       

     

       25
        
             src = fetchurl {

     

       26
        
               url =

     
···

       91
        
               maintainers = [ maintainers.nequissimus ];

     

       92
        
             };

     

       93
        
           };

     

       94
       -
       in

     

       95
       -
       {

     

       96
        
         ammonite_2_12 = common {

     

       97
        
           scalaVersion = "2.12";

     

       98
       -
           sha256 = "K8JII6SAmnBjMWQ9a3NqSLLuP1OLcbwobj3G+OCiLdA=";

     

       99
        
         };

     

       100
        
         ammonite_2_13 = common {

     

       101
        
           scalaVersion = "2.13";

     

       102
       -
           sha256 = "2F35qhWI6hNb+Eh9ZTDznqo116yN7MZIGVchaAIM36A=";

     

       103
        
         };

     

       104
        
       }

···

       1
       +
       { lib, stdenv, fetchurl, jre, writeScript, common-updater-scripts, git, nixfmt

     

       2
       +
       , nix, coreutils, gnused, disableRemoteLogging ? true }:

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       3
        
       

     

       4
        
       with lib;

     

       5
        
       

     
···

       9
        
         common = { scalaVersion, sha256 }:

     

       10
        
           stdenv.mkDerivation rec {

     

       11
        
             pname = "ammonite";

     

       12
       +
             version = "2.4.1";

     

       13
        
       

     

       14
        
             src = fetchurl {

     

       15
        
               url =

     
···

       80
        
               maintainers = [ maintainers.nequissimus ];

     

       81
        
             };

     

       82
        
           };

     

       83
       +
       in {

     

       0
        
       
     

       84
        
         ammonite_2_12 = common {

     

       85
        
           scalaVersion = "2.12";

     

       86
       +
           sha256 = "5n9q/7d/PwDJfBPITYyDua24+fci6bi1oG5dSw8A244=";

     

       87
        
         };

     

       88
        
         ammonite_2_13 = common {

     

       89
        
           scalaVersion = "2.13";

     

       90
       +
           sha256 = "RIuNyWvwNM39/rczUH328K5ky5hePflokW/VP603j+I=";

     

       91
        
         };

     

       92
        
       }

+2 -2

pkgs/development/tools/build-managers/bazel/bazel_3/default.nix

···

       405
        
             substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python"

     

       406
        
       

     

       407
        
             # md5sum is part of coreutils

     

       408
       -
             sed -i 's|/sbin/md5|md5sum|' \

     

       409
       -
               src/BUILD

     

       410
        
       

     

       411
        
             # replace initial value of pythonShebang variable in BazelPythonSemantics.java

     

       412
        
             substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java \

···

       405
        
             substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python"

     

       406
        
       

     

       407
        
             # md5sum is part of coreutils

     

       408
       +
             sed -i 's|/sbin/md5|md5sum|g' \

     

       409
       +
               src/BUILD third_party/ijar/test/testenv.sh tools/objc/libtool.sh

     

       410
        
       

     

       411
        
             # replace initial value of pythonShebang variable in BazelPythonSemantics.java

     

       412
        
             substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java \

+2 -2

pkgs/development/tools/build-managers/bazel/bazel_4/default.nix

···

       434
        
             substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python"

     

       435
        
       

     

       436
        
             # md5sum is part of coreutils

     

       437
       -
             sed -i 's|/sbin/md5|md5sum|' \

     

       438
       -
               src/BUILD

     

       439
        
       

     

       440
        
             # replace initial value of pythonShebang variable in BazelPythonSemantics.java

     

       441
        
             substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java \

···

       434
        
             substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python"

     

       435
        
       

     

       436
        
             # md5sum is part of coreutils

     

       437
       +
             sed -i 's|/sbin/md5|md5sum|g' \

     

       438
       +
               src/BUILD third_party/ijar/test/testenv.sh tools/objc/libtool.sh

     

       439
        
       

     

       440
        
             # replace initial value of pythonShebang variable in BazelPythonSemantics.java

     

       441
        
             substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java \

+3 -3

pkgs/development/tools/cargo-flamegraph/default.nix

···

       4
        
       

     

       5
        
       rustPlatform.buildRustPackage rec {

     

       6
        
         pname = "cargo-flamegraph";

     

       7
       -
         version = "0.4.0";

     

       8
        
       

     

       9
        
         src = fetchFromGitHub {

     

       10
        
           owner = "flamegraph-rs";

     

       11
        
           repo = "flamegraph";

     

       12
        
           rev = "v${version}";

     

       13
       -
           sha256 = "sha256-IpmvFUWNaFQ1ls7u625vvj1TnRYXR+X1mAGdBcwRFLk=";

     

       14
        
         };

     

       15
        
       

     

       16
       -
         cargoSha256 = "sha256-ccy5ZFS2Gp4Dwo8gsS6vzHHO1siicOp7uZTsCh6SKsM=";

     

       17
        
       

     

       18
        
         nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];

     

       19
        
         buildInputs = lib.optionals stdenv.isDarwin [

···

       4
        
       

     

       5
        
       rustPlatform.buildRustPackage rec {

     

       6
        
         pname = "cargo-flamegraph";

     

       7
       +
         version = "0.5.0";

     

       8
        
       

     

       9
        
         src = fetchFromGitHub {

     

       10
        
           owner = "flamegraph-rs";

     

       11
        
           repo = "flamegraph";

     

       12
        
           rev = "v${version}";

     

       13
       +
           sha256 = "sha256-qxUYqqz6dlpkw6MGHH8iPfZcbc3/ZF1E+C8arISSTdY=";

     

       14
        
         };

     

       15
        
       

     

       16
       +
         cargoSha256 = "sha256-qJEhcqa78QW9X5ZD3Jy2BfRh/SkOhqBLzTT00u4DM0Q=";

     

       17
        
       

     

       18
        
         nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];

     

       19
        
         buildInputs = lib.optionals stdenv.isDarwin [

-37

pkgs/development/tools/parsing/flex/2.6.1.nix

···

       1
       -
       { lib, stdenv, fetchurl, bison, m4 }:

     

       2
       -
       

     

       3
       -
       stdenv.mkDerivation rec {

     

       4
       -
         pname = "flex";

     

       5
       -
         version = "2.6.1";

     

       6
       -
       

     

       7
       -
         src = fetchurl {

     

       8
       -
           url = "https://github.com/westes/flex/releases/download/v${version}/flex-${version}.tar.gz";

     

       9
       -
           sha256 = "0fy14c35yz2m1n1m4f02by3501fn0cca37zn7jp8lpp4b3kgjhrw";

     

       10
       -
         };

     

       11
       -
       

     

       12
       -
         postPatch = ''

     

       13
       -
           patchShebangs tests

     

       14
       -
         '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''

     

       15
       -
           substituteInPlace Makefile.in --replace "tests" " ";

     

       16
       -
         '';

     

       17
       -
       

     

       18
       -
         buildInputs = [ bison ];

     

       19
       -
       

     

       20
       -
         propagatedBuildInputs = [ m4 ];

     

       21
       -
       

     

       22
       -
         preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''

     

       23
       -
           ac_cv_func_malloc_0_nonnull=yes

     

       24
       -
           ac_cv_func_realloc_0_nonnull=yes

     

       25
       -
         '';

     

       26
       -
       

     

       27
       -
         postConfigure = lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) ''

     

       28
       -
           sed -i Makefile -e 's/-no-undefined//;'

     

       29
       -
         '';

     

       30
       -
       

     

       31
       -
         meta = with lib; {

     

       32
       -
           homepage = "https://github.com/westes/flex";

     

       33
       -
           description = "A fast lexical analyser generator";

     

       34
       -
           license = licenses.bsd2;

     

       35
       -
           platforms = platforms.unix;

     

       36
       -
         };

     

       37
       -
       }

+2 -2

pkgs/development/tools/pipenv/default.nix

···

       18
        
       

     

       19
        
       in buildPythonApplication rec {

     

       20
        
         pname = "pipenv";

     

       21
       -
         version = "2021.5.29";

     

       22
        
       

     

       23
        
         src = fetchPypi {

     

       24
        
           inherit pname version;

     

       25
       -
           sha256 = "05958fadcd70b2de6a27542fcd2bd72dd5c59c6d35307fdac3e06361fb06e30e";

     

       26
        
         };

     

       27
        
       

     

       28
        
         LC_ALL = "en_US.UTF-8";

···

       18
        
       

     

       19
        
       in buildPythonApplication rec {

     

       20
        
         pname = "pipenv";

     

       21
       +
         version = "2021.11.9";

     

       22
        
       

     

       23
        
         src = fetchPypi {

     

       24
        
           inherit pname version;

     

       25
       +
           sha256 = "7662399162bc887ee86e96d0baa6984236228af9c1fd6594be0b18910225579d";

     

       26
        
         };

     

       27
        
       

     

       28
        
         LC_ALL = "en_US.UTF-8";

+2 -2

pkgs/development/tools/pypi-mirror/default.nix

···

       4
        
       }:

     

       5
        
       python3.pkgs.buildPythonApplication rec {

     

       6
        
         pname = "pypi-mirror";

     

       7
       -
         version = "4.0.7";

     

       8
        
       

     

       9
        
         src = fetchFromGitHub {

     

       10
        
           owner = "montag451";

     

       11
        
           repo = pname;

     

       12
        
           rev = "v${version}";

     

       13
       -
           sha256 = "0sjzjvq2jnsr5mfyvkww3rfk3k5xcl8wa07q614850m0sn907laz";

     

       14
        
         };

     

       15
        
       

     

       16
        
         pythonImportsCheck = [ "pypi_mirror" ];

···

       4
        
       }:

     

       5
        
       python3.pkgs.buildPythonApplication rec {

     

       6
        
         pname = "pypi-mirror";

     

       7
       +
         version = "4.1.0";

     

       8
        
       

     

       9
        
         src = fetchFromGitHub {

     

       10
        
           owner = "montag451";

     

       11
        
           repo = pname;

     

       12
        
           rev = "v${version}";

     

       13
       +
           sha256 = "077f3asi5fdbb2j2ll4xdwv7ndfbfr81bpn3zi55h6idfdc7zzc0";

     

       14
        
         };

     

       15
        
       

     

       16
        
         pythonImportsCheck = [ "pypi_mirror" ];

+12 -4

pkgs/games/domination/default.nix

···

       6
        
       , ant

     

       7
        
       , makeWrapper

     

       8
        
       , makeDesktopItem

     

       0
        
       
     

       9
        
       }:

     

       10
        
       

     

       11
        
       let

     
···

       26
        
       

     

       27
        
       in stdenv.mkDerivation {

     

       28
        
         pname = "domination";

     

       29
       -
         version = "1.2.3";

     

       30
        
       

     

       31
        
         # The .zip releases do not contain the build.xml file

     

       32
        
         src = fetchsvn {

     
···

       34
        
           # There are no tags in the repository.

     

       35
        
           # Look for commits like "new version x.y.z info on website"

     

       36
        
           # or "website update for x.y.z".

     

       37
       -
           rev = "1964";

     

       38
       -
           sha256 = "0718gns8d69a1dfq3ywc9kddl1khnrmxqyal7brckbjgay8dq42f";

     

       39
        
         };

     

       40
        
       

     

       41
        
         nativeBuildInputs = [

     
···

       44
        
           makeWrapper

     

       45
        
         ];

     

       46
        
       

     

       47
       -
         buildPhase = "ant";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       48
        
       

     

       49
        
         installPhase = ''

     

       50
        
           # Remove unnecessary files and launchers (they'd need to be wrapped anyway)

     
···

       75
        
             "$out/share/applications/Domination Map Editor.desktop"

     

       76
        
           install -Dm644 build/game/resources/icon.png $out/share/pixmaps/domination.png

     

       77
        
         '';

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       78
        
       

     

       79
        
         meta = with lib; {

     

       80
        
           homepage = "http://domination.sourceforge.net/";

···

       6
        
       , ant

     

       7
        
       , makeWrapper

     

       8
        
       , makeDesktopItem

     

       9
       +
       , nixosTests

     

       10
        
       }:

     

       11
        
       

     

       12
        
       let

     
···

       27
        
       

     

       28
        
       in stdenv.mkDerivation {

     

       29
        
         pname = "domination";

     

       30
       +
         version = "1.2.4";

     

       31
        
       

     

       32
        
         # The .zip releases do not contain the build.xml file

     

       33
        
         src = fetchsvn {

     
···

       35
        
           # There are no tags in the repository.

     

       36
        
           # Look for commits like "new version x.y.z info on website"

     

       37
        
           # or "website update for x.y.z".

     

       38
       +
           rev = "2109";

     

       39
       +
           sha256 = "sha256-awTaEkv0zUXgrKVKuFzi5sgHgrfiNmAFMODO5U0DL6I=";

     

       40
        
         };

     

       41
        
       

     

       42
        
         nativeBuildInputs = [

     
···

       45
        
           makeWrapper

     

       46
        
         ];

     

       47
        
       

     

       48
       +
         buildPhase = ''

     

       49
       +
           cd swingUI

     

       50
       +
           ant

     

       51
       +
         '';

     

       52
        
       

     

       53
        
         installPhase = ''

     

       54
        
           # Remove unnecessary files and launchers (they'd need to be wrapped anyway)

     
···

       79
        
             "$out/share/applications/Domination Map Editor.desktop"

     

       80
        
           install -Dm644 build/game/resources/icon.png $out/share/pixmaps/domination.png

     

       81
        
         '';

     

       82
       +
       

     

       83
       +
         passthru.tests = {

     

       84
       +
           domination-starts = nixosTests.domination;

     

       85
       +
         };

     

       86
        
       

     

       87
        
         meta = with lib; {

     

       88
        
           homepage = "http://domination.sourceforge.net/";

+24 -8

pkgs/games/openrw/default.nix

···

       1
       -
       { lib, stdenv, fetchgit, cmake, sfml, libGLU, libGL, bullet, glm, libmad, xlibsWrapper, openal

     

       2
       -
       , SDL2, boost, ffmpeg_3, Cocoa, OpenAL }:

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       3
        
       

     

       4
        
       stdenv.mkDerivation {

     

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

     

       6
        
         pname = "openrw";

     

       7
        
       

     

       8
       -
         src = fetchgit {

     

       9
       -
           url = "https://github.com/rwengine/openrw";

     

       10
       -
           rev = "51b7264744d1aaa20de3b86a7a4e92a9930881ba";

     

       11
       -
           sha256 = "04s088wfxkfmb4dxdvad611yxj8smxlnxdm5xy81zldfzybvx8dg";

     

       0
        
       
     

       12
        
           fetchSubmodules = true;

     

       13
        
         };

     

       14
        
       

     

       15
        
         nativeBuildInputs = [ cmake ];

     

       16
        
       

     

       17
        
         buildInputs = [

     

       18
       -
           sfml libGLU libGL bullet glm libmad xlibsWrapper openal SDL2 boost ffmpeg_3

     

       19
        
         ] ++ lib.optionals stdenv.isDarwin [ OpenAL Cocoa ];

     

       20
        
       

     

       21
        
         meta = with lib; {

···

       1
       +
       { lib

     

       2
       +
       , stdenv

     

       3
       +
       , fetchFromGitHub

     

       4
       +
       , cmake

     

       5
       +
       , sfml

     

       6
       +
       , libGLU

     

       7
       +
       , libGL

     

       8
       +
       , bullet

     

       9
       +
       , glm

     

       10
       +
       , libmad

     

       11
       +
       , xlibsWrapper

     

       12
       +
       , openal

     

       13
       +
       , SDL2

     

       14
       +
       , boost

     

       15
       +
       , ffmpeg

     

       16
       +
       , Cocoa

     

       17
       +
       , OpenAL }:

     

       18
        
       

     

       19
        
       stdenv.mkDerivation {

     

       20
       +
         version = "unstable-2021-10-14";

     

       21
        
         pname = "openrw";

     

       22
        
       

     

       23
       +
         src = fetchFromGitHub {

     

       24
       +
           owner = "rwengine";

     

       25
       +
           repo = "openrw";

     

       26
       +
           rev = "0f83c16f6518c427a4f156497c3edc843610c402";

     

       27
       +
           sha256 = "0i6nx9g0xb8sziak5swi8636fszcjjx8n2jwgz570izw2fl698ff";

     

       28
        
           fetchSubmodules = true;

     

       29
        
         };

     

       30
        
       

     

       31
        
         nativeBuildInputs = [ cmake ];

     

       32
        
       

     

       33
        
         buildInputs = [

     

       34
       +
           sfml libGLU libGL bullet glm libmad xlibsWrapper openal SDL2 boost ffmpeg

     

       35
        
         ] ++ lib.optionals stdenv.isDarwin [ OpenAL Cocoa ];

     

       36
        
       

     

       37
        
         meta = with lib; {

+1 -1

pkgs/misc/arm-trusted-firmware/default.nix

···

       1
       -
       { lib, stdenv, fetchFromGitHub, fetchpatch, openssl, pkgsCross, buildPackages }:

     

       2
        
       

     

       3
        
       let

     

       4
        
         buildArmTrustedFirmware = { filesToInstall

···

       1
       +
       { lib, stdenv, fetchFromGitHub, openssl, pkgsCross, buildPackages }:

     

       2
        
       

     

       3
        
       let

     

       4
        
         buildArmTrustedFirmware = { filesToInstall

+2 -1

pkgs/misc/drivers/gutenprint/bin.nix

···

       25
        
       */

     

       26
        
       

     

       27
        
       stdenv.mkDerivation {

     

       28
       -
         name = "cups-gutenprint-binary-5.0.1";

     

       0
        
       
     

       29
        
       

     

       30
        
         src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl {

     

       31
        
           url = "https://www.openprinting.org/download/printdriver/debian/dists/lsb3.1/main/binary-amd64/gutenprint_5.0.1-1lsb3.1_amd64.deb";

···

       25
        
       */

     

       26
        
       

     

       27
        
       stdenv.mkDerivation {

     

       28
       +
         pname = "cups-gutenprint-binary";

     

       29
       +
         version = "5.0.1";

     

       30
        
       

     

       31
        
         src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl {

     

       32
        
           url = "https://www.openprinting.org/download/printdriver/debian/dists/lsb3.1/main/binary-amd64/gutenprint_5.0.1-1lsb3.1_amd64.deb";

+1 -1

pkgs/misc/drivers/hplip/3.16.11.nix

···

       2
        
       , pkg-config

     

       3
        
       , cups, libjpeg, libusb1, python2Packages, sane-backends, dbus, usbutils

     

       4
        
       , net-snmp, openssl, nettools

     

       5
       -
       , bash, coreutils, util-linux

     

       6
        
       , qtSupport ? true

     

       7
        
       , withPlugin ? false

     

       8
        
       }:

···

       2
        
       , pkg-config

     

       3
        
       , cups, libjpeg, libusb1, python2Packages, sane-backends, dbus, usbutils

     

       4
        
       , net-snmp, openssl, nettools

     

       5
       +
       , bash, util-linux

     

       6
        
       , qtSupport ? true

     

       7
        
       , withPlugin ? false

     

       8
        
       }:

+1 -1

pkgs/misc/drivers/hplip/default.nix

···

       3
        
       , cups, zlib, libjpeg, libusb1, python3Packages, sane-backends

     

       4
        
       , dbus, file, ghostscript, usbutils

     

       5
        
       , net-snmp, openssl, perl, nettools, avahi

     

       6
       -
       , bash, coreutils, util-linux

     

       7
        
       # To remove references to gcc-unwrapped

     

       8
        
       , removeReferencesTo, qt5

     

       9
        
       , withQt5 ? true

···

       3
        
       , cups, zlib, libjpeg, libusb1, python3Packages, sane-backends

     

       4
        
       , dbus, file, ghostscript, usbutils

     

       5
        
       , net-snmp, openssl, perl, nettools, avahi

     

       6
       +
       , bash, util-linux

     

       7
        
       # To remove references to gcc-unwrapped

     

       8
        
       , removeReferencesTo, qt5

     

       9
        
       , withQt5 ? true

+1 -1

pkgs/misc/drivers/utsushi/default.nix

···

       1
        
       { lib, stdenv, writeScriptBin, fetchFromGitLab, autoreconfHook, pkg-config

     

       2
        
       , autoconf-archive, libxslt, boost , gtkmm2 , imagemagick, sane-backends

     

       3
       -
       , tesseract4, udev, libusb1, gnum4 }:

     

       4
        
       

     

       5
        
       

     

       6
        
       let

···

       1
        
       { lib, stdenv, writeScriptBin, fetchFromGitLab, autoreconfHook, pkg-config

     

       2
        
       , autoconf-archive, libxslt, boost , gtkmm2 , imagemagick, sane-backends

     

       3
       +
       , tesseract4, udev, libusb1 }:

     

       4
        
       

     

       5
        
       

     

       6
        
       let

+1 -3

pkgs/misc/emulators/commanderx16/run.nix

···

       1
       -
       { lib

     

       2
       -
       , stdenv

     

       3
       -
       , runtimeShell

     

       4
        
       , symlinkJoin

     

       5
        
       , writeTextFile

     

       6
        
       }:

···

       1
       +
       { runtimeShell

     

       0
        
       
     

       0
        
       
     

       2
        
       , symlinkJoin

     

       3
        
       , writeTextFile

     

       4
        
       }:

-1

pkgs/misc/emulators/dgen-sdl/default.nix

···

       1
        
       { lib, stdenv

     

       2
        
       , fetchurl

     

       3
        
       , libarchive

     

       4
       -
       , doxygen

     

       5
        
       , SDL

     

       6
        
       }:

     

       7

···

       1
        
       { lib, stdenv

     

       2
        
       , fetchurl

     

       3
        
       , libarchive

     

       0
        
       
     

       4
        
       , SDL

     

       5
        
       }:

     

       6

-1

pkgs/misc/emulators/mgba/default.nix

···

       9
        
       , libedit

     

       10
        
       , libelf

     

       11
        
       , libzip

     

       12
       -
       , copyDesktopItems

     

       13
        
       , makeDesktopItem

     

       14
        
       , minizip

     

       15
        
       , pkg-config

···

       9
        
       , libedit

     

       10
        
       , libelf

     

       11
        
       , libzip

     

       0
        
       
     

       12
        
       , makeDesktopItem

     

       13
        
       , minizip

     

       14
        
       , pkg-config

+8 -7

pkgs/misc/emulators/retroarch/cores.nix

···

       1
       -
       { lib, stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, fetchpatch, cmake, pkg-config, makeWrapper, python27, python3, retroarch

     

       2
       -
       , alsa-lib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, SDL_net, SDL2, SDL2_image, libGL

     

       3
        
       , ffmpeg, pcre, libevdev, libpng, libjpeg, libzip, udev, libvorbis, snappy, which, hexdump

     

       4
       -
       , miniupnpc, sfml, xorg, zlib, nasm, libpcap, boost, icu, openssl

     

       5
        
       , buildPackages }:

     

       6
        
       

     

       7
        
       let

     

       8
        
       

     

       9
        
         d2u = lib.replaceChars ["-"] ["_"];

     

       10
        
       

     

       11
       -
         mkLibRetroCore = { core, src, description, license, broken ? false, ... }@a:

     

       12
        
         lib.makeOverridable stdenv.mkDerivation ((rec {

     

       13
        
       

     

       14
        
           name = "libretro-${a.core}-${version}";

     

       15
       -
           version = "2020-03-06";

     

       16
        
           inherit (a) src;

     

       17
        
       

     

       18
        
           buildInputs = [ zlib ] ++ a.extraBuildInputs or [];

     
···

       334
        
       

     

       335
        
         dolphin = mkLibRetroCore {

     

       336
        
           core = "dolphin";

     

       0
        
       
     

       337
        
           src = fetchRetro {

     

       338
        
             repo = "dolphin";

     

       339
       -
             rev = "1fbd59911d1b718c142d6448dee3ede98152e395";

     

       340
       -
             sha256 = "1rymsvs034l1hbxc3w8zi9lhmgka2qaj3jynjy152dccd480nnd4";

     

       341
        
           };

     

       342
        
           description = "Port of Dolphin to libretro";

     

       343
        
           license = gpl2Plus;

···

       1
       +
       { lib, stdenv, fetchgit, fetchFromGitHub, fetchpatch, cmake, pkg-config, makeWrapper, python27, python3, retroarch

     

       2
       +
       , alsa-lib, fluidsynth, curl, hidapi, libGLU, gettext, portaudio, SDL, SDL2, libGL

     

       3
        
       , ffmpeg, pcre, libevdev, libpng, libjpeg, libzip, udev, libvorbis, snappy, which, hexdump

     

       4
       +
       , sfml, xorg, zlib, nasm, libpcap, boost, icu, openssl

     

       5
        
       , buildPackages }:

     

       6
        
       

     

       7
        
       let

     

       8
        
       

     

       9
        
         d2u = lib.replaceChars ["-"] ["_"];

     

       10
        
       

     

       11
       +
         mkLibRetroCore = { core, src, description, license, broken ? false, version ? "2020-03-06", ... }@a:

     

       12
        
         lib.makeOverridable stdenv.mkDerivation ((rec {

     

       13
        
       

     

       14
        
           name = "libretro-${a.core}-${version}";

     

       15
       +
           inherit version;

     

       16
        
           inherit (a) src;

     

       17
        
       

     

       18
        
           buildInputs = [ zlib ] ++ a.extraBuildInputs or [];

     
···

       334
        
       

     

       335
        
         dolphin = mkLibRetroCore {

     

       336
        
           core = "dolphin";

     

       337
       +
           version = "2021-11-01";

     

       338
        
           src = fetchRetro {

     

       339
        
             repo = "dolphin";

     

       340
       +
             rev = "3370f7693be95c23ac779e5172ff52b7eb2861a7";

     

       341
       +
             sha256 = "0ylxi25kbv0h2p24aid7z4i0w6drf7h92q02hjdl3h3gni98lk9i";

     

       342
        
           };

     

       343
        
           description = "Port of Dolphin to libretro";

     

       344
        
           license = gpl2Plus;

-1

pkgs/misc/emulators/retroarch/default.nix

···

       14
        
       , udev ? null

     

       15
        
       , enableNvidiaCgToolkit ? false, nvidia_cg_toolkit ? null

     

       16
        
       , withVulkan ? stdenv.isLinux, vulkan-loader ? null

     

       17
       -
       , fetchurl

     

       18
        
       , wayland

     

       19
        
       , libxkbcommon

     

       20
        
       }:

···

       14
        
       , udev ? null

     

       15
        
       , enableNvidiaCgToolkit ? false, nvidia_cg_toolkit ? null

     

       16
        
       , withVulkan ? stdenv.isLinux, vulkan-loader ? null

     

       0
        
       
     

       17
        
       , wayland

     

       18
        
       , libxkbcommon

     

       19
        
       }:

+1 -2

pkgs/misc/ghostscript/test-corpus-render.nix

···

       1
       -
       { lib

     

       2
       -
       , stdenv

     

       3
        
       , fetchgit

     

       4
        
       , ghostscript

     

       5
        
       }:

···

       1
       +
       { stdenv

     

       0
        
       
     

       2
        
       , fetchgit

     

       3
        
       , ghostscript

     

       4
        
       }:

-1

pkgs/misc/scrcpy/default.nix

···

       2
        
       , meson

     

       3
        
       , ninja

     

       4
        
       , pkg-config

     

       5
       -
       , fetchpatch

     

       6
        
       

     

       7
        
       , platform-tools

     

       8
        
       , ffmpeg

···

       2
        
       , meson

     

       3
        
       , ninja

     

       4
        
       , pkg-config

     

       0
        
       
     

       5
        
       

     

       6
        
       , platform-tools

     

       7
        
       , ffmpeg

+1 -2

pkgs/misc/vscode-extensions/cpptools/default.nix

···

       1
        
       { lib, vscode-utils

     

       2
       -
       , fetchurl, unzip

     

       3
       -
       , mono, writeScript, runtimeShell

     

       4
        
       , jq, clang-tools

     

       5
        
       , gdbUseFixed ? true, gdb # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise.

     

       6
        
       }:

···

       1
        
       { lib, vscode-utils

     

       2
       +
       , fetchurl, mono, writeScript, runtimeShell

     

       0
        
       
     

       3
        
       , jq, clang-tools

     

       4
        
       , gdbUseFixed ? true, gdb # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise.

     

       5
        
       }:

-1

pkgs/misc/vscode-extensions/default.nix

···

       1
        
       { config

     

       2
        
       , lib

     

       3
       -
       , buildEnv

     

       4
        
       , fetchurl

     

       5
        
       , callPackage

     

       6
        
       , vscode-utils

···

       1
        
       { config

     

       2
        
       , lib

     

       0
        
       
     

       3
        
       , fetchurl

     

       4
        
       , callPackage

     

       5
        
       , vscode-utils

+1 -1

pkgs/misc/vscode-extensions/wakatime/default.nix

···

       1
        
       { lib

     

       2
       -
       , wakatime, vscode-utils }:

     

       3
        
       

     

       4
        
       let

     

       5
        
         inherit (vscode-utils) buildVscodeMarketplaceExtension;

···

       1
        
       { lib

     

       2
       +
       , vscode-utils }:

     

       3
        
       

     

       4
        
       let

     

       5
        
         inherit (vscode-utils) buildVscodeMarketplaceExtension;

+3 -2

pkgs/os-specific/darwin/DarwinTools/default.nix

···

       1
        
       { lib, stdenv, fetchurl }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
       -
         name = "DarwinTools-1";

     

       0
        
       
     

       5
        
       

     

       6
        
         src = fetchurl {

     

       7
       -
           url = "https://opensource.apple.com/tarballs/DarwinTools/${name}.tar.gz";

     

       8
        
           sha256 = "0hh4jl590jv3v830p77r3jcrnpndy7p2b8ajai3ldpnx2913jfhp";

     

       9
        
         };

     

       10

···

       1
        
       { lib, stdenv, fetchurl }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
       +
         pname = "DarwinTools";

     

       5
       +
         version = "1";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
       +
           url = "https://opensource.apple.com/tarballs/DarwinTools/DarwinTools-${version}.tar.gz";

     

       9
        
           sha256 = "0hh4jl590jv3v830p77r3jcrnpndy7p2b8ajai3ldpnx2913jfhp";

     

       10
        
         };

     

       11

+20 -16

pkgs/os-specific/darwin/insert_dylib/default.nix

···

       1
        
       { lib, stdenv, fetchFromGitHub, xcbuildHook }:

     

       2
        
       

     

       3
       -
       stdenv.mkDerivation

     

       4
       -
         { name = "insert_dylib-2016.08.28";

     

       5
       -
           src = fetchFromGitHub

     

       6
       -
             { owner = "Tyilo";

     

       7
       -
               repo = "insert_dylib";

     

       8
       -
               rev = "c8beef66a08688c2feeee2c9b6eaf1061c2e67a9";

     

       9
       -
               sha256 = "0az38y06pvvy9jf2wnzdwp9mp98lj6nr0ldv0cs1df5p9x2qvbya";

     

       10
       -
             };

     

       11
       -
           nativeBuildInputs = [ xcbuildHook ];

     

       12
       -
           installPhase =

     

       13
       -
             ''

     

       14
       -
               mkdir -p $out/bin

     

       15
       -
               install -m755 Products/Release/insert_dylib $out/bin

     

       16
       -
             '';

     

       17
       -
           meta.platforms = lib.platforms.darwin;

     

       18
       -
         }

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0

···

       1
        
       { lib, stdenv, fetchFromGitHub, xcbuildHook }:

     

       2
        
       

     

       3
       +
       stdenv.mkDerivation {

     

       4
       +
         pname = "insert_dylib";

     

       5
       +
         version = "unstable-2016-08-28";

     

       6
       +
       

     

       7
       +
         src = fetchFromGitHub {

     

       8
       +
           owner = "Tyilo";

     

       9
       +
           repo = "insert_dylib";

     

       10
       +
           rev = "c8beef66a08688c2feeee2c9b6eaf1061c2e67a9";

     

       11
       +
           sha256 = "0az38y06pvvy9jf2wnzdwp9mp98lj6nr0ldv0cs1df5p9x2qvbya";

     

       12
       +
         };

     

       13
       +
       

     

       14
       +
         nativeBuildInputs = [ xcbuildHook ];

     

       15
       +
       

     

       16
       +
         installPhase = ''

     

       17
       +
           mkdir -p $out/bin

     

       18
       +
           install -m755 Products/Release/insert_dylib $out/bin

     

       19
       +
         '';

     

       20
       +
       

     

       21
       +
         meta.platforms = lib.platforms.darwin;

     

       22
       +
       }

+2 -1

pkgs/os-specific/darwin/maloader/default.nix

···

       1
        
       { lib, stdenv, fetchgit, opencflite, clang, libcxx }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation {

     

       4
       -
         name = "maloader-0git";

     

       0
        
       
     

       5
        
       

     

       6
        
         src = fetchgit {

     

       7
        
           url = "git://github.com/shinh/maloader.git";

···

       1
        
       { lib, stdenv, fetchgit, opencflite, clang, libcxx }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation {

     

       4
       +
         pname = "maloader";

     

       5
       +
         version = "unstable-2014-02-25";

     

       6
        
       

     

       7
        
         src = fetchgit {

     

       8
        
           url = "git://github.com/shinh/maloader.git";

+2 -2

pkgs/os-specific/linux/eudev/default.nix

···

       9
        
           sha256 = "sha256-h7sCjUcP0bhRaTSbRMVdW3M3M9wtUN3xGW4CZyXq0DQ=";

     

       10
        
         };

     

       11
        
       

     

       12
       -
         nativeBuildInputs = [ pkg-config ];

     

       13
        
         buildInputs = [

     

       14
       -
           glib gperf util-linux kmod

     

       15
        
         ];

     

       16
        
       in

     

       17
        
       stdenv.mkDerivation {

···

       9
        
           sha256 = "sha256-h7sCjUcP0bhRaTSbRMVdW3M3M9wtUN3xGW4CZyXq0DQ=";

     

       10
        
         };

     

       11
        
       

     

       12
       +
         nativeBuildInputs = [ pkg-config gperf ];

     

       13
        
         buildInputs = [

     

       14
       +
           glib util-linux kmod

     

       15
        
         ];

     

       16
        
       in

     

       17
        
       stdenv.mkDerivation {

+10 -11

pkgs/os-specific/linux/fbterm/default.nix

···

       1
       -
       {stdenv, lib, fetchurl, gpm, freetype, fontconfig, pkg-config, ncurses, libx86}:

     

       2
        
       let

     

       3
        
         s = # Generated upstream information

     

       4
       -
         {

     

       5
       -
           baseName="fbterm";

     

       6
       -
           version="1.7.0";

     

       7
       -
           name="fbterm-1.7.0";

     

       8
       -
           hash="0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj";

     

       9
       -
           url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/fbterm/fbterm-1.7.0.tar.gz";

     

       10
       -
           sha256="0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj";

     

       11
       -
         };

     

       12
       -
         buildInputs = [gpm freetype fontconfig ncurses]

     

       13
        
           ++ lib.optional (stdenv.isi686 || stdenv.isx86_64) libx86;

     

       14
        
       in

     

       15
        
       stdenv.mkDerivation {

     

       16
       -
         inherit (s) name version;

     

       17
        
         src = fetchurl {

     

       18
        
           inherit (s) url sha256;

     

       19
        
         };

···

       1
       +
       { stdenv, lib, fetchurl, gpm, freetype, fontconfig, pkg-config, ncurses, libx86 }:

     

       2
        
       let

     

       3
        
         s = # Generated upstream information

     

       4
       +
           {

     

       5
       +
             version = "1.7.0";

     

       6
       +
             pname = "fbterm";

     

       7
       +
             hash = "0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj";

     

       8
       +
             url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/fbterm/fbterm-1.7.0.tar.gz";

     

       9
       +
             sha256 = "0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj";

     

       10
       +
           };

     

       11
       +
         buildInputs = [ gpm freetype fontconfig ncurses ]

     

       0
        
       
     

       12
        
           ++ lib.optional (stdenv.isi686 || stdenv.isx86_64) libx86;

     

       13
        
       in

     

       14
        
       stdenv.mkDerivation {

     

       15
       +
         inherit (s) pname version;

     

       16
        
         src = fetchurl {

     

       17
        
           inherit (s) url sha256;

     

       18
        
         };

+3

pkgs/os-specific/linux/kernel/common-config.nix

···

       748
        
       

     

       749
        
             BSD_PROCESS_ACCT_V3 = yes;

     

       750
        
       

     

       0
        
       
     

       751
        
             BT_HCIUART_BCSP = option yes;

     

       752
        
             BT_HCIUART_H4   = option yes; # UART (H4) protocol support

     

       753
        
             BT_HCIUART_LL   = option yes;

     
···

       861
        
             X86_PLATFORM_DRIVERS_DELL = whenAtLeast "5.12" yes;

     

       862
        
       

     

       863
        
             LIRC = mkMerge [ (whenOlder "4.16" module) (whenAtLeast "4.17" yes) ];

     

       0
        
       
     

       0
        
       
     

       864
        
       

     

       865
        
           } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") {

     

       866
        
             # Enable CPU/memory hotplug support

···

       748
        
       

     

       749
        
             BSD_PROCESS_ACCT_V3 = yes;

     

       750
        
       

     

       751
       +
             BT_HCIBTUSB_MTK = whenAtLeast "5.3" yes; # MediaTek protocol support

     

       752
        
             BT_HCIUART_BCSP = option yes;

     

       753
        
             BT_HCIUART_H4   = option yes; # UART (H4) protocol support

     

       754
        
             BT_HCIUART_LL   = option yes;

     
···

       862
        
             X86_PLATFORM_DRIVERS_DELL = whenAtLeast "5.12" yes;

     

       863
        
       

     

       864
        
             LIRC = mkMerge [ (whenOlder "4.16" module) (whenAtLeast "4.17" yes) ];

     

       865
       +
       

     

       866
       +
             SCHED_CORE = whenAtLeast "5.14" yes;

     

       867
        
       

     

       868
        
           } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") {

     

       869
        
             # Enable CPU/memory hotplug support

+2 -2

pkgs/os-specific/linux/kernel/linux-zen.nix

···

       2
        
       

     

       3
        
       let

     

       4
        
         # having the full version string here makes it easier to update

     

       5
       -
         modDirVersion = "5.15.1-zen1";

     

       6
        
         parts = lib.splitString "-" modDirVersion;

     

       7
        
         version = lib.elemAt parts 0;

     

       8
        
         suffix = lib.elemAt parts 1;

     
···

       19
        
           owner = "zen-kernel";

     

       20
        
           repo = "zen-kernel";

     

       21
        
           rev = "v${modDirVersion}";

     

       22
       -
           sha256 = "sha256-mDAwsqLR55WFaPKO1SXZuxeuaFzprMY4ryeEUdCqKGU=";

     

       23
        
         };

     

       24
        
       

     

       25
        
         structuredExtraConfig = with lib.kernel; {

···

       2
        
       

     

       3
        
       let

     

       4
        
         # having the full version string here makes it easier to update

     

       5
       +
         modDirVersion = "5.15.2-zen1";

     

       6
        
         parts = lib.splitString "-" modDirVersion;

     

       7
        
         version = lib.elemAt parts 0;

     

       8
        
         suffix = lib.elemAt parts 1;

     
···

       19
        
           owner = "zen-kernel";

     

       20
        
           repo = "zen-kernel";

     

       21
        
           rev = "v${modDirVersion}";

     

       22
       +
           sha256 = "sha256-6cYKlRAd8kbphIThmTdWieH322Rj1KSmCJCmYRt8o2w=";

     

       23
        
         };

     

       24
        
       

     

       25
        
         structuredExtraConfig = with lib.kernel; {

+7 -7

pkgs/os-specific/linux/mwprocapture/default.nix

···

       4
        
       

     

       5
        
       let

     

       6
        
         bits =

     

       7
       -
         if stdenv.is64bit then "64"

     

       8
       -
         else "32";

     

       9
        
       

     

       10
        
         libpath = makeLibraryPath [ stdenv.cc.cc stdenv.glibc alsa-lib ];

     

       11
        
       

     

       12
        
       in

     

       13
        
       stdenv.mkDerivation rec {

     

       14
       -
         name = "mwprocapture-1.3.0.${version}-${kernel.version}";

     

       15
       -
         version = "4236";

     

       0
        
       
     

       16
        
       

     

       17
        
         src = fetchurl {

     

       18
       -
           url = "https://www.magewell.com/files/drivers/ProCaptureForLinux_${version}.tar.gz";

     

       19
        
           sha256 = "1mfgj84km276sq5i8dny1vqp2ycqpvgplrmpbqwnk230d0w3qs74";

     

       20
        
         };

     

       21
        
       

     

       22
        
         nativeBuildInputs = kernel.moduleBuildDependencies;

     

       23
        
       

     

       24
       -
         preConfigure =

     

       25
       -
         ''

     

       26
        
           cd ./src

     

       27
        
           export INSTALL_MOD_PATH="$out"

     

       28
        
         '';

···

       4
        
       

     

       5
        
       let

     

       6
        
         bits =

     

       7
       +
           if stdenv.is64bit then "64"

     

       8
       +
           else "32";

     

       9
        
       

     

       10
        
         libpath = makeLibraryPath [ stdenv.cc.cc stdenv.glibc alsa-lib ];

     

       11
        
       

     

       12
        
       in

     

       13
        
       stdenv.mkDerivation rec {

     

       14
       +
         pname = "mwprocapture";

     

       15
       +
         subVersion = "4236";

     

       16
       +
         version = "1.3.0.${subVersion}-${kernel.version}";

     

       17
        
       

     

       18
        
         src = fetchurl {

     

       19
       +
           url = "https://www.magewell.com/files/drivers/ProCaptureForLinux_${subVersion}.tar.gz";

     

       20
        
           sha256 = "1mfgj84km276sq5i8dny1vqp2ycqpvgplrmpbqwnk230d0w3qs74";

     

       21
        
         };

     

       22
        
       

     

       23
        
         nativeBuildInputs = kernel.moduleBuildDependencies;

     

       24
        
       

     

       25
       +
         preConfigure = ''

     

       0
        
       
     

       26
        
           cd ./src

     

       27
        
           export INSTALL_MOD_PATH="$out"

     

       28
        
         '';

+1 -1

pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix

···

       1
       -
       { lib, stdenv, fetchFromGitHub, fetchpatch, kernel }:

     

       2
        
       

     

       3
        
       let

     

       4
        
         rev = "307d694076b056588c652c2bdaa543a89eb255d9";

···

       1
       +
       { lib, stdenv, fetchFromGitHub, kernel }:

     

       2
        
       

     

       3
        
       let

     

       4
        
         rev = "307d694076b056588c652c2bdaa543a89eb255d9";

+9 -7

pkgs/os-specific/linux/seturgent/default.nix

···

       1
        
       { lib, stdenv, fetchurl, libX11, xorgproto, unzip }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation {

     

       4
       -
         name = "seturgent-2012-08-17";

     

       0
        
       
     

       5
        
       

     

       6
        
         src = fetchurl {

     

       7
        
           url = "https://github.com/hiltjo/seturgent/archive/ada70dcb15865391e5cdcab27a0739a304a17e03.zip";

     
···

       10
        
       

     

       11
        
         nativeBuildInputs = [ unzip ];

     

       12
        
         buildInputs = [

     

       13
       -
           libX11 xorgproto

     

       0
        
       
     

       14
        
         ];

     

       15
        
       

     

       16
        
         installPhase = ''

     
···

       19
        
         '';

     

       20
        
       

     

       21
        
         meta = {

     

       22
       -
             platforms = lib.platforms.linux;

     

       23
       -
             description = "Set an application's urgency hint (or not)";

     

       24
       -
             maintainers = [ lib.maintainers.yarr ];

     

       25
       -
             homepage = "https://github.com/hiltjo/seturgent";

     

       26
       -
             license = lib.licenses.mit;

     

       27
        
         };

     

       28
        
       }

···

       1
        
       { lib, stdenv, fetchurl, libX11, xorgproto, unzip }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation {

     

       4
       +
         pname = "seturgent";

     

       5
       +
         version = "unstable-2012-08-17";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "https://github.com/hiltjo/seturgent/archive/ada70dcb15865391e5cdcab27a0739a304a17e03.zip";

     
···

       11
        
       

     

       12
        
         nativeBuildInputs = [ unzip ];

     

       13
        
         buildInputs = [

     

       14
       +
           libX11

     

       15
       +
           xorgproto

     

       16
        
         ];

     

       17
        
       

     

       18
        
         installPhase = ''

     
···

       21
        
         '';

     

       22
        
       

     

       23
        
         meta = {

     

       24
       +
           platforms = lib.platforms.linux;

     

       25
       +
           description = "Set an application's urgency hint (or not)";

     

       26
       +
           maintainers = [ lib.maintainers.yarr ];

     

       27
       +
           homepage = "https://github.com/hiltjo/seturgent";

     

       28
       +
           license = lib.licenses.mit;

     

       29
        
         };

     

       30
        
       }

+6 -5

pkgs/os-specific/linux/udisks-glue/default.nix

···

       1
        
       { lib, stdenv, fetchurl, pkg-config, automake, autoconf, udisks1, dbus-glib, glib, libconfuse }:

     

       2
        
       

     

       3
       -
       stdenv.mkDerivation {

     

       4
       -
         name = "udisks-glue-1.3.5";

     

       0
        
       
     

       5
        
       

     

       6
        
         src = fetchurl {

     

       7
       -
           url = "https://github.com/fernandotcl/udisks-glue/archive/release-1.3.5.tar.gz";

     

       8
        
           sha256 = "317d25bf249278dc8f6a5dcf18f760512427c772b9afe3cfe34e6e1baa258176";

     

       9
        
         };

     

       10
        
       

     
···

       17
        
           homepage = "https://github.com/fernandotcl/udisks-glue";

     

       18
        
           description = "A tool to associate udisks events to user-defined actions";

     

       19
        
           platforms = lib.platforms.linux;

     

       20
       -
           maintainers = with lib.maintainers; [pSub];

     

       21
        
           license = lib.licenses.bsd2;

     

       22
        
           broken = true;

     

       23
       -
           hydraPlatforms = [];

     

       24
        
         };

     

       25
        
       }

···

       1
        
       { lib, stdenv, fetchurl, pkg-config, automake, autoconf, udisks1, dbus-glib, glib, libconfuse }:

     

       2
        
       

     

       3
       +
       stdenv.mkDerivation rec {

     

       4
       +
         pname = "udisks-glue";

     

       5
       +
         version = "1.3.5";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
       +
           url = "https://github.com/fernandotcl/udisks-glue/archive/release-${version}.tar.gz";

     

       9
        
           sha256 = "317d25bf249278dc8f6a5dcf18f760512427c772b9afe3cfe34e6e1baa258176";

     

       10
        
         };

     

       11
        
       

     
···

       18
        
           homepage = "https://github.com/fernandotcl/udisks-glue";

     

       19
        
           description = "A tool to associate udisks events to user-defined actions";

     

       20
        
           platforms = lib.platforms.linux;

     

       21
       +
           maintainers = with lib.maintainers; [ pSub ];

     

       22
        
           license = lib.licenses.bsd2;

     

       23
        
           broken = true;

     

       24
       +
           hydraPlatforms = [ ];

     

       25
        
         };

     

       26
        
       }

+40 -8

pkgs/os-specific/linux/udisks/1-default.nix

···

       1
       -
       { lib, stdenv, fetchurl, pkg-config, sg3_utils, udev, glib, dbus, dbus-glib

     

       2
       -
       , polkit, parted, lvm2, libatasmart, intltool, libuuid, mdadm

     

       3
       -
       , libxslt, docbook_xsl, util-linux, libgudev }:

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       4
        
       

     

       5
        
       stdenv.mkDerivation rec {

     

       6
       -
         name = "udisks-1.0.5";

     

       0
        
       
     

       7
        
       

     

       8
        
         src = fetchurl {

     

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

     

       10
        
           sha256 = "0wbg3jrv8limdgvcygf4dqin3y6d30y9pcmmk711vq571vmq5v7j";

     

       11
        
         };

     

       12
        
       

     
···

       27
        
           '';

     

       28
        
       

     

       29
        
         buildInputs =

     

       30
       -
           [ sg3_utils udev glib dbus dbus-glib polkit parted libgudev

     

       31
       -
             lvm2 libatasmart intltool libuuid libxslt docbook_xsl

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       32
        
           ];

     

       33
        
       

     

       34
        
         nativeBuildInputs = [ pkg-config ];

     
···

       41
        
           platforms = platforms.linux;

     

       42
        
           license = with licenses; [ gpl2 lgpl2Plus ];

     

       43
        
           broken = true;

     

       44
       -
           hydraPlatforms = [];

     

       45
        
         };

     

       46
        
       }

···

       1
       +
       { lib

     

       2
       +
       , stdenv

     

       3
       +
       , fetchurl

     

       4
       +
       , pkg-config

     

       5
       +
       , sg3_utils

     

       6
       +
       , udev

     

       7
       +
       , glib

     

       8
       +
       , dbus

     

       9
       +
       , dbus-glib

     

       10
       +
       , polkit

     

       11
       +
       , parted

     

       12
       +
       , lvm2

     

       13
       +
       , libatasmart

     

       14
       +
       , intltool

     

       15
       +
       , libuuid

     

       16
       +
       , mdadm

     

       17
       +
       , libxslt

     

       18
       +
       , docbook_xsl

     

       19
       +
       , util-linux

     

       20
       +
       , libgudev

     

       21
       +
       }:

     

       22
        
       

     

       23
        
       stdenv.mkDerivation rec {

     

       24
       +
         pname = "udisks";

     

       25
       +
         version = "1.0.5";

     

       26
        
       

     

       27
        
         src = fetchurl {

     

       28
       +
           url = "https://hal.freedesktop.org/releases/udisks-${version}.tar.gz";

     

       29
        
           sha256 = "0wbg3jrv8limdgvcygf4dqin3y6d30y9pcmmk711vq571vmq5v7j";

     

       30
        
         };

     

       31
        
       

     
···

       46
        
           '';

     

       47
        
       

     

       48
        
         buildInputs =

     

       49
       +
           [

     

       50
       +
             sg3_utils

     

       51
       +
             udev

     

       52
       +
             glib

     

       53
       +
             dbus

     

       54
       +
             dbus-glib

     

       55
       +
             polkit

     

       56
       +
             parted

     

       57
       +
             libgudev

     

       58
       +
             lvm2

     

       59
       +
             libatasmart

     

       60
       +
             intltool

     

       61
       +
             libuuid

     

       62
       +
             libxslt

     

       63
       +
             docbook_xsl

     

       64
        
           ];

     

       65
        
       

     

       66
        
         nativeBuildInputs = [ pkg-config ];

     
···

       73
        
           platforms = platforms.linux;

     

       74
        
           license = with licenses; [ gpl2 lgpl2Plus ];

     

       75
        
           broken = true;

     

       76
       +
           hydraPlatforms = [ ];

     

       77
        
         };

     

       78
        
       }

+2 -1

pkgs/os-specific/windows/jom/default.nix

···

       4
        
       # both mingw32 and mingw64.

     

       5
        
       

     

       6
        
       stdenv.mkDerivation {

     

       7
       -
         name = "jom-1.0.11";

     

       0
        
       
     

       8
        
       

     

       9
        
         src = fetchgit {

     

       10
        
           url = "git://gitorious.org/qt-labs/jom.git";

···

       4
        
       # both mingw32 and mingw64.

     

       5
        
       

     

       6
        
       stdenv.mkDerivation {

     

       7
       +
         pname = "jom";

     

       8
       +
         version = "1.0.11";

     

       9
        
       

     

       10
        
         src = fetchgit {

     

       11
        
           url = "git://gitorious.org/qt-labs/jom.git";

+3 -2

pkgs/os-specific/windows/mingwrt/default.nix

···

       1
        
       { stdenv, lib, fetchurl }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
       -
         name = "mingwrt-5.0.2";

     

       0
        
       
     

       5
        
       

     

       6
        
         src = fetchurl {

     

       7
       -
           url = "mirror://sourceforge/mingw/MinGW/Base/mingwrt/${name}/${name}-mingw32-src.tar.xz";

     

       8
        
           sha256 = "1vj6f578wcffdmy7zzf7xz1lw57kxjy08j0k1n28f0j4ylrk68vp";

     

       9
        
         };

     

       10

···

       1
        
       { stdenv, lib, fetchurl }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
       +
         pname = "mingwrt";

     

       5
       +
         version = "5.0.2";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
       +
           url = "mirror://sourceforge/mingw/MinGW/Base/mingwrt/mingwrt-${version}/mingwrt-${version}-mingw32-src.tar.xz";

     

       9
        
           sha256 = "1vj6f578wcffdmy7zzf7xz1lw57kxjy08j0k1n28f0j4ylrk68vp";

     

       10
        
         };

     

       11

+3 -2

pkgs/os-specific/windows/w32api/default.nix

···

       1
        
       { stdenv, fetchurl, lib }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
       -
         name = "w32api-3.17-2";

     

       0
        
       
     

       5
        
       

     

       6
        
         src = fetchurl {

     

       7
       -
           url = "mirror://sourceforge/mingw/MinGW/Base/w32api/w32api-3.17/${name}-mingw32-src.tar.lzma";

     

       8
        
           sha256 = "09rhnl6zikmdyb960im55jck0rdy5z9nlg3akx68ixn7khf3j8wb";

     

       9
        
         };

     

       10

···

       1
        
       { stdenv, fetchurl, lib }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
       +
         pname = "w32api";

     

       5
       +
         version = "3.17-2";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
       +
           url = "mirror://sourceforge/mingw/MinGW/Base/w32api/w32api-${lib.versions.majorMinor version}/w32api-${version}-mingw32-src.tar.lzma";

     

       9
        
           sha256 = "09rhnl6zikmdyb960im55jck0rdy5z9nlg3akx68ixn7khf3j8wb";

     

       10
        
         };

     

       11

+5 -4

pkgs/os-specific/windows/wxMSW-2.8/default.nix

···

       1
        
       { lib, stdenv, fetchurl, compat24 ? false, compat26 ? true, unicode ? true }:

     

       2
        
       

     

       3
       -
       stdenv.mkDerivation {

     

       4
       -
         name = "wxMSW-2.8.11";

     

       0
        
       
     

       5
        
       

     

       6
        
         src = fetchurl {

     

       7
       -
           url = "mirror://sourceforge/wxwindows/wxWidgets-2.8.11.tar.gz";

     

       8
        
           sha256 = "0icxd21g18d42n1ygshkpw0jnflm03iqki6r623pb5hhd7fm2ksj";

     

       9
        
         };

     

       10
        
       

     
···

       27
        
           (cd $out/include && ln -s wx-*/* .)

     

       28
        
         ";

     

       29
        
       

     

       30
       -
         passthru = {inherit compat24 compat26 unicode;};

     

       31
        
       

     

       32
        
         meta = {

     

       33
        
           platforms = lib.platforms.windows;

···

       1
        
       { lib, stdenv, fetchurl, compat24 ? false, compat26 ? true, unicode ? true }:

     

       2
        
       

     

       3
       +
       stdenv.mkDerivation rec {

     

       4
       +
         pname = "wxMSW";

     

       5
       +
         version = "2.8.11";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
       +
           url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.gz";

     

       9
        
           sha256 = "0icxd21g18d42n1ygshkpw0jnflm03iqki6r623pb5hhd7fm2ksj";

     

       10
        
         };

     

       11
        
       

     
···

       28
        
           (cd $out/include && ln -s wx-*/* .)

     

       29
        
         ";

     

       30
        
       

     

       31
       +
         passthru = { inherit compat24 compat26 unicode; };

     

       32
        
       

     

       33
        
         meta = {

     

       34
        
           platforms = lib.platforms.windows;

+14 -1

pkgs/servers/home-assistant/default.nix

···

       78
        
             });

     

       79
        
           })

     

       80
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       81
        
           # Pinned due to API changes in pyruckus>0.12

     

       82
        
           (self: super: {

     

       83
        
             pyruckus = super.pyruckus.overridePythonAttrs (oldAttrs: rec {

     
···

       813
        
           "tests/auth/mfa_modules/test_notify.py"

     

       814
        
           # emulated_hue/test_upnp.py: Tries to establish the public ipv4 address

     

       815
        
           "tests/components/emulated_hue/test_upnp.py"

     

       816
       -
           # tado/test_climate.py: Tries to connect to my.tado.com

     

       817
        
           "tests/components/tado/test_climate.py"

     

       0
        
       
     

       818
        
         ];

     

       819
        
       

     

       820
        
         disabledTests = [

···

       78
        
             });

     

       79
        
           })

     

       80
        
       

     

       81
       +
           (self: super: {

     

       82
       +
             nettigo-air-monitor = super.nettigo-air-monitor.overridePythonAttrs (oldAttrs: rec {

     

       83
       +
               version = "1.1.1";

     

       84
       +
               src = fetchFromGitHub {

     

       85
       +
                 owner = "bieniu";

     

       86
       +
                 repo = "nettigo-air-monitor";

     

       87
       +
                 rev = version;

     

       88
       +
                 sha256 = "sha256-OIB1d6XtstUr5P0q/dmyJS7+UbtkFQIiuSnzwcdP1mE=";

     

       89
       +
               };

     

       90
       +
             });

     

       91
       +
           })

     

       92
       +
       

     

       93
        
           # Pinned due to API changes in pyruckus>0.12

     

       94
        
           (self: super: {

     

       95
        
             pyruckus = super.pyruckus.overridePythonAttrs (oldAttrs: rec {

     
···

       825
        
           "tests/auth/mfa_modules/test_notify.py"

     

       826
        
           # emulated_hue/test_upnp.py: Tries to establish the public ipv4 address

     

       827
        
           "tests/components/emulated_hue/test_upnp.py"

     

       828
       +
           # tado/test_{climate,water_heater}.py: Tries to connect to my.tado.com

     

       829
        
           "tests/components/tado/test_climate.py"

     

       830
       +
           "tests/components/tado/test_water_heater.py"

     

       831
        
         ];

     

       832
        
       

     

       833
        
         disabledTests = [

+3 -3

pkgs/servers/http/nginx/modules.nix

···

       498
        
             name = "video-thumbextractor";

     

       499
        
             owner = "wandenberg";

     

       500
        
             repo = "nginx-video-thumbextractor-module";

     

       501
       -
             rev = "0.9.0";

     

       502
       -
             sha256 = "1b0v471mzbcys73pzr7gpvzzhff0cva0l5ff32cv7z1v9c0ypji7";

     

       503
        
           };

     

       504
       -
           inputs = [ pkgs.ffmpeg_3 ];

     

       505
        
         };

     

       506
        
       

     

       507
        
         vod = {

···

       498
        
             name = "video-thumbextractor";

     

       499
        
             owner = "wandenberg";

     

       500
        
             repo = "nginx-video-thumbextractor-module";

     

       501
       +
             rev = "92b80642538eec4cfc98114dec5917b8d820e912";

     

       502
       +
             sha256 = "0a8d9ifryhhnll7k7jcsf9frshk5yhpsgz7zgxdmw81wbz5hxklc";

     

       503
        
           };

     

       504
       +
           inputs = [ pkgs.ffmpeg ];

     

       505
        
         };

     

       506
        
       

     

       507
        
         vod = {

+3 -3

pkgs/servers/klipper/default.nix

···

       6
        
       }:

     

       7
        
       stdenv.mkDerivation rec {

     

       8
        
         pname = "klipper";

     

       9
       -
         version = "unstable-2021-09-21";

     

       10
        
       

     

       11
        
         src = fetchFromGitHub {

     

       12
        
           owner = "KevinOConnor";

     

       13
        
           repo = "klipper";

     

       14
       -
           rev = "0b918b357cb0c282d53cbdf59e1931a2054cd60a";

     

       15
       -
           sha256 = "sha256-vUhP71vZ5XFG7MDkPFpAcCUL4kIdzHJ1hAkwqIi6ksQ=";

     

       16
        
         };

     

       17
        
       

     

       18
        
         sourceRoot = "source/klippy";

···

       6
        
       }:

     

       7
        
       stdenv.mkDerivation rec {

     

       8
        
         pname = "klipper";

     

       9
       +
         version = "unstable-2021-11-10";

     

       10
        
       

     

       11
        
         src = fetchFromGitHub {

     

       12
        
           owner = "KevinOConnor";

     

       13
        
           repo = "klipper";

     

       14
       +
           rev = "c179db3d4331db9d85c7acfdaa1e96e295d277ba";

     

       15
       +
           sha256 = "sha256-/fFbhKiSQq9E9iucinTgUTyOtfDKCMgvzebHjfOaJ+M=";

     

       16
        
         };

     

       17
        
       

     

       18
        
         sourceRoot = "source/klippy";

+173

pkgs/servers/openvscode-server/default.nix

···

       1
       +
       { lib, stdenv, fetchFromGitHub, makeWrapper, runCommand

     

       2
       +
       , cacert, moreutils, jq, git, pkg-config, yarn, python3

     

       3
       +
       , esbuild, nodejs-14_x, libsecret, xorg, ripgrep

     

       4
       +
       , AppKit, Cocoa, Security, cctools }:

     

       5
       +
       

     

       6
       +
       let

     

       7
       +
         system = stdenv.hostPlatform.system;

     

       8
       +
       

     

       9
       +
         nodejs = nodejs-14_x;

     

       10
       +
         yarn' = yarn.override { inherit nodejs; };

     

       11
       +
         defaultYarnOpts = [ "frozen-lockfile" "non-interactive" "no-progress"];

     

       12
       +
       

     

       13
       +
         vsBuildTarget = {

     

       14
       +
           x86_64-linux = "linux-x64";

     

       15
       +
           aarch64-linux = "linux-arm64";

     

       16
       +
           x86_64-darwin = "darwin";

     

       17
       +
         }.${system} or (throw "Unsupported system ${system}");

     

       18
       +
       

     

       19
       +
         # replaces esbuild's download script with a binary from nixpkgs

     

       20
       +
         patchEsbuild = path : version : ''

     

       21
       +
           mkdir -p ${path}/node_modules/esbuild/bin

     

       22
       +
           jq "del(.scripts.postinstall)" ${path}/node_modules/esbuild/package.json | sponge ${path}/node_modules/esbuild/package.json

     

       23
       +
           sed -i 's/${version}/${esbuild.version}/g' ${path}/node_modules/esbuild/lib/main.js

     

       24
       +
           ln -s -f ${esbuild}/bin/esbuild ${path}/node_modules/esbuild/bin/esbuild

     

       25
       +
         '';

     

       26
       +
       

     

       27
       +
       in stdenv.mkDerivation rec {

     

       28
       +
         pname = "openvscode-server";

     

       29
       +
         version = "1.62.0";

     

       30
       +
       

     

       31
       +
         src = fetchFromGitHub {

     

       32
       +
           owner = "gitpod-io";

     

       33
       +
           repo = "openvscode-server";

     

       34
       +
           rev = "openvscode-server-v${version}";

     

       35
       +
           sha256 = "0lmka1hgf1703h70s7i2lx07535n2l867kmnc5h89c4vaswy6649";

     

       36
       +
         };

     

       37
       +
       

     

       38
       +
         yarnCache = stdenv.mkDerivation {

     

       39
       +
           name = "${pname}-${version}-${system}-yarn-cache";

     

       40
       +
           inherit src;

     

       41
       +
           nativeBuildInputs = [ cacert yarn git ];

     

       42
       +
           buildPhase = ''

     

       43
       +
             export HOME=$PWD

     

       44
       +
       

     

       45
       +
             yarn config set yarn-offline-mirror $out

     

       46
       +
             find "$PWD" -name "yarn.lock" -printf "%h\n" | \

     

       47
       +
               xargs -I {} yarn --cwd {} \

     

       48
       +
                 --frozen-lockfile --ignore-scripts --ignore-platform \

     

       49
       +
                 --ignore-engines --no-progress --non-interactive

     

       50
       +
           '';

     

       51
       +
       

     

       52
       +
           installPhase = ''

     

       53
       +
             echo yarnCache

     

       54
       +
           '';

     

       55
       +
       

     

       56
       +
           outputHashMode = "recursive";

     

       57
       +
           outputHashAlgo = "sha256";

     

       58
       +
           outputHash = "142m0vkddzv09rbbqw7y7x19q7akkn00dn6az5ppr86k6bmhyk6p";

     

       59
       +
         };

     

       60
       +
       

     

       61
       +
         # Extract the Node.js source code which is used to compile packages with

     

       62
       +
         # native bindings

     

       63
       +
         nodeSources = runCommand "node-sources" {} ''

     

       64
       +
           tar --no-same-owner --no-same-permissions -xf ${nodejs.src}

     

       65
       +
           mv node-* $out

     

       66
       +
         '';

     

       67
       +
       

     

       68
       +
         nativeBuildInputs = [

     

       69
       +
           nodejs yarn' python3 pkg-config makeWrapper git jq moreutils

     

       70
       +
         ];

     

       71
       +
         buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ]

     

       72
       +
           ++ (with xorg; [ libX11 libxkbfile ])

     

       73
       +
           ++ lib.optionals stdenv.isDarwin [

     

       74
       +
             AppKit Cocoa Security cctools

     

       75
       +
           ];

     

       76
       +
       

     

       77
       +
         patches = [

     

       78
       +
           # Patch out remote download of nodejs from build script

     

       79
       +
           ./remove-node-download.patch

     

       80
       +
         ];

     

       81
       +
       

     

       82
       +
         postPatch = ''

     

       83
       +
           export HOME=$PWD

     

       84
       +
       

     

       85
       +
           # remove all built-in extensions, as these are 3rd party extensions that

     

       86
       +
           # get downloaded from vscode marketplace

     

       87
       +
           jq --slurp '.[0] * .[1]' "product.json" <(

     

       88
       +
             cat << EOF

     

       89
       +
           {

     

       90
       +
             "builtInExtensions": []

     

       91
       +
           }

     

       92
       +
           EOF

     

       93
       +
           ) | sponge product.json

     

       94
       +
         '';

     

       95
       +
       

     

       96
       +
         configurePhase = ''

     

       97
       +
           # set default yarn opts

     

       98
       +
           ${lib.concatMapStrings (option: ''

     

       99
       +
             yarn --offline config set ${option}

     

       100
       +
           '') defaultYarnOpts}

     

       101
       +
       

     

       102
       +
           # set offline mirror to yarn cache we created in previous steps

     

       103
       +
           yarn --offline config set yarn-offline-mirror "${yarnCache}"

     

       104
       +
         '' + lib.optionalString stdenv.isLinux ''

     

       105
       +
           # set nodedir, so we can build binaries later

     

       106
       +
           npm config set nodedir "${nodeSources}"

     

       107
       +
         '';

     

       108
       +
       

     

       109
       +
         buildPhase = ''

     

       110
       +
           # install dependencies

     

       111
       +
           yarn --offline --ignore-scripts

     

       112
       +
       

     

       113
       +
           # run yarn install everywhere, skipping postinstall so we can patch esbuild

     

       114
       +
           find . -path "*node_modules" -prune -o \

     

       115
       +
             -path "./*/*" -name "yarn.lock" -printf "%h\n" | \

     

       116
       +
               xargs -I {} yarn --cwd {} \

     

       117
       +
                 --frozen-lockfile --offline --ignore-scripts --ignore-engines

     

       118
       +
       

     

       119
       +
           ${patchEsbuild "./build" "0.12.6"}

     

       120
       +
           ${patchEsbuild "./extensions" "0.11.23"}

     

       121
       +
       

     

       122
       +
           # patch shebangs of node_modules to allow binary packages to build

     

       123
       +
           patchShebangs ./remote/node_modules

     

       124
       +
       

     

       125
       +
           # put ripgrep binary into bin so postinstall does not try to download it

     

       126
       +
           find -name vscode-ripgrep -type d \

     

       127
       +
             -execdir mkdir -p {}/bin \; \

     

       128
       +
             -execdir ln -s ${ripgrep}/bin/rg {}/bin/rg \;

     

       129
       +
         '' + lib.optionalString stdenv.isDarwin ''

     

       130
       +
           # use prebuilt binary for @parcel/watcher, which requires macOS SDK 10.13+

     

       131
       +
           # (see issue #101229)

     

       132
       +
           pushd ./remote/node_modules/@parcel/watcher

     

       133
       +
           mkdir -p ./build/Release

     

       134
       +
           mv ./prebuilds/darwin-x64/node.napi.glibc.node ./build/Release/watcher.node

     

       135
       +
           jq "del(.scripts) | .gypfile = false" ./package.json | sponge ./package.json

     

       136
       +
           popd

     

       137
       +
         '' + ''

     

       138
       +
           # rebuild binaries, we use npm here, as yarn does not provide an alternative

     

       139
       +
           # that would not attempt to try to reinstall everything and break our

     

       140
       +
           # patching attempts

     

       141
       +
           npm --prefix ./remote rebuild --build-from-source

     

       142
       +
       

     

       143
       +
           # run postinstall scripts after patching

     

       144
       +
           find . -path "*node_modules" -prune -o \

     

       145
       +
             -path "./*/*" -name "yarn.lock" -printf "%h\n" | \

     

       146
       +
               xargs -I {} sh -c 'jq -e ".scripts.postinstall" {}/package.json >/dev/null && yarn --cwd {} postinstall --frozen-lockfile --offline || true'

     

       147
       +
       

     

       148
       +
           # build and minify

     

       149
       +
           yarn --offline gulp vscode-reh-web-${vsBuildTarget}-min

     

       150
       +
         '';

     

       151
       +
       

     

       152
       +
         installPhase = ''

     

       153
       +
           mkdir -p $out/libexec

     

       154
       +
       

     

       155
       +
           cp -R -T ../vscode-reh-web-${vsBuildTarget} "$out/libexec"

     

       156
       +
       

     

       157
       +
           ln -s ${nodejs}/bin/node $out/libexec

     

       158
       +
       

     

       159
       +
           makeWrapper "$out/libexec/server.sh" "$out/bin/openvscode-server"

     

       160
       +
         '';

     

       161
       +
       

     

       162
       +
         meta = with lib; {

     

       163
       +
           description = "Run VS Code on a remote machine";

     

       164
       +
           longDescription = ''

     

       165
       +
             Run upstream VS Code on a remote machine with access through a modern web

     

       166
       +
             browser from any device, anywhere.

     

       167
       +
           '';

     

       168
       +
           homepage = "https://github.com/gitpod-io/openvscode-server";

     

       169
       +
           license = licenses.mit;

     

       170
       +
           maintainers = with maintainers; [ dguenther ghuntley ];

     

       171
       +
           platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];

     

       172
       +
         };

     

       173
       +
       }

+27

pkgs/servers/openvscode-server/remove-node-download.patch

···

       1
       +
       --- ./build/gulpfile.reh.js

     

       2
       +
       +++ ./build/gulpfile.reh.js

     

       3
       +
       @@ -277,8 +277,6 @@

     

       4
       +
        			.pipe(util.stripSourceMappingURL())

     

       5
       +
        			.pipe(jsFilter.restore);

     

       6
       +
        

     

       7
       +
       -		const nodePath = `.build/node/v${nodeVersion}/${platform}-${platform === 'darwin' ? 'x64' : arch}`;

     

       8
       +
       -		const node = gulp.src(`${nodePath}/**`, { base: nodePath, dot: true });

     

       9
       +
        

     

       10
       +
        		let web = [];

     

       11
       +
        		if (type === 'reh-web') {

     

       12
       +
       @@ -296,7 +294,6 @@

     

       13
       +
        			license,

     

       14
       +
        			sources,

     

       15
       +
        			deps,

     

       16
       +
       -			node,

     

       17
       +
        			...web

     

       18
       +
        		);

     

       19
       +
        

     

       20
       +
       @@ -376,7 +373,6 @@

     

       21
       +
        			const destinationFolderName = `vscode-${type}${dashed(platform)}${dashed(arch)}`;

     

       22
       +
        

     

       23
       +
        			const serverTaskCI = task.define(`vscode-${type}${dashed(platform)}${dashed(arch)}${dashed(minified)}-ci`, task.series(

     

       24
       +
       -				gulp.task(`node-${platform}-${platform === 'darwin' ? 'x64' : arch}`),

     

       25
       +
        				util.rimraf(path.join(BUILD_ROOT, destinationFolderName)),

     

       26
       +
        				packageTask(type, platform, arch, sourceFolderName, destinationFolderName)

     

       27
       +
        			));

+4 -4

pkgs/servers/prowlarr/default.nix

···

       16
        
         }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

     

       17
        
       

     

       18
        
         hash = {

     

       19
       -
           x64-linux_hash = "sha256-wrBfgwzb+HI6cu9EyC70xZ5WsfkW+o+Q69jeCjoZRtI=";

     

       20
       -
           arm64-linux_hash = "sha256-wnuLqd1T/21QyqjHbpK2w+WRyW1rd4pHqcRLFrIKHW8=";

     

       21
       -
           x64-osx_hash = "sha256-gu+eByulCs9zLe3AXfVfcOXB49q6V7MWQ2DN2O/enfk=";

     

       22
        
         }."${arch}-${os}_hash";

     

       23
        
       

     

       24
        
       in stdenv.mkDerivation rec {

     

       25
        
         pname = "prowlarr";

     

       26
       -
         version = "0.1.1.1030";

     

       27
        
       

     

       28
        
         src = fetchurl {

     

       29
        
           url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.develop.${version}.${os}-core-${arch}.tar.gz";

···

       16
        
         }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

     

       17
        
       

     

       18
        
         hash = {

     

       19
       +
           x64-linux_hash = "sha256-S3ktqBapIi6YIjDOIMziCzecS86hR2LIUey3SLNuWgg=";

     

       20
       +
           arm64-linux_hash = "sha256-lxPglw3whyMQ+v7GpKMygxqINDoczKmh7KpGAuzuQwM=";

     

       21
       +
           x64-osx_hash = "sha256-EUg3eC5QwGgCSi9qAPs6s8wenSXEmLvLHUTlvoLWAtc=";

     

       22
        
         }."${arch}-${os}_hash";

     

       23
        
       

     

       24
        
       in stdenv.mkDerivation rec {

     

       25
        
         pname = "prowlarr";

     

       26
       +
         version = "0.1.2.1060";

     

       27
        
       

     

       28
        
         src = fetchurl {

     

       29
        
           url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.develop.${version}.${os}-core-${arch}.tar.gz";

+2 -2

pkgs/servers/web-apps/wordpress/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "wordpress";

     

       5
       -
         version = "5.8.1";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "https://wordpress.org/${pname}-${version}.tar.gz";

     

       9
       -
           sha256 = "sha256-kMqQxK+jfa3IpHQ7XLERsgzaX5g84HPCwL69zmT6gio=";

     

       10
        
         };

     

       11
        
       

     

       12
        
         installPhase = ''

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "wordpress";

     

       5
       +
         version = "5.8.2";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "https://wordpress.org/${pname}-${version}.tar.gz";

     

       9
       +
           sha256 = "sha256-o9KeTmZXTHtqa/Z2KOo1n6gVCFuna42dFrvf9OBC8v8=";

     

       10
        
         };

     

       11
        
       

     

       12
        
         installPhase = ''

+3 -3

pkgs/shells/zsh/oh-my-zsh/default.nix

···

       5
        
       , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:

     

       6
        
       

     

       7
        
       stdenv.mkDerivation rec {

     

       8
       -
         version = "2021-10-27";

     

       9
        
         pname = "oh-my-zsh";

     

       10
       -
         rev = "2e46b2a2dcb96cadd94283bdce95eca75bef1433";

     

       11
        
       

     

       12
        
         src = fetchFromGitHub {

     

       13
        
           inherit rev;

     

       14
        
           owner = "ohmyzsh";

     

       15
        
           repo = "ohmyzsh";

     

       16
       -
           sha256 = "ZZs7SBfRX1JUmjukvnOqMx77vXgoxqHEatGfRvfToK8=";

     

       17
        
         };

     

       18
        
       

     

       19
        
         installPhase = ''

···

       5
        
       , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:

     

       6
        
       

     

       7
        
       stdenv.mkDerivation rec {

     

       8
       +
         version = "2021-11-11";

     

       9
        
         pname = "oh-my-zsh";

     

       10
       +
         rev = "b3ba9978cc42a5031c7b68e3cf917ec2e64643bc";

     

       11
        
       

     

       12
        
         src = fetchFromGitHub {

     

       13
        
           inherit rev;

     

       14
        
           owner = "ohmyzsh";

     

       15
        
           repo = "ohmyzsh";

     

       16
       +
           sha256 = "9a5eVMphQ0jay9ogc/9ZFS+vvHlXhPYCCo8kMdgVsnA=";

     

       17
        
         };

     

       18
        
       

     

       19
        
         installPhase = ''

+2 -2

pkgs/shells/zsh/zinit/default.nix

···

       4
        
         pname = "zinit";

     

       5
        
         version = "3.7";

     

       6
        
         src = fetchFromGitHub {

     

       7
       -
           owner = "zdharma";

     

       8
        
           repo = pname;

     

       9
        
           rev = "v${version}";

     

       10
        
           hash = "sha256-B+cTGz+U8MR22l6xXdRAAjDr+ulCk+CJ9GllFMK0axE=";

     
···

       37
        
           homepage = "https://github.com/zdharma/zinit";

     

       38
        
           description = "Flexible zsh plugin manager";

     

       39
        
           license = licenses.mit;

     

       40
       -
           maintainers = with maintainers; [ pasqui23 ];

     

       41
        
         };

     

       42
        
       }

···

       4
        
         pname = "zinit";

     

       5
        
         version = "3.7";

     

       6
        
         src = fetchFromGitHub {

     

       7
       +
           owner = "zdharma-continuum";

     

       8
        
           repo = pname;

     

       9
        
           rev = "v${version}";

     

       10
        
           hash = "sha256-B+cTGz+U8MR22l6xXdRAAjDr+ulCk+CJ9GllFMK0axE=";

     
···

       37
        
           homepage = "https://github.com/zdharma/zinit";

     

       38
        
           description = "Flexible zsh plugin manager";

     

       39
        
           license = licenses.mit;

     

       40
       +
           maintainers = with maintainers; [ pasqui23 sei40kr ];

     

       41
        
         };

     

       42
        
       }

+17 -9

pkgs/tools/X11/primus/lib.nix

···

       1
       -
       { lib, stdenv, fetchFromGitHub, fetchpatch

     

       2
       -
       , libX11, libGL, mesa

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       3
        
       , nvidia_x11 ? null

     

       4
        
       , libglvnd

     

       5
        
       }:

     
···

       10
        
           else if nvidia_x11.useGLVND then libglvnd

     

       11
        
           else nvidia_x11;

     

       12
        
       

     

       13
       -
       in stdenv.mkDerivation {

     

       14
       -
         name = "primus-lib-2015-04-28";

     

       0
        
       
     

       0
        
       
     

       15
        
       

     

       16
        
         src = fetchFromGitHub {

     

       17
        
           owner = "amonakov";

     
···

       30
        
       

     

       31
        
         buildInputs = [ libX11 libGL ];

     

       32
        
       

     

       33
       -
         makeFlags = [ "LIBDIR=$(out)/lib"

     

       34
       -
                       "PRIMUS_libGLa=${aPackage}/lib/libGL.so"

     

       35
       -
                       "PRIMUS_libGLd=${libGL}/lib/libGL.so"

     

       36
       -
                       "PRIMUS_LOAD_GLOBAL=${mesa}/lib/libglapi.so"

     

       37
       -
                     ];

     

       0
        
       
     

       38
        
       

     

       39
        
         installPhase = ''

     

       40
        
           ln -s $out/lib/libGL.so.1 $out/lib/libGL.so

···

       1
       +
       { lib

     

       2
       +
       , stdenv

     

       3
       +
       , fetchFromGitHub

     

       4
       +
       , fetchpatch

     

       5
       +
       , libX11

     

       6
       +
       , libGL

     

       7
       +
       , mesa

     

       8
        
       , nvidia_x11 ? null

     

       9
        
       , libglvnd

     

       10
        
       }:

     
···

       15
        
           else if nvidia_x11.useGLVND then libglvnd

     

       16
        
           else nvidia_x11;

     

       17
        
       

     

       18
       +
       in

     

       19
       +
       stdenv.mkDerivation {

     

       20
       +
         pname = "primus-lib";

     

       21
       +
         version = "unstable-2015-04-28";

     

       22
        
       

     

       23
        
         src = fetchFromGitHub {

     

       24
        
           owner = "amonakov";

     
···

       37
        
       

     

       38
        
         buildInputs = [ libX11 libGL ];

     

       39
        
       

     

       40
       +
         makeFlags = [

     

       41
       +
           "LIBDIR=$(out)/lib"

     

       42
       +
           "PRIMUS_libGLa=${aPackage}/lib/libGL.so"

     

       43
       +
           "PRIMUS_libGLd=${libGL}/lib/libGL.so"

     

       44
       +
           "PRIMUS_LOAD_GLOBAL=${mesa}/lib/libglapi.so"

     

       45
       +
         ];

     

       46
        
       

     

       47
        
         installPhase = ''

     

       48
        
           ln -s $out/lib/libGL.so.1 $out/lib/libGL.so

+2 -2

pkgs/tools/X11/xdotool/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "xdotool";

     

       5
       -
         version = "3.20210903.1";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "jordansissel";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "sha256-fmz/CJm1GgNOYjOfC6uNwDa8jV+GczPw8m6Qb2jw3rE=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         nativeBuildInputs = [ pkg-config perl ];

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "xdotool";

     

       5
       +
         version = "3.20211022.1";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "jordansissel";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       +
           sha256 = "sha256-XFiaiHHtUSNFw+xhUR29+2RUHOa+Eyj1HHfjCUjwd9k=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         nativeBuildInputs = [ pkg-config perl ];

+2 -2

pkgs/tools/audio/abcmidi/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "abcMIDI";

     

       5
       -
         version = "2021.10.11";

     

       6
        
       

     

       7
        
         src = fetchzip {

     

       8
        
           url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";

     

       9
       -
           sha256 = "sha256-2M6nCJD1ovW8Wzw+ucii5PjeNTOiTletor7MPCMPl38=";

     

       10
        
         };

     

       11
        
       

     

       12
        
         meta = with lib; {

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "abcMIDI";

     

       5
       +
         version = "2021.10.15";

     

       6
        
       

     

       7
        
         src = fetchzip {

     

       8
        
           url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";

     

       9
       +
           sha256 = "sha256-OEkSgT3Rg0ZcTCTeOd2+GlopzhI19spOLkH3nDDCWo8=";

     

       10
        
         };

     

       11
        
       

     

       12
        
         meta = with lib; {

+3 -3

pkgs/tools/filesystems/lfs/default.nix

···

       5
        
       

     

       6
        
       rustPlatform.buildRustPackage rec {

     

       7
        
         pname = "lfs";

     

       8
       -
         version = "1.1.0";

     

       9
        
       

     

       10
        
         src = fetchFromGitHub {

     

       11
        
           owner = "Canop";

     

       12
        
           repo = pname;

     

       13
        
           rev = "v${version}";

     

       14
       -
           sha256 = "gez5q1niIhzWJpsEkbVRuQFILo3tTO8aJq7ewZArJ5M=";

     

       15
        
         };

     

       16
        
       

     

       17
       -
         cargoSha256 = "2U1xDG4bTimtmjwZ1z9ErlaOcBNJdRcHlEWVaiGg01M=";

     

       18
        
       

     

       19
        
         meta = with lib; {

     

       20
        
           description = "Get information on your mounted disks";

···

       5
        
       

     

       6
        
       rustPlatform.buildRustPackage rec {

     

       7
        
         pname = "lfs";

     

       8
       +
         version = "1.2.1";

     

       9
        
       

     

       10
        
         src = fetchFromGitHub {

     

       11
        
           owner = "Canop";

     

       12
        
           repo = pname;

     

       13
        
           rev = "v${version}";

     

       14
       +
           sha256 = "sha256-Cf9W0LnlvMm0XZe6lvx8hQejcwyfxBC6VKltAAfRD5I=";

     

       15
        
         };

     

       16
        
       

     

       17
       +
         cargoSha256 = "sha256-skP9VJuRMCyA06YjGbyNIt/DljP3fQQOIQDy6k10zGI=";

     

       18
        
       

     

       19
        
         meta = with lib; {

     

       20
        
           description = "Get information on your mounted disks";

+16 -6

pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix

···

       1
       -
       { lib, stdenv, fetchurl, fetchpatch, lvm2, libgcrypt, libuuid, pkg-config, popt

     

       2
       -
       , enablePython ? true, python ? null

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       3
        
       }:

     

       4
        
       

     

       5
        
       assert enablePython -> python != null;

     

       6
        
       

     

       7
        
       stdenv.mkDerivation rec {

     

       8
       -
         name = "cryptsetup-1.6.3";

     

       0
        
       
     

       9
        
       

     

       10
        
         src = fetchurl {

     

       11
       -
           url = "http://cryptsetup.googlecode.com/files/${name}.tar.bz2";

     

       12
        
           sha256 = "1n1qk5chyjspbiianrdb55fhb4wl0vfyqz2br05vfb24v4qlgbx2";

     

       13
        
         };

     

       14
        
       

     
···

       22
        
         ];

     

       23
        
       

     

       24
        
         configureFlags = [ "--enable-cryptsetup-reencrypt" ]

     

       25
       -
                       ++ lib.optional enablePython "--enable-python";

     

       26
        
       

     

       27
        
         nativeBuildInputs = [ pkg-config ];

     

       28
        
         buildInputs = [ lvm2 libgcrypt libuuid popt ]

     

       29
       -
                    ++ lib.optional enablePython python;

     

       30
        
       

     

       31
        
         meta = with lib; {

     

       32
        
           homepage = "http://code.google.com/p/cryptsetup/";

···

       1
       +
       { lib

     

       2
       +
       , stdenv

     

       3
       +
       , fetchurl

     

       4
       +
       , fetchpatch

     

       5
       +
       , lvm2

     

       6
       +
       , libgcrypt

     

       7
       +
       , libuuid

     

       8
       +
       , pkg-config

     

       9
       +
       , popt

     

       10
       +
       , enablePython ? true

     

       11
       +
       , python ? null

     

       12
        
       }:

     

       13
        
       

     

       14
        
       assert enablePython -> python != null;

     

       15
        
       

     

       16
        
       stdenv.mkDerivation rec {

     

       17
       +
         pname = "cryptsetup";

     

       18
       +
         version = "1.6.3";

     

       19
        
       

     

       20
        
         src = fetchurl {

     

       21
       +
           url = "http://cryptsetup.googlecode.com/files/cryptsetup-${version}.tar.bz2";

     

       22
        
           sha256 = "1n1qk5chyjspbiianrdb55fhb4wl0vfyqz2br05vfb24v4qlgbx2";

     

       23
        
         };

     

       24
        
       

     
···

       32
        
         ];

     

       33
        
       

     

       34
        
         configureFlags = [ "--enable-cryptsetup-reencrypt" ]

     

       35
       +
           ++ lib.optional enablePython "--enable-python";

     

       36
        
       

     

       37
        
         nativeBuildInputs = [ pkg-config ];

     

       38
        
         buildInputs = [ lvm2 libgcrypt libuuid popt ]

     

       39
       +
           ++ lib.optional enablePython python;

     

       40
        
       

     

       41
        
         meta = with lib; {

     

       42
        
           homepage = "http://code.google.com/p/cryptsetup/";

+3 -2

pkgs/tools/filesystems/nixpart/0.4/dmraid.nix

···

       1
        
       { lib, stdenv, fetchurl, lvm2 }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
       -
         name = "dmraid-1.0.0.rc15";

     

       0
        
       
     

       5
        
       

     

       6
        
         src = fetchurl {

     

       7
       -
           url = "https://people.redhat.com/~heinzm/sw/dmraid/src/old/${name}.tar.bz2";

     

       8
        
           sha256 = "01bcaq0sc329ghgj7f182xws7jgjpdc41bvris8fsiprnxc7511h";

     

       9
        
         };

     

       10

···

       1
        
       { lib, stdenv, fetchurl, lvm2 }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
       +
         pname = "dmraid";

     

       5
       +
         version = "1.0.0.rc15";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
       +
           url = "https://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-${version}.tar.bz2";

     

       9
        
           sha256 = "01bcaq0sc329ghgj7f182xws7jgjpdc41bvris8fsiprnxc7511h";

     

       10
        
         };

     

       11

+3 -2

pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix

···

       3
        
       { lib, stdenv, fetchurl, fetchpatch, lvm2, libaio, gzip, readline, systemd }:

     

       4
        
       

     

       5
        
       stdenv.mkDerivation rec {

     

       6
       -
         name = "multipath-tools-0.4.9";

     

       0
        
       
     

       7
        
       

     

       8
        
         src = fetchurl {

     

       9
       -
           url = "http://christophe.varoqui.free.fr/multipath-tools/${name}.tar.bz2";

     

       10
        
           sha256 = "04n7kazp1zrlqfza32phmqla0xkcq4zwn176qff5ida4a60whi4d";

     

       11
        
         };

     

       12

···

       3
        
       { lib, stdenv, fetchurl, fetchpatch, lvm2, libaio, gzip, readline, systemd }:

     

       4
        
       

     

       5
        
       stdenv.mkDerivation rec {

     

       6
       +
         pname = "multipath-tools";

     

       7
       +
         version = "0.4.9";

     

       8
        
       

     

       9
        
         src = fetchurl {

     

       10
       +
           url = "http://christophe.varoqui.free.fr/multipath-tools/multipath-tools-${version}.tar.bz2";

     

       11
        
           sha256 = "04n7kazp1zrlqfza32phmqla0xkcq4zwn176qff5ida4a60whi4d";

     

       12
        
         };

     

       13

+16 -7

pkgs/tools/filesystems/nixpart/0.4/parted.nix

···

       1
       -
       { lib,stdenv, fetchurl, fetchpatch, lvm2, libuuid, gettext, readline

     

       2
       -
       , util-linux, check

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       3
        
       , enableStatic ? stdenv.hostPlatform.isStatic

     

       4
        
       }:

     

       5
        
       

     

       6
        
       stdenv.mkDerivation rec {

     

       7
       -
         name = "parted-3.1";

     

       0
        
       
     

       8
        
       

     

       9
        
         src = fetchurl {

     

       10
       -
           url = "mirror://gnu/parted/${name}.tar.xz";

     

       11
        
           sha256 = "05fa4m1bky9d13hqv91jlnngzlyn7y4rnnyq6d86w0dg3vww372y";

     

       12
        
         };

     

       13
        
       

     
···

       26
        
           ++ lib.optional (lvm2 != null) lvm2;

     

       27
        
       

     

       28
        
         configureFlags =

     

       29
       -
              (if (readline != null)

     

       30
       -
               then [ "--with-readline" ]

     

       31
       -
               else [ "--without-readline" ])

     

       32
        
           ++ lib.optional (lvm2 == null) "--disable-device-mapper"

     

       33
        
           ++ lib.optional enableStatic "--enable-static";

     

       34

···

       1
       +
       { lib

     

       2
       +
       , stdenv

     

       3
       +
       , fetchurl

     

       4
       +
       , fetchpatch

     

       5
       +
       , lvm2

     

       6
       +
       , libuuid

     

       7
       +
       , gettext

     

       8
       +
       , readline

     

       9
       +
       , util-linux

     

       10
       +
       , check

     

       11
        
       , enableStatic ? stdenv.hostPlatform.isStatic

     

       12
        
       }:

     

       13
        
       

     

       14
        
       stdenv.mkDerivation rec {

     

       15
       +
         pname = "parted";

     

       16
       +
         version = "3.1";

     

       17
        
       

     

       18
        
         src = fetchurl {

     

       19
       +
           url = "mirror://gnu/parted/parted-${version}.tar.xz";

     

       20
        
           sha256 = "05fa4m1bky9d13hqv91jlnngzlyn7y4rnnyq6d86w0dg3vww372y";

     

       21
        
         };

     

       22
        
       

     
···

       35
        
           ++ lib.optional (lvm2 != null) lvm2;

     

       36
        
       

     

       37
        
         configureFlags =

     

       38
       +
           (if (readline != null)

     

       39
       +
           then [ "--with-readline" ]

     

       40
       +
           else [ "--without-readline" ])

     

       41
        
           ++ lib.optional (lvm2 == null) "--disable-device-mapper"

     

       42
        
           ++ lib.optional enableStatic "--enable-static";

     

       43

+7 -5

pkgs/tools/graphics/wallutils/default.nix

···

       1
        
       { buildGoPackage, fetchFromGitHub, lib

     

       2
       -
       , wayland, libX11, xbitmaps, libXcursor, libXmu, libXpm

     

       0
        
       
     

       3
        
       }:

     

       4
        
       

     

       5
        
       buildGoPackage rec {

     

       6
        
         pname = "wallutils";

     

       7
       -
         version = "5.9.0";

     

       8
        
       

     

       9
        
         src = fetchFromGitHub {

     

       10
        
           owner = "xyproto";

     

       11
        
           repo = "wallutils";

     

       12
        
           rev = version;

     

       13
       -
           sha256 = "17xw1311xpmi5c8mwa9yvn4pxa7g4n09j84lvy61gmxc5m128fwy";

     

       14
        
         };

     

       15
        
       

     

       16
        
         goPackagePath = "github.com/xyproto/wallutils";

     
···

       22
        
           sed -iE 's/VersionString = "[0-9].[0-9].[0-9]"/VersionString = "${version}"/' wallutils.go

     

       23
        
         '';

     

       24
        
       

     

       25
       -
         buildInputs = [ wayland libX11 xbitmaps libXcursor libXmu libXpm ];

     

       0
        
       
     

       26
        
       

     

       27
        
         meta = with lib; {

     

       28
        
           description = "Utilities for handling monitors, resolutions, and (timed) wallpapers";

     

       29
        
           inherit (src.meta) homepage;

     

       30
        
           license = licenses.mit;

     

       31
       -
           maintainers = with maintainers; [ primeos ];

     

       32
        
           platforms = platforms.linux;

     

       33
        
         };

     

       34
        
       }

···

       1
        
       { buildGoPackage, fetchFromGitHub, lib

     

       2
       +
       , pkg-config

     

       3
       +
       , wayland, libX11, xbitmaps, libXcursor, libXmu, libXpm, libheif

     

       4
        
       }:

     

       5
        
       

     

       6
        
       buildGoPackage rec {

     

       7
        
         pname = "wallutils";

     

       8
       +
         version = "5.10.0";

     

       9
        
       

     

       10
        
         src = fetchFromGitHub {

     

       11
        
           owner = "xyproto";

     

       12
        
           repo = "wallutils";

     

       13
        
           rev = version;

     

       14
       +
           sha256 = "1phlkpy8kg4ai2xmachpbbxvl8fga9hqqbad2a2121yl60709l1k";

     

       15
        
         };

     

       16
        
       

     

       17
        
         goPackagePath = "github.com/xyproto/wallutils";

     
···

       23
        
           sed -iE 's/VersionString = "[0-9].[0-9].[0-9]"/VersionString = "${version}"/' wallutils.go

     

       24
        
         '';

     

       25
        
       

     

       26
       +
         nativeBuildInputs = [ pkg-config ];

     

       27
       +
         buildInputs = [ wayland libX11 xbitmaps libXcursor libXmu libXpm libheif ];

     

       28
        
       

     

       29
        
         meta = with lib; {

     

       30
        
           description = "Utilities for handling monitors, resolutions, and (timed) wallpapers";

     

       31
        
           inherit (src.meta) homepage;

     

       32
        
           license = licenses.mit;

     

       33
       +
           maintainers = with maintainers; [ ];

     

       34
        
           platforms = platforms.linux;

     

       35
        
         };

     

       36
        
       }

+5 -4

pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix

···

       1
        
       { lib, stdenv, fetchurl, makeWrapper, pkg-config, cmake, fcitx, gtk3, isocodes, gnome }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
       -
         name = "fcitx-configtool-0.4.10";

     

       0
        
       
     

       5
        
       

     

       6
        
         meta = with lib; {

     

       7
        
           description = "GTK-based config tool for Fcitx";

     

       8
       -
           license     = licenses.gpl2;

     

       9
       -
           platforms   = platforms.linux;

     

       10
        
           maintainers = with maintainers; [ cdepillabout ];

     

       11
        
         };

     

       12
        
       

     

       13
        
         src = fetchurl {

     

       14
       -
           url = "https://download.fcitx-im.org/fcitx-configtool/${name}.tar.xz";

     

       15
        
           sha256 = "1yyi9jhkwn49lx9a47k1zbvwgazv4y4z72gnqgzdpgdzfrlrgi5w";

     

       16
        
         };

     

       17

···

       1
        
       { lib, stdenv, fetchurl, makeWrapper, pkg-config, cmake, fcitx, gtk3, isocodes, gnome }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
       +
         pname = "fcitx-configtool";

     

       5
       +
         version = "0.4.10";

     

       6
        
       

     

       7
        
         meta = with lib; {

     

       8
        
           description = "GTK-based config tool for Fcitx";

     

       9
       +
           license = licenses.gpl2;

     

       10
       +
           platforms = platforms.linux;

     

       11
        
           maintainers = with maintainers; [ cdepillabout ];

     

       12
        
         };

     

       13
        
       

     

       14
        
         src = fetchurl {

     

       15
       +
           url = "https://download.fcitx-im.org/fcitx-configtool/fcitx-configtool-${version}.tar.xz";

     

       16
        
           sha256 = "1yyi9jhkwn49lx9a47k1zbvwgazv4y4z72gnqgzdpgdzfrlrgi5w";

     

       17
        
         };

     

       18

+3 -3

pkgs/tools/misc/chezmoi/default.nix

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "chezmoi";

     

       5
       -
         version = "2.7.3";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "twpayne";

     

       9
        
           repo = "chezmoi";

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "sha256-xn9DSbAqfSK7CokxVRrHuOO62oSXKGR0/HZYadLLd74=";

     

       12
        
         };

     

       13
        
       

     

       14
       -
         vendorSha256 = "sha256-e+LsFlF83OGbhajaGGyWARv7O6dI6ZKm3yhDqrgmMpk=";

     

       15
        
       

     

       16
        
         doCheck = false;

     

       17

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "chezmoi";

     

       5
       +
         version = "2.7.4";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "twpayne";

     

       9
        
           repo = "chezmoi";

     

       10
        
           rev = "v${version}";

     

       11
       +
           sha256 = "sha256-RX9Hgjl/i/FWXHFp+yYWQEYDiOQijU+eiBnREu4K1Mg=";

     

       12
        
         };

     

       13
        
       

     

       14
       +
         vendorSha256 = "sha256-tz3Vcw/p7BKcgc3EsLsSPOKhwqN5kysOcmER7OoKQ+w=";

     

       15
        
       

     

       16
        
         doCheck = false;

     

       17

+3 -3

pkgs/tools/misc/cht.sh/default.nix

···

       10
        
       

     

       11
        
       stdenv.mkDerivation {

     

       12
        
         pname = "cht.sh";

     

       13
       -
         version = "unstable-2021-10-20";

     

       14
        
       

     

       15
        
         nativeBuildInputs = [ makeWrapper ];

     

       16
        
       

     

       17
        
         src = fetchFromGitHub {

     

       18
        
           owner = "chubin";

     

       19
        
           repo = "cheat.sh";

     

       20
       -
           rev = "5a79c76c9b8ef337cffb9537a3d8a47c9ffc8b04";

     

       21
       -
           sha256 = "zDkYp2YPEur26qEwG8DQQzv8/T288HG/9mzzkN4SEtU=";

     

       22
        
         };

     

       23
        
       

     

       24
        
         # Fix ".cht.sh-wrapped" in the help message

···

       10
        
       

     

       11
        
       stdenv.mkDerivation {

     

       12
        
         pname = "cht.sh";

     

       13
       +
         version = "unstable-2021-11-13";

     

       14
        
       

     

       15
        
         nativeBuildInputs = [ makeWrapper ];

     

       16
        
       

     

       17
        
         src = fetchFromGitHub {

     

       18
        
           owner = "chubin";

     

       19
        
           repo = "cheat.sh";

     

       20
       +
           rev = "4bb7b14843c302695b7d47d4d814f38998da1a68";

     

       21
       +
           sha256 = "NbB+UGydk0zSkqTPYw5KOHR0mv1UHH2pXLYdMRdG8UE=";

     

       22
        
         };

     

       23
        
       

     

       24
        
         # Fix ".cht.sh-wrapped" in the help message

+5 -3

pkgs/tools/misc/ckb-next/default.nix

···

       1
       -
       { lib, mkDerivation, fetchFromGitHub, substituteAll, udev

     

       2
       -
       , pkg-config, qtbase, cmake, zlib, kmod, libXdmcp, qttools, qtx11extras, libdbusmenu }:

     

       0
        
       
     

       0
        
       
     

       3
        
       

     

       4
        
       mkDerivation rec {

     

       5
        
         version = "0.4.4";

     
···

       20
        
           qttools

     

       21
        
           qtx11extras

     

       22
        
           libdbusmenu

     

       23
       -
         ];

     

       24
        
       

     

       25
        
         nativeBuildInputs = [

     

       26
        
           pkg-config

···

       1
       +
       { lib, mkDerivation, fetchFromGitHub, substituteAll, udev, stdenv

     

       2
       +
       , pkg-config, qtbase, cmake, zlib, kmod, libXdmcp, qttools, qtx11extras, libdbusmenu

     

       3
       +
       , withPulseaudio ? stdenv.isLinux, libpulseaudio

     

       4
       +
       }:

     

       5
        
       

     

       6
        
       mkDerivation rec {

     

       7
        
         version = "0.4.4";

     
···

       22
        
           qttools

     

       23
        
           qtx11extras

     

       24
        
           libdbusmenu

     

       25
       +
         ] ++ lib.optional withPulseaudio libpulseaudio;

     

       26
        
       

     

       27
        
         nativeBuildInputs = [

     

       28
        
           pkg-config

+2 -2

pkgs/tools/misc/flameshot/default.nix

···

       11
        
       

     

       12
        
       mkDerivation rec {

     

       13
        
         pname = "flameshot";

     

       14
       -
         version = "0.10.1";

     

       15
        
       

     

       16
        
         src = fetchFromGitHub {

     

       17
        
           owner = "flameshot-org";

     

       18
        
           repo = "flameshot";

     

       19
        
           rev = "v${version}";

     

       20
       -
           sha256 = "1ncknjayl6am740f49g0lc28z1zsifbicxz1j1kwps3ksj15nl7a";

     

       21
        
         };

     

       22
        
       

     

       23
        
         patches = [

···

       11
        
       

     

       12
        
       mkDerivation rec {

     

       13
        
         pname = "flameshot";

     

       14
       +
         version = "0.10.2";

     

       15
        
       

     

       16
        
         src = fetchFromGitHub {

     

       17
        
           owner = "flameshot-org";

     

       18
        
           repo = "flameshot";

     

       19
        
           rev = "v${version}";

     

       20
       +
           sha256 = "sha256-rZUiaS32C77tFJmEkw/9MGbVTVscb6LOCyWaWO5FyR4=";

     

       21
        
         };

     

       22
        
       

     

       23
        
         patches = [

+15 -4

pkgs/tools/misc/tty-clock/default.nix

···

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

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "tty-clock";

     

       5
       -
         version = "2.3";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "xorg62";

     

       9
        
           repo = "tty-clock";

     

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

     

       11
       -
           sha256 = "16v3pmva13skpfjja96zacjpxrwzs1nb1iqmrp2qzvdbcm9061pp";

     

       0
        
       
     

       12
        
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       13
        
       

     

       14
        
         nativeBuildInputs = [ pkg-config ];

     

       15
        
         buildInputs = [ ncurses ];

···

       1
       +
       { lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, pkg-config }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "tty-clock";

     

       5
       +
         version = "2.3+unstable=2021-04-07";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "xorg62";

     

       9
        
           repo = "tty-clock";

     

       10
       +
           # Use unreleased version to pull in fix for ncurses-6.3

     

       11
       +
           rev = "9e00c32098524c30dac4dab701f7e33f8bc7c880";

     

       12
       +
           sha256 = "14jrzz06jr29887bxgad1x6kd26c2fnqrc26864wqm3838fpcqw0";

     

       13
        
         };

     

       14
       +
       

     

       15
       +
         patches = [

     

       16
       +
           # Pull upstream patch pending inclusion fir more ncurses-6.3 fixes:

     

       17
       +
           #  https://github.com/xorg62/tty-clock/pull/100

     

       18
       +
           (fetchpatch {

     

       19
       +
             name = "ncurses-6.2.patch";

     

       20
       +
             url = "https://github.com/xorg62/tty-clock/commit/4cfd73080da1964557484da620c401745d73881c.patch";

     

       21
       +
             sha256 = "13pj1v6yrfc4vynsa746974kixfxxsy2jzzpl73c8bp7msr9d3md";

     

       22
       +
           })

     

       23
       +
         ];

     

       24
        
       

     

       25
        
         nativeBuildInputs = [ pkg-config ];

     

       26
        
         buildInputs = [ ncurses ];

+2 -2

pkgs/tools/misc/ytree/default.nix

···

       6
        
       

     

       7
        
       stdenv.mkDerivation rec {

     

       8
        
         pname = "ytree";

     

       9
       -
         version = "2.03";

     

       10
        
       

     

       11
        
         src = fetchurl {

     

       12
        
           url = "https://han.de/~werner/${pname}-${version}.tar.gz";

     

       13
       -
           sha256 = "sha256-WDqnFVLRNH4Oq+OaI2+loXS/Z93piHGFO5/iojO8rvE=";

     

       14
        
         };

     

       15
        
       

     

       16
        
         buildInputs = [

···

       6
        
       

     

       7
        
       stdenv.mkDerivation rec {

     

       8
        
         pname = "ytree";

     

       9
       +
         version = "2.04";

     

       10
        
       

     

       11
        
         src = fetchurl {

     

       12
        
           url = "https://han.de/~werner/${pname}-${version}.tar.gz";

     

       13
       +
           sha256 = "sha256-bnqLf2jv5tNlq+M6HQbXOa2F8io9VN3QrsJKNHjWZkI=";

     

       14
        
         };

     

       15
        
       

     

       16
        
         buildInputs = [

+1 -1

pkgs/tools/networking/chrony/default.nix

···

       22
        
       

     

       23
        
         hardeningEnable = [ "pie" ];

     

       24
        
       

     

       25
       -
         configureFlags = [ "--chronyvardir=$(out)/var/lib/chrony" ]

     

       26
        
           ++ lib.optional stdenv.isLinux "--enable-scfilter";

     

       27
        
       

     

       28
        
         meta = with lib; {

···

       22
        
       

     

       23
        
         hardeningEnable = [ "pie" ];

     

       24
        
       

     

       25
       +
         configureFlags = [ "--chronyvardir=$(out)/var/lib/chrony" "--enable-ntp-signd" ]

     

       26
        
           ++ lib.optional stdenv.isLinux "--enable-scfilter";

     

       27
        
       

     

       28
        
         meta = with lib; {

+12 -5

pkgs/tools/networking/easyrsa/2.x.nix

···

       1
       -
       { lib, stdenv, fetchurl, autoreconfHook, makeWrapper

     

       2
       -
       , gnugrep, openssl }:

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       3
        
       

     

       4
       -
       stdenv.mkDerivation {

     

       5
       -
         name = "easyrsa-2.2.0";

     

       0
        
       
     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
       -
           url = "https://github.com/OpenVPN/easy-rsa/archive/v2.2.0.tar.gz";

     

       9
        
           sha256 = "1xq4by5frb6ikn53ss3y8v7ss639dccxfq8jfrbk07ynkmk668qk";

     

       10
        
         };

     

       11

···

       1
       +
       { lib

     

       2
       +
       , stdenv

     

       3
       +
       , fetchurl

     

       4
       +
       , autoreconfHook

     

       5
       +
       , makeWrapper

     

       6
       +
       , gnugrep

     

       7
       +
       , openssl

     

       8
       +
       }:

     

       9
        
       

     

       10
       +
       stdenv.mkDerivation rec {

     

       11
       +
         pname = "easyrsa";

     

       12
       +
         version = "2.2.0";

     

       13
        
       

     

       14
        
         src = fetchurl {

     

       15
       +
           url = "https://github.com/OpenVPN/easy-rsa/archive/v${version}.tar.gz";

     

       16
        
           sha256 = "1xq4by5frb6ikn53ss3y8v7ss639dccxfq8jfrbk07ynkmk668qk";

     

       17
        
         };

     

       18

+17 -1

pkgs/tools/networking/horst/default.nix

···

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

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "horst";

     
···

       10
        
           rev = "v${version}";

     

       11
        
           sha256 = "140pyv6rlsh4c745w4b59pz3hrarr39qq3mz9z1lsd3avc12nx1a";

     

       12
        
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       13
        
       

     

       14
        
         nativeBuildInputs = [ pkg-config ];

     

       15
        
         buildInputs = [ ncurses libnl ];

···

       1
       +
       {lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, ncurses, libnl }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "horst";

     
···

       10
        
           rev = "v${version}";

     

       11
        
           sha256 = "140pyv6rlsh4c745w4b59pz3hrarr39qq3mz9z1lsd3avc12nx1a";

     

       12
        
         };

     

       13
       +
       

     

       14
       +
         patches = [

     

       15
       +
           # Fix pending upstream inclusion for ncurses-6.3:

     

       16
       +
           #  https://github.com/br101/horst/pull/110

     

       17
       +
           (fetchpatch {

     

       18
       +
             name = "ncurses-6.3.patch";

     

       19
       +
             url = "https://github.com/br101/horst/commit/c9e9b6cc1f97edb9c53f3a67b43f3588f3ac6ea7.patch";

     

       20
       +
             sha256 = "15pahbnql44d5zzxmkd5ky8bl3c3hh3lh5190wynd90jrrhf1a26";

     

       21
       +
             # collides for context change, well apply this part in postPatch

     

       22
       +
             excludes = [ "display-main.c" ];

     

       23
       +
           })

     

       24
       +
         ];

     

       25
       +
         postPatch = ''

     

       26
       +
           # Apply second part of ncurses-6.3.patch:

     

       27
       +
           substituteInPlace display-main.c --replace 'wprintw(dump_win, str);' 'wprintw(dump_win, "%s", str);'

     

       28
       +
         '';

     

       29
        
       

     

       30
        
         nativeBuildInputs = [ pkg-config ];

     

       31
        
         buildInputs = [ ncurses libnl ];

+11 -1

pkgs/tools/networking/nethogs/default.nix

···

       1
       -
       { lib, stdenv, fetchFromGitHub, ncurses, libpcap }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "nethogs";

     
···

       10
        
           rev = "v${version}";

     

       11
        
           sha256 = "0sn1sdp86akwlm4r1vmkxjjl50c0xaisk91bbz57z7kcsaphxna9";

     

       12
        
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       13
        
       

     

       14
        
         buildInputs = [ ncurses libpcap ];

     

       15

···

       1
       +
       { lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, libpcap }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "nethogs";

     
···

       10
        
           rev = "v${version}";

     

       11
        
           sha256 = "0sn1sdp86akwlm4r1vmkxjjl50c0xaisk91bbz57z7kcsaphxna9";

     

       12
        
         };

     

       13
       +
       

     

       14
       +
         patches = [

     

       15
       +
           # Pull upstream patch for ncurses-6.3 support:

     

       16
       +
           #  https://github.com/raboof/nethogs/pull/210

     

       17
       +
           (fetchpatch {

     

       18
       +
             name = "ncurses-6.3.patch";

     

       19
       +
             url = "https://github.com/raboof/nethogs/commit/455daf357da7f394763e5b93b11b3defe1f82ed1.patch";

     

       20
       +
             sha256 = "0wkp0yr6qg1asgvmsn7blf7rq48sh5k4n3w0nxf5869hxvkhnnzs";

     

       21
       +
           })

     

       22
       +
         ];

     

       23
        
       

     

       24
        
         buildInputs = [ ncurses libpcap ];

     

       25

+16 -9

pkgs/tools/networking/offlineimap/default.nix

···

       1
        
       { lib

     

       2
        
       , fetchFromGitHub

     

       3
       -
       , python2Packages

     

       4
        
       , asciidoc

     

       5
        
       , cacert

     

       6
        
       , docbook_xsl

     
···

       9
        
       , libxslt

     

       10
        
       }:

     

       11
        
       

     

       12
       -
       python2Packages.buildPythonApplication rec {

     

       13
       -
         version = "7.3.4";

     

       14
        
         pname = "offlineimap";

     

       0
        
       
     

       15
        
       

     

       16
        
         src = fetchFromGitHub {

     

       17
        
           owner = "OfflineIMAP";

     

       18
       -
           repo = "offlineimap";

     

       19
        
           rev = "v${version}";

     

       20
       -
           sha256 = "sha256-sra2H0+5+LAIU3+uJnii+AYA05nuDyKVMW97rbaFOfI=";

     

       21
        
         };

     

       22
        
       

     

       23
        
         nativeBuildInputs = [

     
···

       28
        
           libxslt

     

       29
        
         ];

     

       30
        
       

     

       31
       -
         propagatedBuildInputs = with python2Packages; [

     

       32
       -
           six

     

       0
        
       
     

       0
        
       
     

       33
        
           kerberos

     

       0
        
       
     

       34
        
           rfc6555

     

       35
       -
           pysocks

     

       36
        
         ];

     

       37
        
       

     

       38
        
         postPatch = ''

     
···

       40
        
           sed -i docs/Makefile -e "s|a2x -v -d |a2x -L -v -d |"

     

       41
        
       

     

       42
        
           # Provide CA certificates (Used when "sslcacertfile = OS-DEFAULT" is configured")

     

       43
       -
           sed -i offlineimap/utils/distro.py -e '/def get_os_sslcertfile():/a\ \ \ \ return "${cacert}/etc/ssl/certs/ca-bundle.crt"'

     

       44
        
         '';

     

       45
        
       

     

       46
        
         postInstall = ''

     
···

       51
        
       

     

       52
        
         # Test requires credentials

     

       53
        
         doCheck = false;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       54
        
       

     

       55
        
         meta = with lib; {

     

       56
        
           description = "Synchronize emails between two repositories, so that you can read the same mailbox from multiple computers";

···

       1
        
       { lib

     

       2
        
       , fetchFromGitHub

     

       3
       +
       , python3

     

       4
        
       , asciidoc

     

       5
        
       , cacert

     

       6
        
       , docbook_xsl

     
···

       9
        
       , libxslt

     

       10
        
       }:

     

       11
        
       

     

       12
       +
       python3.pkgs.buildPythonApplication rec {

     

       0
        
       
     

       13
        
         pname = "offlineimap";

     

       14
       +
         version = "8.0.0";

     

       15
        
       

     

       16
        
         src = fetchFromGitHub {

     

       17
        
           owner = "OfflineIMAP";

     

       18
       +
           repo = "offlineimap3";

     

       19
        
           rev = "v${version}";

     

       20
       +
           sha256 = "0y3giaz9i8vvczlxkbwymfkn3vi9fv599dy4pc2pn2afxsl4mg2w";

     

       21
        
         };

     

       22
        
       

     

       23
        
         nativeBuildInputs = [

     
···

       28
        
           libxslt

     

       29
        
         ];

     

       30
        
       

     

       31
       +
         propagatedBuildInputs = with python3.pkgs; [

     

       32
       +
           certifi

     

       33
       +
           distro

     

       34
       +
           imaplib2

     

       35
        
           kerberos

     

       36
       +
           pysocks

     

       37
        
           rfc6555

     

       38
       +
           urllib3

     

       39
        
         ];

     

       40
        
       

     

       41
        
         postPatch = ''

     
···

       43
        
           sed -i docs/Makefile -e "s|a2x -v -d |a2x -L -v -d |"

     

       44
        
       

     

       45
        
           # Provide CA certificates (Used when "sslcacertfile = OS-DEFAULT" is configured")

     

       46
       +
           sed -i offlineimap/utils/distro_utils.py -e '/def get_os_sslcertfile():/a\ \ \ \ return "${cacert}/etc/ssl/certs/ca-bundle.crt"'

     

       47
        
         '';

     

       48
        
       

     

       49
        
         postInstall = ''

     
···

       54
        
       

     

       55
        
         # Test requires credentials

     

       56
        
         doCheck = false;

     

       57
       +
       

     

       58
       +
         pythonImportsCheck = [

     

       59
       +
           "offlineimap"

     

       60
       +
         ];

     

       61
        
       

     

       62
        
         meta = with lib; {

     

       63
        
           description = "Synchronize emails between two repositories, so that you can read the same mailbox from multiple computers";

+3 -2

pkgs/tools/networking/openvpn/openvpn_learnaddress.nix

···

       1
       -
       { lib, stdenv, fetchgit, makeWrapper,  coreutils, gawk, util-linux }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation {

     

       4
       -
         name = "openvpn-learnaddress-19b03c3";

     

       0
        
       
     

       5
        
       

     

       6
        
         src = fetchgit {

     

       7
        
           url = "https://gist.github.com/4058733.git";

···

       1
       +
       { lib, stdenv, fetchgit, makeWrapper, coreutils, gawk, util-linux }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation {

     

       4
       +
         pname = "openvpn-learnaddress";

     

       5
       +
         version = "unstable-2013-10-21";

     

       6
        
       

     

       7
        
         src = fetchgit {

     

       8
        
           url = "https://gist.github.com/4058733.git";

+4 -2

pkgs/tools/networking/openvpn/update-resolv-conf.nix

···

       3
        
       let

     

       4
        
         binPath = lib.makeBinPath [ coreutils openresolv systemd ];

     

       5
        
       

     

       6
       -
       in stdenv.mkDerivation {

     

       7
       -
         name = "update-resolv-conf-2017-06-21";

     

       0
        
       
     

       0
        
       
     

       8
        
       

     

       9
        
         src = fetchFromGitHub {

     

       10
        
           owner = "masterkorp";

···

       3
        
       let

     

       4
        
         binPath = lib.makeBinPath [ coreutils openresolv systemd ];

     

       5
        
       

     

       6
       +
       in

     

       7
       +
       stdenv.mkDerivation {

     

       8
       +
         pname = "update-resolv-conf";

     

       9
       +
         version = "unstable-2017-06-21";

     

       10
        
       

     

       11
        
         src = fetchFromGitHub {

     

       12
        
           owner = "masterkorp";

+1 -1

pkgs/tools/nix/info/info.sh

···

       70
        
       }

     

       71
        
       

     

       72
        
       desc_system() {

     

       73
       -
           nixev '(import <nixpkgs> {}).system'

     

       74
        
       }

     

       75
        
       

     

       76
        
       desc_host_os() {

···

       70
        
       }

     

       71
        
       

     

       72
        
       desc_system() {

     

       73
       +
           nixev '(import <nixpkgs> {}).stdenv.hostPlatform.system'

     

       74
        
       }

     

       75
        
       

     

       76
        
       desc_host_os() {

+2 -2

pkgs/tools/package-management/nix-update/default.nix

···

       1
        
       { lib

     

       2
        
       , buildPythonApplication

     

       3
        
       , fetchFromGitHub

     

       4
       -
       , nixUnstable

     

       5
        
       , nix-prefetch

     

       6
        
       , nixpkgs-fmt

     

       7
        
       , nixpkgs-review

     
···

       19
        
         };

     

       20
        
       

     

       21
        
         makeWrapperArgs = [

     

       22
       -
           "--prefix" "PATH" ":" (lib.makeBinPath [ nixUnstable nix-prefetch nixpkgs-fmt nixpkgs-review ])

     

       23
        
         ];

     

       24
        
       

     

       25
        
         checkPhase = ''

···

       1
        
       { lib

     

       2
        
       , buildPythonApplication

     

       3
        
       , fetchFromGitHub

     

       4
       +
       , nix

     

       5
        
       , nix-prefetch

     

       6
        
       , nixpkgs-fmt

     

       7
        
       , nixpkgs-review

     
···

       19
        
         };

     

       20
        
       

     

       21
        
         makeWrapperArgs = [

     

       22
       +
           "--prefix" "PATH" ":" (lib.makeBinPath [ nix nix-prefetch nixpkgs-fmt nixpkgs-review ])

     

       23
        
         ];

     

       24
        
       

     

       25
        
         checkPhase = ''

+3 -2

pkgs/tools/security/gnupg/1.nix

···

       1
        
       { lib, stdenv, fetchurl, readline, bzip2 }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
       -
         name = "gnupg-1.4.23";

     

       0
        
       
     

       5
        
       

     

       6
        
         src = fetchurl {

     

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

     

       8
        
           sha256 = "1fkq4sqldvf6a25mm2qz95swv1qjg464736091w51djiwqbjyin9";

     

       9
        
         };

     

       10

···

       1
        
       { lib, stdenv, fetchurl, readline, bzip2 }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
       +
         pname = "gnupg";

     

       5
       +
         version = "1.4.23";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

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

     

       9
        
           sha256 = "1fkq4sqldvf6a25mm2qz95swv1qjg464736091w51djiwqbjyin9";

     

       10
        
         };

     

       11

+3 -3

pkgs/tools/security/gopass/default.nix

···

       13
        
       

     

       14
        
       buildGoModule rec {

     

       15
        
         pname = "gopass";

     

       16
       -
         version = "1.12.8";

     

       17
        
       

     

       18
        
         nativeBuildInputs = [ installShellFiles makeWrapper ];

     

       19
        
       

     
···

       21
        
           owner = "gopasspw";

     

       22
        
           repo = pname;

     

       23
        
           rev = "v${version}";

     

       24
       -
           sha256 = "0f3nnhipx2p8w04rxva0pcf7g1nhr4f5bz5dbvr2m76lkiaz5q3v";

     

       25
        
         };

     

       26
        
       

     

       27
       -
         vendorSha256 = "14khs15k9d5m5dms3l4a5bi0s3zl1irm0i4s9pf86gpyz7b55l6a";

     

       28
        
       

     

       29
        
         subPackages = [ "." ];

     

       30

···

       13
        
       

     

       14
        
       buildGoModule rec {

     

       15
        
         pname = "gopass";

     

       16
       +
         version = "1.13.0";

     

       17
        
       

     

       18
        
         nativeBuildInputs = [ installShellFiles makeWrapper ];

     

       19
        
       

     
···

       21
        
           owner = "gopasspw";

     

       22
        
           repo = pname;

     

       23
        
           rev = "v${version}";

     

       24
       +
           sha256 = "sha256-MBpk84H3Ng/+rCjW2Scm/su0/5kgs7IzvFk/bFLNzXY=";

     

       25
        
         };

     

       26
        
       

     

       27
       +
         vendorSha256 = "sha256-HGc6jUp4WO5P5dwfa0r7+X78a8us9fWrf+/IOotZHqk=";

     

       28
        
       

     

       29
        
         subPackages = [ "." ];

     

       30

+1 -1

pkgs/tools/system/tree/default.nix

···

       30
        
       

     

       31
        
         preConfigure = ''

     

       32
        
           sed -i Makefile -e 's|^OBJS=|OBJS=$(EXTRA_OBJS) |'

     

       33
       -
           makeFlags+=("CC=$CC")

     

       34
        
         '';

     

       35
        
       

     

       36
        
         makeFlags = [

···

       30
        
       

     

       31
        
         preConfigure = ''

     

       32
        
           sed -i Makefile -e 's|^OBJS=|OBJS=$(EXTRA_OBJS) |'

     

       33
       +
           makeFlagsArray+=("CC=$CC")

     

       34
        
         '';

     

       35
        
       

     

       36
        
         makeFlags = [

+4 -3

pkgs/tools/text/gnused/422.nix

···

       1
        
       { lib, stdenv, fetchurl }:

     

       2
        
       

     

       3
       -
       stdenv.mkDerivation {

     

       4
       -
         name = "gnused-4.2.2";

     

       0
        
       
     

       5
        
       

     

       6
        
         src = fetchurl {

     

       7
       -
           url = "mirror://gnu/sed/sed-4.2.2.tar.bz2";

     

       8
        
           sha256 = "f048d1838da284c8bc9753e4506b85a1e0cc1ea8999d36f6995bcb9460cddbd7";

     

       9
        
         };

     

       10

···

       1
        
       { lib, stdenv, fetchurl }:

     

       2
        
       

     

       3
       +
       stdenv.mkDerivation rec {

     

       4
       +
         pname = "gnused";

     

       5
       +
         version = "4.2.2";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

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

     

       9
        
           sha256 = "f048d1838da284c8bc9753e4506b85a1e0cc1ea8999d36f6995bcb9460cddbd7";

     

       10
        
         };

     

       11

+6 -7

pkgs/tools/text/highlight/default.nix

···

       1
        
       { lib, stdenv, fetchFromGitLab, getopt, lua, boost, pkg-config, swig, perl, gcc }:

     

       2
        
       

     

       3
       -
       with lib;

     

       4
       -
       

     

       5
        
       let

     

       6
        
         self = stdenv.mkDerivation rec {

     

       7
        
           pname = "highlight";

     
···

       16
        
       

     

       17
        
           enableParallelBuilding = true;

     

       18
        
       

     

       19
       -
           nativeBuildInputs = [ pkg-config swig perl ] ++ optional stdenv.isDarwin gcc;

     

       0
        
       
     

       20
        
       

     

       21
        
           buildInputs = [ getopt lua boost ];

     

       22
        
       

     

       23
       -
           prePatch = ''

     

       24
        
             substituteInPlace src/makefile \

     

       25
        
               --replace "shell pkg-config" "shell $PKG_CONFIG"

     

       26
        
             substituteInPlace makefile \

     
···

       36
        
       

     

       37
        
           # This has to happen _before_ the main build because it does a

     

       38
        
           # `make clean' for some reason.

     

       39
       -
           preBuild = optionalString (!stdenv.isDarwin) ''

     

       40
        
             make -C extras/swig $makeFlags perl

     

       41
        
           '';

     

       42
        
       

     

       43
       -
           postCheck = optionalString (!stdenv.isDarwin) ''

     

       44
        
             perl -Iextras/swig extras/swig/testmod.pl

     

       45
        
           '';

     

       46
        
       

     

       47
       -
           preInstall = optionalString (!stdenv.isDarwin) ''

     

       48
        
             mkdir -p $out/${perl.libPrefix}

     

       49
        
             install -m644 extras/swig/highlight.{so,pm} $out/${perl.libPrefix}

     

       50
        
             make -C extras/swig clean # Clean up intermediate files.

···

       1
        
       { lib, stdenv, fetchFromGitLab, getopt, lua, boost, pkg-config, swig, perl, gcc }:

     

       2
        
       

     

       0
        
       
     

       0
        
       
     

       3
        
       let

     

       4
        
         self = stdenv.mkDerivation rec {

     

       5
        
           pname = "highlight";

     
···

       14
        
       

     

       15
        
           enableParallelBuilding = true;

     

       16
        
       

     

       17
       +
           nativeBuildInputs = [ pkg-config swig perl ]

     

       18
       +
             ++ lib.optional stdenv.isDarwin gcc;

     

       19
        
       

     

       20
        
           buildInputs = [ getopt lua boost ];

     

       21
        
       

     

       22
       +
           postPatch = ''

     

       23
        
             substituteInPlace src/makefile \

     

       24
        
               --replace "shell pkg-config" "shell $PKG_CONFIG"

     

       25
        
             substituteInPlace makefile \

     
···

       35
        
       

     

       36
        
           # This has to happen _before_ the main build because it does a

     

       37
        
           # `make clean' for some reason.

     

       38
       +
           preBuild = lib.optionalString (!stdenv.isDarwin) ''

     

       39
        
             make -C extras/swig $makeFlags perl

     

       40
        
           '';

     

       41
        
       

     

       42
       +
           postCheck = lib.optionalString (!stdenv.isDarwin) ''

     

       43
        
             perl -Iextras/swig extras/swig/testmod.pl

     

       44
        
           '';

     

       45
        
       

     

       46
       +
           preInstall = lib.optionalString (!stdenv.isDarwin) ''

     

       47
        
             mkdir -p $out/${perl.libPrefix}

     

       48
        
             install -m644 extras/swig/highlight.{so,pm} $out/${perl.libPrefix}

     

       49
        
             make -C extras/swig clean # Clean up intermediate files.

+2 -2

pkgs/tools/text/mark/default.nix

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "mark";

     

       5
       -
         version = "6.3";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner  = "kovetskiy";

     

       9
        
           repo   = "mark";

     

       10
        
           rev    = version;

     

       11
       -
           sha256 = "sha256-HKP8ZYhYDJizZ91q4MRwS00YIMvgB6EJ3au5rMg02hg=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         vendorSha256 = "sha256-y3Q8UebNbLy1jmxUC37mv+2l8dCU3b/Fk8XHn5u57p0=";

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "mark";

     

       5
       +
         version = "6.4";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner  = "kovetskiy";

     

       9
        
           repo   = "mark";

     

       10
        
           rev    = version;

     

       11
       +
           sha256 = "sha256-Ti7qxNb+7S67bXdvEWPyi/v/OAsAI4pd41dlF7GFjjo=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         vendorSha256 = "sha256-y3Q8UebNbLy1jmxUC37mv+2l8dCU3b/Fk8XHn5u57p0=";

+2 -2

pkgs/tools/text/proselint/default.nix

···

       2
        
       

     

       3
        
       buildPythonApplication rec {

     

       4
        
         pname = "proselint";

     

       5
       -
         version = "0.12.0";

     

       6
        
       

     

       7
        
         doCheck = false; # fails to pass because it tries to run in home directory

     

       8
        
       

     

       9
        
         src = fetchurl {

     

       10
        
           url = "mirror://pypi/p/proselint/${pname}-${version}.tar.gz";

     

       11
       -
           sha256 = "2a98d9c14382d94ed9122a6c0b0657a814cd5c892c77d9477309fc99f86592e6";

     

       12
        
         };

     

       13
        
       

     

       14
        
         propagatedBuildInputs = [ click future six ];

···

       2
        
       

     

       3
        
       buildPythonApplication rec {

     

       4
        
         pname = "proselint";

     

       5
       +
         version = "0.13.0";

     

       6
        
       

     

       7
        
         doCheck = false; # fails to pass because it tries to run in home directory

     

       8
        
       

     

       9
        
         src = fetchurl {

     

       10
        
           url = "mirror://pypi/p/proselint/${pname}-${version}.tar.gz";

     

       11
       +
           sha256 = "7dd2b63cc2aa390877c4144fcd3c80706817e860b017f04882fbcd2ab0852a58";

     

       12
        
         };

     

       13
        
       

     

       14
        
         propagatedBuildInputs = [ click future six ];

+5 -4

pkgs/tools/typesetting/pdftk/legacy.nix

···

       1
        
       { fetchurl, lib, stdenv, gcj, unzip }:

     

       2
        
       

     

       3
       -
       stdenv.mkDerivation {

     

       4
       -
         name = "pdftk-2.02";

     

       0
        
       
     

       5
        
       

     

       6
        
         src = fetchurl {

     

       7
       -
           url = "https://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/pdftk-2.02-src.zip";

     

       8
        
           sha256 = "1hdq6zm2dx2f9h7bjrp6a1hfa1ywgkwydp14i2sszjiszljnm3qi";

     

       9
        
         };

     

       10
        
       

     
···

       36
        
           description = "Simple tool for doing everyday things with PDF documents";

     

       37
        
           homepage = "https://www.pdflabs.com/tools/pdftk-server/";

     

       38
        
           license = lib.licenses.gpl2;

     

       39
       -
           maintainers = with lib.maintainers; [raskin];

     

       40
        
           platforms = with lib.platforms; linux;

     

       41
        
           broken = true; # Broken on Hydra since 2020-08-24

     

       42
        
         };

···

       1
        
       { fetchurl, lib, stdenv, gcj, unzip }:

     

       2
        
       

     

       3
       +
       stdenv.mkDerivation rec {

     

       4
       +
         pname = "pdftk";

     

       5
       +
         version = "2.02";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
       +
           url = "https://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/pdftk-${version}-src.zip";

     

       9
        
           sha256 = "1hdq6zm2dx2f9h7bjrp6a1hfa1ywgkwydp14i2sszjiszljnm3qi";

     

       10
        
         };

     

       11
        
       

     
···

       37
        
           description = "Simple tool for doing everyday things with PDF documents";

     

       38
        
           homepage = "https://www.pdflabs.com/tools/pdftk-server/";

     

       39
        
           license = lib.licenses.gpl2;

     

       40
       +
           maintainers = with lib.maintainers; [ raskin ];

     

       41
        
           platforms = with lib.platforms; linux;

     

       42
        
           broken = true; # Broken on Hydra since 2020-08-24

     

       43
        
         };

+2 -2

pkgs/tools/typesetting/scdoc/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "scdoc";

     

       5
       -
         version = "1.11.1";

     

       6
        
       

     

       7
        
         src = fetchFromSourcehut {

     

       8
        
           owner = "~sircmpwn";

     

       9
        
           repo = pname;

     

       10
        
           rev = version;

     

       11
       -
           sha256 = "1g37j847j3h4a4qbbfbr6vvsxpifj9v25jgv25nd71d1n0dxlhvk";

     

       12
        
         };

     

       13
        
       

     

       14
        
         postPatch = ''

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "scdoc";

     

       5
       +
         version = "1.11.2";

     

       6
        
       

     

       7
        
         src = fetchFromSourcehut {

     

       8
        
           owner = "~sircmpwn";

     

       9
        
           repo = pname;

     

       10
        
           rev = version;

     

       11
       +
           sha256 = "07c2vmdgqifbynm19zjnrk7h102pzrriv73izmx8pmd7b3xl5mfq";

     

       12
        
         };

     

       13
        
       

     

       14
        
         postPatch = ''

+5 -4

pkgs/tools/typesetting/tex/pgf/1.x.nix

···

       1
       -
       {lib, stdenv, fetchurl}:

     

       2
        
       

     

       3
       -
       stdenv.mkDerivation {

     

       4
       -
         name = "pgf-1.18";

     

       0
        
       
     

       5
        
       

     

       6
        
         src = fetchurl {

     

       7
       -
           url = "mirror://sourceforge/pgf/pgf-1.18.tar.gz";

     

       8
        
           sha256 = "0s6b8rx9yfxcjjg18vx1mphnwbd28fl5lnq0dasjz40pp3ypwdjv";

     

       9
        
         };

     

       10

···

       1
       +
       { lib, stdenv, fetchurl }:

     

       2
        
       

     

       3
       +
       stdenv.mkDerivation rec {

     

       4
       +
         pname = "pgf";

     

       5
       +
         version = "1.18";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

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

     

       9
        
           sha256 = "0s6b8rx9yfxcjjg18vx1mphnwbd28fl5lnq0dasjz40pp3ypwdjv";

     

       10
        
         };

     

       11

+5 -4

pkgs/tools/typesetting/tex/pgf/2.x.nix

···

       1
       -
       {lib, stdenv, fetchurl}:

     

       2
        
       

     

       3
       -
       stdenv.mkDerivation {

     

       4
       -
         name = "pgf-2.00";

     

       0
        
       
     

       5
        
       

     

       6
        
         src = fetchurl {

     

       7
       -
           url = "mirror://sourceforge/pgf/pgf-2.00.tar.gz";

     

       8
        
           sha256 = "0j57niag4jb2k0iyrvjsannxljc3vkx0iag7zd35ilhiy4dh6264";

     

       9
        
         };

     

       10

···

       1
       +
       { lib, stdenv, fetchurl }:

     

       2
        
       

     

       3
       +
       stdenv.mkDerivation rec {

     

       4
       +
         pname = "pgf";

     

       5
       +
         version = "2.00";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

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

     

       9
        
           sha256 = "0j57niag4jb2k0iyrvjsannxljc3vkx0iag7zd35ilhiy4dh6264";

     

       10
        
         };

     

       11

+5 -4

pkgs/tools/typesetting/tex/pgf/3.x.nix

···

       1
       -
       {lib, stdenv, fetchurl, unzip}:

     

       2
        
       

     

       3
       -
       stdenv.mkDerivation {

     

       4
       -
         name = "pgf-3.00";

     

       0
        
       
     

       5
        
       

     

       6
        
         src = fetchurl {

     

       7
       -
           url = "mirror://sourceforge/project/pgf/pgf/version%203.0.0/pgf_3.0.0.tds.zip";

     

       8
        
           sha256 = "0kj769hyp4z2zmdv3f8xv443wcfqn5nkkbzxzqgfxjizlz81aav7";

     

       9
        
         };

     

       10

···

       1
       +
       { lib, stdenv, fetchurl, unzip }:

     

       2
        
       

     

       3
       +
       stdenv.mkDerivation rec {

     

       4
       +
         pname = "pgf";

     

       5
       +
         version = "3.0.0";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
       +
           url = "mirror://sourceforge/project/pgf/pgf/version%20${version}/pgf_${version}.tds.zip";

     

       9
        
           sha256 = "0kj769hyp4z2zmdv3f8xv443wcfqn5nkkbzxzqgfxjizlz81aav7";

     

       10
        
         };

     

       11

+11

pkgs/top-level/all-packages.nix

···

       4074
        
       

     

       4075
        
         libpinyin = callPackage ../development/libraries/libpinyin { };

     

       4076
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       4077
        
         libskk = callPackage ../development/libraries/libskk {

     

       4078
        
           inherit (gnome) gnome-common;

     

       4079
        
         };

     
···

       28824
        
         vscodium = callPackage ../applications/editors/vscode/vscodium.nix { };

     

       28825
        
         vscodium-fhs = vscodium.fhs;

     

       28826
        
         vscodium-fhsWithPackages = vscodium.fhsWithPackages;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       28827
        
       

     

       28828
        
         code-server = callPackage ../servers/code-server {

     

       28829
        
           inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security;

···

       4074
        
       

     

       4075
        
         libpinyin = callPackage ../development/libraries/libpinyin { };

     

       4076
        
       

     

       4077
       +
         inherit (import ../development/libraries/libsbsms pkgs)

     

       4078
       +
           libsbsms

     

       4079
       +
           libsbsms_2_0_2

     

       4080
       +
           libsbsms_2_3_0

     

       4081
       +
         ;

     

       4082
       +
       

     

       4083
        
         libskk = callPackage ../development/libraries/libskk {

     

       4084
        
           inherit (gnome) gnome-common;

     

       4085
        
         };

     
···

       28830
        
         vscodium = callPackage ../applications/editors/vscode/vscodium.nix { };

     

       28831
        
         vscodium-fhs = vscodium.fhs;

     

       28832
        
         vscodium-fhsWithPackages = vscodium.fhsWithPackages;

     

       28833
       +
       

     

       28834
       +
         openvscode-server = callPackage ../servers/openvscode-server {

     

       28835
       +
           inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security;

     

       28836
       +
           inherit (darwin) cctools;

     

       28837
       +
         };

     

       28838
        
       

     

       28839
        
         code-server = callPackage ../servers/code-server {

     

       28840
        
           inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security;

+1 -2

pkgs/top-level/metrics.nix

···

       4
        
       

     

       5
        
       runCommand "nixpkgs-metrics"

     

       6
        
         { nativeBuildInputs = with pkgs.lib; map getBin [ nix time jq ];

     

       7
       -
           #FIXME: the job doesn't work, see issue #76776

     

       8
       -
           #requiredSystemFeatures = [ "benchmark" ]; # dedicated machine, by @vcunat last time

     

       9
        
         }

     

       10
        
         ''

     

       11
        
           export NIX_STORE_DIR=$TMPDIR/store

···

       4
        
       

     

       5
        
       runCommand "nixpkgs-metrics"

     

       6
        
         { nativeBuildInputs = with pkgs.lib; map getBin [ nix time jq ];

     

       7
       +
           requiredSystemFeatures = [ "benchmark" ]; # dedicated `t2a` machine, by @vcunat

     

       0
        
       
     

       8
        
         }

     

       9
        
         ''

     

       10
        
           export NIX_STORE_DIR=$TMPDIR/store

+15 -1

pkgs/top-level/python-packages.nix

···

       2267
        
       

     

       2268
        
         docloud = callPackage ../development/python-modules/docloud { };

     

       2269
        
       

     

       0
        
       
     

       0
        
       
     

       2270
        
         docopt = callPackage ../development/python-modules/docopt { };

     

       2271
        
       

     

       2272
        
         docopt-ng = callPackage ../development/python-modules/docopt-ng { };

     
···

       3930
        
         jdcal = callPackage ../development/python-modules/jdcal { };

     

       3931
        
       

     

       3932
        
         jedi = callPackage ../development/python-modules/jedi { };

     

       0
        
       
     

       0
        
       
     

       3933
        
       

     

       3934
        
         jeepney = callPackage ../development/python-modules/jeepney { };

     

       3935
        
       

     
···

       7909
        
       

     

       7910
        
         qimage2ndarray = callPackage ../development/python-modules/qimage2ndarray { };

     

       7911
        
       

     

       0
        
       
     

       0
        
       
     

       7912
        
         qiskit-aer = callPackage ../development/python-modules/qiskit-aer { };

     

       7913
        
       

     

       7914
        
         qiskit-aqua = callPackage ../development/python-modules/qiskit-aqua { };

     

       7915
        
       

     

       7916
       -
         qiskit = callPackage ../development/python-modules/qiskit { };

     

       7917
        
       

     

       7918
        
         qiskit-ibmq-provider = callPackage ../development/python-modules/qiskit-ibmq-provider { };

     

       7919
        
       

     

       7920
        
         qiskit-ignis = callPackage ../development/python-modules/qiskit-ignis { };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       7921
        
       

     

       7922
        
         qiskit-terra = callPackage ../development/python-modules/qiskit-terra { };

     

       7923
        
       

     
···

       9803
        
         watermark = callPackage ../development/python-modules/watermark { };

     

       9804
        
       

     

       9805
        
         wavedrom = callPackage ../development/python-modules/wavedrom { };

     

       0
        
       
     

       0
        
       
     

       9806
        
       

     

       9807
        
         wazeroutecalculator = callPackage ../development/python-modules/wazeroutecalculator { };

     

       9808

···

       2267
        
       

     

       2268
        
         docloud = callPackage ../development/python-modules/docloud { };

     

       2269
        
       

     

       2270
       +
         docstring-to-markdown = callPackage ../development/python-modules/docstring-to-markdown { };

     

       2271
       +
       

     

       2272
        
         docopt = callPackage ../development/python-modules/docopt { };

     

       2273
        
       

     

       2274
        
         docopt-ng = callPackage ../development/python-modules/docopt-ng { };

     
···

       3932
        
         jdcal = callPackage ../development/python-modules/jdcal { };

     

       3933
        
       

     

       3934
        
         jedi = callPackage ../development/python-modules/jedi { };

     

       3935
       +
       

     

       3936
       +
         jedi-language-server = callPackage ../development/python-modules/jedi-language-server { };

     

       3937
        
       

     

       3938
        
         jeepney = callPackage ../development/python-modules/jeepney { };

     

       3939
        
       

     
···

       7913
        
       

     

       7914
        
         qimage2ndarray = callPackage ../development/python-modules/qimage2ndarray { };

     

       7915
        
       

     

       7916
       +
         qiskit = callPackage ../development/python-modules/qiskit { };

     

       7917
       +
       

     

       7918
        
         qiskit-aer = callPackage ../development/python-modules/qiskit-aer { };

     

       7919
        
       

     

       7920
        
         qiskit-aqua = callPackage ../development/python-modules/qiskit-aqua { };

     

       7921
        
       

     

       7922
       +
         qiskit-finance = callPackage ../development/python-modules/qiskit-finance { };

     

       7923
        
       

     

       7924
        
         qiskit-ibmq-provider = callPackage ../development/python-modules/qiskit-ibmq-provider { };

     

       7925
        
       

     

       7926
        
         qiskit-ignis = callPackage ../development/python-modules/qiskit-ignis { };

     

       7927
       +
       

     

       7928
       +
         qiskit-machine-learning = callPackage ../development/python-modules/qiskit-machine-learning { };

     

       7929
       +
       

     

       7930
       +
         qiskit-nature = callPackage ../development/python-modules/qiskit-nature { };

     

       7931
       +
       

     

       7932
       +
         qiskit-optimization = callPackage ../development/python-modules/qiskit-optimization { };

     

       7933
        
       

     

       7934
        
         qiskit-terra = callPackage ../development/python-modules/qiskit-terra { };

     

       7935
        
       

     
···

       9815
        
         watermark = callPackage ../development/python-modules/watermark { };

     

       9816
        
       

     

       9817
        
         wavedrom = callPackage ../development/python-modules/wavedrom { };

     

       9818
       +
       

     

       9819
       +
         wavefile = callPackage ../development/python-modules/wavefile { };

     

       9820
        
       

     

       9821
        
         wazeroutecalculator = callPackage ../development/python-modules/wazeroutecalculator { };

     

       9822