commit 839c033ffbbaf67c74447fcfb0dc50f7ad5cd85a · pyrox.dev/nixpkgs

+33

lib/systems/default.nix

···

       9
       9
        
         examples = import ./examples.nix { inherit lib; };

     

       10
       10
        
         architectures = import ./architectures.nix { inherit lib; };

     

       11
       11
        
       

     

       12
       12
       +
         /*

     

       13
       13
       +
           Elaborated systems contain functions, which means that they don't satisfy

     

       14
       14
       +
           `==` for a lack of reflexivity.

     

       15
       15
       +
       

     

       16
       16
       +
           They might *appear* to satisfy `==` reflexivity when the same exact value is

     

       17
       17
       +
           compared to itself, because object identity is used as an "optimization";

     

       18
       18
       +
           compare the value with a reconstruction of itself, e.g. with `f == a: f a`,

     

       19
       19
       +
           or perhaps calling `elaborate` twice, and one will see reflexivity fail as described.

     

       20
       20
       +
       

     

       21
       21
       +
           Hence a custom equality test.

     

       22
       22
       +
       

     

       23
       23
       +
           Note that this does not canonicalize the systems, so you'll want to make sure

     

       24
       24
       +
           both arguments have been `elaborate`-d.

     

       25
       25
       +
         */

     

       26
       26
       +
         equals =

     

       27
       27
       +
           let removeFunctions = a: lib.filterAttrs (_: v: !builtins.isFunction v) a;

     

       28
       28
       +
           in a: b: removeFunctions a == removeFunctions b;

     

       29
       29
       +
       

     

       30
       30
       +
         /*

     

       31
       31
       +
           Try to convert an elaborated system back to a simple string. If not possible,

     

       32
       32
       +
           return null. So we have the property:

     

       33
       33
       +
       

     

       34
       34
       +
               sys: _valid_ sys ->

     

       35
       35
       +
                 sys == elaborate (toLosslessStringMaybe sys)

     

       36
       36
       +
       

     

       37
       37
       +
           NOTE: This property is not guaranteed when `sys` was elaborated by a different

     

       38
       38
       +
                 version of Nixpkgs.

     

       39
       39
       +
         */

     

       40
       40
       +
         toLosslessStringMaybe = sys:

     

       41
       41
       +
           if lib.isString sys then sys

     

       42
       42
       +
           else if equals sys (elaborate sys.system) then sys.system

     

       43
       43
       +
           else null;

     

       44
       44
       +
       

     

       12
       45
        
         /* List of all Nix system doubles the nixpkgs flake will expose the package set

     

       13
       46
        
            for. All systems listed here must be supported by nixpkgs as `localSystem`.

     

       14
       47

lib/tests/release.nix

···

       53
       53
        
             echo "Running lib/tests/sources.sh"

     

       54
       54
        
             TEST_LIB=$PWD/lib bash lib/tests/sources.sh

     

       55
       55
        
       

     

       56
       56
       +
             echo "Running lib/tests/systems.nix"

     

       57
       57
       +
             [[ $(nix-instantiate --eval --strict lib/tests/systems.nix | tee /dev/stderr) == '[ ]' ]];

     

       58
       58
       +
       

     

       56
       59
        
             mkdir $out

     

       57
       60
        
             echo success > $out/${nix.version}

     

       58
       61
        
           '';

+54 -7

lib/tests/systems.nix

···

       1
       1
       -
       # We assert that the new algorithmic way of generating these lists matches the

     

       2
       2
       -
       # way they were hard-coded before.

     

       1
       1
       +
       # Run:

     

       2
       2
       +
       # [nixpkgs]$ nix-instantiate --eval --strict lib/tests/systems.nix

     

       3
       3
       +
       # Expected output: [], or the failed cases

     

       3
       4
        
       #

     

       4
       4
       -
       # One might think "if we exhaustively test, what's the point of procedurally

     

       5
       5
       -
       # calculating the lists anyway?". The answer is one can mindlessly update these

     

       6
       6
       -
       # tests as new platforms become supported, and then just give the diff a quick

     

       7
       7
       -
       # sanity check before committing :).

     

       5
       5
       +
       # OfBorg runs (approximately) nix-build lib/tests/release.nix

     

       8
       6
        
       let

     

       9
       7
        
         lib = import ../default.nix;

     

       10
       8
        
         mseteq = x: y: {

     
···

       12
       10
        
           expected = lib.sort lib.lessThan y;

     

       13
       11
        
         };

     

       14
       12
        
       in

     

       15
       15
       -
       with lib.systems.doubles; lib.runTests {

     

       13
       13
       +
       lib.runTests (

     

       14
       14
       +
       # We assert that the new algorithmic way of generating these lists matches the

     

       15
       15
       +
       # way they were hard-coded before.

     

       16
       16
       +
       #

     

       17
       17
       +
       # One might think "if we exhaustively test, what's the point of procedurally

     

       18
       18
       +
       # calculating the lists anyway?". The answer is one can mindlessly update these

     

       19
       19
       +
       # tests as new platforms become supported, and then just give the diff a quick

     

       20
       20
       +
       # sanity check before committing :).

     

       21
       21
       +
       

     

       22
       22
       +
       (with lib.systems.doubles; {

     

       16
       23
        
         testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows ++ embedded ++ mmix ++ js ++ genode ++ redox);

     

       17
       24
        
       

     

       18
       25
        
         testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv6l-netbsd" "armv6l-none" "armv7a-linux" "armv7a-netbsd" "armv7l-linux" "armv7l-netbsd" "arm-none" "armv7a-darwin" ];

     
···

       39
       46
        
         testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ];

     

       40
       47
        
         testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ];

     

       41
       48
        
         testunix = mseteq unix (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ cygwin ++ redox);

     

       49
       49
       +
       })

     

       50
       50
       +
       

     

       51
       51
       +
       // {

     

       52
       52
       +
         test_equals_example_x86_64-linux = {

     

       53
       53
       +
           expr = lib.systems.equals (lib.systems.elaborate "x86_64-linux") (lib.systems.elaborate "x86_64-linux");

     

       54
       54
       +
           expected = true;

     

       55
       55
       +
         };

     

       56
       56
       +
       

     

       57
       57
       +
         test_toLosslessStringMaybe_example_x86_64-linux = {

     

       58
       58
       +
           expr = lib.systems.toLosslessStringMaybe (lib.systems.elaborate "x86_64-linux");

     

       59
       59
       +
           expected = "x86_64-linux";

     

       60
       60
       +
         };

     

       61
       61
       +
         test_toLosslessStringMaybe_fail = {

     

       62
       62
       +
           expr = lib.systems.toLosslessStringMaybe (lib.systems.elaborate "x86_64-linux" // { something = "extra"; });

     

       63
       63
       +
           expected = null;

     

       64
       64
       +
         };

     

       42
       65
        
       }

     

       66
       66
       +
       

     

       67
       67
       +
       # Generate test cases to assert that a change in any non-function attribute makes a platform unequal

     

       68
       68
       +
       // lib.concatMapAttrs (platformAttrName: origValue: {

     

       69
       69
       +
       

     

       70
       70
       +
         ${"test_equals_unequal_${platformAttrName}"} =

     

       71
       71
       +
           let modified =

     

       72
       72
       +
                 assert origValue != arbitraryValue;

     

       73
       73
       +
                 lib.systems.elaborate "x86_64-linux" // { ${platformAttrName} = arbitraryValue; };

     

       74
       74
       +
               arbitraryValue = x: "<<modified>>";

     

       75
       75
       +
           in {

     

       76
       76
       +
             expr = lib.systems.equals (lib.systems.elaborate "x86_64-linux") modified;

     

       77
       77
       +
             expected = {

     

       78
       78
       +
               # Changes in these attrs are not detectable because they're function.

     

       79
       79
       +
               # The functions should be derived from the data, so this is not a problem.

     

       80
       80
       +
               canExecute = null;

     

       81
       81
       +
               emulator = null;

     

       82
       82
       +
               emulatorAvailable = null;

     

       83
       83
       +
               isCompatible = null;

     

       84
       84
       +
             }?${platformAttrName};

     

       85
       85
       +
           };

     

       86
       86
       +
       

     

       87
       87
       +
       }) (lib.systems.elaborate "x86_64-linux" /* arbitrary choice, just to get all the elaborated attrNames */)

     

       88
       88
       +
       

     

       89
       89
       +
       )

maintainers/maintainer-list.nix

···

       3098
       3098
        
           githubId = 34317;

     

       3099
       3099
        
           name = "Corey O'Connor";

     

       3100
       3100
        
         };

     

       3101
       3101
       +
         code-asher = {

     

       3102
       3102
       +
           email = "ash@coder.com";

     

       3103
       3103
       +
           github = "code-asher";

     

       3104
       3104
       +
           githubId = 45609798;

     

       3105
       3105
       +
           name = "Asher";

     

       3106
       3106
       +
           keys = [{

     

       3107
       3107
       +
             fingerprint = "6E3A FA6D 915C C2A4 D26F  C53E 7BB4 BA9C 783D 2BBC";

     

       3108
       3108
       +
           }];

     

       3109
       3109
       +
         };

     

       3101
       3110
        
         CodeLongAndProsper90 = {

     

       3102
       3111
        
           github = "CodeLongAndProsper90";

     

       3103
       3112
        
           githubId = 50145141;

+2 -2

nixos/lib/test-driver/test_driver/machine.py

···

       868
       868
        
               # to match multiline regexes.

     

       869
       869
        
               console = io.StringIO()

     

       870
       870
        
       

     

       871
       871
       -
               def console_matches() -> bool:

     

       871
       871
       +
               def console_matches(_: Any) -> bool:

     

       872
       872
        
                   nonlocal console

     

       873
       873
        
                   try:

     

       874
       874
        
                       # This will return as soon as possible and

     
···

       884
       884
        
                   if timeout is not None:

     

       885
       885
        
                       retry(console_matches, timeout)

     

       886
       886
        
                   else:

     

       887
       887
       -
                       while not console_matches():

     

       887
       887
       +
                       while not console_matches(False):

     

       888
       888
        
                           pass

     

       889
       889
        
       

     

       890
       890
        
           def send_key(

+7 -1

nixos/modules/programs/cfs-zen-tweaks.nix

···

       23
       23
        
         config = mkIf cfg.enable {

     

       24
       24
        
           systemd.packages = [ pkgs.cfs-zen-tweaks ];

     

       25
       25
        
       

     

       26
       26
       -
           systemd.services.set-cfs-tweak.wantedBy = [ "multi-user.target" "suspend.target" "hibernate.target" "hybrid-sleep.target" "suspend-then-hibernate.target" ];

     

       26
       26
       +
           systemd.services.set-cfs-tweaks.wantedBy = [

     

       27
       27
       +
             "multi-user.target"

     

       28
       28
       +
             "suspend.target"

     

       29
       29
       +
             "hibernate.target"

     

       30
       30
       +
             "hybrid-sleep.target"

     

       31
       31
       +
             "suspend-then-hibernate.target"

     

       32
       32
       +
           ];

     

       27
       33
        
         };

     

       28
       34
        
       }

+13 -4

nixos/tests/systemd-initrd-vconsole.nix

···

       2
       2
        
         name = "systemd-initrd-vconsole";

     

       3
       3
        
       

     

       4
       4
        
         nodes.machine = { pkgs, ... }: {

     

       5
       5
       -
           boot.kernelParams = [ "rd.systemd.unit=rescue.target" ];

     

       5
       5
       +
           boot.kernelParams = lib.mkAfter [ "rd.systemd.unit=rescue.target" "loglevel=3" "udev.log_level=3" "systemd.log_level=warning" ];

     

       6
       6
        
       

     

       7
       7
        
           boot.initrd.systemd = {

     

       8
       8
        
             enable = true;

     
···

       20
       20
        
           machine.start()

     

       21
       21
        
           machine.wait_for_console_text("Press Enter for maintenance")

     

       22
       22
        
           machine.send_console("\n")

     

       23
       23
       -
           machine.wait_for_console_text("Logging in with home")

     

       23
       23
       +
       

     

       24
       24
       +
           # Wait for shell to become ready

     

       25
       25
       +
           for _ in range(300):

     

       26
       26
       +
             machine.send_console("printf '%s to receive commands:\\n' Ready\n")

     

       27
       27
       +
             try:

     

       28
       28
       +
               machine.wait_for_console_text("Ready to receive commands:", timeout=1)

     

       29
       29
       +
               break

     

       30
       30
       +
             except Exception:

     

       31
       31
       +
               continue

     

       32
       32
       +
           else:

     

       33
       33
       +
             raise RuntimeError("Rescue shell never became ready")

     

       24
       34
        
       

     

       25
       35
        
           # Check keymap

     

       26
       26
       -
           machine.send_console("(printf '%s to receive text: \\n' Ready && read text && echo \"$text\") </dev/tty1\n")

     

       36
       36
       +
           machine.send_console("(printf '%s to receive text:\\n' Ready && read text && echo \"$text\") </dev/tty1\n")

     

       27
       37
        
           machine.wait_for_console_text("Ready to receive text:")

     

       28
       38
        
           for key in "asdfjkl;\n":

     

       29
       39
        
             machine.send_key(key)

     

       30
       40
        
           machine.wait_for_console_text("arstneio")

     

       31
       31
       -
           machine.send_console("systemctl poweroff\n")

     

       32
       41
        
         '';

     

       33
       42
        
       })

+2 -2

pkgs/applications/editors/vscode/extensions/default.nix

···

       847
       847
        
               mktplcRef = {

     

       848
       848
        
                 name = "vscode-markdownlint";

     

       849
       849
        
                 publisher = "DavidAnson";

     

       850
       850
       -
                 version = "0.50.0";

     

       851
       851
       -
                 sha256 = "sha256-F+lryIhSudDz68t1eGrfqI8EuoUUOWU5LfWj0IRCQyY=";

     

       850
       850
       +
                 version = "0.51.0";

     

       851
       851
       +
                 sha256 = "sha256-Xtr8cqcPrcrKpJBxQcY1j9Gl4CC6U3ZazS4bdBtdzUk=";

     

       852
       852
        
               };

     

       853
       853
        
               meta = {

     

       854
       854
        
                 changelog = "https://marketplace.visualstudio.com/items/DavidAnson.vscode-markdownlint/changelog";

+5 -5

pkgs/applications/networking/browsers/chromium/upstream-info.json

···

       45
       45
        
           }

     

       46
       46
        
         },

     

       47
       47
        
         "ungoogled-chromium": {

     

       48
       48
       -
           "version": "114.0.5735.106",

     

       49
       49
       -
           "sha256": "0jihf4gv7n2kkp78n42ha4ick8mzixb4xrfdk84iqazmifrb066z",

     

       50
       50
       -
           "sha256bin64": "1zlw9gjb2fmjf1d952adqg07cyq60yck0aarz20lcvv2jzb7s46i",

     

       48
       48
       +
           "version": "114.0.5735.133",

     

       49
       49
       +
           "sha256": "0qnj4gr4b9gmla1hbz1ir64hfmpc45vzkg0hmw9h6m72r4gfr2c2",

     

       50
       50
       +
           "sha256bin64": "0gk9l1xspbqdxv9q16zdcrrr6bxx677cnz7vv4pgg85k1pwhyw3g",

     

       51
       51
        
           "deps": {

     

       52
       52
        
             "gn": {

     

       53
       53
        
               "version": "2023-04-19",

     
···

       56
       56
        
               "sha256": "01xrh9m9m6x8lz0vxwdw2mrhrvnw93zpg09hwdhqakj06agf4jjk"

     

       57
       57
        
             },

     

       58
       58
        
             "ungoogled-patches": {

     

       59
       59
       -
               "rev": "114.0.5735.106-1",

     

       60
       60
       -
               "sha256": "1aac1711mbr3jwxbnjkl5kxvb64bhwnw0ls1wj7w7pmka5gmardv"

     

       59
       59
       +
               "rev": "114.0.5735.133-1",

     

       60
       60
       +
               "sha256": "1i9ql4b2rn9jryyc3hfr9kh8ccf5a4gvpwsp9lnp9jc2gryrv70y"

     

       61
       61
        
             }

     

       62
       62
        
           }

     

       63
       63
        
         }

+184

pkgs/development/compilers/opensmalltalk-vm/default.nix

···

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , lib

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , fetchurl

     

       5
       5
       +
       , alsa-lib

     

       6
       6
       +
       , coreutils

     

       7
       7
       +
       , file

     

       8
       8
       +
       , freetype

     

       9
       9
       +
       , gnugrep

     

       10
       10
       +
       , libpulseaudio

     

       11
       11
       +
       , libtool

     

       12
       12
       +
       , libuuid

     

       13
       13
       +
       , openssl

     

       14
       14
       +
       , pango

     

       15
       15
       +
       , pkg-config

     

       16
       16
       +
       , xorg

     

       17
       17
       +
       }:

     

       18
       18
       +
       let

     

       19
       19
       +
         buildVM =

     

       20
       20
       +
           {

     

       21
       21
       +
             # VM-specific information, manually extracted from building/<platformDir>/<vmName>/build/mvm

     

       22
       22
       +
             platformDir

     

       23
       23
       +
           , vmName

     

       24
       24
       +
           , scriptName

     

       25
       25
       +
           , configureFlagsArray

     

       26
       26
       +
           , configureFlags

     

       27
       27
       +
           }:

     

       28
       28
       +
           let

     

       29
       29
       +
             src = fetchFromGitHub {

     

       30
       30
       +
               owner = "OpenSmalltalk";

     

       31
       31
       +
               repo = "opensmalltalk-vm";

     

       32
       32
       +
               rev = "202206021410";

     

       33
       33
       +
               hash = "sha256-QqElPiJuqD5svFjWrLz1zL0Tf+pHxQ2fPvkVRn2lyBI=";

     

       34
       34
       +
             };

     

       35
       35
       +
           in

     

       36
       36
       +
           stdenv.mkDerivation {

     

       37
       37
       +
             pname =

     

       38
       38
       +
               let vmNameNoDots = builtins.replaceStrings [ "." ] [ "-" ] vmName;

     

       39
       39
       +
               in "opensmalltalk-vm-${platformDir}-${vmNameNoDots}";

     

       40
       40
       +
             version = src.rev;

     

       41
       41
       +
       

     

       42
       42
       +
             inherit src;

     

       43
       43
       +
       

     

       44
       44
       +
             postPatch =

     

       45
       45
       +
               ''

     

       46
       46
       +
                 vmVersionFiles=$(sed -n 's/^versionfiles="\(.*\)"/\1/p' ./scripts/updateSCCSVersions)

     

       47
       47
       +
                 for vmVersionFile in $vmVersionFiles; do

     

       48
       48
       +
                   substituteInPlace "$vmVersionFile" \

     

       49
       49
       +
                     --replace "\$Date\$" "\$Date: Thu Jan 1 00:00:00 1970 +0000 \$" \

     

       50
       50
       +
                     --replace "\$URL\$" "\$URL: ${src.url} \$" \

     

       51
       51
       +
                     --replace "\$Rev\$" "\$Rev: ${src.rev} \$" \

     

       52
       52
       +
                     --replace "\$CommitHash\$" "\$CommitHash: 000000000000 \$"

     

       53
       53
       +
                 done

     

       54
       54
       +
                 patchShebangs --build ./building/${platformDir} scripts

     

       55
       55
       +
                 substituteInPlace ./platforms/unix/config/mkmf \

     

       56
       56
       +
                   --replace "/bin/rm" "rm"

     

       57
       57
       +
                 substituteInPlace ./platforms/unix/config/configure \

     

       58
       58
       +
                   --replace "/usr/bin/file" "file" \

     

       59
       59
       +
                   --replace "/usr/bin/pkg-config" "pkg-config" \

     

       60
       60
       +
               '';

     

       61
       61
       +
       

     

       62
       62
       +
             preConfigure = ''

     

       63
       63
       +
               cd building/${platformDir}/${vmName}/build

     

       64
       64
       +
               # Exits with non-zero code if the check fails, counterintuitively

     

       65
       65
       +
               ../../../../scripts/checkSCCSversion && exit 1

     

       66
       66
       +
               cp ../plugins.int ../plugins.ext .

     

       67
       67
       +
               configureFlagsArray=${configureFlagsArray}

     

       68
       68
       +
             '';

     

       69
       69
       +
       

     

       70
       70
       +
             configureScript = "../../../../platforms/unix/config/configure";

     

       71
       71
       +
       

     

       72
       72
       +
             configureFlags = [ "--with-scriptname=${scriptName}" ] ++ configureFlags;

     

       73
       73
       +
       

     

       74
       74
       +
             buildFlags = "all";

     

       75
       75
       +
       

     

       76
       76
       +
             enableParallelBuilding = true;

     

       77
       77
       +
       

     

       78
       78
       +
             nativeBuildInputs = [

     

       79
       79
       +
               file

     

       80
       80
       +
               pkg-config

     

       81
       81
       +
             ];

     

       82
       82
       +
       

     

       83
       83
       +
             buildInputs = [

     

       84
       84
       +
               alsa-lib

     

       85
       85
       +
               freetype

     

       86
       86
       +
               libpulseaudio

     

       87
       87
       +
               libtool

     

       88
       88
       +
               libuuid

     

       89
       89
       +
               openssl

     

       90
       90
       +
               pango

     

       91
       91
       +
               xorg.libX11

     

       92
       92
       +
               xorg.libXrandr

     

       93
       93
       +
             ];

     

       94
       94
       +
       

     

       95
       95
       +
             postInstall = ''

     

       96
       96
       +
               rm "$out/squeak"

     

       97
       97
       +
               cd "$out/bin"

     

       98
       98
       +
               BIN="$(find ../lib -type f -name squeak)"

     

       99
       99
       +
               for f in $(find . -type f); do

     

       100
       100
       +
                 rm "$f"

     

       101
       101
       +
                 ln -s "$BIN" "$f"

     

       102
       102
       +
               done

     

       103
       103
       +
             '';

     

       104
       104
       +
       

     

       105
       105
       +
             meta = {

     

       106
       106
       +
               description = "The cross-platform virtual machine for Squeak, Pharo, Cuis, and Newspeak.";

     

       107
       107
       +
               mainProgram = scriptName;

     

       108
       108
       +
               homepage = "https://opensmalltalk.org/";

     

       109
       109
       +
               license = with lib.licenses; [ mit ];

     

       110
       110
       +
               maintainers = with lib.maintainers; [ jakewaksbaum ];

     

       111
       111
       +
               platforms = [ stdenv.targetPlatform.system ];

     

       112
       112
       +
             };

     

       113
       113
       +
           };

     

       114
       114
       +
       

     

       115
       115
       +
         vmsByPlatform = {

     

       116
       116
       +
           "aarch64-linux" = {

     

       117
       117
       +
             "squeak-cog-spur" = buildVM {

     

       118
       118
       +
               platformDir = "linux64ARMv8";

     

       119
       119
       +
               vmName = "squeak.cog.spur";

     

       120
       120
       +
               scriptName = "squeak";

     

       121
       121
       +
               configureFlagsArray = ''(

     

       122
       122
       +
                 CFLAGS="-DNDEBUG -DDEBUGVM=0 -DMUSL -D_GNU_SOURCE -DUSEEVDEV -DCOGMTVM=0 -DDUAL_MAPPED_CODE_ZONE=1"

     

       123
       123
       +
                 LIBS="-lrt"

     

       124
       124
       +
               )'';

     

       125
       125
       +
               configureFlags = [

     

       126
       126
       +
                 "--with-vmversion=5.0"

     

       127
       127
       +
                 "--with-src=src/spur64.cog"

     

       128
       128
       +
                 "--without-npsqueak"

     

       129
       129
       +
                 "--enable-fast-bitblt"

     

       130
       130
       +
               ];

     

       131
       131
       +
             };

     

       132
       132
       +
       

     

       133
       133
       +
             "squeak-stack-spur" = buildVM {

     

       134
       134
       +
               platformDir = "linux64ARMv8";

     

       135
       135
       +
               vmName = "squeak.stack.spur";

     

       136
       136
       +
               scriptName = "squeak";

     

       137
       137
       +
               configureFlagsArray = ''(

     

       138
       138
       +
                 CFLAGS="-DNDEBUG -DDEBUGVM=0 -DMUSL -D_GNU_SOURCE -DUSEEVDEV -D__ARM_ARCH_ISA_A64 -DARM64 -D__arm__ -D__arm64__ -D__aarch64__"

     

       139
       139
       +
               )'';

     

       140
       140
       +
               configureFlags = [

     

       141
       141
       +
                 "--with-vmversion=5.0"

     

       142
       142
       +
                 "--with-src=src/spur64.stack"

     

       143
       143
       +
                 "--disable-cogit"

     

       144
       144
       +
                 "--without-npsqueak"

     

       145
       145
       +
               ];

     

       146
       146
       +
             };

     

       147
       147
       +
           };

     

       148
       148
       +
       

     

       149
       149
       +
           "x86_64-linux" = {

     

       150
       150
       +
             "newspeak-cog-spur" = buildVM {

     

       151
       151
       +
               platformDir = "linux64x64";

     

       152
       152
       +
               vmName = "newspeak.cog.spur";

     

       153
       153
       +
               scriptName = "newspeak";

     

       154
       154
       +
               configureFlagsArray = ''(

     

       155
       155
       +
                 CFLAGS="-DNDEBUG -DDEBUGVM=0"

     

       156
       156
       +
               )'';

     

       157
       157
       +
               configureFlags = [

     

       158
       158
       +
                 "--with-vmversion=5.0"

     

       159
       159
       +
                 "--with-src=src/spur64.cog.newspeak"

     

       160
       160
       +
                 "--without-vm-display-fbdev"

     

       161
       161
       +
                 "--without-npsqueak"

     

       162
       162
       +
               ];

     

       163
       163
       +
             };

     

       164
       164
       +
       

     

       165
       165
       +
             "squeak-cog-spur" = buildVM {

     

       166
       166
       +
               platformDir = "linux64x64";

     

       167
       167
       +
               vmName = "squeak.cog.spur";

     

       168
       168
       +
               scriptName = "squeak";

     

       169
       169
       +
               configureFlagsArray = ''(

     

       170
       170
       +
                 CFLAGS="-DNDEBUG -DDEBUGVM=0 -DCOGMTVM=0"

     

       171
       171
       +
               )'';

     

       172
       172
       +
               configureFlags = [

     

       173
       173
       +
                 "--with-vmversion=5.0"

     

       174
       174
       +
                 "--with-src=src/spur64.cog"

     

       175
       175
       +
                 "--without-npsqueak"

     

       176
       176
       +
               ];

     

       177
       177
       +
             };

     

       178
       178
       +
           };

     

       179
       179
       +
         };

     

       180
       180
       +
       

     

       181
       181
       +
         platform = stdenv.targetPlatform.system;

     

       182
       182
       +
       in

     

       183
       183
       +
         vmsByPlatform.${platform} or

     

       184
       184
       +
           (throw "Unsupported platform ${platform}: only the following platforms are supported: ${builtins.attrNames vmsByPlatform}")

+3 -21

pkgs/development/libraries/capstone/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , stdenv

     

       3
       3
       +
       , cmake

     

       3
       4
        
       , fetchFromGitHub

     

       4
       4
       -
       , pkg-config

     

       5
       5
        
       , fixDarwinDylibNames

     

       6
       6
        
       }:

     

       7
       7
        
       

     
···

       16
       16
        
           sha256 = "sha256-XMwQ7UaPC8YYu4yxsE4bbR3leYPfBHu5iixSLz05r3g=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         # replace faulty macos detection

     

       20
       20
       -
         postPatch = lib.optionalString stdenv.isDarwin ''

     

       21
       21
       -
           sed -i 's/^IS_APPLE := .*$/IS_APPLE := 1/' Makefile

     

       22
       22
       -
         '';

     

       23
       23
       -
       

     

       24
       24
       -
         configurePhase = "patchShebangs make.sh ";

     

       25
       25
       -
         buildPhase = "PREFIX=$out ./make.sh";

     

       26
       26
       -
       

     

       27
       27
       -
         doCheck = true;

     

       28
       28
       -
         checkPhase = ''

     

       29
       29
       -
           # first remove fuzzing steps from check target

     

       30
       30
       -
           substituteInPlace Makefile --replace "fuzztest fuzzallcorp" ""

     

       31
       31
       -
           make check

     

       32
       32
       -
         '';

     

       33
       33
       -
       

     

       34
       34
       -
         installPhase = (lib.optionalString stdenv.isDarwin "HOMEBREW_CAPSTONE=1 ")

     

       35
       35
       -
           + "PREFIX=$out ./make.sh install";

     

       36
       36
       -
       

     

       37
       19
        
         nativeBuildInputs = [

     

       38
       38
       -
           pkg-config

     

       20
       20
       +
           cmake

     

       39
       21
        
         ] ++ lib.optionals stdenv.isDarwin [

     

       40
       22
        
           fixDarwinDylibNames

     

       41
       23
        
         ];

     

       42
       24
        
       

     

       43
       43
       -
         enableParallelBuilding = true;

     

       25
       25
       +
         doCheck = true;

     

       44
       26
        
       

     

       45
       27
        
         meta = {

     

       46
       28
        
           description = "Advanced disassembly library";

+3 -9

pkgs/development/libraries/libraspberrypi/default.nix

···

       16
       16
        
           hash = "sha512-f7tBgIykcIdkwcFjBKk5ooD/5Bsyrd/0OFr7LNCwWFYeE4DH3XA7UR7YjArkwqUVCVBByr82EOaacw0g1blOkw==";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         patches = [

     

       20
       20
       -
           (fetchpatch {

     

       21
       21
       -
             # https://github.com/raspberrypi/userland/pull/670

     

       22
       22
       -
             url = "https://github.com/raspberrypi/userland/commit/37cb44f314ab1209fe2a0a2449ef78893b1e5f62.patch";

     

       23
       23
       -
             sha256 = "1fbrbkpc4cc010ji8z4ll63g17n6jl67kdy62m74bhlxn72gg9rw";

     

       24
       24
       -
           })

     

       25
       25
       -
         ];

     

       26
       26
       -
       

     

       27
       19
        
         nativeBuildInputs = [ cmake pkg-config ];

     

       28
       20
        
         cmakeFlags = [

     

       29
       29
       -
           (if (stdenv.hostPlatform.isAarch64) then "-DARM64=ON" else "-DARM64=OFF")

     

       21
       21
       +
           # -DARM64=ON disables all targets that only build on 32-bit ARM; this allows

     

       22
       22
       +
           # the package to build on aarch64 and other architectures

     

       23
       23
       +
           "-DARM64=${if stdenv.hostPlatform.isAarch32 then "OFF" else "ON"}"

     

       30
       24
        
           "-DVMCS_INSTALL_PREFIX=${placeholder "out"}"

     

       31
       25
        
         ];

     

       32
       26

+7 -7

pkgs/development/libraries/libuv/default.nix

···

       22
       22
        
       , python3

     

       23
       23
        
       }:

     

       24
       24
        
       

     

       25
       25
       -
       stdenv.mkDerivation rec {

     

       25
       25
       +
       stdenv.mkDerivation (finalAttrs: {

     

       26
       26
        
         version = "1.45.0";

     

       27
       27
        
         pname = "libuv";

     

       28
       28
        
       

     

       29
       29
        
         src = fetchFromGitHub {

     

       30
       30
       -
           owner = pname;

     

       31
       31
       -
           repo = pname;

     

       32
       32
       -
           rev = "v${version}";

     

       30
       30
       +
           owner = "libuv";

     

       31
       31
       +
           repo = "libuv";

     

       32
       32
       +
           rev = "v${finalAttrs.version}";

     

       33
       33
        
           sha256 = "sha256-qKw9QFR24Uw7pVA9isPH8Va+9/5DYuqXz6l6jWcXn+4=";

     

       34
       34
        
         };

     

       35
       35
        
       

     
···

       76
       76
        
             "shutdown_close_pipe"

     

       77
       77
        
           ];

     

       78
       78
        
           tdRegexp = lib.concatStringsSep "\\|" toDisable;

     

       79
       79
       -
           in lib.optionalString doCheck ''

     

       79
       79
       +
           in lib.optionalString (finalAttrs.doCheck) ''

     

       80
       80
        
             sed '/${tdRegexp}/d' -i test/test-list.h

     

       81
       81
        
           '';

     

       82
       82
        
       

     
···

       112
       112
        
         meta = with lib; {

     

       113
       113
        
           description = "A multi-platform support library with a focus on asynchronous I/O";

     

       114
       114
        
           homepage    = "https://libuv.org/";

     

       115
       115
       -
           changelog   = "https://github.com/libuv/libuv/blob/v${version}/ChangeLog";

     

       115
       115
       +
           changelog   = "https://github.com/libuv/libuv/blob/v${finalAttrs.version}/ChangeLog";

     

       116
       116
        
           maintainers = with maintainers; [ cstrahan ];

     

       117
       117
        
           platforms   = platforms.all;

     

       118
       118
        
           license     = with licenses; [ mit isc bsd2 bsd3 cc-by-40 ];

     

       119
       119
        
         };

     

       120
       120
        
       

     

       121
       121
       -
       }

     

       121
       121
       +
       })

+23

pkgs/development/libraries/science/astronomy/libxisf/0001-Fix-pkg-config-paths.patch

···

       1
       1
       +
       From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Nicolas Benes <nbenes.gh@xandea.de>

     

       3
       3
       +
       Date: Mon, 22 May 2023 09:25:27 +0200

     

       4
       4
       +
       Subject: [PATCH] Fix pkg-config paths

     

       5
       5
       +
       

     

       6
       6
       +
       

     

       7
       7
       +
       diff --git a/libxisf.pc.in b/libxisf.pc.in

     

       8
       8
       +
       index b0b8b53..944b068 100644

     

       9
       9
       +
       --- a/libxisf.pc.in

     

       10
       10
       +
       +++ b/libxisf.pc.in

     

       11
       11
       +
       @@ -1,7 +1,7 @@

     

       12
       12
       +
        prefix="@CMAKE_INSTALL_PREFIX@"

     

       13
       13
       +
        exec_prefix="${prefix}"

     

       14
       14
       +
       -libdir="${exec_prefix}/@CMAKE_INSTALL_LIBDIR@"

     

       15
       15
       +
       -includedir="${prefix}/@CMAKE_INSTALL_INCLUDEDIR@"

     

       16
       16
       +
       +libdir="@CMAKE_INSTALL_FULL_LIBDIR@"

     

       17
       17
       +
       +includedir="@CMAKE_INSTALL_FULL_INCLUDEDIR@"

     

       18
       18
       +
        

     

       19
       19
       +
        Name: @PROJECT_NAME@

     

       20
       20
       +
        Description: @CMAKE_PROJECT_DESCRIPTION@

     

       21
       21
       +
       -- 

     

       22
       22
       +
       2.38.5

     

       23
       23
       +

+6 -2

pkgs/development/libraries/science/astronomy/libxisf/default.nix

···

       10
       10
        
       

     

       11
       11
        
       stdenv.mkDerivation (finalAttrs: {

     

       12
       12
        
         pname = "libxisf";

     

       13
       13
       -
         version = "0.2.3";

     

       13
       13
       +
         version = "0.2.8";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitea {

     

       16
       16
        
           domain = "gitea.nouspiro.space";

     

       17
       17
        
           owner = "nou";

     

       18
       18
        
           repo = "libXISF";

     

       19
       19
        
           rev = "v${finalAttrs.version}";

     

       20
       20
       -
           hash = "sha256-u5EYnRO2rUV8ofLL9qfACeVvVbWXEXpkqh2Q4OOxpaQ=";

     

       20
       20
       +
           hash = "sha256-YB97vMz2+cFRYq8x2Su3Eh952U6kGIVLYV7kDEd5S8g=";

     

       21
       21
        
         };

     

       22
       22
       +
       

     

       23
       23
       +
         patches = [

     

       24
       24
       +
           ./0001-Fix-pkg-config-paths.patch

     

       25
       25
       +
         ];

     

       22
       26
        
       

     

       23
       27
        
         nativeBuildInputs = [

     

       24
       28
        
           cmake

+81

pkgs/development/tools/language-servers/nixd/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , boost182

     

       5
       5
       +
       , gtest

     

       6
       6
       +
       , libbacktrace

     

       7
       7
       +
       , lit

     

       8
       8
       +
       , llvmPackages

     

       9
       9
       +
       , meson

     

       10
       10
       +
       , ninja

     

       11
       11
       +
       , nix

     

       12
       12
       +
       , nixpkgs-fmt

     

       13
       13
       +
       , pkg-config

     

       14
       14
       +
       }:

     

       15
       15
       +
       

     

       16
       16
       +
       stdenv.mkDerivation rec {

     

       17
       17
       +
         pname = "nixd";

     

       18
       18
       +
         version = "1.0.0";

     

       19
       19
       +
       

     

       20
       20
       +
         src = fetchFromGitHub {

     

       21
       21
       +
           owner = "nix-community";

     

       22
       22
       +
           repo = "nixd";

     

       23
       23
       +
           rev = version;

     

       24
       24
       +
           hash = "sha256-kTDPbsQi9gzFAFkiAPF+V3yI1WBmILEnnsqdgHMqXJA=";

     

       25
       25
       +
         };

     

       26
       26
       +
       

     

       27
       27
       +
         mesonBuildType = "release";

     

       28
       28
       +
       

     

       29
       29
       +
         nativeBuildInputs = [

     

       30
       30
       +
           meson

     

       31
       31
       +
           ninja

     

       32
       32
       +
           pkg-config

     

       33
       33
       +
         ];

     

       34
       34
       +
       

     

       35
       35
       +
         nativeCheckInputs = [

     

       36
       36
       +
           lit

     

       37
       37
       +
           nixpkgs-fmt

     

       38
       38
       +
         ];

     

       39
       39
       +
       

     

       40
       40
       +
         buildInputs = [

     

       41
       41
       +
           libbacktrace

     

       42
       42
       +
           nix

     

       43
       43
       +
           gtest

     

       44
       44
       +
           boost182

     

       45
       45
       +
           llvmPackages.llvm

     

       46
       46
       +
         ];

     

       47
       47
       +
       

     

       48
       48
       +
         env.CXXFLAGS = "-include ${nix.dev}/include/nix/config.h";

     

       49
       49
       +
       

     

       50
       50
       +
         doCheck = true;

     

       51
       51
       +
       

     

       52
       52
       +
         checkPhase = ''

     

       53
       53
       +
           runHook preCheck

     

       54
       54
       +
           dirs=(store var var/nix var/log/nix etc home)

     

       55
       55
       +
       

     

       56
       56
       +
           for dir in $dirs; do

     

       57
       57
       +
             mkdir -p "$TMPDIR/$dir"

     

       58
       58
       +
           done

     

       59
       59
       +
       

     

       60
       60
       +
           export NIX_STORE_DIR=$TMPDIR/store

     

       61
       61
       +
           export NIX_LOCALSTATE_DIR=$TMPDIR/var

     

       62
       62
       +
           export NIX_STATE_DIR=$TMPDIR/var/nix

     

       63
       63
       +
           export NIX_LOG_DIR=$TMPDIR/var/log/nix

     

       64
       64
       +
           export NIX_CONF_DIR=$TMPDIR/etc

     

       65
       65
       +
           export HOME=$TMPDIR/home

     

       66
       66
       +
       

     

       67
       67
       +
           # Disable nixd regression tests, because it uses some features provided by

     

       68
       68
       +
           # nix, and does not correctly work in the sandbox

     

       69
       69
       +
           meson test --print-errorlogs server regression/nix-ast-dump

     

       70
       70
       +
           runHook postCheck

     

       71
       71
       +
         '';

     

       72
       72
       +
       

     

       73
       73
       +
         meta = {

     

       74
       74
       +
           description = "Nix language server";

     

       75
       75
       +
           homepage = "https://github.com/nix-community/nixd";

     

       76
       76
       +
           license = lib.licenses.lgpl3Plus;

     

       77
       77
       +
           maintainers = with lib.maintainers; [ inclyc ];

     

       78
       78
       +
           platforms = lib.platforms.unix;

     

       79
       79
       +
           broken = stdenv.isDarwin;

     

       80
       80
       +
         };

     

       81
       81
       +
       }

+6 -6

pkgs/misc/documentation-highlighter/default.nix

···

       9
       9
        
         };

     

       10
       10
        
         src = lib.sources.cleanSourceWith {

     

       11
       11
        
           src = ./.;

     

       12
       12
       -
           filter = path: type: lib.elem path (map toString [

     

       13
       13
       -
             ./highlight.pack.js

     

       14
       14
       -
             ./LICENSE

     

       15
       15
       -
             ./loader.js

     

       16
       16
       -
             ./mono-blue.css

     

       17
       17
       -
             ./README.md

     

       12
       12
       +
           filter = path: type: lib.elem (baseNameOf path) ([

     

       13
       13
       +
             "highlight.pack.js"

     

       14
       14
       +
             "LICENSE"

     

       15
       15
       +
             "loader.js"

     

       16
       16
       +
             "mono-blue.css"

     

       17
       17
       +
             "README.md"

     

       18
       18
        
           ]);

     

       19
       19
        
         };

     

       20
       20
        
       } ''

+5 -10

pkgs/os-specific/linux/cfs-zen-tweaks/default.nix

···

       17
       17
        
           sha256 = "HRR2tdjNmWyrpbcMlihSdb/7g/tHma3YyXogQpRCVyo=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         postPatch = ''

     

       21
       21
       -
           patchShebangs set-cfs-zen-tweaks.bash

     

       22
       22
       -
           chmod +x set-cfs-zen-tweaks.bash

     

       20
       20
       +
         preConfigure = ''

     

       23
       21
        
           substituteInPlace set-cfs-zen-tweaks.bash \

     

       24
       22
        
             --replace '$(gawk' '$(${gawk}/bin/gawk'

     

       25
       23
        
         '';

     

       26
       24
        
       

     

       27
       27
       -
         buildInputs = [

     

       28
       28
       -
           gawk

     

       29
       29
       -
         ];

     

       25
       25
       +
         preFixup = ''

     

       26
       26
       +
           chmod +x $out/lib/cfs-zen-tweaks/set-cfs-zen-tweaks.bash

     

       27
       27
       +
         '';

     

       30
       28
        
       

     

       31
       31
       -
         nativeBuildInputs = [

     

       32
       32
       -
           cmake

     

       33
       33
       -
           makeWrapper

     

       34
       34
       -
         ];

     

       29
       29
       +
         nativeBuildInputs = [ cmake ];

     

       35
       30
        
       

     

       36
       31
        
         meta = with lib; {

     

       37
       32
        
           description = "Tweak Linux CPU scheduler for desktop responsiveness";

-34

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

···

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

     

       2
       2
       -
       

     

       3
       3
       -
       stdenv.mkDerivation {

     

       4
       4
       -
         pname = "sch_cake";

     

       5
       5
       -
         version = "unstable-2017-07-16";

     

       6
       6
       -
       

     

       7
       7
       -
         src = fetchFromGitHub {

     

       8
       8
       -
           owner = "dtaht";

     

       9
       9
       -
           repo = "sch_cake";

     

       10
       10
       -
           rev = "e641a56f27b6848736028f87eda65ac3df9f99f7";

     

       11
       11
       -
           sha256 = "08582jy01j32b3mj8hf6m8687qrcz64zv2m236j24inlkmd94q21";

     

       12
       12
       -
         };

     

       13
       13
       -
       

     

       14
       14
       -
         hardeningDisable = [ "pic" ];

     

       15
       15
       -
       

     

       16
       16
       -
         makeFlags = [

     

       17
       17
       -
           "KERNEL_VERSION=${kernel.version}"

     

       18
       18
       -
           "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

     

       19
       19
       -
         ];

     

       20
       20
       -
       

     

       21
       21
       -
         installPhase = ''

     

       22
       22
       -
           install -v -m 644 -D sch_cake.ko \

     

       23
       23
       -
             $out/lib/modules/${kernel.modDirVersion}/kernel/net/sched/sch_cake.ko

     

       24
       24
       -
         '';

     

       25
       25
       -
       

     

       26
       26
       -
         meta = with lib; {

     

       27
       27
       -
           description = "The cake qdisc scheduler";

     

       28
       28
       -
           homepage = "https://www.bufferbloat.net/projects/codel/wiki/Cake/";

     

       29
       29
       -
           license = with licenses; [ bsd3 gpl2 ];

     

       30
       30
       -
           maintainers = with maintainers; [ fpletz ];

     

       31
       31
       -
           platforms = platforms.linux;

     

       32
       32
       -
           broken = lib.versionAtLeast kernel.version "4.13";

     

       33
       33
       -
         };

     

       34
       34
       -
       }

+6 -12

pkgs/servers/code-server/build-vscode-nogit.patch

···

       1
       1
       -
       --- ./ci/build/build-vscode.sh

     

       2
       2
       -
       +++ ./ci/build/build-vscode.sh

     

       3
       3
       -
       @@ -45,14 +45,12 @@

     

       4
       4
       -
          # Set the commit Code will embed into the product.json.  We need to do this

     

       5
       5
       -
          # since Code tries to get the commit from the `.git` directory which will fail

     

       6
       6
       -
          # as it is a submodule.

     

       7
       7
       -
       -  export VSCODE_DISTRO_COMMIT

     

       8
       8
       -
       -  VSCODE_DISTRO_COMMIT=$(git rev-parse HEAD)

     

       9
       9
       -
       +  export VSCODE_DISTRO_COMMIT=none

     

       10
       10
       -
        

     

       11
       11
       -
          # Add the date, our name, links, and enable telemetry (this just makes

     

       1
       1
       +
       diff --git a/ci/build/build-vscode.sh b/ci/build/build-vscode.sh

     

       2
       2
       +
       index a72549fb..3aed1ad5 100755

     

       3
       3
       +
       --- a/ci/build/build-vscode.sh

     

       4
       4
       +
       +++ b/ci/build/build-vscode.sh

     

       5
       5
       +
       @@ -58,7 +58,6 @@ main() {

     

       12
       6
        
          # telemetry available; telemetry can still be disabled by flag or setting).

     

       13
       7
        
          # This needs to be done before building as Code will read this file and embed

     

       14
       8
        
          # it into the client-side code.

     
···

       16
       10
        
          cp product.json product.original.json # Since jq has no inline edit.

     

       17
       11
        
          jq --slurp '.[0] * .[1]' product.original.json <(

     

       18
       12
        
            cat << EOF

     

       19
       19
       -
       @@ -99,7 +97,6 @@

     

       13
       13
       +
       @@ -105,7 +104,6 @@ EOF

     

       20
       14
        
          # Reset so if you develop after building you will not be stuck with the wrong

     

       21
       15
        
          # commit (the dev client will use `oss-dev` but the dev server will still use

     

       22
       16
        
          # product.json which will have `stable-$commit`).

+23 -9

pkgs/servers/code-server/default.nix

···

       54
       54
        
           sed -i 's/${version}/${esbuild'.version}/g' ${path}/node_modules/esbuild/lib/main.js

     

       55
       55
        
           ln -s -f ${esbuild'}/bin/esbuild ${path}/node_modules/esbuild/bin/esbuild

     

       56
       56
        
         '';

     

       57
       57
       +
       

     

       58
       58
       +
         commit = "2798322b03e7f446f59c5142215c11711ed7a427";

     

       57
       59
        
       in

     

       58
       60
        
       stdenv.mkDerivation (finalAttrs: {

     

       59
       61
        
         pname = "code-server";

     

       60
       60
       -
         version = "4.12.0";

     

       62
       62
       +
         version = "4.13.0";

     

       61
       63
        
       

     

       62
       64
        
         src = fetchFromGitHub {

     

       63
       65
        
           owner = "coder";

     

       64
       66
        
           repo = "code-server";

     

       65
       67
        
           rev = "v${finalAttrs.version}";

     

       66
       68
        
           fetchSubmodules = true;

     

       67
       67
       -
           hash = "sha256-PQp5dji2Ynp+LJRWBka41umwe1/IR76C+at/wyOWGcI=";

     

       69
       69
       +
           hash = "sha256-4hkKGQU9G3CllD+teWXnYoHaY3YdDz25fwaMUS5OlfM=";

     

       68
       70
        
         };

     

       69
       71
        
       

     

       70
       72
        
         yarnCache = stdenv.mkDerivation {

     
···

       92
       94
        
       

     

       93
       95
        
           outputHashMode = "recursive";

     

       94
       96
        
           outputHashAlgo = "sha256";

     

       95
       95
       -
           outputHash = "sha256-4Vr9u3+W/IhbbTc39jyDyDNQODlmdF+M/N8oJn0Z4+w=";

     

       97
       97
       +
           outputHash = "sha256-xLcrOVhKC0cOPcS5XwIMyv1KiEE0azZ1z+wS9PPKjAQ=";

     

       96
       98
        
         };

     

       97
       99
        
       

     

       98
       100
        
         nativeBuildInputs = [

     
···

       120
       122
        
         ];

     

       121
       123
        
       

     

       122
       124
        
         patches = [

     

       123
       123
       -
           # remove git calls from vscode build script

     

       125
       125
       +
           # Remove all git calls from the VS Code build script except `git rev-parse

     

       126
       126
       +
           # HEAD` which is replaced in postPatch with the commit.

     

       124
       127
        
           ./build-vscode-nogit.patch

     

       125
       128
        
         ];

     

       126
       129
        
       

     
···

       130
       133
        
           patchShebangs ./ci

     

       131
       134
        
       

     

       132
       135
        
           # inject git commit

     

       133
       133
       -
           substituteInPlace ci/build/build-release.sh \

     

       134
       134
       -
             --replace '$(git rev-parse HEAD)' "$commit"

     

       136
       136
       +
           substituteInPlace ./ci/build/build-vscode.sh \

     

       137
       137
       +
             --replace '$(git rev-parse HEAD)' "${commit}"

     

       138
       138
       +
           substituteInPlace ./ci/build/build-release.sh \

     

       139
       139
       +
             --replace '$(git rev-parse HEAD)' "${commit}"

     

       135
       140
        
         '';

     

       136
       141
        
       

     

       137
       142
        
         configurePhase = ''

     
···

       232
       237
        
             -execdir ln -s ${ripgrep}/bin/rg {}/bin/rg \;

     

       233
       238
        
       

     

       234
       239
        
           # run postinstall scripts after patching

     

       235
       235
       -
           find ./lib/vscode -path "*node_modules" -prune -o \

     

       236
       236
       -
             -path "./*/*/*/*/*" -name "yarn.lock" -printf "%h\n" | \

     

       240
       240
       +
           find ./lib/vscode \( -path "*/node_modules/*" -or -path "*/extensions/*" \) \

     

       241
       241
       +
             -and -type f -name "yarn.lock" -printf "%h\n" | \

     

       237
       242
        
               xargs -I {} sh -c 'jq -e ".scripts.postinstall" {}/package.json >/dev/null && yarn --cwd {} postinstall --frozen-lockfile --offline || true'

     

       238
       243
        
       

     

       239
       244
        
           # build code-server

     
···

       241
       246
        
       

     

       242
       247
        
           # build vscode

     

       243
       248
        
           VERSION=${finalAttrs.version} yarn build:vscode

     

       249
       249
       +
       

     

       250
       250
       +
           # inject version into package.json

     

       251
       251
       +
           jq --slurp '.[0] * .[1]' ./package.json <(

     

       252
       252
       +
             cat << EOF

     

       253
       253
       +
           {

     

       254
       254
       +
             "version": "${finalAttrs.version}"

     

       255
       255
       +
           }

     

       256
       256
       +
           EOF

     

       257
       257
       +
           ) | sponge ./package.json

     

       244
       258
        
       

     

       245
       259
        
           # create release

     

       246
       260
        
           yarn release

     
···

       283
       297
        
           '';

     

       284
       298
        
           homepage = "https://github.com/coder/code-server";

     

       285
       299
        
           license = lib.licenses.mit;

     

       286
       286
       -
           maintainers = with lib.maintainers; [ offline henkery ];

     

       300
       300
       +
           maintainers = with lib.maintainers; [ offline henkery code-asher ];

     

       287
       301
        
           platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];

     

       288
       302
        
         };

     

       289
       303
        
       })

+4 -4

pkgs/servers/web-apps/lemmy/update.sh

···

       24
       24
        
         const package_json = $(curl -qf $source/package.json)

     

       25
       25
        
         echo $package_json > $directory/package.json

     

       26
       26
        
       

     

       27
       27
       -
         const server_tarball_meta = $(nix-prefetch-github $owner $server_repo --rev $latest_rev)

     

       27
       27
       +
         const server_tarball_meta = $(nix-prefetch-github $owner $server_repo --rev $latest_rev --fetch-submodules)

     

       28
       28
        
         const server_tarball_hash = "sha256-$(echo $server_tarball_meta | jq -r '.sha256')"

     

       29
       29
       -
         const ui_tarball_meta = $(nix-prefetch-github $owner $ui_repo --rev $latest_rev)

     

       29
       29
       +
         const ui_tarball_meta = $(nix-prefetch-github $owner $ui_repo --rev $latest_rev --fetch-submodules)

     

       30
       30
        
         const ui_tarball_hash = "sha256-$(echo $ui_tarball_meta | jq -r '.sha256')"

     

       31
       31
        
       

     

       32
       32
        
         jq ".version = \"$latest_version\" | \

     
···

       35
       35
        
             .\"serverCargoSha256\" = \"\" | \

     

       36
       36
        
             .\"uiYarnDepsSha256\" = \"\"" $directory/pin.json | sponge $directory/pin.json

     

       37
       37
        
       

     

       38
       38
       -
         const new_cargo_sha256 = $(nix-build -A lemmy-server 2>&1 | \

     

       38
       38
       +
         const new_cargo_sha256 = $(nix-build $directory/../../../.. -A lemmy-server 2>&1 | \

     

       39
       39
        
           tail -n 2 | \

     

       40
       40
        
           head -n 1 | \

     

       41
       41
        
           sd '\s+got:\s+' '')

     

       42
       42
        
       

     

       43
       43
       -
         const new_offline_cache_sha256 = $(nix-build -A lemmy-ui 2>&1 | \

     

       43
       43
       +
         const new_offline_cache_sha256 = $(nix-build $directory/../../../.. -A lemmy-ui 2>&1 | \

     

       44
       44
        
           tail -n 2 | \

     

       45
       45
        
           head -n 1 | \

     

       46
       46
        
           sd '\s+got:\s+' '')

+5 -5

pkgs/tools/misc/shopware-cli/default.nix

···

       3
       3
        
       , fetchFromGitHub

     

       4
       4
        
       , installShellFiles

     

       5
       5
        
       , makeWrapper

     

       6
       6
       -
       , dart-sass-embedded

     

       6
       6
       +
       , dart-sass

     

       7
       7
        
       }:

     

       8
       8
        
       

     

       9
       9
        
       buildGoModule rec {

     

       10
       10
        
         pname = "shopware-cli";

     

       11
       11
       -
         version = "0.1.78";

     

       11
       11
       +
         version = "0.2.0";

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           repo = "shopware-cli";

     

       14
       14
        
           owner = "FriendsOfShopware";

     

       15
       15
        
           rev = version;

     

       16
       16
       -
           hash = "sha256-IJOT4hnh/ufF8x9EXAJ6TaXVD3qoyv+NqDXqH9XB9C4=";

     

       16
       16
       +
           hash = "sha256-IWp4cgZd6td2hOMd2r4v3MI5kY1PqLhLGAIJ3VLvgEA=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         nativeBuildInputs = [ installShellFiles makeWrapper ];

     

       20
       20
        
       

     

       21
       21
       -
         vendorHash = "sha256-MoqLxEPxApxMyGKGiPfdehdmKacpwL0BqRP7rEC0TdY=";

     

       21
       21
       +
         vendorHash = "sha256-JTjz39zw5Il37V6V7mOQuCYiPJnnizBhkBHBAg2DvSU=";

     

       22
       22
        
       

     

       23
       23
        
         postInstall = ''

     

       24
       24
        
           export HOME="$(mktemp -d)"

     
···

       30
       30
        
       

     

       31
       31
        
         preFixup = ''

     

       32
       32
        
           wrapProgram $out/bin/shopware-cli \

     

       33
       33
       -
             --prefix PATH : ${lib.makeBinPath [ dart-sass-embedded ]}

     

       33
       33
       +
             --prefix PATH : ${lib.makeBinPath [ dart-sass ]}

     

       34
       34
        
         '';

     

       35
       35
        
       

     

       36
       36
        
         ldflags = [

+3 -3

pkgs/tools/system/tree/default.nix

···

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         # These settings are found in the Makefile, but there seems to be no

     

       5
       5
       -
         # way to select one ore the other setting other than editing the file

     

       5
       5
       +
         # way to select one or the other setting other than editing the file

     

       6
       6
        
         # manually, so we have to duplicate the know how here.

     

       7
       7
        
         systemFlags = lib.optionalString stdenv.isDarwin ''

     

       8
       8
        
           CFLAGS="-O2 -Wall -fomit-frame-pointer -no-cpp-precomp"

     
···

       18
       18
        
       in

     

       19
       19
        
       stdenv.mkDerivation rec {

     

       20
       20
        
         pname = "tree";

     

       21
       21
       -
         version = "2.0.4";

     

       21
       21
       +
         version = "2.1.1";

     

       22
       22
        
       

     

       23
       23
        
         src = fetchFromGitLab {

     

       24
       24
        
           owner = "OldManProgrammer";

     

       25
       25
        
           repo = "unix-tree";

     

       26
       26
        
           rev = version;

     

       27
       27
       -
           sha256 = "sha256-2voXL31JHh09yBBLuHhYyZsUapiPVF/cgRmTU6wSXk4=";

     

       27
       27
       +
           sha256 = "sha256-aPz1ROUeAKDmMjEtAaL2AguF54/CbIYWpL4Qovv2ftQ=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         preConfigure = ''

pkgs/top-level/all-packages.nix

···

       16672
       16672
        
       

     

       16673
       16673
        
         ograc = callPackage ../development/tools/rust/ograc { };

     

       16674
       16674
        
       

     

       16675
       16675
       +
         opensmalltalk-vm = callPackage ../development/compilers/opensmalltalk-vm { };

     

       16676
       16676
       +
       

     

       16675
       16677
        
         ravedude = callPackage ../development/tools/rust/ravedude { };

     

       16678
       16678
       +
       

     

       16676
       16679
        
         rhack = callPackage ../development/tools/rust/rhack { };

     

       16677
       16680
        
         roogle = callPackage ../development/tools/rust/roogle { };

     

       16678
       16681
        
         rustfmt = rustPackages.rustfmt;

     
···

       17797
       17800
        
         neocmakelsp = callPackage ../development/tools/language-servers/neocmakelsp { };

     

       17798
       17801
        
       

     

       17799
       17802
        
         nil = callPackage ../development/tools/language-servers/nil { };

     

       17803
       17803
       +
       

     

       17804
       17804
       +
         nixd = callPackage ../development/tools/language-servers/nixd {

     

       17805
       17805
       +
           llvmPackages = llvmPackages_16;

     

       17806
       17806
       +
           nix = nixVersions.nix_2_16;

     

       17807
       17807
       +
         };

     

       17800
       17808
        
       

     

       17801
       17809
        
         nls = callPackage ../development/tools/language-servers/nls { };

     

       17802
       17810

+1 -2

pkgs/top-level/linux-kernels.nix

···

       482
       482
        
       

     

       483
       483
        
           prl-tools = callPackage ../os-specific/linux/prl-tools { };

     

       484
       484
        
       

     

       485
       485
       -
           sch_cake = callPackage ../os-specific/linux/sch_cake { };

     

       486
       486
       -
       

     

       487
       485
        
           isgx = callPackage ../os-specific/linux/isgx { };

     

       488
       486
        
       

     

       489
       487
        
           rr-zen_workaround = callPackage ../development/tools/analysis/rr/zen_workaround.nix { };

     
···

       563
       561
        
       

     

       564
       562
        
         } // lib.optionalAttrs config.allowAliases {

     

       565
       563
        
           ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18;

     

       564
       564
       +
           sch_cake = throw "sch_cake was added in mainline kernel version 4.19"; # Added 2023-06-14

     

       566
       565
        
           xmm7360-pci = throw "Support for the XMM7360 WWAN card was added to the iosm kmod in mainline kernel version 5.18";

     

       567
       566
        
         });

     

       568
       567